From b4a3b608abfe05825d034dc413691bb26e738606 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sat, 1 Aug 2020 10:20:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Drtmp=E5=A2=9E=E9=95=BF?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E7=9B=B8=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Rtmp/Rtmp.h           |  6 +--
 src/Rtmp/RtmpProtocol.cpp | 90 +++++++++++++++++++--------------------
 2 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/src/Rtmp/Rtmp.h b/src/Rtmp/Rtmp.h
index f9d3d8e6..3df5240e 100644
--- a/src/Rtmp/Rtmp.h
+++ b/src/Rtmp/Rtmp.h
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
  *
  * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
@@ -130,8 +130,6 @@ public:
     uint8_t typeId;
     uint32_t bodySize = 0;
     uint32_t timeStamp = 0;
-    bool hasAbsStamp = false;
-    bool hasExtStamp = false;
     uint32_t deltaStamp = 0;
     uint32_t streamId;
     uint32_t chunkId;
@@ -153,8 +151,6 @@ public:
         typeId = that.typeId;
         bodySize = that.bodySize;
         timeStamp = that.timeStamp;
-        hasAbsStamp = that.hasAbsStamp;
-        hasExtStamp = that.hasExtStamp;
         deltaStamp = that.deltaStamp;
         streamId = that.streamId;
         chunkId = that.chunkId;
diff --git a/src/Rtmp/RtmpProtocol.cpp b/src/Rtmp/RtmpProtocol.cpp
index 3789b3c3..dcd5ee93 100644
--- a/src/Rtmp/RtmpProtocol.cpp
+++ b/src/Rtmp/RtmpProtocol.cpp
@@ -514,35 +514,35 @@ void RtmpProtocol::handle_rtmp() {
     while (!_strRcvBuf.empty()) {
         uint8_t flags = _strRcvBuf[0];
         int iOffset = 0;
-        static const size_t HEADER_LENGTH[] = { 12, 8, 4, 1 };
+        static const size_t HEADER_LENGTH[] = {12, 8, 4, 1};
         size_t iHeaderLen = HEADER_LENGTH[flags >> 6];
         _iNowChunkID = flags & 0x3f;
         switch (_iNowChunkID) {
-        case 0: {
-            //0 值表示二字节形式，并且 ID 范围 64 - 319
-            //(第二个字节 + 64)。
-            if (_strRcvBuf.size() < 2) {
-                //need more data
-                return;
+            case 0: {
+                //0 值表示二字节形式，并且 ID 范围 64 - 319
+                //(第二个字节 + 64)。
+                if (_strRcvBuf.size() < 2) {
+                    //need more data
+                    return;
+                }
+                _iNowChunkID = 64 + (uint8_t) (_strRcvBuf[1]);
+                iOffset = 1;
             }
-            _iNowChunkID = 64 + (uint8_t) (_strRcvBuf[1]);
-            iOffset = 1;
-        }
-            break;
-        case 1: {
-            //1 值表示三字节形式，并且 ID 范围为 64 - 65599
-            //((第三个字节) * 256 + 第二个字节 + 64)。
-            if (_strRcvBuf.size() < 3) {
-                //need more data
-                return;
+                break;
+            case 1: {
+                //1 值表示三字节形式，并且 ID 范围为 64 - 65599
+                //((第三个字节) * 256 + 第二个字节 + 64)。
+                if (_strRcvBuf.size() < 3) {
+                    //need more data
+                    return;
+                }
+                _iNowChunkID = 64 + ((uint8_t) (_strRcvBuf[2]) << 8) + (uint8_t) (_strRcvBuf[1]);
+                iOffset = 2;
             }
-            _iNowChunkID = 64 + ((uint8_t) (_strRcvBuf[2]) << 8) + (uint8_t) (_strRcvBuf[1]);
-            iOffset = 2;
-        }
-            break;
-        default:
-            //带有 2 值的块流 ID 被保留，用于下层协议控制消息和命令。
-            break;
+                break;
+            default:
+                //带有 2 值的块流 ID 被保留，用于下层协议控制消息和命令。
+                break;
         }
 
         if (_strRcvBuf.size() < iHeaderLen + iOffset) {
@@ -553,18 +553,16 @@ void RtmpProtocol::handle_rtmp() {
         auto &chunkData = _mapChunkData[_iNowChunkID];
         chunkData.chunkId = _iNowChunkID;
         switch (iHeaderLen) {
-        case 12:
-            chunkData.hasAbsStamp = true;
-            chunkData.streamId = load_le32(header.streamId);
-        case 8:
-            chunkData.bodySize = load_be24(header.bodySize);
-            chunkData.typeId = header.typeId;
-        case 4:
-            chunkData.deltaStamp = load_be24(header.timeStamp);
-            chunkData.hasExtStamp = chunkData.deltaStamp == 0xFFFFFF;
+            case 12:
+                chunkData.streamId = load_le32(header.streamId);
+            case 8:
+                chunkData.bodySize = load_be24(header.bodySize);
+                chunkData.typeId = header.typeId;
+            case 4:
+                chunkData.deltaStamp = load_be24(header.timeStamp);
         }
-        
-        if (chunkData.hasExtStamp) {
+
+        if (chunkData.deltaStamp == 0xFFFFFF) {
             if (_strRcvBuf.size() < iHeaderLen + iOffset + 4) {
                 //need more data
                 return;
@@ -572,32 +570,34 @@ void RtmpProtocol::handle_rtmp() {
             chunkData.deltaStamp = load_be32(_strRcvBuf.data() + iOffset + iHeaderLen);
             iOffset += 4;
         }
-        
+
         if (chunkData.bodySize < chunkData.strBuf.size()) {
             throw std::runtime_error("非法的bodySize");
         }
-        
+
         auto iMore = min(_iChunkLenIn, chunkData.bodySize - chunkData.strBuf.size());
         if (_strRcvBuf.size() < iHeaderLen + iOffset + iMore) {
             //need more data
             return;
         }
-        
+
+        if (iHeaderLen == 12) {
+            //绝对时间戳
+            chunkData.timeStamp = chunkData.deltaStamp;
+        } else {
+            //时间戳增量
+            chunkData.timeStamp += chunkData.deltaStamp;
+        }
+
         chunkData.strBuf.append(_strRcvBuf, iHeaderLen + iOffset, iMore);
         _strRcvBuf.erase(0, iHeaderLen + iOffset + iMore);
-        
         if (chunkData.strBuf.size() == chunkData.bodySize) {
             //frame is ready
             _iNowStreamID = chunkData.streamId;
-            chunkData.timeStamp = chunkData.deltaStamp + (chunkData.hasAbsStamp ? 0 : chunkData.timeStamp);
-            
-            if(chunkData.bodySize){
+            if (chunkData.bodySize) {
                 handle_rtmpChunk(chunkData);
             }
             chunkData.strBuf.clear();
-            chunkData.hasAbsStamp = false;
-            chunkData.hasExtStamp = false;
-            chunkData.deltaStamp = 0;
         }
     }
 }