From 3acd8a6048882902d835d5a6ea999a12ce585027 Mon Sep 17 00:00:00 2001 From: tonihei Date: Tue, 23 Apr 2019 13:36:24 +0100 Subject: [PATCH] Remove unused PlaybackInfo.resetToNewPosition PiperOrigin-RevId: 244838165 --- .../android/exoplayer2/ExoPlayerImpl.java | 7 +++-- .../android/exoplayer2/PlaybackInfo.java | 30 +------------------ 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java index 15deb8ea47..96b9072c5c 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java @@ -628,8 +628,11 @@ import java.util.concurrent.CopyOnWriteArrayList; if (playbackInfo.startPositionUs == C.TIME_UNSET) { // Replace internal unset start position with externally visible start position of zero. playbackInfo = - playbackInfo.resetToNewPosition( - playbackInfo.periodId, /* startPositionUs= */ 0, playbackInfo.contentPositionUs); + playbackInfo.copyWithNewPosition( + playbackInfo.periodId, + /* positionUs= */ 0, + playbackInfo.contentPositionUs, + playbackInfo.totalBufferedDurationUs); } if (!this.playbackInfo.timeline.isEmpty() && playbackInfo.timeline.isEmpty()) { // Update the masking variables, which are used when the timeline becomes empty. diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java index 0792bf0c7d..f45e61fb37 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java @@ -170,35 +170,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult; } /** - * Copies playback info and resets playing and loading position. - * - * @param periodId New playing and loading {@link MediaPeriodId}. - * @param startPositionUs New start position. See {@link #startPositionUs}. - * @param contentPositionUs New content position. See {@link #contentPositionUs}. Value is ignored - * if {@code periodId.isAd()} is true. - * @return Copied playback info with reset position. - */ - @CheckResult - public PlaybackInfo resetToNewPosition( - MediaPeriodId periodId, long startPositionUs, long contentPositionUs) { - return new PlaybackInfo( - timeline, - manifest, - periodId, - startPositionUs, - periodId.isAd() ? contentPositionUs : C.TIME_UNSET, - playbackState, - isLoading, - trackGroups, - trackSelectorResult, - periodId, - startPositionUs, - /* totalBufferedDurationUs= */ 0, - startPositionUs); - } - - /** - * Copied playback info with new playing position. + * Copies playback info with new playing position. * * @param periodId New playing media period. See {@link #periodId}. * @param positionUs New position. See {@link #positionUs}.