Changeset 357:54cd98ca13fd in mediastreamer2

Timestamp:

Mar 24, 2009 9:28:34 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

enable echo limiter in the other side (control mic)

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

Location:

linphone

Files:

• coreapi/linphonecore.c (modified) (2 diffs)
• mediastreamer2/include/mediastreamer2/mediastream.h (modified) (3 diffs)
• mediastreamer2/src/audiostream.c (modified) (2 diffs)

linphone/coreapi/linphonecore.c

@@ -1415 +1415 @@
         lc->audiostream=audio_stream_new(linphone_core_get_audio_port(lc),linphone_core_ipv6_enabled(lc));
         if (linphone_core_echo_limiter_enabled(lc)){
-                audio_stream_enable_echo_limiter(lc->audiostream,TRUE);
+                const char * type=lp_config_get_string(lc->config,"sound","el_type","mic");
+                if (strcasecmp(type,"mic")==0)
+                        audio_stream_enable_echo_limiter(lc->audiostream,ELControlMic);
+                else if (strcasecmp(type,"speaker")==0)
+                        audio_stream_enable_echo_limiter(lc->audiostream,ELControlSpeaker);
         }
 #ifdef VIDEO_ENABLED
@@ -1436 +1440 @@
                 float speed=lp_config_get_float(lc->config,"sound","el_speed",-1);
                 float thres=lp_config_get_float(lc->config,"sound","el_thres",-1);
+                MSFilter *f;
+                if (st->el_type==ELControlMic)
+                        f=st->volrecv;
+                else f=st->volsend;
                 if (speed!=-1)
-                        ms_filter_call_method(st->volrecv,MS_VOLUME_SET_EA_SPEED,&speed);
+                        ms_filter_call_method(f,MS_VOLUME_SET_EA_SPEED,&speed);
                 if (thres!=-1)
-                        ms_filter_call_method(st->volrecv,MS_VOLUME_SET_EA_THRESHOLD,&thres);
+                        ms_filter_call_method(f,MS_VOLUME_SET_EA_THRESHOLD,&thres);
         }
         if (lc->vtable.dtmf_received!=NULL){

linphone/mediastreamer2/include/mediastreamer2/mediastream.h

@@ -30 +30 @@
 #include "ortp/event.h"
 
+typedef enum EchoLimiterType{
+        ELInactive,
+        ELControlMic,
+        ELControlSpeaker
+} EchoLimiterType;
+
 struct _AudioStream
 {
@@ -45 +51 @@
         unsigned int last_packet_count;
         time_t last_packet_time;
+        EchoLimiterType el_type; /*use echo limiter: two MSVolume, measured input level controlling local output level*/
         bool_t play_dtmfs;
-        bool_t use_ea; /*use echo limiter: two MSVolume, measured input level controlling local output level*/
 };
 
@@ -94 +100 @@
 
 /*enable echo-limiter dispositve: one MSVolume in input branch controls a MSVolume in the output branch*/
-void audio_stream_enable_echo_limiter(AudioStream *stream, bool_t enabled);
+void audio_stream_enable_echo_limiter(AudioStream *stream, EchoLimiterType type);
 
 /* stop the above process*/

linphone/mediastreamer2/src/audiostream.c

@@ -248 +248 @@
         }
 
-        if (stream->use_ea){
+        if (stream->el_type!=ELInactive){
                 stream->volsend=ms_filter_new(MS_VOLUME_ID);
                 stream->volrecv=ms_filter_new(MS_VOLUME_ID);
-                ms_filter_call_method(stream->volrecv,MS_VOLUME_SET_PEER,stream->volsend);
+                if (stream->el_type==ELControlSpeaker)
+                        ms_filter_call_method(stream->volrecv,MS_VOLUME_SET_PEER,stream->volsend);
+                else ms_filter_call_method(stream->volsend,MS_VOLUME_SET_PEER,stream->volrecv);
         }
 
@@ -394 +396 @@
 }
 
-void audio_stream_enable_echo_limiter(AudioStream *stream, bool_t enabled){
-        stream->use_ea=enabled;
+void audio_stream_enable_echo_limiter(AudioStream *stream, EchoLimiterType type){
+        stream->el_type=type;
 }