Changeset 2140:7665a1f08287 in roaraudio

Timestamp:

07/24/09 03:29:18 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added a simple anti echo, dosn't worl but sounds funny

File:

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

roarclients/roarphone.c

@@ -30 +30 @@
 #define DRIVER  "oss"
 
+// anti echo:
+#define AE_NONE      0
+#define AE_SIMPLE    1
+#define AE_SPEEX     2
+
+struct {
+ int antiecho;
+} g_conf;
+
 void usage (void) {
  printf("roarcat [OPTIONS]...\n");
@@ -55 +64 @@
 }
 
+int anti_echo16(int16_t * buf, int16_t * aebuf, size_t len) {
+ size_t i;
+
+ switch (g_conf.antiecho) {
+  case AE_NONE:
+    return 0;
+   break;
+  case AE_SIMPLE:
+    for (i = 0; i < len; i++)
+     buf[i] -= aebuf[i];
+   break;
+  default:
+    return -1;
+   break;
+ }
+
+ return -1;
+}
+
 int run_stream (struct roar_vio_calls * s0, struct roar_vio_calls * s1, struct roar_audio_info * info) {
  size_t len;
- char * buf;
- ssize_t l;
+ void * outbuf, * micbuf;
+ ssize_t outlen, miclen;
 
  len = (info->rate / 100) * info->channels * info->bits / 8;
 
- if ( (buf = malloc(len)) == NULL )
+ if ( (outbuf = malloc(2*len)) == NULL )
   return -1;
 
+ micbuf = outbuf + len;
+
  while (1) {
-  if ( (l = roar_vio_read(s0, buf, len)) <= 0 )
+  if ( (miclen = roar_vio_read(s0, micbuf, len)) <= 0 )
    break;
-  if ( roar_vio_write(s1, buf, l) != l )
+  if ( roar_vio_write(s1, micbuf, miclen) != miclen )
    break;
-  if ( (l = roar_vio_read(s1, buf, len)) <= 0 )
+  if ( (outlen = roar_vio_read(s1, outbuf, len)) <= 0 )
    break;
-  if ( roar_vio_write(s0, buf, l) != l )
+
+  if ( g_conf.antiecho != AE_NONE )
+   anti_echo16(outbuf, micbuf, ROAR_MIN(miclen, outlen)/2);
+
+  if ( roar_vio_write(s0, outbuf, outlen) != outlen )
    break;
  }
 
- free(buf);
+ free(outbuf);
 
  return 0;
@@ -93 +127 @@
  char * k;
  int    i;
+
+ memset(&g_conf, 0, sizeof(g_conf));
+
+ g_conf.antiecho = AE_SIMPLE;
 
  for (i = 1; i < argc; i++) {
@@ -130 +168 @@
  }
 
- run_stream(&svio, &dvio, &info);
+ run_stream(&dvio, &svio, &info);
 
  roar_vio_close(&svio);