FS-8130 regression in bridged channels with jitterbuffers

diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index 0ffe6a6878a8189e9d6f4745b9a02a51f3e21f4d..c0163f07e612cbf6752d5d76d0974d8ecaa50b1e 100644 (file)
--- 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 5c4e48aaf7c2f3a91d170b7f5caff37380988dac..bc3ca09fc99c27f888522840b68d19037d98d029 100644 (file)
--- 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 &&