From bc0702a776c51469540fcd231370c692bedf0141 Mon Sep 17 00:00:00 2001 From: Mike Jerris Date: Thu, 9 Mar 2017 11:13:51 -0600 Subject: [PATCH] FS-10116: [RTP] Crash when rtp_autofix_timing=true on video calls #resolve Conflicts: src/switch_core_media.c --- src/switch_core_media.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/switch_core_media.c b/src/switch_core_media.c index f797d04ef1..966bc491fc 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -2420,7 +2420,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_read_frame(switch_core_session } /* check for timing issues */ - if (smh->media_flags[SCMF_AUTOFIX_TIMING]) { + if (smh->media_flags[SCMF_AUTOFIX_TIMING] && type == SWITCH_MEDIA_TYPE_AUDIO && engine->read_impl.samples_per_second) { char is_vbr; is_vbr = engine->read_impl.encoded_bytes_per_packet?0:1; @@ -2494,8 +2494,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_read_frame(switch_core_session engine->last_ts = engine->read_frame.timestamp; engine->last_seq = engine->read_frame.seq; - } else if (smh->media_flags[SCMF_AUTOFIX_TIMING] && is_vbr && switch_rtp_get_jitter_buffer(engine->rtp_session) - && engine->read_frame.timestamp && engine->read_frame.seq) { + } else if (smh->media_flags[SCMF_AUTOFIX_TIMING] && is_vbr && switch_rtp_get_jitter_buffer(engine->rtp_session) + && type == SWITCH_MEDIA_TYPE_AUDIO + && engine->read_frame.timestamp && engine->read_frame.seq) { uint32_t codec_ms = (int) (engine->read_frame.timestamp - engine->last_ts) / (engine->read_impl.samples_per_second / 1000);