Feature/preload with start time (#4169)

* WiP: Preloading with start time * Fix adjusting the seek target when preloading streams * Fix reset of providedStartTime
Dash-Industry-Forum · Apr 13, 2023 · 9a8f765 · 9a8f765
1 parent 36af412
commit 9a8f765
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/src/streaming/MediaPlayer.js b/src/streaming/MediaPlayer.js
@@ -132,6 +132,7 @@ function MediaPlayer() {
         streamingInitialized,
         playbackInitialized,
         autoPlay,
+        providedStartTime,
         abrController,
         schemeLoaderFactory,
         timelineConverter,
@@ -176,6 +177,7 @@ function MediaPlayer() {
         playbackInitialized = false;
         streamingInitialized = false;
         autoPlay = true;
+        providedStartTime = NaN;
         protectionController = null;
         offlineController = null;
         protectionData = null;
@@ -552,7 +554,7 @@ function MediaPlayer() {
             return;
         }
         if (source) {
-            _initializePlayback();
+            _initializePlayback(providedStartTime);
         } else {
             throw SOURCE_NOT_ATTACHED_ERROR;
         }
@@ -1427,15 +1429,15 @@ function MediaPlayer() {
             _detectMss();
 
             if (streamController) {
-                streamController.switchToVideoElement();
+                streamController.switchToVideoElement(providedStartTime);
             }
         }
 
         if (playbackInitialized) { //Reset if we have been playing before, so this is a new element.
             _resetPlaybackControllers();
         }
 
-        _initializePlayback();
+        _initializePlayback(providedStartTime);
     }
 
     /**
@@ -1893,14 +1895,15 @@ function MediaPlayer() {
             startTime = Math.max(0, startTime);
         }
 
+        providedStartTime = startTime;
         source = urlOrManifest;
 
         if (streamingInitialized || playbackInitialized) {
             _resetPlaybackControllers();
         }
 
         if (isReady()) {
-            _initializePlayback(startTime);
+            _initializePlayback(providedStartTime);
         }
     }
 

diff --git a/src/streaming/controllers/BufferController.js b/src/streaming/controllers/BufferController.js
@@ -75,6 +75,7 @@ function BufferController(config) {
         maximumIndex,
         sourceBufferSink,
         dischargeBuffer,
+        isPrebuffering,
         dischargeFragments,
         bufferState,
         appendedBytesInfo,
@@ -184,6 +185,7 @@ function BufferController(config) {
                 return;
             }
             if (mediaSource) {
+                isPrebuffering = false;
                 _initializeSinkForMseBuffering(mediaInfo, oldBufferSinks)
                     .then((sink) => {
                         resolve(sink);
@@ -192,6 +194,7 @@ function BufferController(config) {
                         reject(e);
                     })
             } else {
+                isPrebuffering = true;
                 _initializeSinkForPrebuffering()
                     .then((sink) => {
                         resolve(sink);
@@ -429,7 +432,7 @@ function BufferController(config) {
      * @private
      */
     function _adjustSeekTarget() {
-        if (isNaN(seekTarget)) return;
+        if (isNaN(seekTarget) || isPrebuffering) return;
         // Check buffered data only for audio and video
         if (type !== Constants.AUDIO && type !== Constants.VIDEO) {
             seekTarget = NaN;
@@ -828,8 +831,13 @@ function BufferController(config) {
 
     function _updateBufferLevel() {
         if (playbackController) {
+            let referenceTime = playbackController.getTime() || 0;
+            // In case we are prebuffering we dont have a current time yet
+            if (isPrebuffering) {
+                referenceTime = !isNaN(seekTarget) ? seekTarget : 0;
+            }
             const tolerance = settings.get().streaming.gaps.jumpGaps && !isNaN(settings.get().streaming.gaps.smallGapLimit) ? settings.get().streaming.gaps.smallGapLimit : NaN;
-            bufferLevel = Math.max(getBufferLength(playbackController.getTime() || 0, tolerance), 0);
+            bufferLevel = Math.max(getBufferLength(referenceTime, tolerance), 0);
             _triggerEvent(Events.BUFFER_LEVEL_UPDATED, { mediaType: type, bufferLevel: bufferLevel });
             checkIfSufficientBuffer();
         }
@@ -1192,6 +1200,7 @@ function BufferController(config) {
         wallclockTicked = 0;
         pendingPruningRanges = [];
         seekTarget = NaN;
+        isPrebuffering = false;
 
         if (sourceBufferSink) {
             let tmpSourceBufferSinkToReset = sourceBufferSink;

diff --git a/src/streaming/controllers/PlaybackController.js b/src/streaming/controllers/PlaybackController.js
@@ -205,7 +205,7 @@ function PlaybackController() {
      * @param {boolean} adjustLiveDelay
      */
     function seek(time, stickToBuffered = false, internal = false, adjustLiveDelay = false) {
-        if (!streamInfo || !videoModel) return;
+        if (!streamInfo || !videoModel || !videoModel.getElement()) return;
 
         let currentTime = !isNaN(seekTarget) ? seekTarget : videoModel.getTime();
         if (time === currentTime) return;

diff --git a/src/streaming/controllers/StreamController.js b/src/streaming/controllers/StreamController.js
@@ -440,6 +440,9 @@ function StreamController() {
             const dvrInfo = dashMetrics.getCurrentDVRInfo();
             mediaSourceController.setSeekable(dvrInfo.range.start, dvrInfo.range.end);
             if (streamActivated) {
+                if (!isNaN(seekTime)) {
+                    playbackController.seek(seekTime, true, true);
+                }
                 // Set the media source for all StreamProcessors
                 activeStream.setMediaSource(mediaSource)
                     .then(() => {