kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-21 19:02:06 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/switch_core_media.c
This commit is contained in:
Mike Jerris 2017-03-09 11:13:51 -06:00
parent f991a08691
commit bc0702a776
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/switch_core_media.c
View File

@ -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);