improve track switch process, do not reload abandonned request.

Dash-Industry-Forum · Mar 12, 2018 · 94583c7 · 94583c7
1 parent c77521c
commit 94583c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/streaming/Stream.js b/src/streaming/Stream.js
@@ -309,6 +309,7 @@ function Stream(config) {
             if (mediaInfo.type !== Constants.FRAGMENTED_TEXT) {
                 abrController.updateTopQualityIndex(mediaInfo);
                 processor.switchTrackAsked();
+                processor.getFragmentModel().abortRequests();
             }
         }
     }

diff --git a/src/streaming/controllers/BufferController.js b/src/streaming/controllers/BufferController.js
@@ -682,7 +682,9 @@ function BufferController(config) {
                 updateBufferLevel();
             } else {
                 bufferResetInProgress = false;
-                appendToBuffer(mediaChunk);
+                if (mediaChunk) {
+                    appendToBuffer(mediaChunk);
+                }
             }
             eventBus.trigger(Events.BUFFER_CLEARED, { sender: instance, from: e.from, to: e.to, hasEnoughSpaceToAppend: hasEnoughSpaceToAppend() });
         }
@@ -718,7 +720,6 @@ function BufferController(config) {
             if (ranges && ranges.length > 0 && playbackController.getTimeToStreamEnd() > STALL_THRESHOLD) {
                 isBufferingCompleted = false;
                 lastIndex = Number.POSITIVE_INFINITY;
-                streamProcessor.getFragmentModel().abortRequests();
             }
         }
     }

diff --git a/src/streaming/controllers/ScheduleController.js b/src/streaming/controllers/ScheduleController.js
@@ -460,8 +460,8 @@ function ScheduleController(config) {
             return;
         }
         log('[ScheduleController][onFragmentLoadingAbandoned] for ' + type + ', request: ' + e.request.url + ' has been aborted');
-        if (!playbackController.isSeeking()) {
-            log('[ScheduleController][onFragmentLoadingAbandoned] for ' + type + ', request: ' + e.request.url + ' has to be downloaded again, origin is not seeking process');
+        if (!playbackController.isSeeking() && !switchTrack) {
+            log('[ScheduleController][onFragmentLoadingAbandoned] for ' + type + ', request: ' + e.request.url + ' has to be downloaded again, origin is not seeking process or switch track call');
             replaceRequest(e.request);
         }
         setFragmentProcessState(false);