fix(dash): live to vod transition seek start (#7347)

Fixes #7346 --------- Co-authored-by: Álvaro Velad Galván <[email protected]>
shaka-project · Sep 26, 2024 · f4ef439 · f4ef439
1 parent a31369b
commit f4ef439
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/lib/media/presentation_timeline.js b/lib/media/presentation_timeline.js
@@ -78,6 +78,9 @@ shaka.media.PresentationTimeline = class {
     /** @private {boolean} */
     this.static_ = true;
 
+    /** @private {boolean} */
+    this.isLive2VodTransition_ = false;
+
     /** @private {number} */
     this.userSeekStart_ = 0;
 
@@ -179,6 +182,9 @@ shaka.media.PresentationTimeline = class {
    */
   setStatic(isStatic) {
     // NOTE: the argument name is not "static" because that's a keyword in ES6
+    if (isStatic && !this.static_) {
+      this.isLive2VodTransition_ = true;
+    }
     this.static_ = isStatic;
   }
 
@@ -384,7 +390,7 @@ shaka.media.PresentationTimeline = class {
       // No data yet, and Math.min(null, startTime) is always 0.  So just store
       // startTime.
       this.minSegmentStartTime_ = startTime;
-    } else {
+    } else if (!this.isLive2VodTransition_) {
       this.minSegmentStartTime_ =
           Math.min(this.minSegmentStartTime_, startTime);
     }

diff --git a/test/player_integration.js b/test/player_integration.js
@@ -82,7 +82,8 @@ describe('Player', () => {
       // Play the stream.
       await player.load('/base/test/test/assets/3675/dash_0.mpd');
       await video.play();
-
+      const seekRangeForStart = player.seekRange();
+      const start = seekRangeForStart.start;
       // Wait for the stream to be over.
       eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
       /** @type {shaka.test.Waiter} */
@@ -97,7 +98,8 @@ describe('Player', () => {
 
       // Check that the final seek range is as expected.
       const seekRange = player.seekRange();
-      expect(seekRange.end).toBeCloseTo(14);
+      expect(seekRange.end).toBeCloseTo(24);
+      expect(seekRange.start).toBeCloseTo(start);
     });
   });
 

diff --git a/test/test/assets/3675/dash_0.mpd b/test/test/assets/3675/dash_0.mpd
@@ -16,7 +16,7 @@
 	</ProgramInformation>
 	<ServiceDescription id="0">
 	</ServiceDescription>
-	<Period id="0" start="PT0.0S">
+	<Period id="0" start="PT10.0S">
 		<AdaptationSet id="0" contentType="video" startWithSAP="1" segmentAlignment="true" bitstreamSwitching="true" frameRate="30/1" maxWidth="1280" maxHeight="720" par="16:9">
 			<Representation id="0" mimeType="video/mp4" codecs="avc1.64001f" bandwidth="122012" width="1280" height="720" sar="1:1">
 				<SegmentTemplate timescale="15360" initialization="init-stream$RepresentationID$.m4s" media="chunk-stream$RepresentationID$-$Number%05d$.m4s" startNumber="1">

diff --git a/test/test/assets/3675/dash_1.mpd b/test/test/assets/3675/dash_1.mpd
@@ -16,7 +16,7 @@
 	</ProgramInformation>
 	<ServiceDescription id="0">
 	</ServiceDescription>
-	<Period id="0" start="PT0.0S">
+	<Period id="0" start="PT10.0S">
 		<AdaptationSet id="0" contentType="video" startWithSAP="1" segmentAlignment="true" bitstreamSwitching="true" frameRate="30/1" maxWidth="1280" maxHeight="720" par="16:9">
 			<Representation id="0" mimeType="video/mp4" codecs="avc1.64001f" bandwidth="122012" width="1280" height="720" sar="1:1">
 				<SegmentTemplate timescale="15360" initialization="init-stream$RepresentationID$.m4s" media="chunk-stream$RepresentationID$-$Number%05d$.m4s" startNumber="1">

diff --git a/test/test/assets/3675/dash_2.mpd b/test/test/assets/3675/dash_2.mpd
@@ -16,7 +16,7 @@
 	</ProgramInformation>
 	<ServiceDescription id="0">
 	</ServiceDescription>
-	<Period id="0" start="PT0.0S">
+	<Period id="0" start="PT10.0S">
 		<AdaptationSet id="0" contentType="video" startWithSAP="1" segmentAlignment="true" bitstreamSwitching="true" frameRate="30/1" maxWidth="1280" maxHeight="720" par="16:9">
 			<Representation id="0" mimeType="video/mp4" codecs="avc1.64001f" bandwidth="122012" width="1280" height="720" sar="1:1">
 				<SegmentTemplate timescale="15360" initialization="init-stream$RepresentationID$.m4s" media="chunk-stream$RepresentationID$-$Number%05d$.m4s" startNumber="1">

diff --git a/test/test/assets/3675/dash_3.mpd b/test/test/assets/3675/dash_3.mpd
@@ -16,7 +16,7 @@
 	</ProgramInformation>
 	<ServiceDescription id="0">
 	</ServiceDescription>
-	<Period id="0" start="PT0.0S">
+	<Period id="0" start="PT10.0S">
 		<AdaptationSet id="0" contentType="video" startWithSAP="1" segmentAlignment="true" bitstreamSwitching="true" frameRate="30/1" maxWidth="1280" maxHeight="720" par="16:9">
 			<Representation id="0" mimeType="video/mp4" codecs="avc1.64001f" bandwidth="122012" width="1280" height="720" sar="1:1">
 				<SegmentTemplate timescale="15360" initialization="init-stream$RepresentationID$.m4s" media="chunk-stream$RepresentationID$-$Number%05d$.m4s" startNumber="1">

diff --git a/test/test/assets/3675/dash_4.mpd b/test/test/assets/3675/dash_4.mpd
@@ -16,7 +16,7 @@
 	</ProgramInformation>
 	<ServiceDescription id="0">
 	</ServiceDescription>
-	<Period id="0" start="PT0.0S">
+	<Period id="0" start="PT10.0S">
 		<AdaptationSet id="0" contentType="video" startWithSAP="1" segmentAlignment="true" bitstreamSwitching="true" frameRate="30/1" maxWidth="1280" maxHeight="720" par="16:9">
 			<Representation id="0" mimeType="video/mp4" codecs="avc1.64001f" bandwidth="122012" width="1280" height="720" sar="1:1">
 				<SegmentTemplate timescale="15360" initialization="init-stream$RepresentationID$.m4s" media="chunk-stream$RepresentationID$-$Number%05d$.m4s" startNumber="3">