Merge pull request #2595 from aescarcha/secureBufferTimestampOffsetCh…

…ange Wait until buffer is ready when changing timestamp offset
Dash-Industry-Forum · Jun 6, 2018 · 640da28 · 640da28
2 parents 9689635 + 688d559
commit 640da28
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 7 deletions.
diff --git a/src/streaming/PreBufferSink.js b/src/streaming/PreBufferSink.js
@@ -113,6 +113,10 @@ function PreBufferSink(onAppendedCallback) {
         return timeranges;
     }
 
+    function updateTimestampOffset() {
+        // Nothing to do
+    }
+
     /**
      * Return the all chunks in the buffer the lie between times start and end.
      * Because a chunk cannot be split, this returns the full chunk if any part of its time lies in the requested range.
@@ -144,7 +148,8 @@ function PreBufferSink(onAppendedCallback) {
         remove: remove,
         abort: abort,
         discharge: discharge,
-        reset: reset
+        reset: reset,
+        updateTimestampOffset: updateTimestampOffset
     };
 
     setup();

diff --git a/src/streaming/SourceBufferSink.js b/src/streaming/SourceBufferSink.js
@@ -105,6 +105,14 @@ function SourceBufferSink(mediaSource, mediaInfo, onAppendedCallback) {
         }
     }
 
+    function updateTimestampOffset(MSETimeOffset) {
+        if (buffer.timestampOffset !== MSETimeOffset && !isNaN(MSETimeOffset)) {
+            waitForUpdateEnd(buffer, () => {
+                buffer.timestampOffset = MSETimeOffset;
+            });
+        }
+    }
+
     function remove(start, end, forceRemoval) {
         const sourceBufferSink = this;
         // make sure that the given time range is correct. Otherwise we will get InvalidAccessError
@@ -271,7 +279,8 @@ function SourceBufferSink(mediaSource, mediaInfo, onAppendedCallback) {
         append: append,
         remove: remove,
         abort: abort,
-        reset: reset
+        reset: reset,
+        updateTimestampOffset: updateTimestampOffset
     };
 
     setup();

diff --git a/src/streaming/controllers/BufferController.js b/src/streaming/controllers/BufferController.js
@@ -734,9 +734,8 @@ function BufferController(config) {
     function updateBufferTimestampOffset(MSETimeOffset) {
         // Each track can have its own @presentationTimeOffset, so we should set the offset
         // if it has changed after switching the quality or updating an mpd
-        const sourceBuffer = buffer && buffer.getBuffer ? buffer.getBuffer() : null;
-        if (sourceBuffer && sourceBuffer.timestampOffset !== MSETimeOffset && !isNaN(MSETimeOffset)) {
-            sourceBuffer.timestampOffset = MSETimeOffset;
+        if (buffer && buffer.updateTimestampOffset) {
+            buffer.updateTimestampOffset(MSETimeOffset);
         }
     }
 

diff --git a/src/streaming/text/NotFragmentedTextBufferController.js b/src/streaming/text/NotFragmentedTextBufferController.js
@@ -187,6 +187,12 @@ function NotFragmentedTextBufferController(config) {
         return null;
     }
 
+    function updateTimestampOffset(MSETimeOffset) {
+        if (buffer.timestampOffset !== MSETimeOffset && !isNaN(MSETimeOffset)) {
+            buffer.timestampOffset = MSETimeOffset;
+        }
+    }
+
     instance = {
         getBufferControllerType: getBufferControllerType,
         initialize: initialize,
@@ -203,7 +209,8 @@ function NotFragmentedTextBufferController(config) {
         dischargePreBuffer: dischargePreBuffer,
         switchInitData: switchInitData,
         getRangeAt: getRangeAt,
-        reset: reset
+        reset: reset,
+        updateTimestampOffset: updateTimestampOffset
     };
 
     setup();

diff --git a/src/streaming/text/TextBufferController.js b/src/streaming/text/TextBufferController.js
@@ -146,6 +146,13 @@ function TextBufferController(config) {
         return _BufferControllerImpl.getRangeAt(time);
     }
 
+    function updateTimestampOffset(MSETimeOffset) {
+        const buffer = getBuffer();
+        if (buffer.timestampOffset !== MSETimeOffset && !isNaN(MSETimeOffset)) {
+            buffer.timestampOffset = MSETimeOffset;
+        }
+    }
+
     instance = {
         getBufferControllerType: getBufferControllerType,
         initialize: initialize,
@@ -163,7 +170,8 @@ function TextBufferController(config) {
         dischargePreBuffer: dischargePreBuffer,
         switchInitData: switchInitData,
         getRangeAt: getRangeAt,
-        reset: reset
+        reset: reset,
+        updateTimestampOffset: updateTimestampOffset
     };
 
     setup();

diff --git a/test/unit/mocks/MediaSourceBufferMock.js b/test/unit/mocks/MediaSourceBufferMock.js
@@ -49,6 +49,13 @@ class MediaSourceBufferMock {
         }, 500);
     }
 
+    updateTimestampOffset(timestampOffset) {
+        this.timestampOffset = timestampOffset;
+        setTimeout(() => {
+            this.updating = false;
+        }, 500);
+    }
+
     abort() {
         this.aborted = true;
     }