Changeset 1041:985498c76f96 in mediastreamer2

Timestamp:

Jun 30, 2010 10:12:48 AM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Parents:

1034:c82afd5c2522 (diff), 1040:8e8716785083 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of git.linphone.org:mediastreamer2

Conflicts:

src/speexec.c

Files:

• src/speexec.c (modified) (1 diff)
• src/speexec.c (modified) (5 diffs)

src/speexec.c

@@ -138 +138 @@
                 maxsize=ms_bufferizer_get_avail(&s->echo);
                 if (s->echostarted==FALSE && maxsize>0){
+                        ms_message("speex_ec: starting receiving echo signal");
                         s->echostarted=TRUE;
                 }

src/speexec.c

@@ -31 +31 @@
 #endif
 
+//#define EC_DUMP 1
+
+#define EC_DUMP_PREFIX "/sdcard"
+
 static const int framesize=128;
-static const int ref_max_delay=70;
-
-#if 0
-typedef struct _BufferSizeEstimator{
-        float mean;
-        float jitter;
-}BufferSizeEstimator;
-
-void buffer_size_estimator_update(BufferSizeEstimator *bse, int size){
-        static const float smooth=0.04;
-}
-
-#endif
+static const int ref_max_delay=60;
+
 
 typedef struct SpeexECState{
@@ -58 +51 @@
         int delay_ms;
         int tail_length_ms;
+#ifdef EC_DUMP
+        FILE *echofile;
+        FILE *reffile;
+#endif
         bool_t using_silence;
         bool_t echostarted;
@@ -77 +74 @@
         s->echostarted=FALSE;
 
+#ifdef EC_DUMP
+        {
+                char *fname=ms_strdup_printf("%s/msspeexec-%p-echo.raw", EC_DUMP_PREFIX,f);
+                s->echofile=fopen(fname,"w");
+                ms_free(fname);
+                fname=ms_strdup_printf("%s/msspeexec-%p-ref.raw", EC_DUMP_PREFIX,f);
+                s->reffile=fopen(fname,"w");
+                ms_free(fname);
+        }
+#endif
+        
         f->data=s;
 }
@@ -84 +92 @@
         ms_bufferizer_uninit(&s->ref);
         ms_bufferizer_uninit(&s->delayed_ref);
+#ifdef EC_DUMP
+        if (s->echofile)
+                fclose(s->echofile);
+        if (s->reffile)
+                fclose(s->reffile);
+#endif
         ms_free(s);
 }
@@ -167 +181 @@
                 oref->b_wptr+=nbytes;
                 ms_queue_put(f->outputs[0],oref);
+#ifdef EC_DUMP
+                if (s->reffile)
+                        fwrite(ref,nbytes,1,s->reffile);
+                if (s->echofile)
+                        fwrite(echo,nbytes,1,s->echofile);
+#endif
                 speex_echo_cancellation(s->ecstate,(short*)echo,(short*)ref,(short*)oecho->b_wptr);
                 speex_preprocess_run(s->den, (short*)oecho->b_wptr);