amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 10:40:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

RTC: 修复twcc rtp ext seq回退处理逻辑bug

Browse Source
This commit is contained in:
xiongziliang 2021-11-27 22:20:22 +08:00
parent 8b3a5dda1c
commit 8a1f979375
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
webrtc/TwccContext.cpp
View File

@ -21,7 +21,7 @@ enum class ExtSeqStatus : int {
void TwccContext::onRtp(uint32_t ssrc, uint16_t twcc_ext_seq, uint64_t stamp_ms) { void TwccContext::onRtp(uint32_t ssrc, uint16_t twcc_ext_seq, uint64_t stamp_ms) {
switch ((ExtSeqStatus) checkSeqStatus(twcc_ext_seq)) { switch ((ExtSeqStatus) checkSeqStatus(twcc_ext_seq)) {
case ExtSeqStatus::jumped: /*回环后，收到回环前的大ext seq包,过滤掉*/ return; case ExtSeqStatus::jumped: /*seq异常,过滤掉*/ return;
case ExtSeqStatus::looped: /*回环，触发发送twcc rtcp*/ onSendTwcc(ssrc); break; case ExtSeqStatus::looped: /*回环，触发发送twcc rtcp*/ onSendTwcc(ssrc); break;
case ExtSeqStatus::normal: break; case ExtSeqStatus::normal: break;
default: /*不可达*/assert(0); break; default: /*不可达*/assert(0); break;
@ -56,16 +56,29 @@ int TwccContext::checkSeqStatus(uint16_t twcc_ext_seq) const {
return (int) ExtSeqStatus::normal; return (int) ExtSeqStatus::normal;
} }
auto max = _rtp_recv_status.rbegin()->first; auto max = _rtp_recv_status.rbegin()->first;
if (max > 0xFF00 && twcc_ext_seq < 0xFF) { auto delta = (int32_t) twcc_ext_seq - (int32_t) max;
//发生回环了 if (delta > 0 && delta < 0xFFFF / 2) {
//正常增长
return (int) ExtSeqStatus::normal;
}
if (delta < -0xFF00) {
//回环
TraceL << "rtp twcc ext seq looped:" << max << " -> " << twcc_ext_seq; TraceL << "rtp twcc ext seq looped:" << max << " -> " << twcc_ext_seq;
return (int) ExtSeqStatus::looped; return (int) ExtSeqStatus::looped;
} }
if (twcc_ext_seq - max > 0xFFFF / 2) { if (delta > 0xFF00) {
TraceL << "rtp twcc ext seq jumped:" << max << " -> " << twcc_ext_seq; //回环后收到前面大的乱序的包，无法处理，丢弃
TraceL << "rtp twcc ext seq jumped after looped:" << max << " -> " << twcc_ext_seq;
return (int) ExtSeqStatus::jumped; return (int) ExtSeqStatus::jumped;
} }
return (int) ExtSeqStatus::normal; auto min = _rtp_recv_status.begin()->first;
if (min <= twcc_ext_seq || twcc_ext_seq <= max) {
//正常回退
return (int) ExtSeqStatus::normal;
}
//seq莫名的大幅增加或减少，无法处理，丢弃
TraceL << "rtp twcc ext seq jumped:" << max << " -> " << twcc_ext_seq;
return (int) ExtSeqStatus::jumped;
} }
void TwccContext::onSendTwcc(uint32_t ssrc) { void TwccContext::onSendTwcc(uint32_t ssrc) {