Changeset 2305:d0b7c9a6b499 in roaraudio

Timestamp:

08/05/09 06:06:35 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for stereo Speex

File:

• libroardsp/transcode_speex.c (modified) (7 diffs)

libroardsp/transcode_speex.c

@@ -44 +44 @@
  }
 
- // curruntly only mono mode is supported
- if ( info->channels != 1 ) {
-  free(self);
-  return -1;
+ // only mono/stereo mode is supported
+ switch (info->channels) {
+  case 1: self->stereo = 0; break;
+  case 2: self->stereo = 1; break;
+  default:
+    free(self);
+    return -1;
  }
 
@@ -101 +104 @@
    return -1;
 
- return _16BIT * self->frame_size;
+ return _16BIT * self->frame_size * (self->stereo ? 2 : 1);
 }
 
@@ -131 +134 @@
  speex_bits_reset(&(self->bits));
 
+ if ( self->stereo )
+  speex_encode_stereo_int((spx_int16_t *) buf, self->frame_size, &(self->bits));
+
  speex_encode_int(self->xcoder, (spx_int16_t *) buf, &(self->bits));
 
@@ -146 +152 @@
 }
 
+// TODO: move all the init thingys into a seperate function
 int roar_xcoder_speex_decode     (struct roar_xcoder * state, void * buf, size_t len) {
  struct roar_xcoder_speex * self = state->inst;
@@ -152 +159 @@
  int pkg_len;
  int tmp;
+ SpeexStereoState stereo = SPEEX_STEREO_STATE_INIT;
+ SpeexCallback callback;
 
  if ( state->stage == ROAR_XCODER_STAGE_INITED ) {
@@ -184 +193 @@
   speex_decoder_ctl(self->xcoder, SPEEX_GET_FRAME_SIZE, &(self->frame_size));
 
+  if ( self->stereo ) {
+   memcpy(&(self->stereo_state), &stereo, sizeof(self->stereo_state));
+
+   callback.callback_id = SPEEX_INBAND_STEREO;
+   callback.func = speex_std_stereo_request_handler;
+   callback.data = &(self->stereo_state);
+
+   speex_decoder_ctl(self->xcoder, SPEEX_SET_HANDLER, &callback);
+  }
+
   state->stage = ROAR_XCODER_STAGE_OPENED;
  }
@@ -202 +221 @@
  speex_decode_int(self->xcoder, &(self->bits), buf);
 
+ if ( self->stereo ) {
+  speex_decode_stereo_int(buf, self->frame_size, &(self->stereo_state));
+ }
+
  return 0;
 }