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

修复TCP RTP 2字节头被误判为4字节头的问题 (#2499)

Browse Source 
当RFC4571封装的RTP包大小在0x2400到0x24ff之间时，会被误认为是RTSP Interleaved
封装的数据。因为0x24正好是'$'的ASCII码，而RtpSplitter::onSearchPacketTail通过'$'来识别RTSP
Interleaved数据。暂时没有想到什么好的办法能够百分之百的正确区分RFC4571数据和RTSP
Interleaved数据。增加一个状态变量记录之前的状态，一旦检测到数据不是RTSP
Interleaved格式，则后续不再进行尝试，以减小误判的可能性。
This commit is contained in:
dengjfzh 2023-05-26 17:34:47 +08:00 committed by GitHub
parent 3f447246c2
commit 032a2ac91d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Rtp/RtpSplitter.cpp
View File

@ -59,11 +59,15 @@ const char *RtpSplitter::onSearchPacketTail(const char *data, size_t len) {
return onSearchPacketTail_l(data + kEHOME_OFFSET + 2, len - kEHOME_OFFSET - 2); return onSearchPacketTail_l(data + kEHOME_OFFSET + 2, len - kEHOME_OFFSET - 2);
} }
if (data[0] == '$') { if ( _is_rtsp_interleaved ) {
//可能是4个字节的rtp头 if (data[0] == '$') {
_offset = 4; //可能是4个字节的rtp头
return onSearchPacketTail_l(data + 2, len - 2); _offset = 4;
return onSearchPacketTail_l(data + 2, len - 2);
}
_is_rtsp_interleaved = false;
} }
//两个字节的rtp头 //两个字节的rtp头
_offset = 2; _offset = 2;
return onSearchPacketTail_l(data, len); return onSearchPacketTail_l(data, len);

1
src/Rtp/RtpSplitter.h
View File

@ -36,6 +36,7 @@ protected:
private: private:
bool _is_ehome = false; bool _is_ehome = false;
bool _is_rtsp_interleaved = true;
size_t _offset = 0; size_t _offset = 0;
}; };