Changeset 415:8d28c251c714 in mediastreamer2

Timestamp:

Apr 15, 2009 8:41:24 AM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

add a new gain control setting

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

Location:

linphone

Files:

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

linphone/coreapi/linphonecore.c

@@ -1418 +1418 @@
         lc->audiostream=audio_stream_new(linphone_core_get_audio_port(lc),linphone_core_ipv6_enabled(lc));
         if (linphone_core_echo_limiter_enabled(lc)){
-                const char * type=lp_config_get_string(lc->config,"sound","el_type","mic");
+                const char *type=lp_config_get_string(lc->config,"sound","el_type","mic");
+                float gain=lp_config_get_float(lc->config,"sound","mic_gain",-1);
                 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);
+                if (gain>0){
+                        audio_stream_enable_gain_control(lc->audiostream,TRUE);
+                }
+                
         }
 #ifdef VIDEO_ENABLED
@@ -1444 +1449 @@
                 float thres=lp_config_get_float(lc->config,"sound","el_thres",-1);
                 float force=lp_config_get_float(lc->config,"sound","el_force",-1);
+                float gain=lp_config_get_float(lc->config,"sound","mic_gain",-1);
                 MSFilter *f=NULL;
                 if (st->el_type==ELControlMic){
@@ -1464 +1470 @@
                 if (force!=-1)
                         ms_filter_call_method(f,MS_VOLUME_SET_EA_FORCE,&force);
+                if (gain!=-1)
+                        ms_filter_call_method(st->volsend,MS_VOLUME_SET_GAIN,&gain);
         }
         if (lc->vtable.dtmf_received!=NULL){

linphone/mediastreamer2/include/mediastreamer2/mediastream.h

@@ -53 +53 @@
         EchoLimiterType el_type; /*use echo limiter: two MSVolume, measured input level controlling local output level*/
         bool_t play_dtmfs;
+        bool_t use_gc;
 };
 
@@ -102 +103 @@
 void audio_stream_enable_echo_limiter(AudioStream *stream, EchoLimiterType type);
 
-/* stop the above process*/
+/*enable gain control, to be done before start() */
+void audio_stream_enable_gain_control(AudioStream *stream, bool_t val);
+
+void audio_stream_set_mic_gain(AudioStream *stream, float gain);
+
+/* stop the audio streaming thread and free everything*/
 void audio_stream_stop (AudioStream * stream);
 

linphone/mediastreamer2/src/audiostream.c

@@ -248 +248 @@
         }
 
-        if (stream->el_type!=ELInactive){
+        if (stream->el_type!=ELInactive || stream->use_gc){
                 stream->volsend=ms_filter_new(MS_VOLUME_ID);
                 stream->volrecv=ms_filter_new(MS_VOLUME_ID);
-                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);
+                if (stream->el_type!=ELInactive){
+                        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);
+                }
         }
 
@@ -380 +382 @@
         stream->rtpsend=ms_filter_new(MS_RTP_SEND_ID);
         stream->play_dtmfs=TRUE;
+        stream->use_gc=FALSE;
         return stream;
 }
@@ -398 +401 @@
 void audio_stream_enable_echo_limiter(AudioStream *stream, EchoLimiterType type){
         stream->el_type=type;
+}
+
+void audio_stream_enable_gain_control(AudioStream *stream, bool_t val){
+        stream->use_gc=val;
+}
+
+void audio_stream_set_mic_gain(AudioStream *stream, float gain){
+        if (stream->volsend){
+                ms_filter_call_method(stream->volsend,MS_VOLUME_SET_GAIN,&gain);
+        }else ms_warning("Could not apply gain: gain control wasn't activated. "
+                        "Use audio_stream_enable_gain_control() before starting the stream.");
 }