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

Rename EPII.copyWithNewPosition to handlePositionDiscontinuity

Browse Source 
The new name better reflects the purpose of the method.

PiperOrigin-RevId: 298835578
This commit is contained in:
tonihei 2020-03-04 14:18:37 +00:00 committed by Oliver Woodman
parent 8b9f7c5628
commit 0339a33430
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -712,7 +712,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
/* forceBufferingState= */ false); /* forceBufferingState= */ false);
if (newPositionUs != playbackInfo.positionUs) { if (newPositionUs != playbackInfo.positionUs) {
playbackInfo = playbackInfo =
copyWithNewPosition(periodId, newPositionUs, playbackInfo.requestedContentPositionUs); handlePositionDiscontinuity(
periodId, newPositionUs, playbackInfo.requestedContentPositionUs);
if (sendDiscontinuity) { if (sendDiscontinuity) {
playbackInfoUpdate.setPositionDiscontinuity(Player.DISCONTINUITY_REASON_INTERNAL); playbackInfoUpdate.setPositionDiscontinuity(Player.DISCONTINUITY_REASON_INTERNAL);
} }
@ -751,7 +752,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
// renderers are flushed. Only report the discontinuity externally if the position changed. // renderers are flushed. Only report the discontinuity externally if the position changed.
if (discontinuityPositionUs != playbackInfo.positionUs) { if (discontinuityPositionUs != playbackInfo.positionUs) {
playbackInfo = playbackInfo =
copyWithNewPosition( handlePositionDiscontinuity(
playbackInfo.periodId, playbackInfo.periodId,
discontinuityPositionUs, discontinuityPositionUs,
playbackInfo.requestedContentPositionUs); playbackInfo.requestedContentPositionUs);
@ -972,7 +973,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
periodPositionUs = newPeriodPositionUs; periodPositionUs = newPeriodPositionUs;
} }
} finally { } finally {
playbackInfo = copyWithNewPosition(periodId, periodPositionUs, requestedContentPosition); playbackInfo =
handlePositionDiscontinuity(periodId, periodPositionUs, requestedContentPosition);
if (seekPositionAdjusted) { if (seekPositionAdjusted) {
playbackInfoUpdate.setPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT); playbackInfoUpdate.setPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT);
} }
@ -1430,7 +1432,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
playingPeriodHolder.applyTrackSelection( playingPeriodHolder.applyTrackSelection(
newTrackSelectorResult, playbackInfo.positionUs, recreateStreams, streamResetFlags); newTrackSelectorResult, playbackInfo.positionUs, recreateStreams, streamResetFlags);
playbackInfo = playbackInfo =
copyWithNewPosition( handlePositionDiscontinuity(
playbackInfo.periodId, periodPositionUs, playbackInfo.requestedContentPositionUs); playbackInfo.periodId, periodPositionUs, playbackInfo.requestedContentPositionUs);
if (playbackInfo.playbackState != Player.STATE_ENDED if (playbackInfo.playbackState != Player.STATE_ENDED
&& periodPositionUs != playbackInfo.positionUs) { && periodPositionUs != playbackInfo.positionUs) {
@ -1596,7 +1598,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
if (periodPositionChanged if (periodPositionChanged
|| newRequestedContentPositionUs != playbackInfo.requestedContentPositionUs) { || newRequestedContentPositionUs != playbackInfo.requestedContentPositionUs) {
playbackInfo = playbackInfo =
copyWithNewPosition(newPeriodId, newPositionUs, newRequestedContentPositionUs); handlePositionDiscontinuity(newPeriodId, newPositionUs, newRequestedContentPositionUs);
} }
resetPendingPauseAtEndOfPeriod(); resetPendingPauseAtEndOfPeriod();
resolvePendingMessagePositions( resolvePendingMessagePositions(
@ -1774,7 +1776,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
disablePlayingPeriodRenderersForTransition(rendererWasEnabledFlags); disablePlayingPeriodRenderersForTransition(rendererWasEnabledFlags);
MediaPeriodHolder newPlayingPeriodHolder = queue.advancePlayingPeriod(); MediaPeriodHolder newPlayingPeriodHolder = queue.advancePlayingPeriod();
playbackInfo = playbackInfo =
copyWithNewPosition( handlePositionDiscontinuity(
newPlayingPeriodHolder.info.id, newPlayingPeriodHolder.info.id,
newPlayingPeriodHolder.info.startPositionUs, newPlayingPeriodHolder.info.startPositionUs,
newPlayingPeriodHolder.info.requestedContentPositionUs); newPlayingPeriodHolder.info.requestedContentPositionUs);
@ -1858,7 +1860,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
resetRendererPosition(loadingPeriodHolder.info.startPositionUs); resetRendererPosition(loadingPeriodHolder.info.startPositionUs);
enablePlayingPeriodRenderers(); enablePlayingPeriodRenderers();
playbackInfo = playbackInfo =
copyWithNewPosition( handlePositionDiscontinuity(
playbackInfo.periodId, playbackInfo.periodId,
playbackInfo.positionUs, playbackInfo.positionUs,
playbackInfo.requestedContentPositionUs); playbackInfo.requestedContentPositionUs);
@ -1937,7 +1939,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
} }
@CheckResult @CheckResult
private PlaybackInfo copyWithNewPosition( private PlaybackInfo handlePositionDiscontinuity(
MediaPeriodId mediaPeriodId, long positionUs, long contentPositionUs) { MediaPeriodId mediaPeriodId, long positionUs, long contentPositionUs) {
deliverPendingMessageAtStartPositionRequired = deliverPendingMessageAtStartPositionRequired =
deliverPendingMessageAtStartPositionRequired deliverPendingMessageAtStartPositionRequired