From 8b7465425d0a89c89784e4bbacf84cfe9051ec64 Mon Sep 17 00:00:00 2001 From: Brian West Date: Wed, 23 Sep 2015 14:46:47 -0500 Subject: [PATCH] FS-8130 regression in bridged channels with jitterbuffers --- src/switch_core_media.c | 3 ++- src/switch_rtp.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/switch_core_media.c b/src/switch_core_media.c index 0ffe6a6878..c0163f07e6 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -9075,7 +9075,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_receive_message(switch_core_se const char *val; int ok = 0; - if (!(val = switch_channel_get_variable(session->channel, "rtp_jitter_buffer_during_bridge")) || switch_false(val)) { + if (!switch_channel_test_flag(session->channel, CF_VIDEO) && + (!(val = switch_channel_get_variable(session->channel, "rtp_jitter_buffer_during_bridge")) || switch_false(val))) { if (switch_channel_test_flag(session->channel, CF_JITTERBUFFER) && switch_channel_test_cap_partner(session->channel, CC_FS_RTP)) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s PAUSE Jitterbuffer\n", switch_channel_get_name(session->channel)); diff --git a/src/switch_rtp.c b/src/switch_rtp.c index 5c4e48aaf7..bc3ca09fc9 100644 --- a/src/switch_rtp.c +++ b/src/switch_rtp.c @@ -5416,7 +5416,7 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t } } - if (rtp_session->jb && jb_valid(rtp_session)) { + if (rtp_session->jb && !rtp_session->pause_jb && jb_valid(rtp_session)) { uint32_t read_ssrc = ntohl(rtp_session->last_rtp_hdr.ssrc); if (rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->recv_te &&