Changeset 1332:71e753387e4c in mediastreamer2

Timestamp:

Mar 30, 2011 5:42:41 PM (2 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

echo canceller improvements

Files:

• include/mediastreamer2/msinterfaces.h (modified) (2 diffs)
• src/speexec.c (modified) (7 diffs)

include/mediastreamer2/msinterfaces.h

@@ -101 +101 @@
         MS_FILTER_METHOD(MSFilterEchoCancellerInterface,2,int)
 
-
-/** Interface definitions for video decoders */
-#define MS_VIDEO_DECODER_DECODING_ERRORS \
-                MS_FILTER_EVENT_NO_ARG(MSFilterVideoDecoderInterface,0)
-
 /** put filter in bypass mode */
 #define MS_ECHO_CANCELLER_SET_BYPASS_MODE \
@@ -112 +107 @@
 #define MS_ECHO_CANCELLER_GET_BYPASS_MODE \
         MS_FILTER_METHOD(MSFilterEchoCancellerInterface,4,bool_t)
+
+
+
+/** Interface definitions for video decoders */
+#define MS_VIDEO_DECODER_DECODING_ERRORS \
+                MS_FILTER_EVENT_NO_ARG(MSFilterVideoDecoderInterface,0)
 #endif
 

src/speexec.c

@@ -33 +33 @@
 
 //#define EC_DUMP 1
-
+#ifdef ANDROID
 #define EC_DUMP_PREFIX "/sdcard"
+#else
+#define EC_DUMP_PREFIX "/dynamic/tests"
+#endif
 
 static const float smooth_factor=0.05;
@@ -55 +58 @@
         FILE *echofile;
         FILE *reffile;
+        FILE *cleanfile;
 #endif
         bool_t echostarted;
@@ -84 +88 @@
                 s->reffile=fopen(fname,"w");
                 ms_free(fname);
+                fname=ms_strdup_printf("%s/msspeexec-%p-clean.raw", EC_DUMP_PREFIX,f);
+                s->cleanfile=fopen(fname,"w");
+                ms_free(fname);
         }
 #endif
@@ -123 +130 @@
         ms_bufferizer_put (&s->delayed_ref,m);
         s->min_ref_samples=-1;
+        s->nominal_ref_samples=delay_samples;
 }
 
@@ -194 +202 @@
                 speex_echo_cancellation(s->ecstate,(short*)echo,(short*)ref,(short*)oecho->b_wptr);
                 speex_preprocess_run(s->den, (short*)oecho->b_wptr);
+#ifdef EC_DUMP
+                if (s->cleanfile)
+                        fwrite(oecho->b_wptr,nbytes,1,s->cleanfile);
+#endif
                 oecho->b_wptr+=nbytes;
                 ms_queue_put(f->outputs[1],oecho);
@@ -202 +214 @@
                 int diff=s->min_ref_samples-s->nominal_ref_samples;
                 if (diff>nbytes){
-                        ms_warning("echo canceller: we are accumulating too much reference signal, purging now %i bytes",nbytes);
-                        ms_bufferizer_skip_bytes(&s->delayed_ref,nbytes);
+                        int purge=diff-(nbytes/2);
+                        ms_warning("echo canceller: we are accumulating too much reference signal, purging now %i bytes",purge);
+                        ms_bufferizer_skip_bytes(&s->delayed_ref,purge);
                 }
                 s->min_ref_samples=-1;
@@ -262 +275 @@
         {       MS_ECHO_CANCELLER_SET_TAIL_LENGTH       ,       speex_ec_set_tail_length        },
         {       MS_ECHO_CANCELLER_SET_DELAY             ,       speex_ec_set_delay              },
-        {       MS_ECHO_CANCELLER_SET_FRAMESIZE ,       speex_ec_set_framesize          },
+        {       MS_ECHO_CANCELLER_SET_FRAMESIZE         ,       speex_ec_set_framesize          },
         {       MS_ECHO_CANCELLER_SET_BYPASS_MODE       ,       speex_ec_set_bypass_mode                },
         {       MS_ECHO_CANCELLER_GET_BYPASS_MODE       ,       speex_ec_get_bypass_mode                },