feat(supermediaplayer): support buffer in demuxer

Signed-off-by: pingkai <pingkai010@gmail.com>
alibaba · May 26, 2020 · 94b08d2 · 94b08d2
1 parent a80bf24
commit 94b08d2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/framework/demuxer/IDemuxer.h b/framework/demuxer/IDemuxer.h
@@ -155,6 +155,11 @@ namespace Cicada {
         virtual void setDemuxerCb(std::function<void(std::string, std::string)> func)
         { mDemuxerCbfunc = func; }
 
+        virtual int64_t getBufferDuration(int index)
+        {
+            return 0;
+        }
+
     protected:
         demuxer_callback_read mReadCb{nullptr};
         demuxer_callback_seek mSeekCb{nullptr};

diff --git a/mediaPlayer/SuperMediaPlayer.cpp b/mediaPlayer/SuperMediaPlayer.cpp
@@ -2763,12 +2763,18 @@ namespace Cicada {
                     duration_c = (int64_t) mBufferController.GetPacketSize(BUFFER_TYPE_VIDEO) * 40 * 1000;
                 }
             }
+            if (mDemuxerService && mDemuxerService->getDemuxerHandle()) {
+                duration_c += mDemuxerService->getDemuxerHandle()->getBufferDuration(mCurrentVideoIndex);
+            }
         }
 
         if (HAVE_AUDIO) {
             int64_t &duration_c = durations[i++];
             duration_c = mBufferController.GetPacketDuration(BUFFER_TYPE_AUDIO);
 //            AF_LOGD("audioDuration is %lld\n",audioDuration);
+            if (mDemuxerService && mDemuxerService->getDemuxerHandle()) {
+                duration_c += mDemuxerService->getDemuxerHandle()->getBufferDuration(mCurrentAudioIndex);
+            }
         }
 
         /*
@@ -2778,6 +2784,9 @@ namespace Cicada {
         if (HAVE_SUBTITLE && !mSubtitleEOS && mSubtitleChangedFirstPts == INT64_MIN) {
             int64_t &duration_c = durations[i++];
             duration_c = mBufferController.GetPacketDuration(BUFFER_TYPE_SUBTITLE);
+            if (mDemuxerService && mDemuxerService->getDemuxerHandle()) {
+                duration_c += mDemuxerService->getDemuxerHandle()->getBufferDuration(mCurrentSubtitleIndex);
+            }
         }
 
         int num = i;