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

HLS: ts分包器主动丢弃非法数据

Browse Source
This commit is contained in:
ziyue 2021-12-24 14:25:01 +08:00
parent c25ff6400f
commit 5832de7ed8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Rtp/TSDecoder.cpp
View File

@ -15,8 +15,8 @@ bool TSSegment::isTSPacket(const char *data, size_t len){
return len == TS_PACKET_SIZE && ((uint8_t*)data)[0] == TS_SYNC_BYTE; return len == TS_PACKET_SIZE && ((uint8_t*)data)[0] == TS_SYNC_BYTE;
} }
void TSSegment::setOnSegment(const TSSegment::onSegment &cb) { void TSSegment::setOnSegment(TSSegment::onSegment cb) {
_onSegment = cb; _onSegment = std::move(cb);
} }
ssize_t TSSegment::onRecvHeader(const char *data, size_t len) { ssize_t TSSegment::onRecvHeader(const char *data, size_t len) {
@ -43,6 +43,11 @@ const char *TSSegment::onSearchPacketTail(const char *data, size_t len) {
if (pos) { if (pos) {
return (char *) pos; return (char *) pos;
} }
if (remainDataSize() > 4 * _size) {
//数据这么多都没ts包，全部清空
return data + len;
}
//等待更多数据
return nullptr; return nullptr;
} }

2
src/Rtp/TSDecoder.h
View File

@ -27,7 +27,7 @@ public:
typedef std::function<void(const char *data,size_t len)> onSegment; typedef std::function<void(const char *data,size_t len)> onSegment;
TSSegment(size_t size = TS_PACKET_SIZE) : _size(size){} TSSegment(size_t size = TS_PACKET_SIZE) : _size(size){}
~TSSegment(){} ~TSSegment(){}
void setOnSegment(const onSegment &cb); void setOnSegment(onSegment cb);
static bool isTSPacket(const char *data, size_t len); static bool isTSPacket(const char *data, size_t len);
protected: protected: