Merge pull request #2985 from Orange-OpenSource/preloadRegressionFix

Preload regression fix
Dash-Industry-Forum · May 6, 2019 · f790bb9 · f790bb9
2 parents f292782 + afc03ae
commit f790bb9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/streaming/PreBufferSink.js b/src/streaming/PreBufferSink.js
@@ -121,6 +121,10 @@ function PreBufferSink(onAppendedCallback) {
         // Nothing to do
     }
 
+    function getBuffer() {
+        return this;
+    }
+
     /**
      * 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.
@@ -159,7 +163,8 @@ function PreBufferSink(onAppendedCallback) {
         reset: reset,
         updateTimestampOffset: updateTimestampOffset,
         hasDiscontinuitiesAfter: hasDiscontinuitiesAfter,
-        waitForUpdateEnd: waitForUpdateEnd
+        waitForUpdateEnd: waitForUpdateEnd,
+        getBuffer: getBuffer
     };
 
     setup();

diff --git a/src/streaming/Stream.js b/src/streaming/Stream.js
@@ -505,7 +505,7 @@ function Stream(config) {
         filterCodecs(Constants.VIDEO);
         filterCodecs(Constants.AUDIO);
 
-        if (element === null || (element && (/^VIDEO$/i).test(element.nodeName))) {
+        if (!element || (element && (/^VIDEO$/i).test(element.nodeName))) {
             initializeMediaForType(Constants.VIDEO, mediaSource);
         }
         initializeMediaForType(Constants.AUDIO, mediaSource);