Changeset 393:698f0de23178 in roaraudio

Timestamp:

08/06/08 18:29:56 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

cf speex: detect mode on first read

Files:

• include/roaraudio/audio.h (modified) (1 diff)
• roard/codecfilter_speex.c (modified) (2 diffs)

include/roaraudio/audio.h

@@ -91 +91 @@
 #define ROAR_SET_VOL_ONE           2
 
+
+#define ROAR_SPEEX_MODE_NB         1
+#define ROAR_SPEEX_MODE_WB         2
+#define ROAR_SPEEX_MODE_UWB        3
+
+
 struct roar_audio_info {
  unsigned int rate;

roard/codecfilter_speex.c

@@ -16 +16 @@
  self->encoder = NULL;
  self->decoder = NULL;
+
+ self->stream  = info;
 
  speex_bits_init(&(self->bits));
@@ -49 +51 @@
 int cf_speex_read(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
  struct codecfilter_speex_inst * self = (struct codecfilter_speex_inst *) inst;
+  struct roar_stream * s = (struct roar_stream *) self->stream;
+ int mode;
+ uint16_t ui;
+
+ if ( ! self->decoder ) {
+  if ( read(s->fh, &ui, 2) != 2 )
+   return 0;
+
+  mode = ntohs(ui);
+
+  if ( mode == ROAR_SPEEX_MODE_NB ) {
+   self->decoder = speex_decoder_init(&speex_nb_mode);
+  } else if ( mode == ROAR_SPEEX_MODE_WB ) {
+   self->decoder = speex_decoder_init(&speex_wb_mode);
+  } else if ( mode == ROAR_SPEEX_MODE_UWB ) {
+   self->decoder = speex_decoder_init(&speex_uwb_mode);
+  } else {
+   return 0;
+  }
+ }
 
  return -1;
 }
+
 int cf_speex_write(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
  struct codecfilter_speex_inst * self = (struct codecfilter_speex_inst *) inst;