Changeset 355:87138af50068 in mediastreamer2

Timestamp:

Mar 23, 2009 3:09:10 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

tuning of echo limiter

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

Location:

linphone

Files:

• coreapi/exevents.c (modified) (1 diff)
• coreapi/linphonecore.c (modified) (2 diffs)
• coreapi/lpconfig.c (modified) (1 diff)
• coreapi/proxy.c (modified) (5 diffs)
• mediastreamer2/src/ice.c (modified) (3 diffs)
• mediastreamer2/src/msvolume.c (modified) (6 diffs)

linphone/coreapi/exevents.c

@@ -705 +705 @@
         if (!linphone_core_video_enabled(lc)) return -1;
 
+        if (payload->remoteport==0) {
+                ms_message("Video stream refused by remote.");
+                return 0;
+        }
+
         params=&call->video_params;
         remote_profile=call->profile;

linphone/coreapi/linphonecore.c

@@ -1437 +1437 @@
                 float thres=lp_config_get_float(lc->config,"sound","el_thres",-1);
                 if (speed!=-1)
-                        ms_filter_call_method(st->volsend,MS_VOLUME_SET_EA_SPEED,&speed);
+                        ms_filter_call_method(st->volrecv,MS_VOLUME_SET_EA_SPEED,&speed);
                 if (thres!=-1)
                         ms_filter_call_method(st->volrecv,MS_VOLUME_SET_EA_THRESHOLD,&thres);
@@ -2407 +2407 @@
 void linphone_core_uninit(LinphoneCore *lc)
 {
+        if (lc->call){
+                int i;
+                linphone_core_terminate_call(lc,NULL);
+                for(i=0;i<10;++i){
+#ifndef WIN32
+                        usleep(50000);
+#else
+                        Sleep(50);
+#endif
+                        linphone_core_iterate(lc);
+                }
+        }
         gstate_new_state(lc, GSTATE_POWER_SHUTDOWN, NULL);
 #ifdef VIDEO_ENABLED

linphone/coreapi/lpconfig.c

@@ -293 +293 @@
 float lp_config_get_float(LpConfig *lpconfig,const char *section, const char *key, float default_value){
         const char *str=lp_config_get_string(lpconfig,section,key,NULL);
-        float ret;
+        float ret=default_value;
         if (str==NULL) return default_value;
         sscanf(str,"%f",&ret);

linphone/coreapi/proxy.c

@@ -26 +26 @@
 #include "private.h"
 
+void linphone_proxy_config_write_all_to_config_file(LinphoneCore *lc){
+        MSList *elem;
+        int i;
+        for(elem=lc->sip_conf.proxies,i=0;elem!=NULL;elem=ms_list_next(elem),i++){
+                LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
+                linphone_proxy_config_write_to_config_file(lc->config,cfg,i);
+        }
+}
 
 void linphone_proxy_config_init(LinphoneProxyConfig *obj){
@@ -232 +240 @@
 }
 
-int linphone_proxy_config_done(LinphoneProxyConfig *obj)
-{
+static void linphone_proxy_config_register(LinphoneProxyConfig *obj){
         const char *id_str;
-        if (!linphone_proxy_config_check(obj->lc,obj)) return -1;
         if (obj->reg_identity!=NULL) id_str=obj->reg_identity;
         else id_str=linphone_core_get_primary_contact(obj->lc);
-        obj->frozen=FALSE;
         if (obj->reg_sendregister){
                 char *ct=NULL;
@@ -246 +251 @@
                 if (ct!=NULL) osip_free(ct);
         }
+}
+
+int linphone_proxy_config_done(LinphoneProxyConfig *obj)
+{
+        if (!linphone_proxy_config_check(obj->lc,obj)) return -1;
+        obj->frozen=FALSE;
+        linphone_proxy_config_register(obj);
+        linphone_proxy_config_write_all_to_config_file(obj->lc);
         return 0;
 }
@@ -503 +516 @@
         LinphoneProxyConfig *cfg=linphone_core_get_proxy_config_from_rid(lc, ev->rid);
         if (cfg){
-                        cfg->auth_failures++;
-                        /*restart a new register */
-                        if (cfg->auth_failures==1){
-                                linphone_proxy_config_done(cfg);
-                        }
-        }
-}
-
+                cfg->auth_failures++;
+                /*restart a new register */
+                if (cfg->auth_failures==1){
+                        linphone_proxy_config_register(cfg);
+                }
+        }
+}
 
 void linphone_proxy_config_write_to_config_file(LpConfig *config, LinphoneProxyConfig *obj, int index)
