Changeset 1331:498cc1c1ce41 in mediastreamer2

Timestamp:

Mar 29, 2011 6:22:54 PM (2 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

speex echo improvements about delay

Files:

• src/speexec.c (modified) (9 diffs)
• tests/mediastream.c (modified) (4 diffs)

src/speexec.c

@@ -20 +20 @@
 
 #include "mediastreamer2/msfilter.h"
+#include "mediastreamer2/msticker.h"
 #include <speex/speex_echo.h>
 #include <speex/speex_preprocess.h>
@@ -44 +45 @@
         MSBufferizer delayed_ref;
         MSBufferizer echo;
-        int ref_bytes_limit;
         int framesize;
         int filterlength;
@@ -50 +50 @@
         int delay_ms;
         int tail_length_ms;
-        float ref_bufsize_ms;
+        int nominal_ref_samples;
+        int min_ref_samples;
 #ifdef EC_DUMP
         FILE *echofile;
         FILE *reffile;
 #endif
-        bool_t using_silence;
         bool_t echostarted;
         bool_t bypass_mode;
+        bool_t using_zeroes;
 }SpeexECState;
 
@@ -71 +72 @@
         s->framesize=framesize;
         s->den = NULL;
-        s->using_silence=FALSE;
+        s->using_zeroes=FALSE;
         s->echostarted=FALSE;
         s->bypass_mode=FALSE;
@@ -121 +122 @@
         m->b_wptr+=delay_samples*2;
         ms_bufferizer_put (&s->delayed_ref,m);
-        s->ref_bufsize_ms=s->delay_ms;
-}
-
-/*      inputs[0]= reference signal (sent to soundcard)
+        s->min_ref_samples=-1;
+}
+
+/*      inputs[0]= reference signal from far end (sent to soundcard)
  *      inputs[1]= near speech & echo signal    (read from soundcard)
- *      outputs[0]=  far end speech
+ *      outputs[0]=  is a copy of inputs[0] to be sent to soundcard
  *      outputs[1]=  near end speech, echo removed - towards far end
 */
@@ -134 +135 @@
         mblk_t *refm;
         uint8_t *ref,*echo;
