From 83c1f29253af51163513084fcfba4f79aa9ef182 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sun, 13 Feb 2022 21:06:32 +0800
Subject: [PATCH] =?UTF-8?q?HLS:=20=E8=A7=A3=E5=86=B3hls=E6=96=AD=E6=B5=81?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E5=90=8E=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Record/HlsMaker.cpp    |  3 ++-
 src/Record/HlsMakerImp.cpp | 10 +++++++---
 src/Record/HlsMakerImp.h   |  4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Record/HlsMaker.cpp b/src/Record/HlsMaker.cpp
index e8e90692..be1c9f01 100644
--- a/src/Record/HlsMaker.cpp
+++ b/src/Record/HlsMaker.cpp
@@ -92,7 +92,7 @@ void HlsMaker::inputData(void *data, size_t len, uint32_t timestamp, bool is_idr
         }
     } else {
         //resetTracks时触发此逻辑
-        flushLastSegment(true);
+        flushLastSegment(false);
     }
 }
 
@@ -151,6 +151,7 @@ bool HlsMaker::isLive() {
 
 void HlsMaker::clear() {
     _file_index = 0;
+    _last_timestamp = 0;
     _last_seg_timestamp = 0;
     _seg_dur_list.clear();
     _last_file_name.clear();
diff --git a/src/Record/HlsMakerImp.cpp b/src/Record/HlsMakerImp.cpp
index 05f783fe..5e73a54b 100644
--- a/src/Record/HlsMakerImp.cpp
+++ b/src/Record/HlsMakerImp.cpp
@@ -37,12 +37,16 @@ HlsMakerImp::HlsMakerImp(const string &m3u8_file,
 }
 
 HlsMakerImp::~HlsMakerImp() {
-    clearCache(false);
+    clearCache(false, true);
 }
 
-void HlsMakerImp::clearCache(bool immediately) {
+void HlsMakerImp::clearCache() {
+    clearCache(true, false);
+}
+
+void HlsMakerImp::clearCache(bool immediately, bool eof) {
     //录制完了
-    flushLastSegment(true);
+    flushLastSegment(eof);
     if (!isLive()) {
         return;
     }
diff --git a/src/Record/HlsMakerImp.h b/src/Record/HlsMakerImp.h
index d401e08a..8de756b1 100644
--- a/src/Record/HlsMakerImp.h
+++ b/src/Record/HlsMakerImp.h
@@ -45,9 +45,8 @@ public:
 
      /**
       * 清空缓存
-      * @param immediately 时候立即删除
       */
-     void clearCache(bool immediately = true);
+     void clearCache();
 
 protected:
     std::string onOpenSegment(uint64_t index) override ;
@@ -58,6 +57,7 @@ protected:
 
 private:
     std::shared_ptr<FILE> makeFile(const std::string &file,bool setbuf = false);
+    void clearCache(bool immediately, bool eof);
 
 private:
     int _buf_size;