Changeset 358:31895a961d7c in mediastreamer2

Timestamp:

Mar 24, 2009 9:36:22 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

add new force parameter.

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

Location:

linphone

Files:

• coreapi/linphonecore.c (modified) (2 diffs)
• mediastreamer2/include/mediastreamer2/msvolume.h (modified) (1 diff)
• mediastreamer2/src/msvolume.c (modified) (6 diffs)

linphone/coreapi/linphonecore.c

@@ -1440 +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);
+                float force=lp_config_get_float(lc->config,"sound","el_force",-1);
                 MSFilter *f;
                 if (st->el_type==ELControlMic)
@@ -1448 +1449 @@
                 if (thres!=-1)
                         ms_filter_call_method(f,MS_VOLUME_SET_EA_THRESHOLD,&thres);
+                if (force!=-1)
+                        ms_filter_call_method(f,MS_VOLUME_SET_EA_FORCE,&force);
         }
         if (lc->vtable.dtmf_received!=NULL){

linphone/mediastreamer2/include/mediastreamer2/msvolume.h

@@ -47 +47 @@
 #define MS_VOLUME_SET_EA_SPEED          MS_FILTER_METHOD(MS_VOLUME_ID,6,float)
 
+#define MS_VOLUME_SET_EA_FORCE          MS_FILTER_METHOD(MS_VOLUME_ID,7,float)
+
 extern MSFilterDesc ms_volume_desc;
 

linphone/mediastreamer2/src/msvolume.c

@@ -35 +35 @@
         float gain_k;
         float thres;
+        float force;
         MSFilter *peer;
         bool_t ea_active;
@@ -47 +48 @@
         v->gain_k=gain_k;
         v->thres=noise_thres;
+        v->force=en_weight;
         v->peer=NULL;
         f->data=v;
@@ -84 +86 @@
                 if (peer_e>v->thres){
                         /*lower our output*/
-                        gain=compute_gain(v->static_gain,peer_e,en_weight);
+                        gain=compute_gain(v->static_gain,peer_e,v->force);
                 }else {
                         gain=v->static_gain;
@@ -94 +96 @@
                 if (peer_e>v->thres && ! peer_active){
                         /*lower our output*/
-                        gain=compute_gain(v->static_gain,peer_e,en_weight);
+                        gain=compute_gain(v->static_gain,peer_e,v->force);
                         v->ea_active=TRUE;
                 }else gain=v->static_gain;
@@ -146 +148 @@
         }
         v->gain_k=val;
+        return 0;
+}
+
+static int volume_set_ea_force(MSFilter *f, void*arg){
+        Volume *v=(Volume*)f->data;
+        float val=*(float*)arg;
+        v->force=val;
         return 0;
 }
@@ -189 +198 @@
         {       MS_VOLUME_SET_EA_THRESHOLD ,    volume_set_ea_threshold },
         {       MS_VOLUME_SET_EA_SPEED  ,       volume_set_ea_speed     },
+        {       MS_VOLUME_SET_EA_FORCE  ,       volume_set_ea_force     },
         {       0                       ,       NULL                    }
 };