Skip to content

SDK / exoplayer

Go to a project
Commit aab6aef4 by tonihei Committed by Oliver Woodman
Options

Set min/max supported live offset in DashMediaSource. 

In order to ensure we can update the values for new manifests but still use
the user provided override, we need to save the original and the updated MediaItem
seperately.

And in order to incorporate the existing logic for the min/max supported live
offset, which we already use to correct the target offset, also move both places
together so that all the adjustment happens in one place.

Logical adjustments to the previous min/max supported live offset:
 - Use the user-provided MediaItem values if set
 - Use the newly parsed ServiceDescription values if available.
 - Limit the minimum to 0 if the current time is in the window and we can
   assume to have low-latency stream.
 - Add minBufferTime from the manifest to ensure we don't reduce the live
   offset below this value.

Issue: #4904
PiperOrigin-RevId: 339452816
parent 32a72fa2
Expand all
Inline Side-by-side
Showing with 116 additions and 72 deletions
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashMediaSourceTest.java
...@@ -55,8 +55,9 @@ public final class DashMediaSourceTest { ...@@ -55,8 +55,9 @@ public final class DashMediaSourceTest {
private static final String SAMPLE_MPD_LIVE_WITHOUT_LIVE_CONFIGURATION = private static final String SAMPLE_MPD_LIVE_WITHOUT_LIVE_CONFIGURATION =
"media/mpd/sample_mpd_live_without_live_configuration"; "media/mpd/sample_mpd_live_without_live_configuration";
private static final String SAMPLE_MPD_LIVE_WITH_SUGGESTED_PRESENTATION_DELAY_2S = private static final String
"media/mpd/sample_mpd_live_with_suggested_presentation_delay_2s"; SAMPLE_MPD_LIVE_WITH_SUGGESTED_PRESENTATION_DELAY_2S_MIN_BUFFER_TIME_500MS =
"media/mpd/sample_mpd_live_with_suggested_presentation_delay_2s_min_buffer_time_500ms";
private static final String SAMPLE_MPD_LIVE_WITH_COMPLETE_SERVICE_DESCRIPTION = private static final String SAMPLE_MPD_LIVE_WITH_COMPLETE_SERVICE_DESCRIPTION =
"media/mpd/sample_mpd_live_with_complete_service_description"; "media/mpd/sample_mpd_live_with_complete_service_description";
private static final String SAMPLE_MPD_LIVE_WITH_OFFSET_INSIDE_WINDOW = private static final String SAMPLE_MPD_LIVE_WITH_OFFSET_INSIDE_WINDOW =
...@@ -290,6 +291,8 @@ public final class DashMediaSourceTest { ...@@ -290,6 +291,8 @@ public final class DashMediaSourceTest {
assertThat(mediaItemFromSource.liveConfiguration.targetLiveOffsetMs) assertThat(mediaItemFromSource.liveConfiguration.targetLiveOffsetMs)
.isEqualTo(DashMediaSource.DEFAULT_FALLBACK_TARGET_LIVE_OFFSET_MS); .isEqualTo(DashMediaSource.DEFAULT_FALLBACK_TARGET_LIVE_OFFSET_MS);
assertThat(mediaItemFromSource.liveConfiguration.minLiveOffsetMs).isEqualTo(0L);
assertThat(mediaItemFromSource.liveConfiguration.maxLiveOffsetMs).isEqualTo(58_000L);
assertThat(mediaItemFromSource.liveConfiguration.minPlaybackSpeed).isEqualTo(C.RATE_UNSET); assertThat(mediaItemFromSource.liveConfiguration.minPlaybackSpeed).isEqualTo(C.RATE_UNSET);
assertThat(mediaItemFromSource.liveConfiguration.maxPlaybackSpeed).isEqualTo(C.RATE_UNSET); assertThat(mediaItemFromSource.liveConfiguration.maxPlaybackSpeed).isEqualTo(C.RATE_UNSET);
} }
...@@ -306,6 +309,8 @@ public final class DashMediaSourceTest { ...@@ -306,6 +309,8 @@ public final class DashMediaSourceTest {
MediaItem mediaItemFromSource = prepareAndWaitForTimelineRefresh(mediaSource).mediaItem; MediaItem mediaItemFromSource = prepareAndWaitForTimelineRefresh(mediaSource).mediaItem;
assertThat(mediaItemFromSource.liveConfiguration.targetLiveOffsetMs).isEqualTo(1234L); assertThat(mediaItemFromSource.liveConfiguration.targetLiveOffsetMs).isEqualTo(1234L);
assertThat(mediaItemFromSource.liveConfiguration.minLiveOffsetMs).isEqualTo(0L);
assertThat(mediaItemFromSource.liveConfiguration.maxLiveOffsetMs).isEqualTo(58_000L);
assertThat(mediaItemFromSource.liveConfiguration.minPlaybackSpeed).isEqualTo(C.RATE_UNSET); assertThat(mediaItemFromSource.liveConfiguration.minPlaybackSpeed).isEqualTo(C.RATE_UNSET);
assertThat(mediaItemFromSource.liveConfiguration.maxPlaybackSpeed).isEqualTo(C.RATE_UNSET); assertThat(mediaItemFromSource.liveConfiguration.maxPlaybackSpeed).isEqualTo(C.RATE_UNSET);
} }
...@@ -319,6 +324,8 @@ public final class DashMediaSourceTest { ...@@ -319,6 +324,8 @@ public final class DashMediaSourceTest {
.setLiveTargetOffsetMs(876L) .setLiveTargetOffsetMs(876L)
.setLiveMinPlaybackSpeed(23f) .setLiveMinPlaybackSpeed(23f)
.setLiveMaxPlaybackSpeed(42f) .setLiveMaxPlaybackSpeed(42f)
.setLiveMinOffsetMs(500L)
.setLiveMaxOffsetMs(20_000L)
.build(); .build();
DashMediaSource mediaSource = DashMediaSource mediaSource =
new DashMediaSource.Factory( new DashMediaSource.Factory(
...@@ -329,47 +336,58 @@ public final class DashMediaSourceTest { ...@@ -329,47 +336,58 @@ public final class DashMediaSourceTest {
MediaItem mediaItemFromSource = prepareAndWaitForTimelineRefresh(mediaSource).mediaItem; MediaItem mediaItemFromSource = prepareAndWaitForTimelineRefresh(mediaSource).mediaItem;
assertThat(mediaItemFromSource.liveConfiguration.targetLiveOffsetMs).isEqualTo(876L); assertThat(mediaItemFromSource.liveConfiguration.targetLiveOffsetMs).isEqualTo(876L);
assertThat(mediaItemFromSource.liveConfiguration.minLiveOffsetMs).isEqualTo(500L);
assertThat(mediaItemFromSource.liveConfiguration.maxLiveOffsetMs).isEqualTo(20_000L);
assertThat(mediaItemFromSource.liveConfiguration.minPlaybackSpeed).isEqualTo(23f); assertThat(mediaItemFromSource.liveConfiguration.minPlaybackSpeed).isEqualTo(23f);
assertThat(mediaItemFromSource.liveConfiguration.maxPlaybackSpeed).isEqualTo(42f); assertThat(mediaItemFromSource.liveConfiguration.maxPlaybackSpeed).isEqualTo(42f);
} }
@Test @Test
public void prepare_withSuggestedPresentationDelay_usesManifestValue() public void prepare_withSuggestedPresentationDelayAndMinBufferTime_usesManifestValue()
throws InterruptedException { throws InterruptedException {
DashMediaSource mediaSource = DashMediaSource mediaSource =
new DashMediaSource.Factory( new DashMediaSource.Factory(
() -> () ->
createSampleMpdDataSource(SAMPLE_MPD_LIVE_WITH_SUGGESTED_PRESENTATION_DELAY_2S)) createSampleMpdDataSource(
SAMPLE_MPD_LIVE_WITH_SUGGESTED_PRESENTATION_DELAY_2S_MIN_BUFFER_TIME_500MS))
.setFallbackTargetLiveOffsetMs(1234L) .setFallbackTargetLiveOffsetMs(1234L)
.createMediaSource(MediaItem.fromUri(Uri.EMPTY)); .createMediaSource(MediaItem.fromUri(Uri.EMPTY));
MediaItem mediaItem = prepareAndWaitForTimelineRefresh(mediaSource).mediaItem; MediaItem mediaItem = prepareAndWaitForTimelineRefresh(mediaSource).mediaItem;
assertThat(mediaItem.liveConfiguration.targetLiveOffsetMs).isEqualTo(2_000L); assertThat(mediaItem.liveConfiguration.targetLiveOffsetMs).isEqualTo(2_000L);
assertThat(mediaItem.liveConfiguration.minLiveOffsetMs).isEqualTo(500L);
assertThat(mediaItem.liveConfiguration.maxLiveOffsetMs).isEqualTo(58_000L);
assertThat(mediaItem.liveConfiguration.minPlaybackSpeed).isEqualTo(C.RATE_UNSET); assertThat(mediaItem.liveConfiguration.minPlaybackSpeed).isEqualTo(C.RATE_UNSET);
assertThat(mediaItem.liveConfiguration.maxPlaybackSpeed).isEqualTo(C.RATE_UNSET); assertThat(mediaItem.liveConfiguration.maxPlaybackSpeed).isEqualTo(C.RATE_UNSET);
} }
@Test @Test
public void prepare_withSuggestedPresentationDelay_withMediaItemLiveProperties_usesMediaItem() public void
throws InterruptedException { prepare_withSuggestedPresentationDelayAndMinBufferTime_withMediaItemLiveProperties_usesMediaItem()
throws InterruptedException {
MediaItem mediaItem = MediaItem mediaItem =
new MediaItem.Builder() new MediaItem.Builder()
.setUri(Uri.EMPTY) .setUri(Uri.EMPTY)
.setLiveTargetOffsetMs(876L) .setLiveTargetOffsetMs(876L)
.setLiveMinPlaybackSpeed(23f) .setLiveMinPlaybackSpeed(23f)
.setLiveMaxPlaybackSpeed(42f) .setLiveMaxPlaybackSpeed(42f)
.setLiveMinOffsetMs(200L)
.setLiveMaxOffsetMs(999L)
.build(); .build();
DashMediaSource mediaSource = DashMediaSource mediaSource =
new DashMediaSource.Factory( new DashMediaSource.Factory(
() -> () ->
createSampleMpdDataSource(SAMPLE_MPD_LIVE_WITH_SUGGESTED_PRESENTATION_DELAY_2S)) createSampleMpdDataSource(
SAMPLE_MPD_LIVE_WITH_SUGGESTED_PRESENTATION_DELAY_2S_MIN_BUFFER_TIME_500MS))
.setFallbackTargetLiveOffsetMs(1234L) .setFallbackTargetLiveOffsetMs(1234L)
.createMediaSource(mediaItem); .createMediaSource(mediaItem);
MediaItem mediaItemFromSource = prepareAndWaitForTimelineRefresh(mediaSource).mediaItem; MediaItem mediaItemFromSource = prepareAndWaitForTimelineRefresh(mediaSource).mediaItem;
assertThat(mediaItemFromSource.liveConfiguration.targetLiveOffsetMs).isEqualTo(876L); assertThat(mediaItemFromSource.liveConfiguration.targetLiveOffsetMs).isEqualTo(876L);
assertThat(mediaItem.liveConfiguration.minLiveOffsetMs).isEqualTo(200L);
assertThat(mediaItem.liveConfiguration.maxLiveOffsetMs).isEqualTo(999L);
assertThat(mediaItemFromSource.liveConfiguration.minPlaybackSpeed).isEqualTo(23f); assertThat(mediaItemFromSource.liveConfiguration.minPlaybackSpeed).isEqualTo(23f);
assertThat(mediaItemFromSource.liveConfiguration.maxPlaybackSpeed).isEqualTo(42f); assertThat(mediaItemFromSource.liveConfiguration.maxPlaybackSpeed).isEqualTo(42f);
} }
...@@ -386,6 +404,8 @@ public final class DashMediaSourceTest { ...@@ -386,6 +404,8 @@ public final class DashMediaSourceTest {
MediaItem mediaItem = prepareAndWaitForTimelineRefresh(mediaSource).mediaItem; MediaItem mediaItem = prepareAndWaitForTimelineRefresh(mediaSource).mediaItem;
assertThat(mediaItem.liveConfiguration.targetLiveOffsetMs).isEqualTo(4_000L); assertThat(mediaItem.liveConfiguration.targetLiveOffsetMs).isEqualTo(4_000L);
assertThat(mediaItem.liveConfiguration.minLiveOffsetMs).isEqualTo(2_000L);
assertThat(mediaItem.liveConfiguration.maxLiveOffsetMs).isEqualTo(6_000L);
assertThat(mediaItem.liveConfiguration.minPlaybackSpeed).isEqualTo(0.96f); assertThat(mediaItem.liveConfiguration.minPlaybackSpeed).isEqualTo(0.96f);
assertThat(mediaItem.liveConfiguration.maxPlaybackSpeed).isEqualTo(1.04f); assertThat(mediaItem.liveConfiguration.maxPlaybackSpeed).isEqualTo(1.04f);
} }
...@@ -399,6 +419,8 @@ public final class DashMediaSourceTest { ...@@ -399,6 +419,8 @@ public final class DashMediaSourceTest {
.setLiveTargetOffsetMs(876L) .setLiveTargetOffsetMs(876L)
.setLiveMinPlaybackSpeed(23f) .setLiveMinPlaybackSpeed(23f)
.setLiveMaxPlaybackSpeed(42f) .setLiveMaxPlaybackSpeed(42f)
.setLiveMinOffsetMs(100L)
.setLiveMaxOffsetMs(999L)
.build(); .build();
DashMediaSource mediaSource = DashMediaSource mediaSource =
new DashMediaSource.Factory( new DashMediaSource.Factory(
...@@ -409,6 +431,8 @@ public final class DashMediaSourceTest { ...@@ -409,6 +431,8 @@ public final class DashMediaSourceTest {
MediaItem mediaItemFromSource = prepareAndWaitForTimelineRefresh(mediaSource).mediaItem; MediaItem mediaItemFromSource = prepareAndWaitForTimelineRefresh(mediaSource).mediaItem;
assertThat(mediaItemFromSource.liveConfiguration.targetLiveOffsetMs).isEqualTo(876L); assertThat(mediaItemFromSource.liveConfiguration.targetLiveOffsetMs).isEqualTo(876L);
assertThat(mediaItemFromSource.liveConfiguration.minLiveOffsetMs).isEqualTo(100L);
assertThat(mediaItemFromSource.liveConfiguration.maxLiveOffsetMs).isEqualTo(999L);
assertThat(mediaItemFromSource.liveConfiguration.minPlaybackSpeed).isEqualTo(23f); assertThat(mediaItemFromSource.liveConfiguration.minPlaybackSpeed).isEqualTo(23f);
assertThat(mediaItemFromSource.liveConfiguration.maxPlaybackSpeed).isEqualTo(42f); assertThat(mediaItemFromSource.liveConfiguration.maxPlaybackSpeed).isEqualTo(42f);
} }
......
testdata/src/test/assets/media/mpd/sample_mpd_live_with_complete_service_description
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
schemeIdUri="urn:mpeg:dash:utc:direct:2014" schemeIdUri="urn:mpeg:dash:utc:direct:2014"
value="2020-01-01T01:00:00Z" /> value="2020-01-01T01:00:00Z" />
<ServiceDescription id="0"> <ServiceDescription id="0">
<Latency target="4000" /> <Latency min="2000" target="4000" max="6000"/>
<PlaybackRate max="1.04" min="0.96" /> <PlaybackRate max="1.04" min="0.96" />
</ServiceDescription> </ServiceDescription>
<Period start="PT0.0S"> <Period start="PT0.0S">
......
testdata/src/test/assets/media/mpd/sample_mpd_live_with_suggested_presentation_delay_2s → testdata/src/test/assets/media/mpd/sample_mpd_live_with_suggested_presentation_delay_2s_min_buffer_time_500ms
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
<MPD <MPD
type="dynamic" type="dynamic"
suggestedPresentationDelay="PT2S" suggestedPresentationDelay="PT2S"
minBufferTime="PT0.5S"
minimumUpdatePeriod="PT4M" minimumUpdatePeriod="PT4M"
availabilityStartTime="2020-01-01T00:00:00Z" availabilityStartTime="2020-01-01T00:00:00Z"
timeShiftBufferDepth="PT6.0S"> timeShiftBufferDepth="PT1M">
<UTCTiming <UTCTiming
schemeIdUri="urn:mpeg:dash:utc:direct:2014" schemeIdUri="urn:mpeg:dash:utc:direct:2014"
value="2020-01-01T01:00:00Z" /> value="2020-01-01T01:00:00Z" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment