Changeset 1049:da935660c926 in mediastreamer2

Timestamp:

Jul 6, 2010 11:28:48 AM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

automatic configuration of echo cancellation upon latency of android sound reader

Files:

• include/mediastreamer2/msfilter.h (modified) (2 diffs)
• src/audiostream.c (modified) (2 diffs)
• src/msandroid.cpp (modified) (7 diffs)

include/mediastreamer2/msfilter.h

@@ -470 +470 @@
 #define MS_FILTER_SET_MTU               MS_FILTER_BASE_METHOD(9,int)
 #define MS_FILTER_GET_MTU               MS_FILTER_BASE_METHOD(10,int)
+/**Filters can return their latency in milliseconds (if known) using this method:*/
+#define MS_FILTER_GET_LATENCY   MS_FILTER_BASE_METHOD(11,int)
 
 
@@ -484 +486 @@
 
 /* more specific methods: to be moved into implementation specific header files*/
-#define MS_FILTER_SET_FRAMESIZE         MS_FILTER_BASE_METHOD(11,int)
 #define MS_FILTER_SET_FILTERLENGTH      MS_FILTER_BASE_METHOD(12,int)
 #define MS_FILTER_SET_OUTPUT_SAMPLE_RATE MS_FILTER_BASE_METHOD(13,int)

src/audiostream.c

@@ -246 +246 @@
         }
 
-        if (use_ec) {
-                stream->ec=ms_filter_new(MS_SPEEX_EC_ID);
-                ms_filter_call_method(stream->ec,MS_FILTER_SET_SAMPLE_RATE,&pt->clock_rate);
-                if (stream->ec_tail_len!=0)
-                        ms_filter_call_method(stream->ec,MS_ECHO_CANCELLER_SET_TAIL_LENGTH,&stream->ec_tail_len);
-                if (stream->ec_delay!=0)
-                        ms_filter_call_method(stream->ec,MS_ECHO_CANCELLER_SET_DELAY,&stream->ec_delay);
-                if (stream->ec_framesize!=0)
-                        ms_filter_call_method(stream->ec,MS_ECHO_CANCELLER_SET_FRAMESIZE,&stream->ec_framesize);
-        }
-
         if (stream->el_type!=ELInactive || stream->use_gc || stream->use_ng){
                 stream->volsend=ms_filter_new(MS_VOLUME_ID);
@@ -292 +281 @@
         }
 
-
         tmp=1;
         ms_filter_call_method(stream->soundwrite,MS_FILTER_SET_NCHANNELS, &tmp);
+
+        /*configure the echo canceller if required */
+        if (use_ec) {
+                stream->ec=ms_filter_new(MS_SPEEX_EC_ID);
+                ms_filter_call_method(stream->ec,MS_FILTER_SET_SAMPLE_RATE,&pt->clock_rate);
+                if (stream->ec_tail_len!=0)
+                        ms_filter_call_method(stream->ec,MS_ECHO_CANCELLER_SET_TAIL_LENGTH,&stream->ec_tail_len);
+                if (stream->ec_delay!=0){
+                        ms_filter_call_method(stream->ec,MS_ECHO_CANCELLER_SET_DELAY,&stream->ec_delay);
+                }else{
+                        /*configure from latency of sound card in case it is availlable */
+                        int latency=0;
+                        ms_filter_call_method(stream->soundread,MS_FILTER_GET_LATENCY,&latency);
+                        latency-=30; /*keep 30 milliseconds security margin*/
+                        if (latency<0) latency=0;
+                        ms_filter_call_method(stream->ec,MS_ECHO_CANCELLER_SET_DELAY,&latency);
+                }
+                if (stream->ec_framesize!=0)
+                        ms_filter_call_method(stream->ec,MS_ECHO_CANCELLER_SET_FRAMESIZE,&stream->ec_framesize);
+        }
 
         /* give the encoder/decoder some parameters*/

src/msandroid.cpp

@@ -27 +27 @@
 static JavaVM *ms_andsnd_jvm;
 
-
+static void sound_read_setup(MSFilter *f);
 
 /*
@@ -136 +136 @@
         d->rate=proposed_rate;
         return 0;
-        /*d->rate=44100; //to improve latency on msn 7k
-        if (proposed_rate == d->rate) {
+}
+
+static int get_latency(MSFilter *f, void *arg){
+        msandroid_sound_data *d=(msandroid_sound_data*)f->data;
+        if (!d->started){
+                sound_read_setup(f);
+                ((int*)arg)=(1000*d->buff_size)/(d->nchannels*2*d->rate);
+        }
         return 0;
-        } else {
-                return d->rate;
-        }*/
-}
+}
+             
 
 MSFilterMethod msandroid_sound_read_methods[]={
@@ -148 +152 @@
         {       MS_FILTER_GET_SAMPLE_RATE       , get_rate      },
         {       MS_FILTER_SET_NCHANNELS         , set_nchannels },
+        {       MS_FILTER_GET_LATENCY   , get_latency},
         {       0                               , NULL          }
 };
@@ -211 +216 @@
 }
 
-void msandroid_sound_read_preprocess(MSFilter *f){
+static void sound_read_setup(MSFilter *f){
         ms_debug("andsnd_read_preprocess");
         msandroid_sound_read_data *d=(msandroid_sound_read_data*)f->data;
@@ -301 +306 @@
 }
 
-void msandroid_sound_read_postprocess(MSFilter *f){
+static void sound_read_preprocess(MSFilter *f){
+        ms_debug("andsnd_read_preprocess");
+        if (!d->started)
+                sound_read_setup(f);
+}
+
+static void sound_read_postprocess(MSFilter *f){
         msandroid_sound_read_data *d=(msandroid_sound_read_data*)f->data;
         JNIEnv *jni_env = 0;
@@ -345 +356 @@
 }
 
-void msandroid_sound_read_process(MSFilter *f){
+static void sound_read_process(MSFilter *f){
         msandroid_sound_read_data *d=(msandroid_sound_read_data*)f->data;
         mblk_t *m;
@@ -374 +385 @@
 /*.noutputs=*/1,
 /*.init*/NULL,
-/*.preprocess=*/msandroid_sound_read_preprocess,
-/*.process=*/msandroid_sound_read_process,
-/*.postprocess=*/msandroid_sound_read_postprocess,
+/*.preprocess=*/sound_read_preprocess,
+/*.process=*/sound_read_process,
+/*.postprocess=*/sound_read_postprocess,
 /*.uninit*/NULL,
 /*.methods=*/msandroid_sound_read_methods