Changeset 3007:40a4f2639fb6 in roaraudio

Timestamp:

10/27/09 19:58:55 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to enable Speex Prep components

File:

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

roarclients/roarphone.c

@@ -65 +65 @@
    float lowp_freq;
    int speex_prep;
+   int speex_prep_denoise;
+   int speex_prep_agc;
+   int speex_prep_vad;
   } in;
  } filter;
@@ -119 +122 @@
         "  --afi-lowpass FREQ   - Enable input lowpass at FREQ (in Hz)\n"
         "  --afi-speex-prep     - Enable speex preprocessor\n"
+        "  --afi-speex-denoise  - Enable speex denoiser\n"
+        "  --afi-speex-agc      - Enable speex AGC\n"
+        "  --afi-speex-vad      - Enable speex VAD\n"
        );
 
@@ -403 +409 @@
  char * k;
  int    i;
+ union {
+  int32_t i32;
+  size_t  size;
+ } tmp;
 
  memset(&g_conf, 0, sizeof(g_conf));
@@ -440 +450 @@
   } else if ( strcmp(k, "--afi-speex-prep") == 0 ) {
    g_conf.filter.in.speex_prep = 1;
+  } else if ( strcmp(k, "--afi-speex-denoise") == 0 ) {
+   g_conf.filter.in.speex_prep = 1;
+   g_conf.filter.in.speex_prep_denoise = 1;
+  } else if ( strcmp(k, "--afi-speex-agc") == 0 ) {
+   g_conf.filter.in.speex_prep = 1;
+   g_conf.filter.in.speex_prep_agc = 1;
+  } else if ( strcmp(k, "--afi-speex-vad") == 0 ) {
+   g_conf.filter.in.speex_prep = 1;
+   g_conf.filter.in.speex_prep_vad = 1;
 
   } else if ( strcmp(k, "--codec") == 0 ) {
@@ -591 +610 @@
   }
 
+  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);