Changeset 2311:883f5e3c33f0 in roaraudio

Timestamp:

08/05/09 16:29:04 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added a lot debug lions, commented out parts making the speex xcoder unusable

Location:

libroardsp

Files:

• transcode.c (modified) (4 diffs)
• transcode_speex.c (modified) (8 diffs)

libroardsp/transcode.c

@@ -129 +129 @@
  _CHECK();
 
+ ROAR_DBG("roar_xcoder_proc_packet(state=%p, buf=%p, len=%lu) = ?", state, buf, (unsigned long)len);
+
  if ( state->backend == NULL )
   return -1;
@@ -168 +170 @@
  int ret;
 
+ ROAR_DBG("roar_bixcoder_packet_size(state=%p, samples=%i) = ?", state, samples);
+
  if ( state == NULL )
   return -1;
@@ -174 +178 @@
   return -1;
 
+ ROAR_DBG("roar_bixcoder_packet_size(state=%p, samples=%i): ret=%i", state, samples, ret);
+
+// TODO: we need a lot hope here...
+/*
  if ( roar_xcoder_packet_size(&(state->decoder), ret) != ret )
   return -1;
-
+*/
+
+ ROAR_DBG("roar_bixcoder_packet_size(state=%p, samples=%i) = %i", state, samples, ret);
  return ret;
 }
@@ -195 +205 @@
 
 int roar_bixcoder_read_packet (struct roar_bixcoder * state, void * buf, size_t len) {
+
+ ROAR_DBG("roar_bixcoder_read_packet(state=%p, buf=%p, len=%lu) = ?", state, buf, (unsigned long)len);
+
  if ( state == NULL )
   return -1;

libroardsp/transcode_speex.c

@@ -34 +34 @@
  struct roar_audio_info  * info = &(state->info.pcm);
  int tmp;
+
+ ROAR_DBG("roar_xcoder_speex_init(*): sizeof(*self) = %lu", (unsigned long)sizeof(*self));
 
  if ( self == NULL )
@@ -162 +164 @@
  SpeexCallback callback;
 
+ ROAR_DBG("roar_xcoder_speex_decode(state=%p, buf=%p, len=%lu) = ?", state, buf, (unsigned long)len);
+
  if ( state->stage == ROAR_XCODER_STAGE_INITED ) {
+  ROAR_DBG("roar_xcoder_speex_decode(state=%p, buf=%p, len=%lu): state->stage = INITED", state, buf, (unsigned long)len);
   if ( roar_vio_read(state->backend, magic, ROAR_SPEEX_MAGIC_LEN) != ROAR_SPEEX_MAGIC_LEN )
    return -1;
@@ -170 +175 @@
 
   state->stage = ROAR_XCODER_STAGE_MAGIC;
+  ROAR_DBG("roar_xcoder_speex_decode(state=%p, buf=%p, len=%lu): state->stage = MAGIC", state, buf, (unsigned long)len);
 
   if ( roar_vio_read(state->backend, &tmp_net, 2) != 2 )
@@ -177 +183 @@
 
   state->stage = ROAR_XCODER_STAGE_OPENING;
+  ROAR_DBG("roar_xcoder_speex_decode(state=%p, buf=%p, len=%lu): state->stage = OPENING", state, buf, (unsigned long)len);
 
   switch (self->mode) {
@@ -187 +194 @@
   }
 
+  ROAR_DBG("roar_xcoder_speex_decode(state=%p, buf=%p, len=%lu): opened decoder state", state, buf, (unsigned long)len);
+
   tmp=1;
   speex_decoder_ctl(self->xcoder, SPEEX_SET_ENH, &tmp);
+/*
+// FIXME: why does this make the decoder segfaul?
   tmp = state->info.pcm.rate;
   speex_encoder_ctl(self->xcoder, SPEEX_SET_SAMPLING_RATE, &tmp);
+*/
   speex_decoder_ctl(self->xcoder, SPEEX_GET_FRAME_SIZE, &(self->frame_size));
+
+  ROAR_DBG("roar_xcoder_speex_decode(state=%p, buf=%p, len=%lu): self->stereo = %i", state, buf, (unsigned long)len, self->stereo);
 
   if ( self->stereo ) {
@@ -204 +218 @@
 
   state->stage = ROAR_XCODER_STAGE_OPENED;
- }
+  ROAR_DBG("roar_xcoder_speex_decode(state=%p, buf=%p, len=%lu): state->stage = OPENED", state, buf, (unsigned long)len);
+ }
+
+ ROAR_DBG("roar_xcoder_speex_decode(state=%p, buf=%p, len=%lu): state->stage = %s", state, buf, (unsigned long)len,
+          state->stage == ROAR_XCODER_STAGE_OPENED ? "OPENED" : "???"
+         );
 
  if ( roar_vio_read(state->backend, &tmp_net, 2) != 2 )
@@ -213 +232 @@
  if ( pkg_len > ROAR_SPEEX_MAX_CC )
   return -1;
+
+ ROAR_DBG("roar_xcoder_speex_decode(state=%p, buf=%p, len=%lu) = ?", state, buf, (unsigned long)len);
 
  if ( roar_vio_read(state->backend, self->cc, pkg_len) != pkg_len )
@@ -225 +246 @@
  }
 
+ ROAR_DBG("roar_xcoder_speex_decode(state=%p, buf=%p, len=%lu) = 0", state, buf, (unsigned long)len);
  return 0;
 }