Skip to content

SDK / exoplayer

Go to a project
Commit 4e6960ee by tonihei
Options

Add large renderer position offset. 

This helps to prevent issues where decoders can't handle negative
timestamps. In particular it avoids issues when the media accidentally
or intentionally starts with small negative timestamps. But it also
helps to prevent other renderer resets at a later point, for example
if a live stream with a large start offset is enqueued in the playlist.

#minor-release

PiperOrigin-RevId: 406786977
parent 4c40e80d
Inline Side-by-side
Showing with 127 additions and 79 deletions
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
......@@ -1266,7 +1266,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
queue.advancePlayingPeriod();
}
queue.removeAfter(newPlayingPeriodHolder);
newPlayingPeriodHolder.setRendererOffset(/* rendererPositionOffsetUs= */ 0);
newPlayingPeriodHolder.setRendererOffset(
MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US);
enableRenderers();
}
}
......@@ -1299,7 +1300,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
MediaPeriodHolder playingMediaPeriod = queue.getPlayingPeriod();
rendererPositionUs =
playingMediaPeriod == null
? periodPositionUs
? MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US + periodPositionUs
: playingMediaPeriod.toRendererTime(periodPositionUs);
mediaClock.resetPosition(rendererPositionUs);
for (Renderer renderer : renderers) {
......@@ -1375,7 +1376,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
pendingRecoverableRendererError = null;
isRebuffering = false;
mediaClock.stop();
rendererPositionUs = 0;
rendererPositionUs = MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US;
for (Renderer renderer : renderers) {
try {
disableRenderer(renderer);
......@@ -1963,7 +1964,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
emptyTrackSelectorResult);
mediaPeriodHolder.mediaPeriod.prepare(this, info.startPositionUs);
if (queue.getPlayingPeriod() == mediaPeriodHolder) {
resetRendererPosition(mediaPeriodHolder.getStartPositionRendererTime());
resetRendererPosition(info.startPositionUs);
}
handleLoadingMediaPeriodChanged(/* loadingTrackSelectionChanged= */ false);
}
......
library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
......@@ -38,6 +38,26 @@ import com.google.common.collect.ImmutableList;
/* package */ final class MediaPeriodQueue {
/**
* Initial renderer position offset used for the first item in the queue, in microseconds.
*
* <p>Choosing a positive value, larger than any reasonable single media duration, ensures three
* things:
*
* <ul>
* <li>Media that accidentally or intentionally starts with small negative timestamps doesn't
* send samples with negative timestamps to decoders. This makes rendering more robust as
* many decoders are known to have problems with negative timestamps.
* <li>Enqueueing media after the initial item with a non-zero start offset (e.g. content after
* ad breaks or live streams) is virtually guaranteed to stay in the positive timestamp
* range even when seeking back. This prevents renderer resets that are required if the
* allowed timestamp range may become negative.
* <li>Choosing a large value with zeros at all relevant digits simplifies debugging as the
* original timestamp of the media is still visible.
* </ul>
*/
public static final long INITIAL_RENDERER_POSITION_OFFSET_US = 1_000_000_000_000L;
/**
* Limits the maximum number of periods to buffer ahead of the current playing period. The
* buffering policy normally prevents buffering too far ahead, but the policy could allow too many
* small periods to be buffered if the period count were not limited.
......@@ -163,9 +183,7 @@ import com.google.common.collect.ImmutableList;
TrackSelectorResult emptyTrackSelectorResult) {
long rendererPositionOffsetUs =
loading == null
? (info.id.isAd() && info.requestedContentPositionUs != C.TIME_UNSET
? info.requestedContentPositionUs
: 0)
? INITIAL_RENDERER_POSITION_OFFSET_US
: (loading.getRendererOffset() + loading.info.durationUs - info.startPositionUs);
MediaPeriodHolder newPeriodHolder =
new MediaPeriodHolder(
......
library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
......@@ -493,10 +493,13 @@ public final class MediaPeriodQueueTest {
// Change position of first ad (= change duration of playing content before first ad).
updateAdPlaybackStateAndTimeline(/* adGroupTimesUs...= */ FIRST_AD_START_TIME_US - 2000);
setAdGroupLoaded(/* adGroupIndex= */ 0);
long maxRendererReadPositionUs = FIRST_AD_START_TIME_US - 3000;
long maxRendererReadPositionUs =
MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US + FIRST_AD_START_TIME_US - 3000;
boolean changeHandled =
mediaPeriodQueue.updateQueuedPeriods(
playbackInfo.timeline, /* rendererPositionUs= */ 0, maxRendererReadPositionUs);
playbackInfo.timeline,
/* rendererPositionUs= */ MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US,
maxRendererReadPositionUs);
assertThat(changeHandled).isTrue();
assertThat(getQueueLength()).isEqualTo(1);
......@@ -518,10 +521,13 @@ public final class MediaPeriodQueueTest {
// Change position of first ad (= change duration of playing content before first ad).
updateAdPlaybackStateAndTimeline(/* adGroupTimesUs...= */ FIRST_AD_START_TIME_US - 2000);
setAdGroupLoaded(/* adGroupIndex= */ 0);
long maxRendererReadPositionUs = FIRST_AD_START_TIME_US - 1000;
long maxRendererReadPositionUs =
MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US + FIRST_AD_START_TIME_US - 1000;
boolean changeHandled =
mediaPeriodQueue.updateQueuedPeriods(
playbackInfo.timeline, /* rendererPositionUs= */ 0, maxRendererReadPositionUs);
playbackInfo.timeline,
/* rendererPositionUs= */ MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US,
maxRendererReadPositionUs);
assertThat(changeHandled).isFalse();
assertThat(getQueueLength()).isEqualTo(1);
......@@ -552,10 +558,13 @@ public final class MediaPeriodQueueTest {
.withIsServerSideInserted(/* adGroupIndex= */ 0, /* isServerSideInserted= */ true);
updateTimeline();
setAdGroupLoaded(/* adGroupIndex= */ 0);
long maxRendererReadPositionUs = FIRST_AD_START_TIME_US - 1000;
long maxRendererReadPositionUs =
MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US + FIRST_AD_START_TIME_US - 1000;
boolean changeHandled =
mediaPeriodQueue.updateQueuedPeriods(
playbackInfo.timeline, /* rendererPositionUs= */ 0, maxRendererReadPositionUs);
playbackInfo.timeline,
/* rendererPositionUs= */ MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US,
maxRendererReadPositionUs);
assertThat(changeHandled).isTrue();
assertThat(getQueueLength()).isEqualTo(1);
......@@ -583,7 +592,9 @@ public final class MediaPeriodQueueTest {
setAdGroupLoaded(/* adGroupIndex= */ 1);
boolean changeHandled =
mediaPeriodQueue.updateQueuedPeriods(
playbackInfo.timeline, /* rendererPositionUs= */ 0, /* maxRendererReadPositionUs= */ 0);
playbackInfo.timeline,
/* rendererPositionUs= */ MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US,
/* maxRendererReadPositionUs= */ MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US);
assertThat(changeHandled).isTrue();
assertThat(getQueueLength()).isEqualTo(3);
......@@ -608,11 +619,13 @@ public final class MediaPeriodQueueTest {
/* adGroupTimesUs...= */ FIRST_AD_START_TIME_US, SECOND_AD_START_TIME_US - 1000);
setAdGroupLoaded(/* adGroupIndex= */ 0);
setAdGroupLoaded(/* adGroupIndex= */ 1);
long maxRendererReadPositionUs =
MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US + FIRST_AD_START_TIME_US;
boolean changeHandled =
mediaPeriodQueue.updateQueuedPeriods(
playbackInfo.timeline,
/* rendererPositionUs= */ 0,
/* maxRendererReadPositionUs= */ FIRST_AD_START_TIME_US);
/* rendererPositionUs= */ MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US,
maxRendererReadPositionUs);
assertThat(changeHandled).isFalse();
assertThat(getQueueLength()).isEqualTo(3);
......@@ -636,11 +649,14 @@ public final class MediaPeriodQueueTest {
/* adGroupTimesUs...= */ FIRST_AD_START_TIME_US, SECOND_AD_START_TIME_US - 1000);
setAdGroupLoaded(/* adGroupIndex= */ 0);
setAdGroupLoaded(/* adGroupIndex= */ 1);
long readingPositionAtStartOfContentBetweenAds = FIRST_AD_START_TIME_US + AD_DURATION_US;
long readingPositionAtStartOfContentBetweenAds =
MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US
+ FIRST_AD_START_TIME_US
+ AD_DURATION_US;
boolean changeHandled =
mediaPeriodQueue.updateQueuedPeriods(
playbackInfo.timeline,
/* rendererPositionUs= */ 0,
/* rendererPositionUs= */ MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US,
/* maxRendererReadPositionUs= */ readingPositionAtStartOfContentBetweenAds);
assertThat(changeHandled).isTrue();
......@@ -665,11 +681,14 @@ public final class MediaPeriodQueueTest {
/* adGroupTimesUs...= */ FIRST_AD_START_TIME_US, SECOND_AD_START_TIME_US - 1000);
setAdGroupLoaded(/* adGroupIndex= */ 0);
setAdGroupLoaded(/* adGroupIndex= */ 1);
long readingPositionAtEndOfContentBetweenAds = SECOND_AD_START_TIME_US + AD_DURATION_US;
long readingPositionAtEndOfContentBetweenAds =
MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US
+ SECOND_AD_START_TIME_US
+ AD_DURATION_US;
boolean changeHandled =
mediaPeriodQueue.updateQueuedPeriods(
playbackInfo.timeline,
/* rendererPositionUs= */ 0,
/* rendererPositionUs= */ MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US,
/* maxRendererReadPositionUs= */ readingPositionAtEndOfContentBetweenAds);
assertThat(changeHandled).isFalse();
......@@ -697,7 +716,7 @@ public final class MediaPeriodQueueTest {
boolean changeHandled =
mediaPeriodQueue.updateQueuedPeriods(
playbackInfo.timeline,
/* rendererPositionUs= */ 0,
/* rendererPositionUs= */ MediaPeriodQueue.INITIAL_RENDERER_POSITION_OFFSET_US,
/* maxRendererReadPositionUs= */ C.TIME_END_OF_SOURCE);
assertThat(changeHandled).isFalse();
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerAudioRenderer.java
......@@ -279,6 +279,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
int result = readSource(getFormatHolder(), decoderInputBuffer, /* readFlags= */ 0);
switch (result) {
case C.RESULT_BUFFER_READ:
decoderInputBuffer.timeUs -= streamOffsetUs;
mediaClock.updateTimeForTrackType(getTrackType(), decoderInputBuffer.timeUs);
decoderInputBuffer.flip();
decoder.queueInputBuffer(decoderInputBuffer);
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerBaseRenderer.java
......@@ -34,6 +34,7 @@ import com.google.android.exoplayer2.util.MimeTypes;
protected final Transformation transformation;
protected boolean isRendererStarted;
protected long streamOffsetUs;
public TransformerBaseRenderer(
int trackType,
......@@ -47,6 +48,12 @@ import com.google.android.exoplayer2.util.MimeTypes;
}
@Override
protected void onStreamChanged(Format[] formats, long startPositionUs, long offsetUs)
throws ExoPlaybackException {
this.streamOffsetUs = offsetUs;
}
@Override
@C.FormatSupport
public final int supportsFormat(Format format) {
@Nullable String sampleMimeType = format.sampleMimeType;
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerMuxingVideoRenderer.java
......@@ -117,6 +117,7 @@ import java.nio.ByteBuffer;
muxerWrapper.endTrack(getTrackType());
return false;
}
buffer.timeUs -= streamOffsetUs;
mediaClock.updateTimeForTrackType(getTrackType(), buffer.timeUs);
ByteBuffer data = checkNotNull(buffer.data);
data.flip();
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerTranscodingVideoRenderer.java
......@@ -320,6 +320,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
case C.RESULT_FORMAT_READ:
throw new IllegalStateException("Format changes are not supported.");
case C.RESULT_BUFFER_READ:
decoderInputBuffer.timeUs -= streamOffsetUs;
mediaClock.updateTimeForTrackType(getTrackType(), decoderInputBuffer.timeUs);
ByteBuffer data = checkNotNull(decoderInputBuffer.data);
data.flip();
......
testdata/src/test/assets/audiosinkdumps/mka/bear-flac-16bit.mka.audiosink.dump
......@@ -3,89 +3,89 @@ config:
channelCount = 2
sampleRate = 48000
buffer:
time = 1000
time = 1000000001000
data = 1217833679
buffer:
time = 97000
time = 1000000097000
data = 558614672
buffer:
time = 193000
time = 1000000193000
data = -709714787
buffer:
time = 289000
time = 1000000289000
data = 1367870571
buffer:
time = 385000
time = 1000000385000
data = -141229457
buffer:
time = 481000
time = 1000000481000
data = 1287758361
buffer:
time = 577000
time = 1000000577000
data = 1125289147
buffer:
time = 673000
time = 1000000673000
data = -1677383475
buffer:
time = 769000
time = 1000000769000
data = 2130742861
buffer:
time = 865000
time = 1000000865000
data = -1292320253
buffer:
time = 961000
time = 1000000961000
data = -456587163
buffer:
time = 1057000
time = 1000001057000
data = 748981534
buffer:
time = 1153000
time = 1000001153000
data = 1550456016
buffer:
time = 1249000
time = 1000001249000
data = 1657906039
buffer:
time = 1345000
time = 1000001345000
data = -762677083
buffer:
time = 1441000
time = 1000001441000
data = -1343810763
buffer:
time = 1537000
time = 1000001537000
data = 1137318783
buffer:
time = 1633000
time = 1000001633000
data = -1891318229
buffer:
time = 1729000
time = 1000001729000
data = -472068495
buffer:
time = 1825000
time = 1000001825000
data = 832315001
buffer:
time = 1921000
time = 1000001921000
data = 2054935175
buffer:
time = 2017000
time = 1000002017000
data = 57921641
buffer:
time = 2113000
time = 1000002113000
data = 2132759067
buffer:
time = 2209000
time = 1000002209000
data = -1742540521
buffer:
time = 2305000
time = 1000002305000
data = 1657024301
buffer:
time = 2401000
time = 1000002401000
data = -585080145
buffer:
time = 2497000
time = 1000002497000
data = 427271397
buffer:
time = 2593000
time = 1000002593000
data = -364201340
buffer:
time = 2689000
time = 1000002689000
data = -627965287
testdata/src/test/assets/audiosinkdumps/mka/bear-flac-24bit.mka.audiosink.dump
......@@ -3,89 +3,89 @@ config:
channelCount = 2
sampleRate = 48000
buffer:
time = 0
time = 1000000000000
data = 225023649
buffer:
time = 96000
time = 1000000096000
data = 455106306
buffer:
time = 192000
time = 1000000192000
data = 2025727297
buffer:
time = 288000
time = 1000000288000
data = 758514657
buffer:
time = 384000
time = 1000000384000
data = 1044986473
buffer:
time = 480000
time = 1000000480000
data = -2030029695
buffer:
time = 576000
time = 1000000576000
data = 1907053281
buffer:
time = 672000
time = 1000000672000
data = -1974954431
buffer:
time = 768000
time = 1000000768000
data = -206248383
buffer:
time = 864000
time = 1000000864000
data = 1484984417
buffer:
time = 960000
time = 1000000960000
data = -1306117439
buffer:
time = 1056000
time = 1000001056000
data = 692829792
buffer:
time = 1152000
time = 1000001152000
data = 1070563058
buffer:
time = 1248000
time = 1000001248000
data = -1444096479
buffer:
time = 1344000
time = 1000001344000
data = 1753016419
buffer:
time = 1440000
time = 1000001440000
data = 1947797953
buffer:
time = 1536000
time = 1000001536000
data = 266121411
buffer:
time = 1632000
time = 1000001632000
data = 1275494369
buffer:
time = 1728000
time = 1000001728000
data = 372077825
buffer:
time = 1824000
time = 1000001824000
data = -993079679
buffer:
time = 1920000
time = 1000001920000
data = 177307937
buffer:
time = 2016000
time = 1000002016000
data = 2037083009
buffer:
time = 2112000
time = 1000002112000
data = -435776287
buffer:
time = 2208000
time = 1000002208000
data = 1867447329
buffer:
time = 2304000
time = 1000002304000
data = 1884495937
buffer:
time = 2400000
time = 1000002400000
data = -804673375
buffer:
time = 2496000
time = 1000002496000
data = -588531007
buffer:
time = 2592000
time = 1000002592000
data = -1064642970
buffer:
time = 2688000
time = 1000002688000
data = -1771406207
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