From 433ecb1c5cea66deb900d5f7cbd392c38a728338 Mon Sep 17 00:00:00 2001
From: yujitai <atailikec@163.com>
Date: Tue, 7 Nov 2023 19:34:40 +0800
Subject: [PATCH] =?UTF-8?q?RTC:=20=E4=BF=AE=E5=A4=8Dgop=E6=B2=A1=E6=9C=89s?=
 =?UTF-8?q?ps/pps=E5=AF=BC=E8=87=B4=E7=9A=84=E7=A7=92=E5=BC=80=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98=20(#2959)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

rtc场景下，如果directProxy设置为1，sdp没有传递sps/pps，因此gop的开始需要是rtp sps/pps配置帧而不是idr关键帧，这样才能保证秒开。
---
 src/Extension/H264Rtp.cpp | 12 +++++++-----
 src/Extension/H264Rtp.h   |  1 +
 src/Extension/H265Rtp.cpp | 10 ++++++----
 src/Extension/H265Rtp.h   |  1 +
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Extension/H264Rtp.cpp b/src/Extension/H264Rtp.cpp
index 28c775c6..442205a6 100644
--- a/src/Extension/H264Rtp.cpp
+++ b/src/Extension/H264Rtp.cpp
@@ -44,13 +44,15 @@ H264Frame::Ptr H264RtpDecoder::obtainFrame() {
 
 bool H264RtpDecoder::inputRtp(const RtpPacket::Ptr &rtp, bool key_pos) {
     auto seq = rtp->getSeq();
-    auto ret = decodeRtp(rtp);
-    if (!_gop_dropped && seq != (uint16_t) (_last_seq + 1) && _last_seq) {
+    auto last_is_gop = _is_gop;
+    _is_gop = decodeRtp(rtp);
+    if (!_gop_dropped && seq != (uint16_t)(_last_seq + 1) && _last_seq) {
         _gop_dropped = true;
         WarnL << "start drop h264 gop, last seq:" << _last_seq << ", rtp:\r\n" << rtp->dumpString();
     }
     _last_seq = seq;
-    return ret;
+    // 确保有sps rtp的时候，gop从sps开始；否则从关键帧开始
+    return _is_gop && !last_is_gop;
 }
 
 /*
@@ -74,7 +76,7 @@ bool H264RtpDecoder::singleFrame(const RtpPacket::Ptr &rtp, const uint8_t *ptr,
     _frame->_buffer.assign("\x00\x00\x00\x01", 4);
     _frame->_buffer.append((char *) ptr, size);
     _frame->_pts = stamp;
-    auto key = _frame->keyFrame();
+    auto key = _frame->keyFrame() || _frame->configFrame();
     outputFrame(rtp, _frame);
     return key;
 }
@@ -127,7 +129,7 @@ bool H264RtpDecoder::mergeFu(const RtpPacket::Ptr &rtp, const uint8_t *ptr, ssiz
 
     if (!fu->end_bit) {
         //非末尾包
-        return fu->start_bit ? _frame->keyFrame() : false;
+        return fu->start_bit ? (_frame->keyFrame() || _frame->configFrame()) : false;
     }
 
     //确保下一次fu必须收到第一个包
diff --git a/src/Extension/H264Rtp.h b/src/Extension/H264Rtp.h
index 31200cb8..98d49cda 100644
--- a/src/Extension/H264Rtp.h
+++ b/src/Extension/H264Rtp.h
@@ -51,6 +51,7 @@ private:
     void outputFrame(const RtpPacket::Ptr &rtp, const H264Frame::Ptr &frame);
 
 private:
+    bool _is_gop = false;
     bool _gop_dropped = false;
     bool _fu_dropped = true;
     uint16_t _last_seq = 0;
diff --git a/src/Extension/H265Rtp.cpp b/src/Extension/H265Rtp.cpp
index 23bbb109..22866ff4 100644
--- a/src/Extension/H265Rtp.cpp
+++ b/src/Extension/H265Rtp.cpp
@@ -163,7 +163,7 @@ bool H265RtpDecoder::mergeFu(const RtpPacket::Ptr &rtp, const uint8_t *ptr, ssiz
 
     if (!e_bit) {
         //非末尾包
-        return s_bit ? _frame->keyFrame() : false;
+        return s_bit ? (_frame->keyFrame() || _frame->configFrame()) : false;
     }
 
     //确保下一次fu必须收到第一个包
@@ -175,13 +175,15 @@ bool H265RtpDecoder::mergeFu(const RtpPacket::Ptr &rtp, const uint8_t *ptr, ssiz
 
 bool H265RtpDecoder::inputRtp(const RtpPacket::Ptr &rtp, bool) {
     auto seq = rtp->getSeq();
-    auto ret = decodeRtp(rtp);
+    auto last_is_gop = _is_gop;
+    _is_gop = decodeRtp(rtp);
     if (!_gop_dropped && seq != (uint16_t) (_last_seq + 1) && _last_seq) {
         _gop_dropped = true;
         WarnL << "start drop h265 gop, last seq:" << _last_seq << ", rtp:\r\n" << rtp->dumpString();
     }
     _last_seq = seq;
-    return ret;
+    // 确保有sps rtp的时候，gop从sps开始；否则从关键帧开始
+    return _is_gop && !last_is_gop;
 }
 
 bool H265RtpDecoder::decodeRtp(const RtpPacket::Ptr &rtp) {
@@ -220,7 +222,7 @@ bool H265RtpDecoder::singleFrame(const RtpPacket::Ptr &rtp, const uint8_t *ptr,
     _frame->_buffer.assign("\x00\x00\x00\x01", 4);
     _frame->_buffer.append((char *) ptr, size);
     _frame->_pts = stamp;
-    auto key = _frame->keyFrame();
+    auto key = _frame->keyFrame() || _frame->configFrame();
     outputFrame(rtp, _frame);
     return key;
 }
diff --git a/src/Extension/H265Rtp.h b/src/Extension/H265Rtp.h
index cd9702f4..569d8091 100644
--- a/src/Extension/H265Rtp.h
+++ b/src/Extension/H265Rtp.h
@@ -51,6 +51,7 @@ private:
     void outputFrame(const RtpPacket::Ptr &rtp, const H265Frame::Ptr &frame);
 
 private:
+    bool _is_gop = false;
     bool _using_donl_field = false;
     bool _gop_dropped = false;
     bool _fu_dropped = true;