From ebf0f4c0330b2b69ac51b71bed4ce3d45b25d0c9 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Fri, 18 Dec 2015 17:13:19 +0100 Subject: [PATCH] Fixing problem with trr_interval set to 0 in some cases. --- coreapi/bellesip_sal/sal_sdp.c | 4 ++-- coreapi/sal.c | 1 + tester/call_tester.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/coreapi/bellesip_sal/sal_sdp.c b/coreapi/bellesip_sal/sal_sdp.c index 7f38dffaa..e732e0104 100644 --- a/coreapi/bellesip_sal/sal_sdp.c +++ b/coreapi/bellesip_sal/sal_sdp.c @@ -125,7 +125,7 @@ static void add_rtcp_fb_attributes(belle_sdp_media_description_t *media_desc, co uint16_t trr_int = 0; general_trr_int = is_rtcp_fb_trr_int_the_same_for_all_payloads(stream, &trr_int); - if (general_trr_int == TRUE) { + if (general_trr_int == TRUE && trr_int != 0) { add_rtcp_fb_trr_int_attribute(media_desc, -1, trr_int); } if (stream->rtcp_fb.generic_nack_enabled == TRUE) { @@ -143,7 +143,7 @@ static void add_rtcp_fb_attributes(belle_sdp_media_description_t *media_desc, co avpf_params = payload_type_get_avpf_params(pt); /* Add trr-int if not set generally. */ - if (general_trr_int != TRUE) { + if (general_trr_int != TRUE && trr_int != 0) { add_rtcp_fb_trr_int_attribute(media_desc, payload_type_get_number(pt), avpf_params.trr_interval); } diff --git a/coreapi/sal.c b/coreapi/sal.c index f9356dc17..d439d2fd8 100644 --- a/coreapi/sal.c +++ b/coreapi/sal.c @@ -61,6 +61,7 @@ SalMediaDescription *sal_media_description_new(){ md->streams[i].dir=SalStreamInactive; md->streams[i].rtp_port = 0; md->streams[i].rtcp_port = 0; + md->streams[i].implicit_rtcp_fb = TRUE; } return md; } diff --git a/tester/call_tester.c b/tester/call_tester.c index 20fbec2e8..fda74ccf6 100644 --- a/tester/call_tester.c +++ b/tester/call_tester.c @@ -2262,8 +2262,8 @@ static void video_call_dtls(void) { static void video_call_using_policy(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); - video_call_base(marie,pauline,TRUE,LinphoneMediaEncryptionNone,TRUE,TRUE); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTcp) ? "pauline_rc" : "pauline_tcp_rc"); + video_call_base(pauline,marie,TRUE,LinphoneMediaEncryptionNone,TRUE,TRUE); linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline); }