]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
disable catchup code when jitterbuffer is there
authorAnthony Minessale <anthm@freeswitch.org>
Fri, 30 Nov 2012 17:43:48 +0000 (11:43 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Fri, 30 Nov 2012 17:43:48 +0000 (11:43 -0600)
src/switch_rtp.c

index 8726beabe87e2c254b16365e081966155ea61a8b..25a46f3b5c9606da0f5617695d4867bb9f6f3b83 100644 (file)
@@ -3234,7 +3234,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 
                if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) {
                        if ((switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH)) &&
-                               rtp_session->read_pollfd) {
+                               rtp_session->read_pollfd && (!rtp_session->jb || rtp_session->pause_jb)) {
                                if (switch_poll(rtp_session->read_pollfd, 1, &fdr, 0) == SWITCH_STATUS_SUCCESS) {
                                        status = read_rtp_packet(rtp_session, &bytes, flags, SWITCH_FALSE);
                                        /* switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Initial (%i) %d\n", status, bytes); */