feat(hls): parse first dts on start and seek

Signed-off-by: pingkai <pingkai010@gmail.com>
alibaba · Feb 24, 2020 · 8bc4386 · 8bc4386
1 parent fa37a8f
commit 8bc4386
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/framework/demuxer/DemuxerMetaInfo.h b/framework/demuxer/DemuxerMetaInfo.h
@@ -12,8 +12,9 @@
 namespace Cicada {
     class DemuxerMetaInfo {
     public:
-        uint64_t id;
-        std::vector<std::unique_ptr<streamMeta>> meta;
+        uint64_t id = 0;
+        std::vector<std::unique_ptr<streamMeta>> meta{};
+        bool bContinue{false};
     };
 }
 

diff --git a/framework/demuxer/avFormatDemuxer.cpp b/framework/demuxer/avFormatDemuxer.cpp
@@ -157,7 +157,9 @@ namespace Cicada {
             }
 
             // TODO: set it to zero can avoid read and decode more frames,but wen seek to back in hlsstream,will lead pts err
-            //    mCtx->max_ts_probe = 0;
+            if (mMetaInfo->bContinue) {
+                mCtx->max_ts_probe = 0;
+            }
         }
 
         ret = avformat_find_stream_info(mCtx, nullptr);

diff --git a/framework/demuxer/play_list/HLSStream.cpp b/framework/demuxer/play_list/HLSStream.cpp
@@ -447,6 +447,8 @@ namespace Cicada {
                 if (needUpdateMeta) {
                     mDemuxerMeta->meta.push_back(move(meta));
                 }
+
+                mDemuxerMeta->bContinue = true;
             }
 
             mPacketFirstPts = getPackedStreamPTS();
@@ -1216,6 +1218,7 @@ namespace Cicada {
         mIsEOS = false;
         mIsDataEOS = false;
         mError = 0;
+        mDemuxerMeta->bContinue = false;
 
         if (mThreadPtr) {
             mThreadPtr->start();