-        int size;
-        float ref_bufsize_ms;
-        int diff;
-        int idiff;
-        int drift;
-        int threshold;
         
         if (s->bypass_mode) {
@@ -165 +160 @@
         while (ms_bufferizer_read(&s->echo,echo,nbytes)>=nbytes){
                 mblk_t *oecho=allocb(nbytes,0);
-                
+                int avail;
+        
+                if ((avail=ms_bufferizer_get_avail(&s->delayed_ref))<(s->nominal_ref_samples+nbytes)){
+                        /*we don't have enough to read in a reference signal buffer, inject silence instead*/
+                        refm=allocb(nbytes,0);
+                        memset(refm->b_wptr,0,nbytes);
+                        refm->b_wptr+=nbytes;
+                        ms_bufferizer_put(&s->delayed_ref,refm);
+                        if (!s->using_zeroes){
+                                ms_warning("Not enough ref samples, using zeroes");
+                                s->using_zeroes=TRUE;
+                        }
+                }else if (s->using_zeroes){
+                        ms_message("Samples are back.");
+                        s->using_zeroes=FALSE;
+                }
+
+                /*now read a valid buffer of ref samples*/
                 if (ms_bufferizer_read(&s->delayed_ref,ref,nbytes)==0){
-                        /* if we don't have enough ref samples, use silence instead */
-                        ms_warning("Not enough ref samples, using zeroes");
-                        memset(ref,0,nbytes);
+                        ms_fatal("Should never happen");
+                }
+                avail-=nbytes;
+                if (avail<s->min_ref_samples || s->min_ref_samples==-1){
+                        s->min_ref_samples=avail;
                 }
                 
@@ -184 +198 @@
         }
 
-        /* control the size of the delayed_ref bufferizer, we should always have in the long term a size
-         that corresponds to the echo delay*/
-        size=ms_bufferizer_get_avail(&s->delayed_ref);
-        ref_bufsize_ms=((size/2)*1000.0)/(float)s->samplerate;
-        s->ref_bufsize_ms=smooth_factor*ref_bufsize_ms + (1-smooth_factor)*s->ref_bufsize_ms;
-        //ms_message("Averaged reference bufsize is %f, instant value is %f",s->ref_bufsize_ms,ref_bufsize_ms);
-        diff=((int)s->ref_bufsize_ms) - s->delay_ms;
-        idiff=((int)ref_bufsize_ms) - s->delay_ms;
-        threshold=s->tail_length_ms/4;
-        drift=diff;
-        if (diff > threshold && idiff>threshold) {
-                nbytes=2*(int)((drift*s->samplerate)/1000.0);
-                ms_warning("Averaged reference bufsize is %f while expected delay is %i, diff=%i, need to drop %i bytes",s->ref_bufsize_ms,s->delay_ms,diff,nbytes);
-                ms_bufferizer_skip_bytes(&s->delayed_ref,nbytes);
-                s->ref_bufsize_ms=s->delay_ms;
-        }else if ((diff < (-threshold)) && (idiff < (-threshold))){
-                nbytes=2*(int)((-drift*s->samplerate)/1000.0);          
-                ms_warning("Averaged reference bufsize is %f while expected delay is %i, diff=%i, need to add %i bytes",s->ref_bufsize_ms,s->delay_ms,diff,nbytes);
-                refm=allocb(nbytes,0);
-                memset(refm->b_wptr,0,nbytes);
-                refm->b_wptr+=nbytes;
-                ms_bufferizer_put(&s->delayed_ref,refm);
-                s->ref_bufsize_ms=s->delay_ms;
+        /*verify our ref buffer does not become too big, meaning that we are receiving more samples than we are sending*/
+        if (f->ticker->time % 5000 == 0 && s->min_ref_samples!=-1){
+                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);
+                }
+                s->min_ref_samples=-1;
         }
 }
@@ -306 +305 @@
 
 MS_FILTER_DESC_EXPORT(ms_speex_ec_desc)
+

tests/mediastream.c

@@ -145 +145 @@
                                                                 "[ --ec-tail <echo canceller tail length in ms> ]\n"
                                                                 "[ --ec-delay <echo canceller delay in ms> ]\n"
+                                                                "[ --ec-framesize <echo canceller framesize in samples> ]\n"
                                                                 "[ --agc (enable automatic gain control)]\n"
                                                                 "[ --ng (enable noise gate)]\n"
@@ -236 +237 @@
                         i++;
                         ec_delay_ms=atoi(argv[i]);
+                }else if (strcmp(argv[i],"--ec-framesize")==0){
+                        i++;
+                        ec_framesize=atoi(argv[i]);
                 }else if (strcmp(argv[i],"--agc")==0){
                         agc=TRUE;
@@ -332 +336 @@
 #endif
         }
