refactor(HLSStream): refactor createDemuxer func

Signed-off-by: pingkai <pingkai010@gmail.com>
alibaba · Feb 24, 2020 · 0850096 · 0850096
1 parent abd8017
commit 0850096
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/framework/demuxer/play_list/HLSStream.cpp b/framework/demuxer/play_list/HLSStream.cpp
@@ -319,30 +319,12 @@ namespace Cicada {
         ret = createDemuxer();
 
         if (ret >= 0) {
-            int nbStream = mPDemuxer->GetNbStreams();
-            AF_LOGI("file have %d streams\n", nbStream);
-            // open all stream in demuxer
-            Stream_meta meta{};
-
-            for (int i = 0; i < nbStream; ++i) {
-                mPDemuxer->GetStreamMeta(&meta, i, false);
-
-                if (meta.type == mPTracker->getStreamType()
-                        || mPTracker->getStreamType() == STREAM_TYPE_MIXED) {
-                    mPDemuxer->OpenStream(i);
-                }
-
-                releaseMeta(&meta);
-            }
-
             mIsOpened_internal = true;
         } else {
             AF_LOGE("open demuxer error %d\n", ret);
             return ret;
         }
 
-        mPacketFirstPts = getPackedStreamPTS();
-
         //     mStatus = status_inited;
 
         if (mPdataSource) {
@@ -430,6 +412,27 @@ namespace Cicada {
         }
 
         ret = mPDemuxer->initOpen();
+
+        if (ret >= 0) {
+            int nbStream = mPDemuxer->GetNbStreams();
+            AF_LOGI("file have %d streams\n", nbStream);
+            // open all stream in demuxer
+            Stream_meta meta{};
+
+            for (int i = 0; i < nbStream; ++i) {
+                mPDemuxer->GetStreamMeta(&meta, i, false);
+
+                if (meta.type == mPTracker->getStreamType()
+                        || mPTracker->getStreamType() == STREAM_TYPE_MIXED) {
+                    mPDemuxer->OpenStream(i);
+                }
+
+                releaseMeta(&meta);
+            }
+
+            mPacketFirstPts = getPackedStreamPTS();
+        }
+
         return ret;
     }