Changeset 2141:ae202c734bd4 in roaraudio

Timestamp:

07/24/09 04:19:27 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added old style speex AEC support

Location:

roarclients

Files:

• Makefile (modified) (1 diff)
• roarphone.c (modified) (9 diffs)

roarclients/Makefile

@@ -51 +51 @@
         $L
 roarphone: roarphone.o $(DRVOBJS)
-        ${CC} ${LDFLAGS} -o roarphone roarphone.o $(DRVOBJS) $(DSPLIBS)
+        ${CC} ${LDFLAGS} -o roarphone roarphone.o $(DRVOBJS) $(DSPLIBS) $(lib_speex)
 roarfilt: roarfilt.o
         ${CC} ${LDFLAGS} -o roarfilt roarfilt.o $(DSPLIBS)

roarclients/roarphone.c

@@ -26 +26 @@
 #include "driver.h"
 
-#define BUFSIZE 1024
+#ifdef ROAR_HAVE_LIBSPEEX
+#include <speex/speex_echo.h>
+#endif
+
+#define TIMEDIV  100
 
 #define DRIVER  "oss"
@@ -34 +38 @@
 #define AE_SIMPLE    1
 #define AE_SPEEX     2
+#define AE_ROARD     3
 
 struct {
@@ -44 +49 @@
  printf("\nOptions:\n\n");
 
- printf("  --server SERVER    - Set server hostname\n"
-        "  --rate   RATE      - Set sample rate\n"
-        "  --bits   BITS      - Set bits per sample\n"
-        "  --chans  CHANNELS  - Set number of channels\n"
-        "  --codec  CODEC     - Set the codec\n"
-        "  --driver DRIVER    - Set the driver\n"
-        "  --device DEVICE    - Set the device\n"
-        "  --help             - Show this help\n"
+ printf("  --server   SERVER    - Set server hostname\n"
+        "  --rate     RATE      - Set sample rate\n"
+        "  --bits     BITS      - Set bits per sample\n"
+        "  --chans    CHANNELS  - Set number of channels\n"
+        "  --codec    CODEC     - Set the codec\n"
+        "  --driver   DRIVER    - Set the driver\n"
+        "  --device   DEVICE    - Set the device\n"
+        "  --antiecho AEMODE    - Set the anti echo mode\n"
+        "  --help               - Show this help\n"
        );
 
@@ -64 +70 @@
 }
 
-int anti_echo16(int16_t * buf, int16_t * aebuf, size_t len) {
+#ifdef ROAR_HAVE_LIBSPEEX
+int anti_echo_speex16(int16_t * buf, int16_t * aebuf, size_t len, struct roar_audio_info * info) {
+ static SpeexEchoState * state = NULL;
+ size_t samples = info->rate / TIMEDIV;
+ static int16_t * obuf = NULL;
+
+ if ( info->channels != 1 )
+  return -1;
+
+ if (len != samples)
+  return -1;
+
+ if ( state == NULL ) {
+  if ( (state = speex_echo_state_init(samples, 100*samples)) == NULL )
+   return -1;
+
+  // todo: set sample rate.
+ }
+
+ if ( obuf == NULL ) {
+  if ( (obuf = malloc(2*samples)) == NULL )
+   return -1;
+ }
+
+/*
+ speex_echo_cancellation(state, buf, aebuf, obuf);
+*/
+
+ speex_echo_cancel(state, buf, aebuf, obuf, NULL);
+
+ memcpy(buf, obuf, 2*samples);
+
+ return 0;
+}
+#endif
+
+int anti_echo16(int16_t * buf, int16_t * aebuf, size_t len, struct roar_audio_info * info) {
  size_t i;
 
@@ -75 +117 @@
      buf[i] -= aebuf[i];
    break;
+#ifdef ROAR_HAVE_LIBSPEEX
+  case AE_SPEEX:
+    return anti_echo_speex16(buf, aebuf, len, info);
+   break;
+#endif
   default:
     return -1;
@@ -88 +135 @@
  ssize_t outlen, miclen;
 
- len = (info->rate / 100) * info->channels * info->bits / 8;
+ len = (info->rate / TIMEDIV) * info->channels * info->bits / 8;
 
  if ( (outbuf = malloc(2*len)) == NULL )
@@ -104 +151 @@
 
   if ( g_conf.antiecho != AE_NONE )
-   anti_echo16(outbuf, micbuf, ROAR_MIN(miclen, outlen)/2);
+   anti_echo16(outbuf, micbuf, ROAR_MIN(miclen, outlen)/2, info);
 
   if ( roar_vio_write(s0, outbuf, outlen) != outlen )
@@ -130 +177 @@
  memset(&g_conf, 0, sizeof(g_conf));
 
- g_conf.antiecho = AE_SIMPLE;
+ g_conf.antiecho = AE_NONE;
 
  for (i = 1; i < argc; i++) {
@@ -149 +196 @@
   } else if ( strcmp(k, "--device") == 0 ) {
    device = argv[++i];
+  } else if ( strcmp(k, "--antiecho") == 0 ) {
+   k = argv[++i];
+   if ( !strcmp(k, "none") ) {
+    g_conf.antiecho = AE_NONE;
+   } else if ( !strcmp(k, "simple") ) {
+    g_conf.antiecho = AE_SIMPLE;
+   } else if ( !strcmp(k, "speex") ) {
+    g_conf.antiecho = AE_SPEEX;
+   } else if ( !strcmp(k, "roard") ) {
+    g_conf.antiecho = AE_ROARD;
+   } else {
+    fprintf(stderr, "Error: unknown mode: %s\n", k);
+    return 1;
+   }
   } else if ( strcmp(k, "--help") == 0 ) {
    usage();