-  if (eq || ec){ /*read from stdin interactive commands */
-    char commands[128];
-    commands[127]='\0';
-    ms_sleep(1);  /* ensure following text be printed after ortp messages */
-    if (eq)
-      printf("\nPlease enter equalizer requests, such as 'eq active 1', 'eq active 0', 'eq 1200 0.1 200'\n");
-    if (ec)
-      printf("\nPlease enter echo canceller requests: ec reset; ec <delay ms> <tail_length ms'\n");
-    while(fgets(commands,sizeof(commands)-1,stdin)!=NULL){
-      int active,freq,freq_width;
-      int delay_ms, tail_ms;
-      float gain;
-      if (sscanf(commands,"eq active %i",&active)==1){
-        audio_stream_enable_equalizer(audio,active);
-        printf("OK\n");
-      }else if (sscanf(commands,"eq %i %f %i",&freq,&gain,&freq_width)==3){
-        audio_stream_equalizer_set_gain(audio,freq,gain,freq_width);
-        printf("OK\n");
-      }else if (sscanf(commands,"eq %i %f",&freq,&gain)==2){
-        audio_stream_equalizer_set_gain(audio,freq,gain,0);
-        printf("OK\n");
-      }else if (strstr(commands,"dump")){
-        int n=0,i;
-        float *t;
-        ms_filter_call_method(audio->equalizer,MS_EQUALIZER_GET_NUM_FREQUENCIES,&n);
-        t=(float*)alloca(sizeof(float)*n);
-        ms_filter_call_method(audio->equalizer,MS_EQUALIZER_DUMP_STATE,t);
-        for(i=0;i<n;++i){
-          if (fabs(t[i]-1)>0.01){
-            printf("%i:%f:0 ",(i*pt->clock_rate)/(2*n),t[i]);
-          }
-        }
-        printf("\nOK\n");
-      }else if (sscanf(commands,"ec reset %i",&active)==1){
-          //audio_stream_enable_equalizer(audio,active);
-          //printf("OK\n");
-      }else if (sscanf(commands,"ec active %i",&active)==1){
-          //audio_stream_enable_equalizer(audio,active);
-          //printf("OK\n");
-      }else if (sscanf(commands,"ec %i %i",&delay_ms,&tail_ms)==2){
-        audio_stream_set_echo_canceller_params(audio,tail_ms,delay_ms,128);
-        // revisit: workaround with old method call to force echo reset
-        delay_ms*=8;
-        ms_filter_call_method(audio->ec,MS_FILTER_SET_PLAYBACKDELAY,&delay_ms);
-        printf("OK\n");
-      }else if (strstr(commands,"quit")){
-        break;
-      }else printf("Cannot understand this.\n");
-    }
+        if (eq){ /*read from stdin interactive commands */
+                char commands[128];
+                commands[127]='\0';
+                ms_sleep(1);  /* ensure following text be printed after ortp messages */
+                if (eq)
+                printf("\nPlease enter equalizer requests, such as 'eq active 1', 'eq active 0', 'eq 1200 0.1 200'\n");
+
+                while(fgets(commands,sizeof(commands)-1,stdin)!=NULL){
+                        int active,freq,freq_width;
+
+                        float gain;
+                        if (sscanf(commands,"eq active %i",&active)==1){
+                                audio_stream_enable_equalizer(audio,active);
+                                printf("OK\n");
+                        }else if (sscanf(commands,"eq %i %f %i",&freq,&gain,&freq_width)==3){
+                                audio_stream_equalizer_set_gain(audio,freq,gain,freq_width);
+                                printf("OK\n");
+                        }else if (sscanf(commands,"eq %i %f",&freq,&gain)==2){
+                                audio_stream_equalizer_set_gain(audio,freq,gain,0);
+                                printf("OK\n");
+                        }else if (strstr(commands,"dump")){
+                                int n=0,i;
+                                float *t;
+                                ms_filter_call_method(audio->equalizer,MS_EQUALIZER_GET_NUM_FREQUENCIES,&n);
+                                t=(float*)alloca(sizeof(float)*n);
+                                ms_filter_call_method(audio->equalizer,MS_EQUALIZER_DUMP_STATE,t);
+                                for(i=0;i<n;++i){
+                                        if (fabs(t[i]-1)>0.01){
+                                        printf("%i:%f:0 ",(i*pt->clock_rate)/(2*n),t[i]);
+                                        }
+                                }
+                                printf("\nOK\n");
+                        } else if (strstr(commands,"quit")){
+                                break;
+                        }else printf("Cannot understand this.\n");
+                }
         }else{  /* no interactive stuff - continuous debug output */
                 rtp_session_register_event_queue(session,q);
@@ -423 +414 @@
         rtp_profile_destroy(profile);
 }
+