Commit 019819a9 by ibaker Committed by marcbaechinger

Rename MediaPeriodHolder.allRenderersEnabled

The new name reflects that it also waits for previously-used renderers
to be disabled.

Also fix some broken javadoc. These methods changed signature in
https://github.com/google/ExoPlayer/commit/ea347a464a81e16a9afdae0dcb5c0cdfcc533dc5

PiperOrigin-RevId: 359253177
parent 4ed36e19
...@@ -1980,7 +1980,7 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -1980,7 +1980,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
@Nullable MediaPeriodHolder readingPeriod = queue.getReadingPeriod(); @Nullable MediaPeriodHolder readingPeriod = queue.getReadingPeriod();
if (readingPeriod == null if (readingPeriod == null
|| queue.getPlayingPeriod() == readingPeriod || queue.getPlayingPeriod() == readingPeriod
|| readingPeriod.allRenderersEnabled) { || readingPeriod.allRenderersInCorrectState) {
// Not reading ahead or all renderers updated. // Not reading ahead or all renderers updated.
return; return;
} }
...@@ -2075,7 +2075,7 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -2075,7 +2075,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
MediaPeriodHolder nextPlayingPeriodHolder = playingPeriodHolder.getNext(); MediaPeriodHolder nextPlayingPeriodHolder = playingPeriodHolder.getNext();
return nextPlayingPeriodHolder != null return nextPlayingPeriodHolder != null
&& rendererPositionUs >= nextPlayingPeriodHolder.getStartPositionRendererTime() && rendererPositionUs >= nextPlayingPeriodHolder.getStartPositionRendererTime()
&& nextPlayingPeriodHolder.allRenderersEnabled; && nextPlayingPeriodHolder.allRenderersInCorrectState;
} }
private boolean hasReadingPeriodFinishedReading() { private boolean hasReadingPeriodFinishedReading() {
...@@ -2294,7 +2294,7 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -2294,7 +2294,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
enableRenderer(i, rendererWasEnabledFlags[i]); enableRenderer(i, rendererWasEnabledFlags[i]);
} }
} }
readingMediaPeriod.allRenderersEnabled = true; readingMediaPeriod.allRenderersInCorrectState = true;
} }
private void enableRenderer(int rendererIndex, boolean wasRendererEnabled) private void enableRenderer(int rendererIndex, boolean wasRendererEnabled)
......
...@@ -53,12 +53,16 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; ...@@ -53,12 +53,16 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
/** {@link MediaPeriodInfo} about this media period. */ /** {@link MediaPeriodInfo} about this media period. */
public MediaPeriodInfo info; public MediaPeriodInfo info;
/** /**
* Whether all required renderers have been enabled with the {@link #sampleStreams} for this * Whether all renderers are in the correct state for this {@link #mediaPeriod}.
*
* <p>Renderers that are needed must have been enabled with the {@link #sampleStreams} for this
* {@link #mediaPeriod}. This means either {@link Renderer#enable(RendererConfiguration, Format[], * {@link #mediaPeriod}. This means either {@link Renderer#enable(RendererConfiguration, Format[],
* SampleStream, long, boolean, boolean, long)} or {@link Renderer#replaceStream(Format[], * SampleStream, long, boolean, boolean, long, long)} or {@link Renderer#replaceStream(Format[],
* SampleStream, long)} has been called. * SampleStream, long, long)} has been called.
*
* <p>Renderers that are not needed must have been {@link Renderer#disable() disabled}.
*/ */
public boolean allRenderersEnabled; public boolean allRenderersInCorrectState;
private final boolean[] mayRetainStreamFlags; private final boolean[] mayRetainStreamFlags;
private final RendererCapabilities[] rendererCapabilities; private final RendererCapabilities[] rendererCapabilities;
......
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