Fix setting MediaSource's duration (#3532)

* Check if no SourceBuffer is updating when setting MediaSource duration * Check if no SourceBuffer is updating when setting MediaSource duration * fix MediaSourceController unit tests
Dash-Industry-Forum · Feb 8, 2021 · ecb4fc4 · ecb4fc4
1 parent ef29480
commit ecb4fc4
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 11 deletions.
diff --git a/src/streaming/controllers/MediaSourceController.js b/src/streaming/controllers/MediaSourceController.js
@@ -70,11 +70,16 @@ function MediaSourceController() {
     }
 
     function setDuration(source, value) {
+        if (!source || source.readyState !== 'open') return;
+        if (value === null && isNaN(value)) return;
+        if (source.duration === value) return;
 
-        if (source.duration != value)
+        if (!isBufferUpdating(source)) {
+            logger.info('Set MediaSource duration:' + value);
             source.duration = value;
-
-        return source.duration;
+        } else {
+            setTimeout(setDuration.bind(null, source, value), 50);
+        }
     }
 
     function setSeekable(source, start, end) {
@@ -104,6 +109,16 @@ function MediaSourceController() {
         source.endOfStream();
     }
 
+    function isBufferUpdating(source) {
+        let buffers = source.sourceBuffers;
+        for (let i = 0; i < buffers.length; i++) {
+            if (buffers[i].updating) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     instance = {
         createMediaSource: createMediaSource,
         attachMediaSource: attachMediaSource,

diff --git a/src/streaming/controllers/StreamController.js b/src/streaming/controllers/StreamController.js
@@ -638,11 +638,7 @@ function StreamController() {
 
     function setMediaDuration(duration) {
         const manifestDuration = duration ? duration : getActiveStreamInfo().manifestInfo.duration;
-
-        if (manifestDuration && !isNaN(manifestDuration)) {
-            const mediaDuration = mediaSourceController.setDuration(mediaSource, manifestDuration);
-            logger.debug('Duration successfully set to: ' + mediaDuration);
-        }
+        mediaSourceController.setDuration(mediaSource, manifestDuration);
     }
 
     function getComposedStream(streamInfo) {

diff --git a/test/unit/streaming.controllers.MediaSourceController.js b/test/unit/streaming.controllers.MediaSourceController.js
@@ -86,9 +86,13 @@ describe('MediaSourceController', function () {
 
         it('should update source duration', function () {
 
-            let source = {};
-            let duration = mediaSourceController.setDuration(source, 'duration');
-            expect(duration).to.equal('duration');
+            let source = {
+                readyState: 'open',
+                sourceBuffers: [],
+                duration: NaN
+            };
+            mediaSourceController.setDuration(source, 'duration');
+            expect(source.duration).to.equal('duration');
 
         });