loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ExoPlayerImplInternal: Some more minor cleanup

Browse Source 
- This should be a no-op change
- Inline attemptRestart
- Clean up processing of pending seeks

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=139804630
This commit is contained in:
olly 2016-11-21 10:50:30 -08:00 committed by Oliver Woodman
parent 9d7d8adc9c
commit 4f3ab7b22d
1 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -839,17 +839,21 @@ import java.io.IOException;
timeline = timelineAndManifest.first; timeline = timelineAndManifest.first;
Object manifest = timelineAndManifest.second; Object manifest = timelineAndManifest.second;
int processedInitialSeekCount = 0;
if (oldTimeline == null) { if (oldTimeline == null) {
if (pendingInitialSeekCount > 0) { if (pendingInitialSeekCount > 0) {
Pair<Integer, Long> periodPosition = resolveSeekPosition(pendingSeekPosition); Pair<Integer, Long> periodPosition = resolveSeekPosition(pendingSeekPosition);
if (periodPosition == null) { if (periodPosition == null) {
// We failed to resolve the seek position. Stop the player. // We failed to resolve the seek position. Stop the player.
finishSourceInfoRefresh(manifest, false); notifySourceInfoRefresh(manifest, 0);
// TODO: We should probably propagate an error here. // TODO: We should probably propagate an error here.
stopInternal(); stopInternal();
return; return;
} }
playbackInfo = new PlaybackInfo(periodPosition.first, periodPosition.second); playbackInfo = new PlaybackInfo(periodPosition.first, periodPosition.second);
processedInitialSeekCount = pendingInitialSeekCount;
pendingInitialSeekCount = 0;
pendingSeekPosition = null;
} else if (playbackInfo.startPositionUs == C.TIME_UNSET) { } else if (playbackInfo.startPositionUs == C.TIME_UNSET) {
Pair<Integer, Long> defaultPosition = getPeriodPosition(0, C.TIME_UNSET); Pair<Integer, Long> defaultPosition = getPeriodPosition(0, C.TIME_UNSET);
playbackInfo = new PlaybackInfo(defaultPosition.first, defaultPosition.second); playbackInfo = new PlaybackInfo(defaultPosition.first, defaultPosition.second);
@ -860,19 +864,34 @@ import java.io.IOException;
: loadingPeriodHolder; : loadingPeriodHolder;
if (periodHolder == null) { if (periodHolder == null) {
// We don't have any period holders, so we're done. // We don't have any period holders, so we're done.
finishSourceInfoRefresh(manifest, true); notifySourceInfoRefresh(manifest, processedInitialSeekCount);
return; return;
} }
int periodIndex = timeline.getIndexOfPeriod(periodHolder.uid); int periodIndex = timeline.getIndexOfPeriod(periodHolder.uid);
if (periodIndex == C.INDEX_UNSET) { if (periodIndex == C.INDEX_UNSET) {
// We didn't find the current period in the new timeline. Attempt to restart. // We didn't find the current period in the new timeline. Attempt to resolve a subsequent
boolean restarted = attemptRestart(periodHolder, oldTimeline, timeline); // period whose window we can restart from.
finishSourceInfoRefresh(manifest, true); int newPeriodIndex = resolveSubsequentPeriod(periodHolder.index, oldTimeline, timeline);
if (!restarted) { if (newPeriodIndex == C.INDEX_UNSET) {
// We failed to resolve a subsequent period. Stop the player.
notifySourceInfoRefresh(manifest, processedInitialSeekCount);
// TODO: We should probably propagate an error here. // TODO: We should probably propagate an error here.
stopInternal(); stopInternal();
return;
} }
// Release all loaded periods.
releasePeriodHoldersFrom(periodHolder);
playingPeriodHolder = null;
readingPeriodHolder = null;
loadingPeriodHolder = null;
// Find the default initial position in the window and seek to it.
Pair<Integer, Long> defaultPosition = getPeriodPosition(
timeline.getPeriod(newPeriodIndex, period).windowIndex, C.TIME_UNSET);
newPeriodIndex = defaultPosition.first;
long newPlayingPositionUs = defaultPosition.second;
playbackInfo = new PlaybackInfo(newPeriodIndex, newPlayingPositionUs);
notifySourceInfoRefresh(manifest, processedInitialSeekCount);
return; return;
} }
@ -925,40 +944,12 @@ import java.io.IOException;
} }
} }
finishSourceInfoRefresh(manifest, true); notifySourceInfoRefresh(manifest, processedInitialSeekCount);
} }
private boolean attemptRestart(MediaPeriodHolder oldPeriodHolder, Timeline oldTimeline, private void notifySourceInfoRefresh(Object manifest, int processedInitialSeekCount) {
Timeline newTimeline) { eventHandler.obtainMessage(MSG_SOURCE_INFO_REFRESHED,
int newPeriodIndex = resolveSubsequentPeriod(oldPeriodHolder.index, oldTimeline, newTimeline); new SourceInfo(timeline, manifest, playbackInfo, processedInitialSeekCount)).sendToTarget();
if (newPeriodIndex == C.INDEX_UNSET) {
// We failed to find a replacement period. Stop the player.
return false;
}
// Release all loaded periods.
releasePeriodHoldersFrom(oldPeriodHolder);
playingPeriodHolder = null;
readingPeriodHolder = null;
loadingPeriodHolder = null;
// Find the default initial position in the window and seek to it.
Pair<Integer, Long> defaultPosition = getPeriodPosition(
timeline.getPeriod(newPeriodIndex, period).windowIndex, C.TIME_UNSET);
newPeriodIndex = defaultPosition.first;
long newPlayingPositionUs = defaultPosition.second;
playbackInfo = new PlaybackInfo(newPeriodIndex, newPlayingPositionUs);
return true;
}
private void finishSourceInfoRefresh(Object manifest, boolean processedInitialSeeks) {
SourceInfo sourceInfo = new SourceInfo(timeline, manifest, playbackInfo,
processedInitialSeeks ? pendingInitialSeekCount : 0);
eventHandler.obtainMessage(MSG_SOURCE_INFO_REFRESHED, sourceInfo).sendToTarget();
if (processedInitialSeeks) {
pendingInitialSeekCount = 0;
pendingSeekPosition = null;
}
} }
/** /**