BADGER-312: Segment timeline manifests unable to repeat segment requests

dash.d.ts

@@ -1016,7 +1016,8 @@ declare namespace dashjs {
                 defaultTimingSource?: {
                     scheme?: string,
                     value?: string
-                }
+                },
+                artificialTimeOffsetToApply?: number
             },
             scheduling?: {
                 defaultTimeout?: number,

src/dash/DashHandler.js

@@ -233,17 +233,17 @@ function DashHandler(config) {
     }
 
 
-    function getSegmentRequestForTime(mediaInfo, representation, time) {
+    function getSegmentRequestForTime(mediaInfo, representation, timeToRequest) {
         let request = null;
 
         if (!representation || !representation.segmentInfoType) {
             return request;
         }
 
-        const segment = segmentsController.getSegmentByTime(representation, time);
+        const segment = segmentsController.getSegment(representation, null, timeToRequest);
         if (segment) {
             lastSegment = segment;
-            logger.debug('Index for time ' + time + ' is ' + segment.index);
+            logger.debug('Index for time ' + timeToRequest + ' is ' + segment.index);
             request = _getRequestForSegment(mediaInfo, segment);
         }
 
@@ -259,10 +259,11 @@ function DashHandler(config) {
     function getNextSegmentRequestIdempotent(mediaInfo, representation) {
         let request = null;
         let indexToRequest = lastSegment ? lastSegment.index + 1 : 0;
-        const segment = segmentsController.getSegmentByIndex(
+        let timeToRequest = lastSegment ? lastSegment.mediaStartTime + lastSegment.duration : 0;
+        const segment = segmentsController.getSegment(
             representation,
             indexToRequest,
-            lastSegment ? lastSegment.mediaStartTime : -1
+            timeToRequest
         );
         if (!segment) return null;
         request = _getRequestForSegment(mediaInfo, segment);
@@ -281,8 +282,9 @@ function DashHandler(config) {
         }
 
         let indexToRequest = lastSegment ? lastSegment.index + 1 : 0;
+        let timeToRequest = lastSegment ? lastSegment.mediaStartTime + lastSegment.duration : 0;
 
-        return _getRequest(mediaInfo, representation, indexToRequest);
+        return _getRequest(mediaInfo, representation, indexToRequest, timeToRequest);
     }
 
     function repeatSegmentRequest(mediaInfo, representation) {
@@ -291,13 +293,14 @@ function DashHandler(config) {
         }
 
         let indexToRequest = lastSegment ? lastSegment.index : 0;
+        let timeToRequest = lastSegment ? lastSegment.mediaStartTime : 0;
 
-        return _getRequest(mediaInfo, representation, indexToRequest);
+        return _getRequest(mediaInfo, representation, indexToRequest, timeToRequest);
     }
 
-    function _getRequest(mediaInfo, representation, indexToRequest) {
+    function _getRequest(mediaInfo, representation, indexToRequest, timeToRequest) {
         let request = null;
-        const segment = segmentsController.getSegmentByIndex(representation, indexToRequest, lastSegment ? lastSegment.mediaStartTime : -1);
+        const segment = segmentsController.getSegment(representation, indexToRequest, timeToRequest);
 
         // No segment found
         if (!segment) {

src/dash/controllers/SegmentsController.js

@@ -81,14 +81,9 @@ function SegmentsController(config) {
         return representation ? representation.segments ? getters[dashConstants.SEGMENT_BASE] : getters[representation.segmentInfoType] : null;
     }
 
-    function getSegmentByIndex(representation, index, lastSegmentTime) {
+    function getSegment(representation, index, requestedTime) {
         const getter = getSegmentsGetter(representation);
-        return getter ? getter.getSegmentByIndex(representation, index, lastSegmentTime) : null;
-    }
-
-    function getSegmentByTime(representation, time) {
-        const getter = getSegmentsGetter(representation);
-        return getter ? getter.getSegmentByTime(representation, time) : null;
+        return getter ? getter.getSegment(representation, index, requestedTime) : null;
     }
 
     function getMediaFinishedInformation(representation) {
@@ -103,8 +98,7 @@ function SegmentsController(config) {
         initialize,
         updateInitData,
         updateSegmentData,
-        getSegmentByIndex,
-        getSegmentByTime,
+        getSegment,
         getMediaFinishedInformation
     };
 

src/dash/utils/ListSegmentsGetter.js

@@ -63,6 +63,11 @@ function ListSegmentsGetter(config, isDynamic) {
         return mediaFinishedInformation
     }
 
+    function getSegment(representation, index, requestedTime) {
+        if (index != null) return getSegmentByIndex(representation, index)
+        return getSegmentByTime(representation, requestedTime)
+    }
+
     function getSegmentByIndex(representation, index) {
         checkConfig();
 
@@ -114,8 +119,7 @@ function ListSegmentsGetter(config, isDynamic) {
     }
 
     instance = {
-        getSegmentByIndex,
-        getSegmentByTime,
+        getSegment,
         getMediaFinishedInformation
     };
 

src/dash/utils/SegmentBaseGetter.js

@@ -58,6 +58,11 @@ function SegmentBaseGetter(config) {
         return mediaFinishedInformation;
     }
 
+    function getSegment(representation, index, requestedTime) {
+        if (index != null) return getSegmentByIndex(representation, index)
+        return getSegmentByTime(representation, requestedTime)
+    }
+
     function getSegmentByIndex(representation, index) {
         checkConfig();
 
@@ -127,8 +132,7 @@ function SegmentBaseGetter(config) {
     }
 
     instance = {
-        getSegmentByIndex,
-        getSegmentByTime,
+        getSegment,
         getMediaFinishedInformation
     };
 

src/dash/utils/TemplateSegmentsGetter.js

@@ -62,6 +62,11 @@ function TemplateSegmentsGetter(config, isDynamic) {
         return mediaFinishedInformation;
     }
 
+    function getSegment(representation, index, requestedTime) {
+        if (index != null) return getSegmentByIndex(representation, index)
+        return getSegmentByTime(representation, requestedTime)
+    }
+
     function getSegmentByIndex(representation, index) {
         checkConfig();
 
@@ -108,8 +113,7 @@ function TemplateSegmentsGetter(config, isDynamic) {
     }
 
     instance = {
-        getSegmentByIndex,
-        getSegmentByTime,
+        getSegment,
         getMediaFinishedInformation
     };
 

src/dash/utils/TimelineSegmentsGetter.js

@@ -187,49 +187,8 @@ function TimelineSegmentsGetter(config, isDynamic) {
         return Math.max(Math.ceil((repeatEndTime - scaledTime) / (frag.d / fTimescale)) - 1, 0);
     }
 
-
-    function getSegmentByIndex(representation, index, lastSegmentTime) {
-        checkConfig();
-
-        if (!representation) {
-            return null;
-        }
-
-        let segment = null;
-        let found = false;
-
-        iterateSegments(representation, function (time, base, list, frag, fTimescale, relativeIdx, i) {
-            if (found || lastSegmentTime < 0) {
-                let media = base.media;
-                let mediaRange = frag.mediaRange;
-
-                if (list) {
-                    media = list[i].media || '';
-                    mediaRange = list[i].mediaRange;
-                }
-
-                segment = getTimeBasedSegment(
-                    timelineConverter,
-                    isDynamic,
-                    representation,
-                    time,
-                    frag.d,
-                    fTimescale,
-                    media,
-                    mediaRange,
-                    relativeIdx,
-                    frag.tManifest);
-
-                return true;
-            } else if (time >= (lastSegmentTime * fTimescale) - (frag.d * 0.5)) { // same logic, if deviation is
-                // 50% of segment duration, segment is found if time is greater than or equal to (startTime of previous segment - half of the previous segment duration)
-                found = true;
-            }
-
-            return false;
-        });
-
-        return segment;
+    function getSegment(representation, index, requestedTime) {
+        return getSegmentByTime(representation, requestedTime)
     }
 
     function getSegmentByTime(representation, requestedTime) {
@@ -286,8 +245,7 @@ function TimelineSegmentsGetter(config, isDynamic) {
     }
 
     instance = {
-        getSegmentByIndex,
-        getSegmentByTime,
+        getSegment,
         getMediaFinishedInformation
     };