Changeset 241:4eec3ed19919 in mediastreamer2

Timestamp:

Feb 5, 2009 6:45:02 PM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

add half duplex simulation with VAD for noisy environment.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@244 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone/mediastreamer2

Files:

• include/mediastreamer2/msfilter.h (modified) (1 diff)
• src/msconf.c (modified) (10 diffs)

linphone/mediastreamer2/include/mediastreamer2/msfilter.h

@@ -389 +389 @@
 #define MS_FILTER_ENABLE_AGC            MS_FILTER_BASE_METHOD(20,int)
 #define MS_FILTER_SET_PLAYBACKDELAY MS_FILTER_BASE_METHOD(21,int)
+#define MS_FILTER_ENABLE_HALFDUPLEX MS_FILTER_BASE_METHOD(22,int)
+#define MS_FILTER_SET_VAD_PROB_START MS_FILTER_BASE_METHOD(23,int)
+#define MS_FILTER_SET_VAD_PROB_CONTINUE MS_FILTER_BASE_METHOD(24,int)
+
 /** @} */
 

linphone/mediastreamer2/src/msconf.c

@@ -45 +45 @@
         bool_t has_contributed;
         bool_t is_used;
+
+        int is_speaking;
+
         int count;
         int missed;
@@ -63 +66 @@
         int enable_directmode;
         int enable_vad;
+
+        int enable_halfduplex;
+        int vad_prob_start;
+        int vad_prob_continue;
+
         int agc_level;
         int mix_mode;
@@ -74 +82 @@
 
 static void channel_init(ConfState *s, Channel *chan, int pos){
+        memset(chan, 0, sizeof(Channel));
         ms_bufferizer_init(&chan->buff);
 #ifndef DISABLE_SPEEX
@@ -92 +101 @@
                         speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_VAD, &val);
                 }
+                else if (pos==0 && s->enable_halfduplex>0)
+                {
+                        val=1;
+                        speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_VAD, &val);
+                        val = s->vad_prob_start; // xx%
+                        speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_PROB_START, &val);
+                        val = s->vad_prob_continue; // xx%
+                        speex_preprocess_ctl(chan->speex_pp, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &val);
+                }
+
                 /* enable AGC only on local soundcard */
                 if (s->agc_level>0 && pos==0)
@@ -250 +269 @@
 
                 /* skip soundread and short buffer entry */
-#if 0
-                if (i>0
-                        && ms_bufferizer_get_avail(&chan->buff)>=s->conf_gran*s->adaptative_msconf_buf)
-                {
-                        while (ms_bufferizer_get_avail(&chan->buff)>=s->conf_gran*2)
-#endif
                 if (i>0 
                         && ms_bufferizer_get_avail(&chan->buff)> s->conf_gran
@@ -283 +296 @@
                         }
 
-                        for(j=0;j<s->conf_nsamples;++j){
-                                s->sum[j]+=chan->input[j];
-                        }
-                        chan->has_contributed=TRUE;
+                        if (s->channels[0].is_speaking<=0)
+                        {
+                                for(j=0;j<s->conf_nsamples;++j){
+                                        s->sum[j]+=chan->input[j];
+                                }
+                                chan->has_contributed=TRUE;
+                        }
                         chan->stat_processed++;
                 }
@@ -297 +313 @@
                                 int vad;
                                 vad = speex_preprocess(chan->speex_pp, (short*)chan->input, NULL);
-                        }
-      else if (chan->speex_pp!=NULL && s->enable_vad==TRUE)
-      {
-        speex_preprocess_estimate_update(chan->speex_pp, (short*)chan->input);
-      }
-#endif
-
-                        for(j=0;j<s->conf_nsamples;++j){
-                                s->sum[j]+=chan->input[j];
-                        }
-                        chan->has_contributed=TRUE;
+                                if (s->enable_halfduplex>0)
+                                {
+                                        if (vad>0)
+                                        {
+                                                /* speech detected */
+                                                chan->is_speaking++;
+                                                if (chan->is_speaking>5)
+                                                        chan->is_speaking=5;
+                                        }
+                                        else
+                                        {
+                                                chan->is_speaking--;
+                                                if (chan->is_speaking<-5)
+                                                        chan->is_speaking=-5;
+                                        }
+                                if (chan->is_speaking<=0)
+                                        ms_message("silence on! (%i)", chan->is_speaking);
+                                else
+                                        ms_message("speech on! (%i)", chan->is_speaking);
+                                }
+                        }
+                        else if (chan->speex_pp!=NULL && s->enable_vad==TRUE)
+                        {
+                                speex_preprocess_estimate_update(chan->speex_pp, (short*)chan->input);
+                        }
+#endif
+
+                        if (i==0
+                                || s->channels[0].is_speaking<=0)
+                        {
+                                for(j=0;j<s->conf_nsamples;++j){
+                                        s->sum[j]+=chan->input[j];
+                                }
+                                chan->has_contributed=TRUE;
+                        }
                         chan->stat_processed++;
                 } else {
@@ -445 +485 @@
         int i;
         ConfState *s=(ConfState*)f->data;
-        Channel *chan;
-        /*read from all inputs and put into bufferizers*/
-        for (i=0;i<CONF_MAX_PINS;++i){
-                if (f->inputs[i]!=NULL){
-                        chan=&s->channels[i];
-                        ms_bufferizer_uninit(&chan->buff);
-                        ms_bufferizer_init(&chan->buff);
-                }
-        }
-}
+        for (i=0;i<CONF_MAX_PINS;i++)
+                channel_uninit(&s->channels[i]);
+    for (i=0;i<CONF_MAX_PINS;i++)
+                channel_init(s, &s->channels[i], i);
+}
+
 static int msconf_set_sr(MSFilter *f, void *arg){
         ConfState *s=(ConfState*)f->data;
@@ -479 +515 @@
         int i;
         s->agc_level = *(int*)arg;
+
+        for (i=0;i<CONF_MAX_PINS;i++)
+                channel_uninit(&s->channels[i]);
+    for (i=0;i<CONF_MAX_PINS;i++)
+                channel_init(s, &s->channels[i], i);
+        return 0;
+}
+
+static int msconf_enable_halfduplex(MSFilter *f, void *arg){
+        ConfState *s=(ConfState*)f->data;
+        int i;
+        s->enable_halfduplex = *(int*)arg;
+
+        for (i=0;i<CONF_MAX_PINS;i++)
+                channel_uninit(&s->channels[i]);
+    for (i=0;i<CONF_MAX_PINS;i++)
+                channel_init(s, &s->channels[i], i);
+        return 0;
+}
+
+static int msconf_set_vad_prob_start(MSFilter *f, void *arg){
+        ConfState *s=(ConfState*)f->data;
+        int i;
+        s->vad_prob_start = *(int*)arg;
+
+        for (i=0;i<CONF_MAX_PINS;i++)
+                channel_uninit(&s->channels[i]);
+    for (i=0;i<CONF_MAX_PINS;i++)
+                channel_init(s, &s->channels[i], i);
+        return 0;
+}
+
+static int msconf_set_vad_prob_continue(MSFilter *f, void *arg){
+        ConfState *s=(ConfState*)f->data;
+        int i;
+        s->vad_prob_continue = *(int*)arg;
 
         for (i=0;i<CONF_MAX_PINS;i++)
@@ -555 +627 @@
         {       MS_FILTER_GET_STAT_MISSED, msconf_get_stat_missed },
         {       MS_FILTER_GET_STAT_OUTPUT, msconf_get_stat_processed },
+
+        {       MS_FILTER_ENABLE_HALFDUPLEX, msconf_enable_halfduplex },
+        {       MS_FILTER_SET_VAD_PROB_START, msconf_set_vad_prob_start },
+        {       MS_FILTER_SET_VAD_PROB_CONTINUE, msconf_set_vad_prob_continue },
         {       0                       , NULL}
 };