From 9fc534d815c01a866bae827ed77f5240a87153ab Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Thu, 11 Apr 2019 18:26:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96rtp=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A4=84=E7=90=86seq=E5=9B=9E?=
 =?UTF-8?q?=E7=8E=AF=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3rdpart/ZLToolKit        |  2 +-
 src/Rtsp/RtpReceiver.cpp | 22 ++++++++++++++--------
 src/Rtsp/RtpReceiver.h   |  4 ++--
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit
index c713905a..942e9bb1 160000
--- a/3rdpart/ZLToolKit
+++ b/3rdpart/ZLToolKit
@@ -1 +1 @@
-Subproject commit c713905a73ba1a86e9978a43e29a3e3d5e6bf77e
+Subproject commit 942e9bb1eb38285c78fcfef9d7468f249b4d36e4
diff --git a/src/Rtsp/RtpReceiver.cpp b/src/Rtsp/RtpReceiver.cpp
index f14ef433..febc28f4 100644
--- a/src/Rtsp/RtpReceiver.cpp
+++ b/src/Rtsp/RtpReceiver.cpp
@@ -81,7 +81,7 @@ bool RtpReceiver::handleOneRtp(int iTrackidx,SdpTrack::Ptr &track, unsigned char
 
     rtppt.payload[0] = '$';
     rtppt.payload[1] = rtppt.interleaved;
-    rtppt.payload[2] = (uiLen & 0xFF00) >> 8;
+    rtppt.payload[2] = uiLen >> 8;
     rtppt.payload[3] = (uiLen & 0x00FF);
 
     rtppt.offset 	= 16;
@@ -100,14 +100,20 @@ bool RtpReceiver::handleOneRtp(int iTrackidx,SdpTrack::Ptr &track, unsigned char
     memcpy(rtppt.payload + 4, pucData, uiLen);
 
     /////////////////////////////////RTP排序逻辑///////////////////////////////////
-    if(rtppt.sequence != (uint16_t)(_aui16LastSeq[iTrackidx] + 1) && _aui16LastSeq[iTrackidx] != 0){
+    if(rtppt.sequence != _aui16LastSeq[iTrackidx] + 1 && _aui16LastSeq[iTrackidx] != 0){
         //包乱序或丢包
-        _aui64SeqOkCnt[iTrackidx] = 0;
+        _aui32SeqOkCnt[iTrackidx] = 0;
         _abSortStarted[iTrackidx] = true;
-        //WarnL << "包乱序或丢包:" << trackidx <<" " << rtppt.sequence << " " << _aui16LastSeq[trackidx];
+
+        if(_aui16LastSeq[iTrackidx] > rtppt.sequence && _aui16LastSeq[iTrackidx] - rtppt.sequence > 0x7FFF){
+            //sequence回环，清空所有排序缓存
+            while (_amapRtpSort[iTrackidx].size()) {
+                POP_HEAD(iTrackidx)
+            }
+        }
     }else{
         //正确序列的包
-        _aui64SeqOkCnt[iTrackidx]++;
+        _aui32SeqOkCnt[iTrackidx]++;
     }
     _aui16LastSeq[iTrackidx] = rtppt.sequence;
 
@@ -116,9 +122,9 @@ bool RtpReceiver::handleOneRtp(int iTrackidx,SdpTrack::Ptr &track, unsigned char
         _amapRtpSort[iTrackidx].emplace(rtppt.sequence, pt_ptr);
         GET_CONFIG_AND_REGISTER(uint32_t,clearCount,Rtp::kClearCount);
         GET_CONFIG_AND_REGISTER(uint32_t,maxRtpCount,Rtp::kMaxRtpCount);
-        if (_aui64SeqOkCnt[iTrackidx] >= clearCount) {
+        if (_aui32SeqOkCnt[iTrackidx] >= clearCount) {
             //网络环境改善，需要清空排序缓存
-            _aui64SeqOkCnt[iTrackidx] = 0;
+            _aui32SeqOkCnt[iTrackidx] = 0;
             _abSortStarted[iTrackidx] = false;
             while (_amapRtpSort[iTrackidx].size()) {
                 POP_HEAD(iTrackidx)
@@ -138,7 +144,7 @@ bool RtpReceiver::handleOneRtp(int iTrackidx,SdpTrack::Ptr &track, unsigned char
 void RtpReceiver::clear() {
     CLEAR_ARR(_aui16LastSeq)
     CLEAR_ARR(_aui32SsrcErrorCnt)
-    CLEAR_ARR(_aui64SeqOkCnt)
+    CLEAR_ARR(_aui32SeqOkCnt)
     CLEAR_ARR(_abSortStarted)
 
     _amapRtpSort[0].clear();
diff --git a/src/Rtsp/RtpReceiver.h b/src/Rtsp/RtpReceiver.h
index eb9a7673..fc52f9d8 100644
--- a/src/Rtsp/RtpReceiver.h
+++ b/src/Rtsp/RtpReceiver.h
@@ -68,9 +68,9 @@ private:
     uint32_t _aui32SsrcErrorCnt[2] = { 0, 0 };
     /* RTP包排序所用参数 */
     uint16_t _aui16LastSeq[2] = { 0 , 0 };
-    uint64_t _aui64SeqOkCnt[2] = { 0 , 0};
+    uint32_t _aui32SeqOkCnt[2] = { 0 , 0};
     bool _abSortStarted[2] = { 0 , 0};
-    map<uint32_t , RtpPacket::Ptr> _amapRtpSort[2];
+    map<uint16_t , RtpPacket::Ptr> _amapRtpSort[2];
     RtspMediaSource::PoolType _pktPool;
 };