loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-15 11:39:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use period holder indices to determine if a period was seen

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=160257503
This commit is contained in:
andrewlewis 2017-06-27 03:41:30 -07:00 committed by Oliver Woodman
parent 444dbeb4c4
commit d4059ecc65
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
View File

@ -430,35 +430,39 @@ import java.io.IOException;
private void setRepeatModeInternal(@ExoPlayer.RepeatMode int repeatMode) private void setRepeatModeInternal(@ExoPlayer.RepeatMode int repeatMode)
throws ExoPlaybackException { throws ExoPlaybackException {
this.repeatMode = repeatMode; this.repeatMode = repeatMode;
// Check if all existing period holders match the new period order.
// Find the last existing period holder that matches the new period order.
MediaPeriodHolder lastValidPeriodHolder = playingPeriodHolder != null MediaPeriodHolder lastValidPeriodHolder = playingPeriodHolder != null
? playingPeriodHolder : loadingPeriodHolder; ? playingPeriodHolder : loadingPeriodHolder;
if (lastValidPeriodHolder == null) { if (lastValidPeriodHolder == null) {
return; return;
} }
boolean seenReadingPeriodHolder = lastValidPeriodHolder == readingPeriodHolder;
boolean seenLoadingPeriodHolder = lastValidPeriodHolder == loadingPeriodHolder;
int nextPeriodIndex = timeline.getNextPeriodIndex(lastValidPeriodHolder.periodIndex, period, int nextPeriodIndex = timeline.getNextPeriodIndex(lastValidPeriodHolder.periodIndex, period,
window, repeatMode); window, repeatMode);
while (lastValidPeriodHolder.next != null && nextPeriodIndex != C.INDEX_UNSET while (lastValidPeriodHolder.next != null && nextPeriodIndex != C.INDEX_UNSET
&& lastValidPeriodHolder.next.periodIndex == nextPeriodIndex) { && lastValidPeriodHolder.next.periodIndex == nextPeriodIndex) {
lastValidPeriodHolder = lastValidPeriodHolder.next; lastValidPeriodHolder = lastValidPeriodHolder.next;
seenReadingPeriodHolder |= lastValidPeriodHolder == readingPeriodHolder;
seenLoadingPeriodHolder |= lastValidPeriodHolder == loadingPeriodHolder;
nextPeriodIndex = timeline.getNextPeriodIndex(lastValidPeriodHolder.periodIndex, period, nextPeriodIndex = timeline.getNextPeriodIndex(lastValidPeriodHolder.periodIndex, period,
window, repeatMode); window, repeatMode);
} }
// Release all period holder beyond the last one matching the new period order.
// Release any period holders that don't match the new period order.
int loadingPeriodHolderIndex = loadingPeriodHolder.index;
int readingPeriodHolderIndex =
readingPeriodHolder != null ? readingPeriodHolder.index : C.INDEX_UNSET;
if (lastValidPeriodHolder.next != null) { if (lastValidPeriodHolder.next != null) {
releasePeriodHoldersFrom(lastValidPeriodHolder.next); releasePeriodHoldersFrom(lastValidPeriodHolder.next);
lastValidPeriodHolder.next = null; lastValidPeriodHolder.next = null;
} }
// Update isFinal flag.
lastValidPeriodHolder.isFinal = isFinalPeriod(lastValidPeriodHolder.periodIndex); lastValidPeriodHolder.isFinal = isFinalPeriod(lastValidPeriodHolder.periodIndex);
// Handle cases where loadingPeriodHolder or readingPeriodHolder have been removed. // Handle cases where loadingPeriodHolder or readingPeriodHolder have been removed.
boolean seenLoadingPeriodHolder = loadingPeriodHolderIndex <= lastValidPeriodHolder.index;
if (!seenLoadingPeriodHolder) { if (!seenLoadingPeriodHolder) {
loadingPeriodHolder = lastValidPeriodHolder; loadingPeriodHolder = lastValidPeriodHolder;
} }
boolean seenReadingPeriodHolder = readingPeriodHolderIndex != C.INDEX_UNSET
&& readingPeriodHolderIndex <= lastValidPeriodHolder.index;
if (!seenReadingPeriodHolder && playingPeriodHolder != null) { if (!seenReadingPeriodHolder && playingPeriodHolder != null) {
// Renderers may have read from a period that's been removed. Seek back to the current // Renderers may have read from a period that's been removed. Seek back to the current
// position of the playing period to make sure none of the removed period is played. // position of the playing period to make sure none of the removed period is played.
@ -466,6 +470,7 @@ import java.io.IOException;
long newPositionUs = seekToPeriodPosition(playingPeriodIndex, playbackInfo.positionUs); long newPositionUs = seekToPeriodPosition(playingPeriodIndex, playbackInfo.positionUs);
playbackInfo = new PlaybackInfo(playingPeriodIndex, newPositionUs); playbackInfo = new PlaybackInfo(playingPeriodIndex, newPositionUs);
} }
// Restart buffering if playback has ended and repetition is enabled. // Restart buffering if playback has ended and repetition is enabled.
if (state == ExoPlayer.STATE_ENDED && repeatMode != ExoPlayer.REPEAT_MODE_OFF) { if (state == ExoPlayer.STATE_ENDED && repeatMode != ExoPlayer.REPEAT_MODE_OFF) {
setState(ExoPlayer.STATE_BUFFERING); setState(ExoPlayer.STATE_BUFFERING);
@ -1011,7 +1016,6 @@ import java.io.IOException;
// The current period is in the new timeline. Update the holder and playbackInfo. // The current period is in the new timeline. Update the holder and playbackInfo.
periodHolder.setPeriodIndex(periodIndex, isFinalPeriod(periodIndex)); periodHolder.setPeriodIndex(periodIndex, isFinalPeriod(periodIndex));
boolean seenReadingPeriod = periodHolder == readingPeriodHolder;
if (periodIndex != playbackInfo.periodIndex) { if (periodIndex != playbackInfo.periodIndex) {
playbackInfo = playbackInfo.copyWithPeriodIndex(periodIndex); playbackInfo = playbackInfo.copyWithPeriodIndex(periodIndex);
} }
@ -1026,10 +1030,11 @@ import java.io.IOException;
&& periodHolder.uid.equals(timeline.getPeriod(periodIndex, period, true).uid)) { && periodHolder.uid.equals(timeline.getPeriod(periodIndex, period, true).uid)) {
// The holder is consistent with the new timeline. Update its index and continue. // The holder is consistent with the new timeline. Update its index and continue.
periodHolder.setPeriodIndex(periodIndex, isFinalPeriod(periodIndex)); periodHolder.setPeriodIndex(periodIndex, isFinalPeriod(periodIndex));
seenReadingPeriod |= (periodHolder == readingPeriodHolder);
} else { } else {
// The holder is inconsistent with the new timeline. // The holder is inconsistent with the new timeline.
if (!seenReadingPeriod) { boolean seenReadingPeriodHolder =
readingPeriodHolder != null && readingPeriodHolder.index < periodHolder.index;
if (!seenReadingPeriodHolder) {
// Renderers may have read from a period that's been removed. Seek back to the current // Renderers may have read from a period that's been removed. Seek back to the current
// position of the playing period to make sure none of the removed period is played. // position of the playing period to make sure none of the removed period is played.
periodIndex = playingPeriodHolder.periodIndex; periodIndex = playingPeriodHolder.periodIndex;