Changeset 3008:edd998caccdc in roaraudio

Timestamp:

10/27/09 20:00:04 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

init bixcoder before we start the filters

File:

• roarclients/roarphone.c (modified) (2 diffs)

roarclients/roarphone.c

@@ -579 +579 @@
  set_meta();
 
-#define _err(x) roar_vio_close(&dvio); roar_vio_close(&svio); return (x)
-
- if ( g_conf.filter.in.downmix ) {
-  if ( roardsp_filter_new(&filter, &(g_cons.stream), ROARDSP_FILTER_DOWNMIX) == -1 ) {
-   _err(2);
-  }
-
-  if ( roardsp_fchain_add(&(g_filterchains.input), filter) == -1 ) {
-   _err(2);
-  }
- }
-
- if ( g_conf.filter.in.lowp_freq > 1 ) {
-  if ( roardsp_filter_new(&filter, &(g_cons.stream), ROARDSP_FILTER_LOWP) == -1 ) {
-   _err(2);
-  }
-
-  if ( roardsp_filter_ctl(filter, ROARDSP_FCTL_FREQ, &(g_conf.filter.in.lowp_freq)) == -1 ) {
-   _err(2);
-  }
-
-  if ( roardsp_fchain_add(&(g_filterchains.input), filter) == -1 ) {
-   _err(2);
-  }
- }
-
- if ( g_conf.filter.in.speex_prep ) {
-  if ( roardsp_filter_new(&filter, &(g_cons.stream), ROARDSP_FILTER_SPEEX_PREP) == -1 ) {
-   _err(2);
-  }
-
-  tmp.size = g_conf.samples;
-  if ( roardsp_filter_ctl(filter, ROARDSP_FCTL_PACKET_SIZE, &tmp) == -1 ) {
-   _err(2);
-  }
-
-  tmp.i32 = 0;
-
-  if ( g_conf.filter.in.speex_prep_denoise )
-   tmp.i32 |= ROARDSP_SPEEX_PREP_DENOISE_ON;
-
-  if ( g_conf.filter.in.speex_prep_agc )
-   tmp.i32 |= ROARDSP_SPEEX_PREP_AGC_ON;
-
-  if ( g_conf.filter.in.speex_prep_vad )
-   tmp.i32 |= ROARDSP_SPEEX_PREP_VAD_ON;
-
-  if ( roardsp_filter_ctl(filter, ROARDSP_FCTL_MODE, &tmp) == -1 ) {
-   _err(2);
-  }
-
-  if ( roardsp_fchain_add(&(g_filterchains.input), filter) == -1 ) {
-   _err(2);
-  }
- }
-
-#undef _err
-
  if ( g_conf.transcode ) {
   dinfo.codec = info.codec;
@@ -653 +595 @@
  }
 
+#define _err(x) roar_vio_close(&dvio); roar_vio_close(&svio); return (x)
+
+ if ( g_conf.filter.in.downmix ) {
+  if ( roardsp_filter_new(&filter, &(g_cons.stream), ROARDSP_FILTER_DOWNMIX) == -1 ) {
+   _err(2);
+  }
+
+  if ( roardsp_fchain_add(&(g_filterchains.input), filter) == -1 ) {
+   _err(2);
+  }
+ }
+
+ if ( g_conf.filter.in.lowp_freq > 1 ) {
+  if ( roardsp_filter_new(&filter, &(g_cons.stream), ROARDSP_FILTER_LOWP) == -1 ) {
+   _err(2);
+  }
+
+  if ( roardsp_filter_ctl(filter, ROARDSP_FCTL_FREQ, &(g_conf.filter.in.lowp_freq)) == -1 ) {
+   _err(2);
+  }
+
+  if ( roardsp_fchain_add(&(g_filterchains.input), filter) == -1 ) {
+   _err(2);
+  }
+ }
+
+ if ( g_conf.filter.in.speex_prep ) {
+  if ( roardsp_filter_new(&filter, &(g_cons.stream), ROARDSP_FILTER_SPEEX_PREP) == -1 ) {
+   _err(2);
+  }
+
+  tmp.size = g_conf.samples;
+  if ( roardsp_filter_ctl(filter, ROARDSP_FCTL_PACKET_SIZE, &tmp) == -1 ) {
+   _err(2);
+  }
+
+  tmp.i32 = 0;
+
+  if ( g_conf.filter.in.speex_prep_denoise )
+   tmp.i32 |= ROARDSP_SPEEX_PREP_DENOISE_ON;
+
+  if ( g_conf.filter.in.speex_prep_agc )
+   tmp.i32 |= ROARDSP_SPEEX_PREP_AGC_ON;
+
+  if ( g_conf.filter.in.speex_prep_vad )
+   tmp.i32 |= ROARDSP_SPEEX_PREP_VAD_ON;
+
+  if ( roardsp_filter_ctl(filter, ROARDSP_FCTL_MODE, &tmp) == -1 ) {
+   _err(2);
+  }
+
+  if ( roardsp_fchain_add(&(g_filterchains.input), filter) == -1 ) {
+   _err(2);
+  }
+ }
+
+#undef _err
+
  ROAR_DBG("main(*): CALL run_stream(&dvio, &svio, &info);");
  run_stream(&dvio, svio_p, &info);