提交 9e07bfb2 authored 作者: Anthony Minessale's avatar Anthony Minessale 提交者: Michael Jerris

FS-7499 some mods to relad/recover in rtp. Killing dtls here might be unsafe…

FS-7499 some mods to relad/recover in rtp.  Killing dtls here might be unsafe and isn't necessary anyway
上级 81094b3a
...@@ -1909,7 +1909,7 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session) ...@@ -1909,7 +1909,7 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
} }
} }
if (!rtcp_ok && (int)((now - rtp_session->rtcp_last_sent) / 1000) > rate) { if (!rtcp_ok && (!rtp_session->rtcp_last_sent || (int)((now - rtp_session->rtcp_last_sent) / 1000) > rate)) {
rtcp_ok = 1; rtcp_ok = 1;
} }
...@@ -2664,7 +2664,10 @@ SWITCH_DECLARE(void) switch_rtp_reset(switch_rtp_t *rtp_session) ...@@ -2664,7 +2664,10 @@ SWITCH_DECLARE(void) switch_rtp_reset(switch_rtp_t *rtp_session)
memset(&rtp_session->ts_norm, 0, sizeof(rtp_session->ts_norm)); memset(&rtp_session->ts_norm, 0, sizeof(rtp_session->ts_norm));
switch_rtp_del_dtls(rtp_session, DTLS_TYPE_RTP|DTLS_TYPE_RTCP); rtp_session->rtcp_sent_packets = 0;
rtp_session->rtcp_last_sent = 0;
//switch_rtp_del_dtls(rtp_session, DTLS_TYPE_RTP|DTLS_TYPE_RTCP);
switch_rtp_set_flag(rtp_session, SWITCH_RTP_FLAG_PAUSE); switch_rtp_set_flag(rtp_session, SWITCH_RTP_FLAG_PAUSE);
switch_rtp_set_flag(rtp_session, SWITCH_RTP_FLAG_MUTE); switch_rtp_set_flag(rtp_session, SWITCH_RTP_FLAG_MUTE);
rtcp_stats_init(rtp_session); rtcp_stats_init(rtp_session);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论