@@ -537 +549 @@
         lp_config_set_int(config,key,"publish",obj->publish);
 }
+
+
 
 LinphoneProxyConfig *linphone_proxy_config_new_from_config_file(LpConfig *config, int index)

linphone/mediastreamer2/src/ice.c

@@ -166 +166 @@
                 /* prepare ONCE tie-break value */
                 if (checklist->tiebreak_value==0) {
-                        checklist->tiebreak_value = random() * (0x7fffffffffffffff/0x7fff);
+                        checklist->tiebreak_value = random() * (0x7fffffffffffffffLL /0x7fff);
                 }
 
@@ -514 +514 @@
         /* prepare ONCE tie-break value */
         if (checklist->tiebreak_value==0) {
-                checklist->tiebreak_value = random() * (0x7fffffffffffffff/0x7fff);
+                checklist->tiebreak_value = random() * (0x7fffffffffffffffLL/0x7fff);
         }
 
@@ -948 +948 @@
                         struct in_addr inaddr;
                         char mapped_addr[64];
-                        struct CandidatePair *cand_pair;
+                        struct CandidatePair *cand_pair=NULL;
                         int pos;
                         inaddr.s_addr = htonl (mappedAddr.addr);

linphone/mediastreamer2/src/msvolume.c

@@ -23 +23 @@
 static const float max_e=32767*32767;
 static const float coef=0.1;
-static const float gain_k=0.2;
-
+static const float gain_k=0.03;
+static const float en_weight=4.0;
 static const float noise_thres=0.1;
 
@@ -47 +47 @@
         v->gain_k=gain_k;
         v->thres=noise_thres;
+        v->peer=NULL;
         f->data=v;
 }
@@ -66 +67 @@
         *farg=(v->energy+1)/max_e;
         return 0;
+}
+
+static inline float compute_gain(float static_gain, float energy, float weight){
+        float ret=static_gain*(1 - (energy*weight));
+        if (ret<0) ret=0;
+        return ret;
 }
 
@@ -71 +78 @@
         float peer_e;
         float gain;
+        float gain_k2;
         ms_filter_call_method(v->peer,MS_VOLUME_GET_LINEAR,&peer_e);
+        peer_e=sqrt(peer_e);
         if (v->ea_active){
                 if (peer_e>v->thres){
                         /*lower our output*/
-                        gain=v->static_gain*(1-peer_e);
+                        gain=compute_gain(v->static_gain,peer_e,en_weight);
                 }else {
                         gain=v->static_gain;
@@ -85 +94 @@
                 if (peer_e>v->thres && ! peer_active){
                         /*lower our output*/
-                        gain=v->static_gain*(1-peer_e);
+                        gain=compute_gain(v->static_gain,peer_e,en_weight);
                         v->ea_active=TRUE;
                 }else gain=v->static_gain;
         }
-        v->gain=(v->gain*(1-v->gain_k)) + (v->gain_k*v->gain);
+        if (v->ea_active){
+                gain_k2=5*v->gain_k;
+        }else gain_k2=v->gain_k;
+        v->gain=(v->gain*(1-gain_k2)) + (gain_k2*gain);
+        ms_message("ea_active=%i, peer_e=%f gain=%f gain_k=%f",v->ea_active,peer_e,v->gain, v->gain_k);
 }
 
@@ -209 +222 @@
 };
 #endif
+
+MS_FILTER_DESC_EXPORT(ms_volume_desc)
+
+