From 5172b846d348a802e31c05bbb7d4d5f54f64051b Mon Sep 17 00:00:00 2001
From: wxf <xiaofeng.wang@bqvision.com>
Date: Sun, 18 Jul 2021 15:02:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?PSDecoder:=20=E7=BC=93=E5=AD=98=E6=9C=AA?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AE=8C=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Rtp/PSDecoder.cpp | 26 +++++++++++++++++++++++++-
 src/Rtp/PSDecoder.h   | 11 ++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/Rtp/PSDecoder.cpp b/src/Rtp/PSDecoder.cpp
index 7854e1af..448f1809 100644
--- a/src/Rtp/PSDecoder.cpp
+++ b/src/Rtp/PSDecoder.cpp
@@ -45,7 +45,8 @@ PSDecoder::~PSDecoder() {
 }
 
 ssize_t PSDecoder::input(const uint8_t *data, size_t bytes) {
-    return ps_demuxer_input((struct ps_demuxer_t*)_ps_demuxer,data,bytes);
+    HttpRequestSplitter::input(reinterpret_cast<const char *>(data), bytes);
+    return bytes;
 }
 
 void PSDecoder::setOnDecode(Decoder::onDecode cb) {
@@ -56,5 +57,28 @@ void PSDecoder::setOnStream(Decoder::onStream cb) {
     _on_stream = std::move(cb);
 }
 
+const char *PSDecoder::onSearchPacketTail(const char *data, size_t len) {
+    try {
+        auto ret = ps_demuxer_input(static_cast<struct ps_demuxer_t *>(_ps_demuxer), reinterpret_cast<const uint8_t *>(data), len);
+        if (ret >= 0) {
+            //解析成功全部或部分
+            return data + ret;
+        }
+
+        //解析失败，丢弃所有数据
+        return data + len;
+    } catch (std::exception &ex) {
+        InfoL << "解析 ps 异常: bytes=" << len
+              << ", exception=" << ex.what()
+              << ", hex=" << hexdump(data, MIN(len, 32));
+        if (remainDataSize() > 256 * 1024) {
+            //缓存太多数据无法处理则上抛异常
+            throw;
+        }
+
+        return nullptr;
+    }
+}
+
 }//namespace mediakit
 #endif//#if defined(ENABLE_RTPPROXY)
\ No newline at end of file
diff --git a/src/Rtp/PSDecoder.h b/src/Rtp/PSDecoder.h
index 270f929a..6cb5b40e 100644
--- a/src/Rtp/PSDecoder.h
+++ b/src/Rtp/PSDecoder.h
@@ -14,17 +14,26 @@
 #if defined(ENABLE_RTPPROXY)
 #include <stdint.h>
 #include "Decoder.h"
+#include "Http/HttpRequestSplitter.h"
+
 namespace mediakit{
 
 //ps解析器
-class PSDecoder : public Decoder {
+class PSDecoder : public Decoder, private HttpRequestSplitter {
 public:
     PSDecoder();
     ~PSDecoder();
+
     ssize_t input(const uint8_t* data, size_t bytes) override;
     void setOnDecode(onDecode cb) override;
     void setOnStream(onStream cb) override;
 
+    // HttpRequestSplitter interface
+private:
+    using HttpRequestSplitter::input;
+    const char *onSearchPacketTail(const char *data, size_t len) override;
+    ssize_t onRecvHeader(const char *, size_t) override { return 0; };
+
 private:
     void *_ps_demuxer = nullptr;
     onDecode _on_decode;

From 9dd602c2427f84e4455dc91905e24c02a9c34f47 Mon Sep 17 00:00:00 2001
From: wxf <xiaofeng.wang@bqvision.com>
Date: Sun, 18 Jul 2021 15:04:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?GB28181Process:=20=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=BC=93=E5=AD=98=E6=9C=AA=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=AE=8C=E7=9A=84=20PS/TS=20=E5=B8=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* PS 帧已由 PSDecoder 缓存;
* TS 帧在 TSDecoder 中有判断是否为 TS, 即使出错缓存也无意义;
---
 src/Rtp/GB28181Process.cpp | 23 +----------------------
 src/Rtp/GB28181Process.h   |  4 +---
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/Rtp/GB28181Process.cpp b/src/Rtp/GB28181Process.cpp
index 42f004d2..c3fb9942 100644
--- a/src/Rtp/GB28181Process.cpp
+++ b/src/Rtp/GB28181Process.cpp
@@ -150,27 +150,6 @@ bool GB28181Process::inputRtp(bool, const char *data, size_t 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) {
     if (frame->getCodecId() != CodecInvalid) {
         //这里不是ps或ts
@@ -197,7 +176,7 @@ void GB28181Process::onRtpDecode(const Frame::Ptr &frame) {
     }
 
     if (_decoder) {
-        HttpRequestSplitter::input(frame->data(), frame->size());
+        _decoder->input(reinterpret_cast<const uint8_t *>(frame->data()), frame->size());
     }
 }
 
diff --git a/src/Rtp/GB28181Process.h b/src/Rtp/GB28181Process.h
index 4d5d06d4..e1a60d5c 100644
--- a/src/Rtp/GB28181Process.h
+++ b/src/Rtp/GB28181Process.h
@@ -22,7 +22,7 @@
 namespace mediakit{
 
 class RtpReceiverImp;
-class GB28181Process : public HttpRequestSplitter, public ProcessInterface{
+class GB28181Process : public ProcessInterface {
 public:
     typedef std::shared_ptr<GB28181Process> Ptr;
     GB28181Process(const MediaInfo &media_info, MediaSinkInterface *interface);
@@ -38,8 +38,6 @@ public:
 
 protected:
     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:
     void onRtpDecode(const Frame::Ptr &frame);