amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-10-06 20:23:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GB28181Process: 不再需要缓存未处理完的 PS/TS 帧

Browse Source 
* PS 帧已由 PSDecoder 缓存;
* TS 帧在 TSDecoder 中有判断是否为 TS, 即使出错缓存也无意义;
This commit is contained in:
wxf 2021-07-18 15:04:56 +08:00
parent 5172b846d3
commit 9dd602c242
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Rtp/GB28181Process.cpp
View File

@ -150,27 +150,6 @@ bool GB28181Process::inputRtp(bool, const char *data, size_t data_len) {
return ref->inputRtp(TrackVideo, (unsigned char *) data, data_len); return ref->inputRtp(TrackVideo, (unsigned char *) data, data_len);
} }
const char *GB28181Process::onSearchPacketTail(const char *packet,size_t bytes){
try {
auto ret = _decoder->input((uint8_t *) packet, bytes);
if (ret >= 0) {
//解析成功全部或部分
return packet + ret;
}
//解析失败，丢弃所有数据
return packet + bytes;
} catch (std::exception &ex) {
InfoL << "解析ps或ts异常: bytes=" << bytes
<< " ,exception=" << ex.what()
<< " ,hex=" << hexdump((uint8_t *) packet, MIN(bytes,32));
if (remainDataSize() > 256 * 1024) {
//缓存太多数据无法处理则上抛异常
throw;
}
return nullptr;
}
}
void GB28181Process::onRtpDecode(const Frame::Ptr &frame) { void GB28181Process::onRtpDecode(const Frame::Ptr &frame) {
if (frame->getCodecId() != CodecInvalid) { if (frame->getCodecId() != CodecInvalid) {
//这里不是ps或ts //这里不是ps或ts
@ -197,7 +176,7 @@ void GB28181Process::onRtpDecode(const Frame::Ptr &frame) {
} }
if (_decoder) { if (_decoder) {
HttpRequestSplitter::input(frame->data(), frame->size()); _decoder->input(reinterpret_cast<const uint8_t *>(frame->data()), frame->size());
} }
} }

4
src/Rtp/GB28181Process.h
View File

@ -22,7 +22,7 @@
namespace mediakit{ namespace mediakit{
class RtpReceiverImp; class RtpReceiverImp;
class GB28181Process : public HttpRequestSplitter, public ProcessInterface{ class GB28181Process : public ProcessInterface {
public: public:
typedef std::shared_ptr<GB28181Process> Ptr; typedef std::shared_ptr<GB28181Process> Ptr;
GB28181Process(const MediaInfo &media_info, MediaSinkInterface *interface); GB28181Process(const MediaInfo &media_info, MediaSinkInterface *interface);
@ -38,8 +38,6 @@ public:
protected: protected:
void onRtpSorted(RtpPacket::Ptr rtp); void onRtpSorted(RtpPacket::Ptr rtp);
const char *onSearchPacketTail(const char *data,size_t len) override;
ssize_t onRecvHeader(const char *data,size_t len) override { return 0; };
private: private:
void onRtpDecode(const Frame::Ptr &frame); void onRtpDecode(const Frame::Ptr &frame);