提交 bc0702a7 authored 作者: Mike Jerris's avatar Mike Jerris

FS-10116: [RTP] Crash when rtp_autofix_timing=true on video calls #resolve

Conflicts:
	src/switch_core_media.c
上级 f991a086
......@@ -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);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论