diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index a952865ab..59ad78c19 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -2282,7 +2282,8 @@ static void report_bandwidth(LinphoneCall *call, MediaStream *as, MediaStream *v call->stats[LINPHONE_CALL_STATS_AUDIO].upload_bandwidth=(as!=NULL) ? (media_stream_get_up_bw(as)*1e-3) : 0; call->stats[LINPHONE_CALL_STATS_VIDEO].download_bandwidth=(vs!=NULL) ? (media_stream_get_down_bw(vs)*1e-3) : 0; call->stats[LINPHONE_CALL_STATS_VIDEO].upload_bandwidth=(vs!=NULL) ? (media_stream_get_up_bw(vs)*1e-3) : 0; - ms_message("bandwidth usage: audio=[d=%.1f,u=%.1f] video=[d=%.1f,u=%.1f] kbit/sec", + ms_message("bandwidth usage for call [%p]: audio=[d=%.1f,u=%.1f] video=[d=%.1f,u=%.1f] kbit/sec", + call, call->stats[LINPHONE_CALL_STATS_AUDIO].download_bandwidth, call->stats[LINPHONE_CALL_STATS_AUDIO].upload_bandwidth , call->stats[LINPHONE_CALL_STATS_VIDEO].download_bandwidth, diff --git a/mediastreamer2 b/mediastreamer2 index 9e7ea53dc..d90b00711 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 9e7ea53dca1ae7447d320b37b14dd4d58e0f67fe +Subproject commit d90b00711f794814fe670c846ca162704df883c7 diff --git a/oRTP b/oRTP index bb43f9fcd..fcc51caa1 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit bb43f9fcd2325bdf44e9a244cc4502b7d5de71d9 +Subproject commit fcc51caa15def815189a388e878877a5354850e6 diff --git a/tester/call_tester.c b/tester/call_tester.c index 8e5c952f7..ab8c5f8c0 100644 --- a/tester/call_tester.c +++ b/tester/call_tester.c @@ -103,7 +103,7 @@ static void check_rtcp(LinphoneCoreManager* caller, LinphoneCoreManager* callee) c1=linphone_core_get_current_call(caller->lc); c2=linphone_core_get_current_call(callee->lc); - for (i=0; i<12 /*=6s*/; i++) { + for (i=0; i<24 /*=12s need at least one exchange of SR to maybe 10s*/; i++) { if (linphone_call_get_audio_stats(c1)->round_trip_delay >0.0 && linphone_call_get_audio_stats(c2)->round_trip_delay >0.0 && (!linphone_call_log_video_enabled(linphone_call_get_call_log(c1)) || linphone_call_get_video_stats(c1)->round_trip_delay>0.0) @@ -133,7 +133,11 @@ bool_t call_with_params(LinphoneCoreManager* caller_mgr stats initial_caller=caller_mgr->stat; stats initial_callee=callee_mgr->stat; bool_t result=FALSE; - + char hellopath[256]; + /*use playfile for callee to avoid locking on capture card*/ + linphone_core_use_files (callee_mgr->lc,TRUE); + snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix); + linphone_core_set_play_file(callee_mgr->lc,hellopath); if (!caller_params){ CU_ASSERT_PTR_NOT_NULL(linphone_core_invite_address(caller_mgr->lc,callee_mgr->identity)); }else{ diff --git a/tester/images/nowebcamCIF.jpg b/tester/images/nowebcamCIF.jpg new file mode 100644 index 000000000..2ab8bdc2a Binary files /dev/null and b/tester/images/nowebcamCIF.jpg differ diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c index f3e0c7280..24a4c5350 100644 --- a/tester/liblinphone_tester.c +++ b/tester/liblinphone_tester.c @@ -96,6 +96,7 @@ static LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* char ringbackpath[256]={0}; char rootcapath[256]={0}; char dnsuserhostspath[256]={0}; + char nowebcampath[256]={0}; if (path==NULL) path="."; @@ -113,11 +114,13 @@ static LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* sprintf(dnsuserhostspath, "%s/%s", path, userhostsfile); sal_set_dns_user_hosts_file(lc->sal, dnsuserhostspath); - sprintf(ringpath, "%s/%s", path, "oldphone.wav"); - sprintf(ringbackpath, "%s/%s", path, "ringback.wav"); + snprintf(ringpath,sizeof(ringpath), "%s/sounds/oldphone.wav",path); + snprintf(ringbackpath,sizeof(ringbackpath), "%s/sounds/ringback.wav", path); linphone_core_set_ring(lc, ringpath); linphone_core_set_ringback(lc, ringbackpath); + snprintf(nowebcampath, sizeof(nowebcampath), "%s/images/nowebcamCIF.jpg", path); + linphone_core_set_static_picture(lc,nowebcampath); return lc; } diff --git a/tester/sounds/hello8000.wav b/tester/sounds/hello8000.wav new file mode 100644 index 000000000..b787b202e Binary files /dev/null and b/tester/sounds/hello8000.wav differ diff --git a/tester/sounds/oldphone.wav b/tester/sounds/oldphone.wav new file mode 100644 index 000000000..e3056cc5d Binary files /dev/null and b/tester/sounds/oldphone.wav differ diff --git a/tester/sounds/ringback.wav b/tester/sounds/ringback.wav new file mode 100644 index 000000000..21f4b5bfb Binary files /dev/null and b/tester/sounds/ringback.wav differ