From 2b045325181621d9ac6acba50dc10eb2a0cbc626 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 6 Aug 2014 17:26:50 +0200 Subject: [PATCH 1/4] fix compilation error and fix bug when updating preview in linphone_core_set_preferred_video_size() --- coreapi/linphonecore.c | 6 ++++-- coreapi/upnp.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index e2c21e90a..1775580a8 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -900,7 +900,7 @@ static int codec_compare(const PayloadType *a, const PayloadType *b){ rb=find_codec_rank(b->mime_type,b->clock_rate); if (ra>rb) return 1; if (ravideo_conf.preview_vsize; + if (oldvsize.width==0){ oldvsize=lc->video_conf.vsize; - update_preview_size(lc,oldvsize,vsize); } lc->video_conf.vsize=vsize; + update_preview_size(lc,oldvsize,vsize); + if (linphone_core_ready(lc)) lp_config_set_string(lc->config,"video","size",video_size_get_name(vsize)); } diff --git a/coreapi/upnp.c b/coreapi/upnp.c index 5fcbbe065..562078570 100644 --- a/coreapi/upnp.c +++ b/coreapi/upnp.c @@ -607,7 +607,7 @@ int linphone_upnp_context_send_add_port_binding(UpnpContext *lupnp, UpnpPortBind mapping.remote_port = port->external_port; mapping.remote_host = ""; snprintf(description, 128, "%s %s at %s:%d", - PACKAGE_NAME, + "Linphone", (port->protocol == UPNP_IGD_IP_PROTOCOL_TCP)? "TCP": "UDP", port->local_addr, port->local_port); mapping.description = description; From dd07464872205ebb908e5864d203e365ac76bf01 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 6 Aug 2014 18:28:29 +0200 Subject: [PATCH 2/4] fix windows build --- tester/call_tester.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tester/call_tester.c b/tester/call_tester.c index 3269c6fe0..09ae65ded 100644 --- a/tester/call_tester.c +++ b/tester/call_tester.c @@ -2669,7 +2669,7 @@ static void recording_call() { LinphoneCallParams *marieParams = linphone_core_create_default_call_parameters(marie->lc); LinphoneCallParams *paulineParams = linphone_core_create_default_call_parameters(pauline->lc); LinphoneCall *callInst = NULL; - + int dummy=0; #ifdef VIDEO_ENABLED const char filename[] = "recording.mkv"; #else @@ -2684,7 +2684,11 @@ static void recording_call() { strcat(filepath, "/"); strcat(filepath, filename); if(access(dirname, F_OK) != 0) { +#ifdef WIN32 + CU_ASSERT_EQUAL(mkdir(dirname),0); +#else CU_ASSERT_EQUAL(mkdir(dirname, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH), 0); +#endif } CU_ASSERT_EQUAL(access(dirname, W_OK), 0); if(access(filepath, F_OK) == 0) { @@ -2714,7 +2718,7 @@ static void recording_call() { CU_ASSERT_PTR_NOT_NULL(callInst = linphone_core_get_current_call(marie->lc)); linphone_call_start_recording(callInst); - sleep(20); + wait_for_until(marie->lc,pauline->lc,&dummy,1,10000); linphone_call_stop_recording(callInst); CU_ASSERT_EQUAL(access(filepath, F_OK), 0); From ad65819eb14b3177646e60ae6bbcb649ef84e21b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Tue, 5 Aug 2014 17:19:52 +0200 Subject: [PATCH 3/4] Make the "Call recording" tester to save the recording file in another place for Android --- tester/call_tester.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tester/call_tester.c b/tester/call_tester.c index 09ae65ded..31129e4b9 100644 --- a/tester/call_tester.c +++ b/tester/call_tester.c @@ -2670,15 +2670,20 @@ static void recording_call() { LinphoneCallParams *paulineParams = linphone_core_create_default_call_parameters(pauline->lc); LinphoneCall *callInst = NULL; int dummy=0; + char *filepath = NULL; + +#ifdef ANDROID + const char dirname[] = "/data/data/org.linphone.tester/files/.test"; +#else + const char dirname[] = ".test"; +#endif + #ifdef VIDEO_ENABLED const char filename[] = "recording.mkv"; #else const char filename[] = "recording.wav"; #endif - const char dirname[] = ".test"; - char *filepath = NULL; - filepath = ms_new0(char, strlen(dirname) + strlen(filename) + 2); strcpy(filepath, dirname); strcat(filepath, "/"); From 1168afe9efd1fd49240a42c44804fc36a1880897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 6 Aug 2014 02:41:23 +0200 Subject: [PATCH 4/4] Update mediastreamer submodule --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 932964c57..8dae6e326 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 932964c57f0fc8d7690334dae59ab70b455bf466 +Subproject commit 8dae6e326a4bb933d0563af744c24d161b3148ef