From 163b0875cfd9ac730c9d0be20e6ed0d82b185649 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Tue, 28 Apr 2020 22:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dh264=20split=E5=90=8E?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=A4=9A=E4=B8=AA=E5=AD=97=E8=8A=82=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Extension/H264.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Extension/H264.cpp b/src/Extension/H264.cpp
index d1f66f9a..7cfb086a 100644
--- a/src/Extension/H264.cpp
+++ b/src/Extension/H264.cpp
@@ -50,6 +50,9 @@ void splitH264(const char *ptr, int len, const std::function<void(const char *,
     while(true) {
         auto next_nal = memfind(nal + 3,end - nal - 3,"\x0\x0\x1",3);
         if(next_nal){
+            if(*(next_nal - 1) == 0x00){
+                next_nal -= 1;
+            }
             cb(nal,next_nal - nal);
             nal = next_nal;
             continue;
@@ -59,6 +62,18 @@ void splitH264(const char *ptr, int len, const std::function<void(const char *,
     }
 }
 
+#if 0
+//splitH264函数测试程序
+static onceToken s_token([](){
+    char buf[] = "\x00\x00\x00\x01\x12\x23\x34\x45\x56"
+                 "\x00\x00\x00\x01\x12\x23\x34\x45\x56"
+                 "\x00\x00\x00\x01\x12\x23\x34\x45\x56"
+                 "\x00\x00\x01\x12\x23\x34\x45\x56";
+    splitH264(buf, sizeof(buf) - 1, [](const char *ptr, int len){
+        cout << hexdump(ptr, len) << endl;
+    });
+});
+#endif //0
 
 Sdp::Ptr H264Track::getSdp() {
     if(!ready()){