Changeset 615:5df24d5c701f in roaraudio

Timestamp:

08/20/08 01:34:50 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added some encoder init code

Location:

roard

Files:

• codecfilter.c (modified) (1 diff)
• codecfilter_speex.c (modified) (1 diff)

roard/codecfilter.c

@@ -34 +34 @@
 #ifdef ROAR_HAVE_LIBSPEEX
  {ROAR_CODEC_ROAR_SPEEX, "RoarSPEEX", "RoarAudio SPEEX", NULL, ROAR_CODECFILTER_READ,
-  cf_speex_open, cf_speex_close, NULL, NULL, cf_speex_read, NULL},
+  cf_speex_open, cf_speex_close, NULL, cf_speex_write, cf_speex_read, NULL},
 #endif
 

roard/codecfilter_speex.c

@@ -193 +193 @@
 int cf_speex_write(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
  struct codecfilter_speex_inst * self = (struct codecfilter_speex_inst *) inst;
+ uint16_t mode = ROAR_SPEEX_MODE_UWB;
+ int tmp;
+
+ if ( ! self->encoder ) {
+  if ( stream_vio_s_write(self->stream, ROAR_SPEEX_MAGIC, ROAR_SPEEX_MAGIC_LEN) != ROAR_SPEEX_MAGIC_LEN )
+   return -1;
+
+  if ( mode == ROAR_SPEEX_MODE_NB ) {
+   self->encoder = speex_encoder_init(&speex_nb_mode);
+  } else if ( mode == ROAR_SPEEX_MODE_WB ) {
+   self->encoder = speex_encoder_init(&speex_wb_mode);
+  } else if ( mode == ROAR_SPEEX_MODE_UWB ) {
+   self->encoder = speex_encoder_init(&speex_uwb_mode);
+  }
+
+  mode = ROAR_HOST2NET16(mode);
+
+  if ( stream_vio_s_write(self->stream, &mode, 2) != 2 )
+   return -1;
+
+  tmp = 8;
+  speex_encoder_ctl(self->encoder, SPEEX_SET_QUALITY,    &tmp);
+  speex_encoder_ctl(self->encoder, SPEEX_GET_FRAME_SIZE, &(self->frame_size));
+
+ }
 
  return -1;