Fix/segment abandon (#4297)

* Fix handling of the AbandonRequest rule.
Dash-Industry-Forum · Oct 11, 2023 · 425fa72 · 425fa72
1 parent 536371a
commit 425fa72
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 10 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -705,6 +705,8 @@ declare namespace dashjs {
 
         getNextSegmentRequest(mediaInfo: MediaInfo, representation: Representation): FragmentRequest | null;
 
+        repeatSegmentRequest(mediaInfo: MediaInfo, representation: Representation): FragmentRequest | null;
+
         getValidTimeCloseToTargetTime(time: number, mediaInfo: MediaInfo, representation: Representation, targetThreshold: number): number;
 
         getValidTimeAheadOfTargetTime(time: number, mediaInfo: MediaInfo, representation: Representation): number;

diff --git a/src/dash/DashHandler.js b/src/dash/DashHandler.js
@@ -276,14 +276,27 @@ function DashHandler(config) {
      * @return {FragmentRequest|null}
      */
     function getNextSegmentRequest(mediaInfo, representation) {
-        let request = null;
-
         if (!representation || !representation.segmentInfoType) {
             return null;
         }
 
         let indexToRequest = lastSegment ? lastSegment.index + 1 : 0;
 
+        return _getRequest(mediaInfo, representation, indexToRequest);
+    }
+
+    function repeatSegmentRequest(mediaInfo, representation) {
+        if (!representation || !representation.segmentInfoType) {
+            return null;
+        }
+
+        let indexToRequest = lastSegment ? lastSegment.index : 0;
+
+        return _getRequest(mediaInfo, representation, indexToRequest);
+    }
+
+    function _getRequest(mediaInfo, representation, indexToRequest) {
+        let request = null;
         const segment = segmentsController.getSegmentByIndex(representation, indexToRequest, lastSegment ? lastSegment.mediaStartTime : -1);
 
         // No segment found
@@ -391,18 +404,19 @@ function DashHandler(config) {
     }
 
     instance = {
-        initialize,
-        getStreamId,
-        getType,
-        getStreamInfo,
-        getInitRequest,
-        getSegmentRequestForTime,
         getCurrentIndex,
+        getInitRequest,
         getNextSegmentRequest,
+        getNextSegmentRequestIdempotent,
+        getSegmentRequestForTime,
+        getStreamId,
+        getStreamInfo,
+        getType,
+        getValidTimeAheadOfTargetTime,
+        initialize,
         isLastSegmentRequested,
+        repeatSegmentRequest,
         reset,
-        getNextSegmentRequestIdempotent,
-        getValidTimeAheadOfTargetTime
     };
 
     setup();

diff --git a/src/streaming/StreamProcessor.js b/src/streaming/StreamProcessor.js
@@ -86,6 +86,7 @@ function StreamProcessor(config) {
         scheduleController,
         representationController,
         shouldUseExplicitTimeForRequest,
+        shouldRepeatRequest,
         qualityChangeInProgress,
         dashHandler,
         segmentsController,
@@ -194,6 +195,7 @@ function StreamProcessor(config) {
 
         bufferingTime = 0;
         shouldUseExplicitTimeForRequest = false;
+        shouldRepeatRequest = false;
     }
 
     function getStreamId() {
@@ -213,6 +215,7 @@ function StreamProcessor(config) {
         mediaInfo = null;
         bufferingTime = 0;
         shouldUseExplicitTimeForRequest = false;
+        shouldRepeatRequest = false;
         qualityChangeInProgress = false;
         pendingSwitchToRepresentationInfo = null;
     }
@@ -432,6 +435,7 @@ function StreamProcessor(config) {
         let request = _getFragmentRequest();
         if (request) {
             shouldUseExplicitTimeForRequest = false;
+            shouldRepeatRequest = false;
             _mediaRequestGenerated(request);
         } else {
             _noMediaRequestGenerated(rescheduleIfNoRequest);
@@ -546,6 +550,8 @@ function StreamProcessor(config) {
 
             if (shouldUseExplicitTimeForRequest) {
                 request = dashHandler.getSegmentRequestForTime(mediaInfo, representation, bufferingTime);
+            } else if (shouldRepeatRequest) {
+                request = dashHandler.repeatSegmentRequest(mediaInfo, representation);
             } else {
                 request = dashHandler.getNextSegmentRequest(mediaInfo, representation);
             }
@@ -657,6 +663,11 @@ function StreamProcessor(config) {
             _prepareForForceReplacementQualitySwitch(representationInfo);
         }
 
+        // We abandoned a current request
+        else if (e && e.reason && e.reason.forceAbandon) {
+            _prepareForAbandonQualitySwitch(representationInfo)
+        }
+
         // If fast switch is enabled we check if we are supposed to replace existing stuff in the buffer
         else if (settings.get().streaming.buffer.fastSwitchEnabled) {
             _prepareForFastQualitySwitch(representationInfo);
@@ -690,14 +701,32 @@ function StreamProcessor(config) {
         bufferController.prepareForForceReplacementQualitySwitch(representationInfo)
             .then(() => {
                 _bufferClearedForReplacement();
+                pendingSwitchToRepresentationInfo = null;
                 qualityChangeInProgress = false;
             })
             .catch(() => {
                 _bufferClearedForReplacement();
+                pendingSwitchToRepresentationInfo = null;
                 qualityChangeInProgress = false;
             });
     }
 
+    function _prepareForAbandonQualitySwitch(representationInfo) {
+        bufferController.updateBufferTimestampOffset(representationInfo)
+            .then(() => {
+                fragmentModel.abortRequests();
+                shouldRepeatRequest = true;
+                scheduleController.setCheckPlaybackQuality(false);
+                scheduleController.startScheduleTimer();
+                qualityChangeInProgress = false;
+                pendingSwitchToRepresentationInfo = null;
+            })
+            .catch(() => {
+                pendingSwitchToRepresentationInfo = null;
+                qualityChangeInProgress = false;
+            })
+    }
+
     function _prepareForFastQualitySwitch(representationInfo) {
         // if we switch up in quality and need to replace existing parts in the buffer we need to adjust the buffer target
         const time = playbackController.getTime();

diff --git a/src/streaming/rules/abr/ABRRulesCollection.js b/src/streaming/rules/abr/ABRRulesCollection.js
@@ -213,6 +213,10 @@ function ABRRulesCollection(config) {
         const activeRules = _getRulesWithChange(abandonRequestArray);
         const shouldAbandon = getMinSwitchRequest(activeRules);
 
+        if (shouldAbandon) {
+            shouldAbandon.reason.forceAbandon = true
+        }
+
         return shouldAbandon || SwitchRequest(context).create();
     }