Skip to content

SDK / exoplayer

Go to a project
Commit 2e7978a0 by tonihei Committed by Oliver Woodman
Options

Reorder renderer changes at period transitions 

Currently the following sequence of events happens at automatic period transitions:
1. Update queue (=release old playing period)
2. Disable unused renderers
3. Enable newly needed renderers

This order requires difficult to follow workarounds in AnalyticsCollector for all
events related to step 2 (disable renderers). The current media period has already
been advanced so can't be used. The current workaround saves the last known playing
media period that was published as part of a PlaybackInfo update in ExoPlayerImpl.
This works in most cases, but is inherently wrong because the published state in
ExoPlayerImpl may be completely unrelated to the updates happening on the playback
thread (e.g. if many other operations are pending).

Simplify and fix this problem by changing the order of the events above:
1. Disable unused renderers.
2. Update queue
3. Enable newly needed renderers.
This way the current playing media period can be used for both renderer disable
and renderer enable events, thus it's correct in all cases and the workaround
in AnalyticsCollector can be removed.

PiperOrigin-RevId: 290037225
parent 8d2fd383
Expand all
Inline Side-by-side
Showing with 39 additions and 27 deletions
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
...@@ -950,15 +950,14 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -950,15 +950,14 @@ import java.util.concurrent.atomic.AtomicBoolean;
setState(Player.STATE_BUFFERING); setState(Player.STATE_BUFFERING);
} }
// Clear the timeline, but keep the requested period if it is already prepared. // Find the requested period if it's already prepared.
MediaPeriodHolder oldPlayingPeriodHolder = queue.getPlayingPeriod(); @Nullable MediaPeriodHolder oldPlayingPeriodHolder = queue.getPlayingPeriod();
MediaPeriodHolder newPlayingPeriodHolder = oldPlayingPeriodHolder; @Nullable MediaPeriodHolder newPlayingPeriodHolder = oldPlayingPeriodHolder;
while (newPlayingPeriodHolder != null) { while (newPlayingPeriodHolder != null) {
if (periodId.equals(newPlayingPeriodHolder.info.id) && newPlayingPeriodHolder.prepared) { if (periodId.equals(newPlayingPeriodHolder.info.id) && newPlayingPeriodHolder.prepared) {
queue.removeAfter(newPlayingPeriodHolder);
break; break;
} }
newPlayingPeriodHolder = queue.advancePlayingPeriod(); newPlayingPeriodHolder = newPlayingPeriodHolder.getNext();
} }
// Disable all renderers if the period being played is changing, if the seek results in negative // Disable all renderers if the period being played is changing, if the seek results in negative
...@@ -971,15 +970,19 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -971,15 +970,19 @@ import java.util.concurrent.atomic.AtomicBoolean;
disableRenderer(renderer); disableRenderer(renderer);
} }
enabledRenderers = new Renderer[0]; enabledRenderers = new Renderer[0];
oldPlayingPeriodHolder = null;
if (newPlayingPeriodHolder != null) { if (newPlayingPeriodHolder != null) {
// Update the queue and reenable renderers if the requested media period already exists.
while (queue.getPlayingPeriod() != newPlayingPeriodHolder) {
queue.advancePlayingPeriod();
}
newPlayingPeriodHolder.setRendererOffset(/* rendererPositionOffsetUs= */ 0); newPlayingPeriodHolder.setRendererOffset(/* rendererPositionOffsetUs= */ 0);
enablePlayingPeriodRenderers();
} }
} }
// Update the holders. // Do the actual seeking.
if (newPlayingPeriodHolder != null) { if (newPlayingPeriodHolder != null) {
updatePlayingPeriodRenderers(oldPlayingPeriodHolder); queue.removeAfter(newPlayingPeriodHolder);
if (newPlayingPeriodHolder.hasEnabledTracks) { if (newPlayingPeriodHolder.hasEnabledTracks) {
periodPositionUs = newPlayingPeriodHolder.mediaPeriod.seekToUs(periodPositionUs); periodPositionUs = newPlayingPeriodHolder.mediaPeriod.seekToUs(periodPositionUs);
newPlayingPeriodHolder.mediaPeriod.discardBuffer( newPlayingPeriodHolder.mediaPeriod.discardBuffer(
...@@ -1694,7 +1697,7 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -1694,7 +1697,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
// The window index of the seek position was outside the bounds of the timeline. // The window index of the seek position was outside the bounds of the timeline.
return null; return null;
} }
if (timeline == seekTimeline) { if (timeline.equals(seekTimeline)) {
// Our internal timeline is the seek timeline, so the mapped position is correct. // Our internal timeline is the seek timeline, so the mapped position is correct.
return periodPosition; return periodPosition;
} }
...@@ -1869,8 +1872,10 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -1869,8 +1872,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
// anymore and need to re-enable the renderers. Set all current streams final to do that. // anymore and need to re-enable the renderers. Set all current streams final to do that.
setAllRendererStreamsFinal(); setAllRendererStreamsFinal();
} }
boolean[] rendererWasEnabledFlags = new boolean[renderers.length];
disablePlayingPeriodRenderersForTransition(rendererWasEnabledFlags);
MediaPeriodHolder newPlayingPeriodHolder = queue.advancePlayingPeriod(); MediaPeriodHolder newPlayingPeriodHolder = queue.advancePlayingPeriod();
updatePlayingPeriodRenderers(oldPlayingPeriodHolder); enablePlayingPeriodRenderers(rendererWasEnabledFlags);
playbackInfo = playbackInfo =
copyWithNewPosition( copyWithNewPosition(
newPlayingPeriodHolder.info.id, newPlayingPeriodHolder.info.id,
...@@ -1943,7 +1948,7 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -1943,7 +1948,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
if (loadingPeriodHolder == queue.getPlayingPeriod()) { if (loadingPeriodHolder == queue.getPlayingPeriod()) {
// This is the first prepared period, so update the position and the renderers. // This is the first prepared period, so update the position and the renderers.
resetRendererPosition(loadingPeriodHolder.info.startPositionUs); resetRendererPosition(loadingPeriodHolder.info.startPositionUs);
updatePlayingPeriodRenderers(/* oldPlayingPeriodHolder= */ null); enablePlayingPeriodRenderers();
} }
maybeContinueLoading(); maybeContinueLoading();
} }
...@@ -2025,22 +2030,15 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -2025,22 +2030,15 @@ import java.util.concurrent.atomic.AtomicBoolean;
mediaPeriodId, positionUs, contentPositionUs, getTotalBufferedDurationUs()); mediaPeriodId, positionUs, contentPositionUs, getTotalBufferedDurationUs());
} }
@SuppressWarnings("ParameterNotNullable") private void disablePlayingPeriodRenderersForTransition(boolean[] outRendererWasEnabledFlags)
private void updatePlayingPeriodRenderers(@Nullable MediaPeriodHolder oldPlayingPeriodHolder)
throws ExoPlaybackException { throws ExoPlaybackException {
MediaPeriodHolder newPlayingPeriodHolder = queue.getPlayingPeriod(); MediaPeriodHolder oldPlayingPeriodHolder = Assertions.checkNotNull(queue.getPlayingPeriod());
if (newPlayingPeriodHolder == null || oldPlayingPeriodHolder == newPlayingPeriodHolder) { MediaPeriodHolder newPlayingPeriodHolder =
return; Assertions.checkNotNull(oldPlayingPeriodHolder.getNext());
}
int enabledRendererCount = 0;
boolean[] rendererWasEnabledFlags = new boolean[renderers.length];
for (int i = 0; i < renderers.length; i++) { for (int i = 0; i < renderers.length; i++) {
Renderer renderer = renderers[i]; Renderer renderer = renderers[i];
rendererWasEnabledFlags[i] = renderer.getState() != Renderer.STATE_DISABLED; outRendererWasEnabledFlags[i] = renderer.getState() != Renderer.STATE_DISABLED;
if (newPlayingPeriodHolder.getTrackSelectorResult().isRendererEnabled(i)) { if (outRendererWasEnabledFlags[i]
enabledRendererCount++;
}
if (rendererWasEnabledFlags[i]
&& (!newPlayingPeriodHolder.getTrackSelectorResult().isRendererEnabled(i) && (!newPlayingPeriodHolder.getTrackSelectorResult().isRendererEnabled(i)
|| (renderer.isCurrentStreamFinal() || (renderer.isCurrentStreamFinal()
&& renderer.getStream() == oldPlayingPeriodHolder.sampleStreams[i]))) { && renderer.getStream() == oldPlayingPeriodHolder.sampleStreams[i]))) {
...@@ -2050,10 +2048,24 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -2050,10 +2048,24 @@ import java.util.concurrent.atomic.AtomicBoolean;
disableRenderer(renderer); disableRenderer(renderer);
} }
} }
}
private void enablePlayingPeriodRenderers() throws ExoPlaybackException {
enablePlayingPeriodRenderers(/* rendererWasEnabledFlags= */ new boolean[renderers.length]);
}
private void enablePlayingPeriodRenderers(boolean[] rendererWasEnabledFlags)
throws ExoPlaybackException {
MediaPeriodHolder playingPeriodHolder = Assertions.checkNotNull(queue.getPlayingPeriod());
playbackInfo = playbackInfo =
playbackInfo.copyWithTrackInfo( playbackInfo.copyWithTrackInfo(
newPlayingPeriodHolder.getTrackGroups(), playingPeriodHolder.getTrackGroups(), playingPeriodHolder.getTrackSelectorResult());
newPlayingPeriodHolder.getTrackSelectorResult()); int enabledRendererCount = 0;
for (int i = 0; i < renderers.length; i++) {
if (playingPeriodHolder.getTrackSelectorResult().isRendererEnabled(i)) {
enabledRendererCount++;
}
}
enableRenderers(rendererWasEnabledFlags, enabledRendererCount); enableRenderers(rendererWasEnabledFlags, enabledRendererCount);
} }
......
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
...@@ -434,7 +434,7 @@ public final class AnalyticsCollectorTest { ...@@ -434,7 +434,7 @@ public final class AnalyticsCollectorTest {
assertThat(listener.getEvents(EVENT_DECODER_DISABLED)).containsExactly(period0); assertThat(listener.getEvents(EVENT_DECODER_DISABLED)).containsExactly(period0);
assertThat(listener.getEvents(EVENT_AUDIO_SESSION_ID)).containsExactly(period1Seq2); assertThat(listener.getEvents(EVENT_AUDIO_SESSION_ID)).containsExactly(period1Seq2);
assertThat(listener.getEvents(EVENT_DROPPED_VIDEO_FRAMES)) assertThat(listener.getEvents(EVENT_DROPPED_VIDEO_FRAMES))
.containsExactly(period0, period0, period1Seq2); .containsExactly(period0, period1Seq2, period1Seq2);
assertThat(listener.getEvents(EVENT_VIDEO_SIZE_CHANGED)).containsExactly(period0, period1Seq2); assertThat(listener.getEvents(EVENT_VIDEO_SIZE_CHANGED)).containsExactly(period0, period1Seq2);
assertThat(listener.getEvents(EVENT_RENDERED_FIRST_FRAME)) assertThat(listener.getEvents(EVENT_RENDERED_FIRST_FRAME))
.containsExactly(period0, period1Seq2); .containsExactly(period0, period1Seq2);
......
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