From 59860a2ab73dfdfd8c615b3c66e6e7286cb4101f Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 19 Mar 2015 12:08:13 +0100 Subject: [PATCH 1/4] Also test that the video stream is started to try early-media forking. --- coreapi/callbacks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index df6170c77..25e579495 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -432,7 +432,8 @@ static void call_ringing(SalOp *h){ linphone_call_set_state(call,LinphoneCallOutgoingRinging,"Remote ringing"); }else{ /*accept early media */ - if (call->audiostream && audio_stream_started(call->audiostream)){ + if ((call->audiostream && audio_stream_started(call->audiostream)) + || (call->videostream && video_stream_started(call->videostream))) { /*streams already started */ try_early_media_forking(call,md); #ifdef VIDEO_ENABLED From c757b8e4c11099020f41a06045ed7529159eb445 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 19 Mar 2015 12:08:56 +0100 Subject: [PATCH 2/4] Test video bandwidth during early-media in "Forked outgoing early-media video call with inactive audio" test. --- tester/video_tester.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tester/video_tester.c b/tester/video_tester.c index 5418d5873..e61450f02 100644 --- a/tester/video_tester.c +++ b/tester/video_tester.c @@ -450,6 +450,9 @@ static void forked_outgoing_early_media_video_call_with_inactive_audio_test(void CU_ASSERT_TRUE(linphone_call_get_audio_stats(pauline_call)->download_bandwidth == 0); CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie1_call)->download_bandwidth == 0); CU_ASSERT_TRUE(linphone_call_get_audio_stats(marie2_call)->download_bandwidth == 0); + CU_ASSERT_TRUE(linphone_call_get_video_stats(pauline_call)->download_bandwidth == 0); + CU_ASSERT_TRUE(linphone_call_get_video_stats(marie1_call)->download_bandwidth > 0); + CU_ASSERT_TRUE(linphone_call_get_video_stats(marie2_call)->download_bandwidth > 0); linphone_call_params_set_audio_direction(marie1_params, LinphoneMediaDirectionSendRecv); linphone_core_accept_call_with_params(marie1->lc, linphone_core_get_current_call(marie1->lc), marie1_params); From 0ce5a5f7dfa9b5ca053bdf210f8ed60d4d46e518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 19 Mar 2015 14:01:23 +0100 Subject: [PATCH 3/4] Add a config parameter to avoid linphone to save authentication data --- coreapi/authentication.c | 4 ++-- coreapi/linphonecore.c | 1 + coreapi/private.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/coreapi/authentication.c b/coreapi/authentication.c index 0306803f8..f0f5eec2e 100644 --- a/coreapi/authentication.c +++ b/coreapi/authentication.c @@ -353,7 +353,7 @@ void linphone_core_add_auth_info(LinphoneCore *lc, const LinphoneAuthInfo *info) info->domain ? info->domain : ""); } ms_list_free(l); - write_auth_infos(lc); + if(lc->sip_conf.save_auth_info) write_auth_infos(lc); } @@ -373,7 +373,7 @@ void linphone_core_remove_auth_info(LinphoneCore *lc, const LinphoneAuthInfo *in if (r){ lc->auth_info=ms_list_remove(lc->auth_info,r); linphone_auth_info_destroy(r); - write_auth_infos(lc); + if(lc->sip_conf.save_auth_info) write_auth_infos(lc); } } diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index c56dbe02c..c22229cd8 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -961,6 +961,7 @@ static void sip_config_read(LinphoneCore *lc) lc->sip_conf.vfu_with_info=lp_config_get_int(lc->config,"sip","vfu_with_info",1); linphone_core_set_sip_transport_timeout(lc, lp_config_get_int(lc->config, "sip", "transport_timeout", 63000)); sal_set_supported_tags(lc->sal,lp_config_get_string(lc->config,"sip","supported","replaces, outbound")); + lc->sip_conf.save_auth_info = lp_config_get_int(lc->config, "sip", "save_auth_info", 1); } static void rtp_config_read(LinphoneCore *lc) diff --git a/coreapi/private.h b/coreapi/private.h index 27ad33d52..4dea61ebb 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -583,6 +583,7 @@ typedef struct sip_config bool_t auto_net_state_mon; bool_t tcp_tls_keepalive; bool_t vfu_with_info; /*use to enable vfu request using sip info*/ + bool_t save_auth_info; // if true, auth infos will be write in the config file when they are added to the list } sip_config_t; typedef struct rtp_config From ac233d1c226c547fb61650e6db85c022a44b8bd3 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 19 Mar 2015 14:45:18 +0100 Subject: [PATCH 4/4] fix Makefile.am problem --- Makefile.am | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 74467b7c9..075a85f43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -92,10 +92,6 @@ rpm-novideo: rpm-base #a zip containing win32 binaries, suitable to generate an installer -if BUILD_ZRTP -WINBINDIST_FILES+=./bin/libzrtpcpp.dll ./bin/msys-1.0.dll ./bin/msys-crypto-1.0.0.dll -endif - if BUILD_TUNNEL WINBINDIST_FILES+=./bin/libtunnel-0.dll endif