Merge pull request #1104 in FS/freeswitch from ~CRIENZO/freeswitch:fs-9826 to master

* commit '74ecc8882ff59f5f8aacaef28a59d1c0d33192ab':
  FS-9826 reset jitter buffer if SSRC changes regardless of jitter buffer paused state
This commit is contained in:
Brian West 2016-12-07 13:05:55 -06:00
commit a8da1d7cff
1 changed files with 4 additions and 2 deletions

View File

@ -5793,13 +5793,15 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
}
}
if (rtp_session->jb && !rtp_session->pause_jb && jb_valid(rtp_session)) {
if (rtp_session->jb && jb_valid(rtp_session)) {
if (rtp_session->last_jb_read_ssrc && rtp_session->last_jb_read_ssrc != read_ssrc) {
switch_jb_reset(rtp_session->jb);
}
rtp_session->last_jb_read_ssrc = read_ssrc;
}
if (rtp_session->jb && !rtp_session->pause_jb && jb_valid(rtp_session)) {
if (!rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER] && rtp_session->timer.interval) {
switch_core_timer_sync(&rtp_session->timer);