Skip to content

SDK / exoplayer

Go to a project
Commit c2c41558 by andrewlewis Committed by Oliver Woodman
Options

Merge the internal timeline into ExoPlayerImplInternal. 

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=129325922
parent ee565300
Inline Side-by-side
Showing with 186 additions and 226 deletions
library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
...@@ -86,8 +86,7 @@ import java.util.ArrayList; ...@@ -86,8 +86,7 @@ import java.util.ArrayList;
private static final int MSG_PERIOD_PREPARED = 6; private static final int MSG_PERIOD_PREPARED = 6;
private static final int MSG_SOURCE_CONTINUE_LOADING_REQUESTED = 7; private static final int MSG_SOURCE_CONTINUE_LOADING_REQUESTED = 7;
private static final int MSG_TRACK_SELECTION_INVALIDATED = 8; private static final int MSG_TRACK_SELECTION_INVALIDATED = 8;
private static final int MSG_SOURCE_INVALIDATED = 9; private static final int MSG_CUSTOM = 9;
private static final int MSG_CUSTOM = 10;
private static final int PREPARING_SOURCE_INTERVAL_MS = 10; private static final int PREPARING_SOURCE_INTERVAL_MS = 10;
private static final int RENDERING_INTERVAL_MS = 10; private static final int RENDERING_INTERVAL_MS = 10;
...@@ -100,13 +99,14 @@ import java.util.ArrayList; ...@@ -100,13 +99,14 @@ import java.util.ArrayList;
*/ */
private static final int MAXIMUM_BUFFER_AHEAD_PERIODS = 100; private static final int MAXIMUM_BUFFER_AHEAD_PERIODS = 100;
private final Renderer[] renderers;
private final RendererCapabilities[] rendererCapabilities;
private final TrackSelector trackSelector; private final TrackSelector trackSelector;
private final LoadControl loadControl; private final LoadControl loadControl;
private final StandaloneMediaClock standaloneMediaClock; private final StandaloneMediaClock standaloneMediaClock;
private final Handler handler; private final Handler handler;
private final HandlerThread internalPlaybackThread; private final HandlerThread internalPlaybackThread;
private final Handler eventHandler; private final Handler eventHandler;
private final InternalTimeline internalTimeline;
private PlaybackInfo playbackInfo; private PlaybackInfo playbackInfo;
private Renderer rendererMediaClockSource; private Renderer rendererMediaClockSource;
...@@ -124,9 +124,20 @@ import java.util.ArrayList; ...@@ -124,9 +124,20 @@ import java.util.ArrayList;
private long internalPositionUs; private long internalPositionUs;
private boolean isTimelineReady;
private boolean isTimelineEnded;
private int bufferAheadPeriodCount;
private Period playingPeriod;
private Period readingPeriod;
private Period loadingPeriod;
private long playingPeriodEndPositionUs;
private Timeline timeline;
public ExoPlayerImplInternal(Renderer[] renderers, TrackSelector trackSelector, public ExoPlayerImplInternal(Renderer[] renderers, TrackSelector trackSelector,
LoadControl loadControl, boolean playWhenReady, Handler eventHandler, LoadControl loadControl, boolean playWhenReady, Handler eventHandler,
PlaybackInfo playbackInfo) { PlaybackInfo playbackInfo) {
this.renderers = renderers;
this.trackSelector = trackSelector; this.trackSelector = trackSelector;
this.loadControl = loadControl; this.loadControl = loadControl;
this.playWhenReady = playWhenReady; this.playWhenReady = playWhenReady;
...@@ -134,13 +145,15 @@ import java.util.ArrayList; ...@@ -134,13 +145,15 @@ import java.util.ArrayList;
this.state = ExoPlayer.STATE_IDLE; this.state = ExoPlayer.STATE_IDLE;
this.playbackInfo = playbackInfo; this.playbackInfo = playbackInfo;
rendererCapabilities = new RendererCapabilities[renderers.length];
for (int i = 0; i < renderers.length; i++) { for (int i = 0; i < renderers.length; i++) {
renderers[i].setIndex(i); renderers[i].setIndex(i);
rendererCapabilities[i] = renderers[i].getCapabilities();
} }
playingPeriodEndPositionUs = C.UNSET_TIME_US;
standaloneMediaClock = new StandaloneMediaClock(); standaloneMediaClock = new StandaloneMediaClock();
enabledRenderers = new Renderer[0]; enabledRenderers = new Renderer[0];
internalTimeline = new InternalTimeline(renderers);
trackSelector.init(this); trackSelector.init(this);
...@@ -259,21 +272,17 @@ import java.util.ArrayList; ...@@ -259,21 +272,17 @@ import java.util.ArrayList;
return true; return true;
} }
case MSG_PERIOD_PREPARED: { case MSG_PERIOD_PREPARED: {
internalTimeline.handlePeriodPrepared((MediaPeriod) msg.obj); handlePeriodPrepared((MediaPeriod) msg.obj);
return true; return true;
} }
case MSG_SOURCE_CONTINUE_LOADING_REQUESTED: { case MSG_SOURCE_CONTINUE_LOADING_REQUESTED: {
internalTimeline.handleContinueLoadingRequested((MediaPeriod) msg.obj); handleContinueLoadingRequested((MediaPeriod) msg.obj);
return true; return true;
} }
case MSG_TRACK_SELECTION_INVALIDATED: { case MSG_TRACK_SELECTION_INVALIDATED: {
reselectTracksInternal(); reselectTracksInternal();
return true; return true;
} }
case MSG_SOURCE_INVALIDATED: {
internalTimeline.invalidate((Timeline) msg.obj);
return true;
}
case MSG_CUSTOM: { case MSG_CUSTOM: {
sendMessagesInternal((ExoPlayerMessage[]) msg.obj); sendMessagesInternal((ExoPlayerMessage[]) msg.obj);
return true; return true;
...@@ -305,7 +314,7 @@ import java.util.ArrayList; ...@@ -305,7 +314,7 @@ import java.util.ArrayList;
@Override @Override
public void onTimelineChanged(Timeline timeline) { public void onTimelineChanged(Timeline timeline) {
try { try {
internalTimeline.invalidate(timeline); handleSourceInvalidated(timeline);
} catch (ExoPlaybackException | IOException e) { } catch (ExoPlaybackException | IOException e) {
Log.e(TAG, "Error handling timeline change.", e); Log.e(TAG, "Error handling timeline change.", e);
eventHandler.obtainMessage(MSG_ERROR, e).sendToTarget(); eventHandler.obtainMessage(MSG_ERROR, e).sendToTarget();
...@@ -379,10 +388,10 @@ import java.util.ArrayList; ...@@ -379,10 +388,10 @@ import java.util.ArrayList;
} }
private void updatePlaybackPositions() throws ExoPlaybackException { private void updatePlaybackPositions() throws ExoPlaybackException {
MediaPeriod mediaPeriod = internalTimeline.getPeriod(); if (playingPeriod == null) {
if (mediaPeriod == null) {
return; return;
} }
MediaPeriod mediaPeriod = playingPeriod.mediaPeriod;
// Update the duration. // Update the duration.
if (playbackInfo.durationUs == C.UNSET_TIME_US) { if (playbackInfo.durationUs == C.UNSET_TIME_US) {
...@@ -400,7 +409,7 @@ import java.util.ArrayList; ...@@ -400,7 +409,7 @@ import java.util.ArrayList;
} else { } else {
internalPositionUs = standaloneMediaClock.getPositionUs(); internalPositionUs = standaloneMediaClock.getPositionUs();
} }
positionUs = internalPositionUs - internalTimeline.playingPeriod.offsetUs; positionUs = internalPositionUs - playingPeriod.offsetUs;
} }
playbackInfo.positionUs = positionUs; playbackInfo.positionUs = positionUs;
elapsedRealtimeUs = SystemClock.elapsedRealtime() * 1000; elapsedRealtimeUs = SystemClock.elapsedRealtime() * 1000;
...@@ -418,10 +427,10 @@ import java.util.ArrayList; ...@@ -418,10 +427,10 @@ import java.util.ArrayList;
private void doSomeWork() throws ExoPlaybackException, IOException { private void doSomeWork() throws ExoPlaybackException, IOException {
long operationStartTimeMs = SystemClock.elapsedRealtime(); long operationStartTimeMs = SystemClock.elapsedRealtime();
internalTimeline.updatePeriods(); updatePeriods();
if (internalTimeline.getPeriod() == null) { if (playingPeriod == null) {
// We're still waiting for the first source to be prepared. // We're still waiting for the first period to be prepared.
internalTimeline.maybeThrowPeriodPrepareError(); maybeThrowPeriodPrepareError();
scheduleNextOperation(MSG_DO_SOME_WORK, operationStartTimeMs, PREPARING_SOURCE_INTERVAL_MS); scheduleNextOperation(MSG_DO_SOME_WORK, operationStartTimeMs, PREPARING_SOURCE_INTERVAL_MS);
return; return;
} }
...@@ -447,23 +456,25 @@ import java.util.ArrayList; ...@@ -447,23 +456,25 @@ import java.util.ArrayList;
} }
if (!allRenderersReadyOrEnded) { if (!allRenderersReadyOrEnded) {
internalTimeline.maybeThrowPeriodPrepareError(); maybeThrowPeriodPrepareError();
} }
if (allRenderersEnded && (playbackInfo.durationUs == C.UNSET_TIME_US if (allRenderersEnded
|| playbackInfo.durationUs <= playbackInfo.positionUs) && internalTimeline.isEnded) { && (playbackInfo.durationUs == C.UNSET_TIME_US
|| playbackInfo.durationUs <= playbackInfo.positionUs)
&& isTimelineEnded) {
setState(ExoPlayer.STATE_ENDED); setState(ExoPlayer.STATE_ENDED);
stopRenderers(); stopRenderers();
} else if (state == ExoPlayer.STATE_BUFFERING) { } else if (state == ExoPlayer.STATE_BUFFERING) {
if ((enabledRenderers.length > 0 ? allRenderersReadyOrEnded : internalTimeline.isReady) if ((enabledRenderers.length > 0 ? allRenderersReadyOrEnded : isTimelineReady)
&& internalTimeline.haveSufficientBuffer(rebuffering)) { && haveSufficientBuffer(rebuffering)) {
setState(ExoPlayer.STATE_READY); setState(ExoPlayer.STATE_READY);
if (playWhenReady) { if (playWhenReady) {
startRenderers(); startRenderers();
} }
} }
} else if (state == ExoPlayer.STATE_READY) { } else if (state == ExoPlayer.STATE_READY) {
if (enabledRenderers.length > 0 ? !allRenderersReadyOrEnded : !internalTimeline.isReady) { if (enabledRenderers.length > 0 ? !allRenderersReadyOrEnded : !isTimelineReady) {
rebuffering = playWhenReady; rebuffering = playWhenReady;
setState(ExoPlayer.STATE_BUFFERING); setState(ExoPlayer.STATE_BUFFERING);
stopRenderers(); stopRenderers();
...@@ -525,7 +536,52 @@ import java.util.ArrayList; ...@@ -525,7 +536,52 @@ import java.util.ArrayList;
stopRenderers(); stopRenderers();
rebuffering = false; rebuffering = false;
positionUs = internalTimeline.seekTo(periodIndex, positionUs); if (positionUs == C.UNSET_TIME_US) {
// We don't know where to seek to yet, so clear the whole timeline.
periodIndex = Timeline.NO_PERIOD_INDEX;
}
// Clear the timeline, but keep the requested period if it is already prepared.
Period period = playingPeriod;
Period newPlayingPeriod = null;
while (period != null) {
if (period.index == periodIndex && period.prepared) {
newPlayingPeriod = period;
} else {
period.release();
}
period = period.nextPeriod;
}
// Update loaded periods.
bufferAheadPeriodCount = 0;
if (newPlayingPeriod != null) {
newPlayingPeriod.nextPeriod = null;
setPlayingPeriod(newPlayingPeriod);
updateTimelineState();
readingPeriod = playingPeriod;
loadingPeriod = playingPeriod;
if (playingPeriod.hasEnabledTracks) {
positionUs = playingPeriod.mediaPeriod.seekToUs(positionUs);
}
resetInternalPosition(positionUs);
maybeContinueLoading();
} else {
for (Renderer renderer : enabledRenderers) {
renderer.disable();
}
enabledRenderers = new Renderer[0];
rendererMediaClock = null;
rendererMediaClockSource = null;
playingPeriod = null;
readingPeriod = null;
loadingPeriod = null;
if (positionUs != C.UNSET_TIME_US) {
resetInternalPosition(positionUs);
}
}
// Update the expose playback information.
if (periodIndex != playbackInfo.periodIndex) { if (periodIndex != playbackInfo.periodIndex) {
playbackInfo = new PlaybackInfo(periodIndex); playbackInfo = new PlaybackInfo(periodIndex);
playbackInfo.startPositionUs = positionUs; playbackInfo.startPositionUs = positionUs;
...@@ -544,9 +600,8 @@ import java.util.ArrayList; ...@@ -544,9 +600,8 @@ import java.util.ArrayList;
} }
private void resetInternalPosition(long periodPositionUs) throws ExoPlaybackException { private void resetInternalPosition(long periodPositionUs) throws ExoPlaybackException {
long sourceOffsetUs = long periodOffsetUs = playingPeriod == null ? 0 : playingPeriod.offsetUs;
internalTimeline.playingPeriod == null ? 0 : internalTimeline.playingPeriod.offsetUs; internalPositionUs = periodOffsetUs + periodPositionUs;
internalPositionUs = sourceOffsetUs + periodPositionUs;
standaloneMediaClock.setPositionUs(internalPositionUs); standaloneMediaClock.setPositionUs(internalPositionUs);
for (Renderer renderer : enabledRenderers) { for (Renderer renderer : enabledRenderers) {
renderer.resetPosition(internalPositionUs); renderer.resetPosition(internalPositionUs);
...@@ -587,7 +642,15 @@ import java.util.ArrayList; ...@@ -587,7 +642,15 @@ import java.util.ArrayList;
mediaSource.releaseSource(); mediaSource.releaseSource();
mediaSource = null; mediaSource = null;
} }
internalTimeline.reset(); releasePeriodsFrom(playingPeriod != null ? playingPeriod : loadingPeriod);
playingPeriodEndPositionUs = C.UNSET_TIME_US;
isTimelineReady = false;
isTimelineEnded = false;
playingPeriod = null;
readingPeriod = null;
loadingPeriod = null;
timeline = null;
bufferAheadPeriodCount = 0;
loadControl.reset(); loadControl.reset();
setIsLoading(false); setIsLoading(false);
} }
...@@ -616,48 +679,90 @@ import java.util.ArrayList; ...@@ -616,48 +679,90 @@ import java.util.ArrayList;
} }
private void reselectTracksInternal() throws ExoPlaybackException { private void reselectTracksInternal() throws ExoPlaybackException {
if (internalTimeline.getPeriod() == null) { if (playingPeriod == null) {
// We don't have tracks yet, so we don't care. // We don't have tracks yet, so we don't care.
return; return;
} }
internalTimeline.reselectTracks(); // Reselect tracks on each period in turn, until the selection changes.
updatePlaybackPositions(); Period period = playingPeriod;
handler.sendEmptyMessage(MSG_DO_SOME_WORK); boolean selectionsChangedForReadPeriod = true;
while (true) {
if (period == null || !period.prepared) {
// The reselection did not change any prepared periods.
return;
}
if (period.selectTracks()) {
// Selected tracks have changed for this period.
break;
}
if (period == readingPeriod) {
// The track reselection didn't affect any period that has been read.
selectionsChangedForReadPeriod = false;
}
period = period.nextPeriod;
} }
// TODO[playlists]: Merge this into the outer class. if (selectionsChangedForReadPeriod) {
/** // Release everything after the playing period because a renderer may have read data from a
* Keeps track of the {@link Period}s of media being played in the timeline. // track whose selection has now changed.
*/ releasePeriodsFrom(playingPeriod.nextPeriod);
private final class InternalTimeline { playingPeriod.nextPeriod = null;
readingPeriod = playingPeriod;
private final Renderer[] renderers; loadingPeriod = playingPeriod;
private final RendererCapabilities[] rendererCapabilities; playingPeriodEndPositionUs = C.UNSET_TIME_US;
bufferAheadPeriodCount = 0;
public boolean isReady;
public boolean isEnded;
private int bufferAheadPeriodCount;
private Period playingPeriod;
private Period readingPeriod;
private Period loadingPeriod;
private long playingPeriodEndPositionUs;
private Timeline timeline; // Update streams for the new selection, recreating all streams if reading ahead.
boolean recreateStreams = readingPeriod != playingPeriod;
TrackSelectionArray playingPeriodOldTrackSelections = playingPeriod.periodTrackSelections;
playingPeriod.updatePeriodTrackSelection(playbackInfo.positionUs, loadControl,
recreateStreams);
public InternalTimeline(Renderer[] renderers) { int enabledRendererCount = 0;
this.renderers = renderers; boolean[] rendererWasEnabledFlags = new boolean[renderers.length];
rendererCapabilities = new RendererCapabilities[renderers.length];
for (int i = 0; i < renderers.length; i++) { for (int i = 0; i < renderers.length; i++) {
rendererCapabilities[i] = renderers[i].getCapabilities(); Renderer renderer = renderers[i];
rendererWasEnabledFlags[i] = renderer.getState() != Renderer.STATE_DISABLED;
TrackSelection oldSelection = playingPeriodOldTrackSelections.get(i);
TrackSelection newSelection = playingPeriod.trackSelections.get(i);
if (newSelection != null) {
enabledRendererCount++;
} }
playingPeriodEndPositionUs = C.UNSET_TIME_US; if (rendererWasEnabledFlags[i]
&& (recreateStreams || !Util.areEqual(oldSelection, newSelection))) {
// We need to disable the renderer so that we can enable it with its new stream.
if (renderer == rendererMediaClockSource) {
// The renderer is providing the media clock.
if (newSelection == null) {
// The renderer won't be re-enabled. Sync standaloneMediaClock so that it can take
// over timing responsibilities.
standaloneMediaClock.setPositionUs(rendererMediaClock.getPositionUs());
} }
rendererMediaClock = null;
public MediaPeriod getPeriod() throws ExoPlaybackException { rendererMediaClockSource = null;
return playingPeriod == null ? null : playingPeriod.mediaPeriod; }
ensureStopped(renderer);
renderer.disable();
}
}
trackSelector.onSelectionActivated(playingPeriod.trackSelectionData);
enableRenderers(rendererWasEnabledFlags, enabledRendererCount);
} else {
// Release and re-prepare/buffer periods after the one whose selection changed.
loadingPeriod = period;
period = loadingPeriod.nextPeriod;
while (period != null) {
period.release();
period = period.nextPeriod;
bufferAheadPeriodCount--;
}
loadingPeriod.nextPeriod = null;
long positionUs = Math.max(0, internalPositionUs - loadingPeriod.offsetUs);
loadingPeriod.updatePeriodTrackSelection(positionUs, loadControl, false);
}
maybeContinueLoading();
updatePlaybackPositions();
handler.sendEmptyMessage(MSG_DO_SOME_WORK);
} }
public boolean haveSufficientBuffer(boolean rebuffering) { public boolean haveSufficientBuffer(boolean rebuffering) {
...@@ -665,8 +770,8 @@ import java.util.ArrayList; ...@@ -665,8 +770,8 @@ import java.util.ArrayList;
return false; return false;
} }
long positionUs = internalPositionUs - loadingPeriod.offsetUs; long positionUs = internalPositionUs - loadingPeriod.offsetUs;
long bufferedPositionUs = !loadingPeriod.prepared ? 0 long bufferedPositionUs =
: loadingPeriod.mediaPeriod.getBufferedPositionUs(); !loadingPeriod.prepared ? 0 : loadingPeriod.mediaPeriod.getBufferedPositionUs();
if (bufferedPositionUs == C.END_OF_SOURCE_US) { if (bufferedPositionUs == C.END_OF_SOURCE_US) {
if (loadingPeriod.isLast) { if (loadingPeriod.isLast) {
return true; return true;
...@@ -688,7 +793,7 @@ import java.util.ArrayList; ...@@ -688,7 +793,7 @@ import java.util.ArrayList;
} }
} }
public void invalidate(Timeline timeline) throws ExoPlaybackException, IOException { public void handleSourceInvalidated(Timeline timeline) throws ExoPlaybackException, IOException {
Timeline oldTimeline = this.timeline; Timeline oldTimeline = this.timeline;
this.timeline = timeline; this.timeline = timeline;
eventHandler.obtainMessage(MSG_TIMELINE_CHANGED, timeline).sendToTarget(); eventHandler.obtainMessage(MSG_TIMELINE_CHANGED, timeline).sendToTarget();
...@@ -733,8 +838,8 @@ import java.util.ArrayList; ...@@ -733,8 +838,8 @@ import java.util.ArrayList;
index++; index++;
if (!period.id.equals(timeline.getPeriodId(index))) { if (!period.id.equals(timeline.getPeriodId(index))) {
if (!seenReadingPeriod) { if (!seenReadingPeriod) {
// Renderers may have read a period that has been removed, so release all loaded // Renderers may have read a period that has been removed, so release all loaded periods
// periods and seek to the playing period index. // and seek to the playing period index.
index = playingPeriod.index; index = playingPeriod.index;
releasePeriodsFrom(playingPeriod); releasePeriodsFrom(playingPeriod);
playingPeriod = null; playingPeriod = null;
...@@ -798,12 +903,11 @@ import java.util.ArrayList; ...@@ -798,12 +903,11 @@ import java.util.ArrayList;
// Update the loading period. // Update the loading period.
if (loadingPeriod == null || (loadingPeriod.isFullyBuffered() && !loadingPeriod.isLast if (loadingPeriod == null || (loadingPeriod.isFullyBuffered() && !loadingPeriod.isLast
&& bufferAheadPeriodCount < MAXIMUM_BUFFER_AHEAD_PERIODS)) { && bufferAheadPeriodCount < MAXIMUM_BUFFER_AHEAD_PERIODS)) {
int periodIndex = int periodIndex = loadingPeriod == null ? playbackInfo.periodIndex : loadingPeriod.index + 1;
loadingPeriod == null ? playbackInfo.periodIndex : loadingPeriod.index + 1;
long startPositionUs = playbackInfo.positionUs; long startPositionUs = playbackInfo.positionUs;
if (loadingPeriod != null || startPositionUs == C.UNSET_TIME_US) { if (loadingPeriod != null || startPositionUs == C.UNSET_TIME_US) {
// We are starting to load the next period or seeking to the default position, so request // We are starting to load the next period or seeking to the default position, so request a
// a period and position from the source. // period and position from the source.
MediaSource.Position defaultStartPosition = MediaSource.Position defaultStartPosition =
mediaSource.getDefaultStartPosition(periodIndex); mediaSource.getDefaultStartPosition(periodIndex);
if (defaultStartPosition != null) { if (defaultStartPosition != null) {
...@@ -826,8 +930,7 @@ import java.util.ArrayList; ...@@ -826,8 +930,7 @@ import java.util.ArrayList;
bufferAheadPeriodCount++; bufferAheadPeriodCount++;
loadingPeriod = newPeriod; loadingPeriod = newPeriod;
setIsLoading(true); setIsLoading(true);
loadingPeriod.mediaPeriod.preparePeriod(ExoPlayerImplInternal.this, loadingPeriod.mediaPeriod.preparePeriod(this, loadControl.getAllocator(), startPositionUs);
loadControl.getAllocator(), startPositionUs);
} }
} }
...@@ -849,8 +952,8 @@ import java.util.ArrayList; ...@@ -849,8 +952,8 @@ import java.util.ArrayList;
} }
while (playingPeriod != readingPeriod && playingPeriod.nextPeriod != null while (playingPeriod != readingPeriod && playingPeriod.nextPeriod != null
&& internalPositionUs >= playingPeriod.nextPeriod.offsetUs) { && internalPositionUs >= playingPeriod.nextPeriod.offsetUs) {
// All enabled renderers' streams have been read to the end, and the playback position // All enabled renderers' streams have been read to the end, and the playback position reached
// reached the end of the playing period, so advance playback to the next period. // the end of the playing period, so advance playback to the next period.
playingPeriod.release(); playingPeriod.release();
setPlayingPeriod(playingPeriod.nextPeriod); setPlayingPeriod(playingPeriod.nextPeriod);
bufferAheadPeriodCount--; bufferAheadPeriodCount--;
...@@ -879,17 +982,16 @@ import java.util.ArrayList; ...@@ -879,17 +982,16 @@ import java.util.ArrayList;
TrackSelection newSelection = newTrackSelections.get(i); TrackSelection newSelection = newTrackSelections.get(i);
if (oldSelection != null) { if (oldSelection != null) {
if (newSelection != null) { if (newSelection != null) {
// Replace the renderer's SampleStream so the transition to playing the next period // Replace the renderer's SampleStream so the transition to playing the next period can
// can be seamless. // be seamless.
Format[] formats = new Format[newSelection.length()]; Format[] formats = new Format[newSelection.length()];
for (int j = 0; j < formats.length; j++) { for (int j = 0; j < formats.length; j++) {
formats[j] = newSelection.getFormat(j); formats[j] = newSelection.getFormat(j);
} }
renderer.replaceStream(formats, readingPeriod.sampleStreams[i], renderer.replaceStream(formats, readingPeriod.sampleStreams[i], readingPeriod.offsetUs);
readingPeriod.offsetUs);
} else { } else {
// The renderer will be disabled when transitioning to playing the next period. Mark // The renderer will be disabled when transitioning to playing the next period. Mark the
// the SampleStream as final to play out any remaining data. // SampleStream as final to play out any remaining data.
renderer.setCurrentStreamIsFinal(); renderer.setCurrentStreamIsFinal();
} }
} }
...@@ -950,146 +1052,6 @@ import java.util.ArrayList; ...@@ -950,146 +1052,6 @@ import java.util.ArrayList;
} }
} }
public long seekTo(int periodIndex, long seekPositionUs) throws ExoPlaybackException {
if (seekPositionUs == C.UNSET_TIME_US) {
// We don't know where to seek to yet, so clear the whole timeline.
periodIndex = Timeline.NO_PERIOD_INDEX;
}
// Clear the timeline, but keep the requested period if it is already prepared.
Period period = playingPeriod;
Period newPlayingPeriod = null;
while (period != null) {
if (period.index == periodIndex && period.prepared) {
newPlayingPeriod = period;
} else {
period.release();
}
period = period.nextPeriod;
}
bufferAheadPeriodCount = 0;
if (newPlayingPeriod != null) {
newPlayingPeriod.nextPeriod = null;
setPlayingPeriod(newPlayingPeriod);
updateTimelineState();
readingPeriod = playingPeriod;
loadingPeriod = playingPeriod;
if (playingPeriod.hasEnabledTracks) {
seekPositionUs = playingPeriod.mediaPeriod.seekToUs(seekPositionUs);
}
resetInternalPosition(seekPositionUs);
maybeContinueLoading();
} else {
for (Renderer renderer : enabledRenderers) {
renderer.disable();
}
enabledRenderers = new Renderer[0];
rendererMediaClock = null;
rendererMediaClockSource = null;
playingPeriod = null;
readingPeriod = null;
loadingPeriod = null;
if (seekPositionUs != C.UNSET_TIME_US) {
resetInternalPosition(seekPositionUs);
}
}
return seekPositionUs;
}
public void reselectTracks() throws ExoPlaybackException {
// Reselect tracks on each period in turn, until the selection changes.
Period period = playingPeriod;
boolean selectionsChangedForReadPeriod = true;
while (true) {
if (period == null || !period.prepared) {
// The reselection did not change any prepared periods.
return;
}
if (period.selectTracks()) {
// Selected tracks have changed for this period.
break;
}
if (period == readingPeriod) {
// The track reselection didn't affect any period that has been read.
selectionsChangedForReadPeriod = false;
}
period = period.nextPeriod;
}
if (selectionsChangedForReadPeriod) {
// Release everything after the playing period because a renderer may have read data from a
// track whose selection has now changed.
releasePeriodsFrom(playingPeriod.nextPeriod);
playingPeriod.nextPeriod = null;
readingPeriod = playingPeriod;
loadingPeriod = playingPeriod;
playingPeriodEndPositionUs = C.UNSET_TIME_US;
bufferAheadPeriodCount = 0;
// Update streams for the new selection, recreating all streams if reading ahead.
boolean recreateStreams = readingPeriod != playingPeriod;
TrackSelectionArray playingPeriodOldTrackSelections = playingPeriod.periodTrackSelections;
playingPeriod.updatePeriodTrackSelection(playbackInfo.positionUs, loadControl,
recreateStreams);
int enabledRendererCount = 0;
boolean[] rendererWasEnabledFlags = new boolean[renderers.length];
for (int i = 0; i < renderers.length; i++) {
Renderer renderer = renderers[i];
rendererWasEnabledFlags[i] = renderer.getState() != Renderer.STATE_DISABLED;
TrackSelection oldSelection = playingPeriodOldTrackSelections.get(i);
TrackSelection newSelection = playingPeriod.trackSelections.get(i);
if (newSelection != null) {
enabledRendererCount++;
}
if (rendererWasEnabledFlags[i]
&& (recreateStreams || !Util.areEqual(oldSelection, newSelection))) {
// We need to disable the renderer so that we can enable it with its new stream.
if (renderer == rendererMediaClockSource) {
// The renderer is providing the media clock.
if (newSelection == null) {
// The renderer won't be re-enabled. Sync standaloneMediaClock so that it can take
// over timing responsibilities.
standaloneMediaClock.setPositionUs(rendererMediaClock.getPositionUs());
}
rendererMediaClock = null;
rendererMediaClockSource = null;
}
ensureStopped(renderer);
renderer.disable();
}
}
trackSelector.onSelectionActivated(playingPeriod.trackSelectionData);
enableRenderers(rendererWasEnabledFlags, enabledRendererCount);
} else {
// Release and re-prepare/buffer periods after the one whose selection changed.
loadingPeriod = period;
period = loadingPeriod.nextPeriod;
while (period != null) {
period.release();
period = period.nextPeriod;
bufferAheadPeriodCount--;
}
loadingPeriod.nextPeriod = null;
long positionUs = Math.max(0, internalPositionUs - loadingPeriod.offsetUs);
loadingPeriod.updatePeriodTrackSelection(positionUs, loadControl, false);
}
maybeContinueLoading();
}
public void reset() {
releasePeriodsFrom(playingPeriod != null ? playingPeriod : loadingPeriod);
playingPeriodEndPositionUs = C.UNSET_TIME_US;
isReady = false;
isEnded = false;
playingPeriod = null;
readingPeriod = null;
loadingPeriod = null;
timeline = null;
bufferAheadPeriodCount = 0;
}
private void releasePeriodsFrom(Period period) { private void releasePeriodsFrom(Period period) {
while (period != null) { while (period != null) {
period.release(); period.release();
...@@ -1127,10 +1089,10 @@ import java.util.ArrayList; ...@@ -1127,10 +1089,10 @@ import java.util.ArrayList;
} }
private void updateTimelineState() { private void updateTimelineState() {
isReady = playingPeriodEndPositionUs == C.UNSET_TIME_US isTimelineReady = playingPeriodEndPositionUs == C.UNSET_TIME_US
|| internalPositionUs < playingPeriodEndPositionUs || internalPositionUs < playingPeriodEndPositionUs
|| (playingPeriod.nextPeriod != null && playingPeriod.nextPeriod.prepared); || (playingPeriod.nextPeriod != null && playingPeriod.nextPeriod.prepared);
isEnded = playingPeriod.isLast; isTimelineEnded = playingPeriod.isLast;
} }
private void enableRenderers(boolean[] rendererWasEnabledFlags, int enabledRendererCount) private void enableRenderers(boolean[] rendererWasEnabledFlags, int enabledRendererCount)
...@@ -1173,8 +1135,6 @@ import java.util.ArrayList; ...@@ -1173,8 +1135,6 @@ import java.util.ArrayList;
} }
} }
}
/** /**
* Represents a {@link MediaPeriod} with information required to play it as part of a timeline. * Represents a {@link MediaPeriod} with information required to play it as part of a timeline.
*/ */
...@@ -1220,8 +1180,8 @@ import java.util.ArrayList; ...@@ -1220,8 +1180,8 @@ import java.util.ArrayList;
} }
public boolean isFullyBuffered() { public boolean isFullyBuffered() {
return prepared && (!hasEnabledTracks return prepared
|| mediaPeriod.getBufferedPositionUs() == C.END_OF_SOURCE_US); && (!hasEnabledTracks || mediaPeriod.getBufferedPositionUs() == C.END_OF_SOURCE_US);
} }
public void handlePrepared(long positionUs, LoadControl loadControl) public void handlePrepared(long positionUs, LoadControl loadControl)
......
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