From 7ba5da44f494d08f7673ea4d59b49a8641354eef Mon Sep 17 00:00:00 2001
From: zjx94 <741450045@qq.com>
Date: Sat, 25 Nov 2023 17:08:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0firstTSOneGOP=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE,=E8=A7=A3=E5=86=B3=E5=BD=93GOP=E5=B0=8F=E4=BA=8EsegDu?=
 =?UTF-8?q?r=E6=97=B6=EF=BC=8C=E5=8F=AF=E6=8F=90=E9=AB=98=E9=A6=96?=
 =?UTF-8?q?=E5=B1=8F=E6=92=AD=E6=94=BE=E7=9A=84=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/config.ini         |  2 ++
 src/Common/config.cpp   |  2 ++
 src/Common/config.h     |  2 ++
 src/Record/HlsMaker.cpp | 15 +++++++++++----
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/conf/config.ini b/conf/config.ini
index dc343b32..c09ac189 100644
--- a/conf/config.ini
+++ b/conf/config.ini
@@ -140,6 +140,8 @@ deleteDelaySec=10
 #0为不保留，不起作用
 #1为保留，则不删除hls文件，如果开启此功能，注意磁盘大小，或者定期手动清理hls文件
 segKeep=0
+#如果设置为1，则第一个切片长度强制设置为1个GOP。当GOP小于segDur，可以提高首屏速度
+firstTSOneGOP=0
 
 [hook]
 #是否启用hook事件，启用后，推拉流都将进行鉴权
diff --git a/src/Common/config.cpp b/src/Common/config.cpp
index 1009f1e6..0cf6658c 100644
--- a/src/Common/config.cpp
+++ b/src/Common/config.cpp
@@ -305,6 +305,7 @@ const string kSegmentRetain = HLS_FIELD "segRetain";
 const string kFileBufSize = HLS_FIELD "fileBufSize";
 const string kBroadcastRecordTs = HLS_FIELD "broadcastRecordTs";
 const string kDeleteDelaySec = HLS_FIELD "deleteDelaySec";
+const string kFirstTSOneGOP = HLS_FIELD "firstTSOneGOP";
 
 static onceToken token([]() {
     mINI::Instance()[kSegmentDuration] = 2;
@@ -314,6 +315,7 @@ static onceToken token([]() {
     mINI::Instance()[kFileBufSize] = 64 * 1024;
     mINI::Instance()[kBroadcastRecordTs] = false;
     mINI::Instance()[kDeleteDelaySec] = 10;
+    mINI::Instance()[kFirstTSOneGOP] = false;
 });
 } // namespace Hls
 
diff --git a/src/Common/config.h b/src/Common/config.h
index dcbc5514..afe158b9 100644
--- a/src/Common/config.h
+++ b/src/Common/config.h
@@ -350,6 +350,8 @@ extern const std::string kFileBufSize;
 extern const std::string kBroadcastRecordTs;
 // hls直播文件删除延时，单位秒
 extern const std::string kDeleteDelaySec;
+// 如果设置为1，则第一个切片长度强制设置为1个GOP
+extern const std::string kFirstTSOneGOP;
 } // namespace Hls
 
 ////////////Rtp代理相关配置///////////
diff --git a/src/Record/HlsMaker.cpp b/src/Record/HlsMaker.cpp
index 31f705b8..eb6c9bd3 100644
--- a/src/Record/HlsMaker.cpp
+++ b/src/Record/HlsMaker.cpp
@@ -111,11 +111,18 @@ void HlsMaker::delOldSegment() {
 }
 
 void HlsMaker::addNewSegment(uint64_t stamp) {
-    if (!_last_file_name.empty() && stamp - _last_seg_timestamp < _seg_duration * 1000) {
-        //存在上个切片，并且未到分片时间
-        return;
+    GET_CONFIG(bool, firstTSOneGOP, Hls::kFirstTSOneGOP);
+    if (!firstTSOneGOP) {   
+    	if (!_last_file_name.empty() && stamp - _last_seg_timestamp < _seg_duration * 1000) {
+            //存在上个切片，并且未到分片时间
+            return;
+    	}
+    }
+    else {
+        if (!_last_file_name.empty() && _file_index>1 && stamp - _last_seg_timestamp < _seg_duration * 1000) {
+	    return;
+	}
     }
-
     //关闭并保存上一个切片，如果_seg_number==0,那么是点播。
     flushLastSegment(false);
     //新增切片