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

Remove unused code path

Browse Source 
The deleted path was only used if resetPosition=false and clearPlaylist=true,
which is never the case.

PiperOrigin-RevId: 291154550
This commit is contained in:
tonihei 2020-01-23 14:23:28 +00:00 committed by Ian Baker
parent 23f316d67e
commit 454d4add4a
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1125,20 +1125,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
} }
enabledRenderers = new Renderer[0]; enabledRenderers = new Renderer[0];
if (resetPosition) {
pendingInitialSeekPosition = null;
} else if (clearPlaylist) {
// When clearing the playlist, also reset the period-based PlaybackInfo position and convert
// existing position to initial seek instead.
resetPosition = true;
if (pendingInitialSeekPosition == null && !playbackInfo.timeline.isEmpty()) {
playbackInfo.timeline.getPeriodByUid(playbackInfo.periodId.periodUid, period);
long windowPositionUs = playbackInfo.positionUs + period.getPositionInWindowUs();
pendingInitialSeekPosition =
new SeekPosition(Timeline.EMPTY, period.windowIndex, windowPositionUs);
}
}
queue.clear(); queue.clear();
shouldContinueLoading = false; shouldContinueLoading = false;
Timeline timeline = playbackInfo.timeline; Timeline timeline = playbackInfo.timeline;
@ -1155,6 +1141,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
long contentPositionUs = playbackInfo.contentPositionUs; long contentPositionUs = playbackInfo.contentPositionUs;
boolean resetTrackInfo = clearPlaylist; boolean resetTrackInfo = clearPlaylist;
if (resetPosition) { if (resetPosition) {
pendingInitialSeekPosition = null;
Pair<MediaPeriodId, Long> firstPeriodAndPosition = getDummyFirstMediaPeriodPosition(); Pair<MediaPeriodId, Long> firstPeriodAndPosition = getDummyFirstMediaPeriodPosition();
mediaPeriodId = firstPeriodAndPosition.first; mediaPeriodId = firstPeriodAndPosition.first;
startPositionUs = firstPeriodAndPosition.second; startPositionUs = firstPeriodAndPosition.second;