Changeset 2977:60f2e8ce2816 in roaraudio

Timestamp:

10/23/09 12:01:51 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for filter chains

File:

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

roarclients/roarphone.c

@@ -72 +72 @@
 
 struct {
+ struct roardsp_filterchain input;
+ struct roardsp_filterchain output;
+} g_filterchains;
+
+struct {
  struct {
   char key[ROAR_META_MAX_NAMELEN];
@@ -313 +318 @@
    break;
 
+  if ( roardsp_fchain_num(&(g_filterchains.input)) ) {
+   if ( roardsp_fchain_calc(&(g_filterchains.input), micbuf, len) == -1 )
+    break;
+  }
+
   if ( g_conf.dtx_threshold > 0 )
    if ( info->bits == 16 )
@@ -338 +348 @@
   if ( g_conf.antiecho != AE_NONE && info->bits == 16 )
    anti_echo16(outbuf, micbuf, ROAR_MIN(miclen, outlen)/2, info);
+
+  if ( roardsp_fchain_num(&(g_filterchains.output)) ) {
+   if ( roardsp_fchain_calc(&(g_filterchains.output), outbuf, outlen) == -1 )
+    break;
+  }
 
   if ( roar_vio_write(s0, outbuf, outlen) != outlen )
@@ -371 +386 @@
 
  memset(&g_meta, 0, sizeof(g_meta));
+
+ roardsp_fchain_init(&(g_filterchains.input));
+ roardsp_fchain_init(&(g_filterchains.output));
 
  for (i = 1; i < argc; i++) {
@@ -515 +533 @@
  roar_vio_close(&dvio);
 
+ roardsp_fchain_uninit(&(g_filterchains.input));
+ roardsp_fchain_uninit(&(g_filterchains.output));
+
  roar_disconnect(&(g_cons.con));