No-op restructure of playlist update handling.

This restructure moves all the position resolving code to a static method and
removes the dependency of the MediaPeriodQueue on having an up-to-date timeline.

Both steps allow simplified reasoning about the code as the static method can't change
the state of the player, and there is no risk the queue can use the wrong timeline.

These propoerties allow to fix a bug causing inconsistent states in a follow-up step.

PiperOrigin-RevId: 290616395

library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java

@@ -839,7 +839,7 @@ import java.util.concurrent.TimeoutException;
     long startPositionUs = playbackInfo.positionUs;
     long startPositionUs = playbackInfo.positionUs;
     if (clearPlaylist) {
     if (clearPlaylist) {
       timeline = Timeline.EMPTY;
       timeline = Timeline.EMPTY;
-      mediaPeriodId = playbackInfo.getDummyPeriodForEmptyTimeline();
+      mediaPeriodId = PlaybackInfo.getDummyPeriodForEmptyTimeline();
       contentPositionUs = C.TIME_UNSET;
       contentPositionUs = C.TIME_UNSET;
       startPositionUs = C.TIME_UNSET;
       startPositionUs = C.TIME_UNSET;
     }
     }

library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java

@@ -151,35 +151,8 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
     this.positionUs = positionUs;
     this.positionUs = positionUs;
   }
   }
 
 
-  /**
-   * Returns dummy media period id for the first-to-be-played period of the current timeline.
-   *
-   * @param shuffleModeEnabled Whether shuffle mode is enabled.
-   * @param window A writable {@link Timeline.Window}.
-   * @param period A writable {@link Timeline.Period}.
-   * @return A dummy media period id for the first-to-be-played period of the current timeline.
-   */
-  public MediaPeriodId getDummyFirstMediaPeriodId(
-      boolean shuffleModeEnabled, Timeline.Window window, Timeline.Period period) {
-    if (timeline.isEmpty()) {
-      return getDummyPeriodForEmptyTimeline();
-    }
-    int firstWindowIndex = timeline.getFirstWindowIndex(shuffleModeEnabled);
-    int firstPeriodIndex = timeline.getWindow(firstWindowIndex, window).firstPeriodIndex;
-    int currentPeriodIndex = timeline.getIndexOfPeriod(periodId.periodUid);
-    long windowSequenceNumber = C.INDEX_UNSET;
-    if (currentPeriodIndex != C.INDEX_UNSET) {
-      int currentWindowIndex = timeline.getPeriod(currentPeriodIndex, period).windowIndex;
-      if (firstWindowIndex == currentWindowIndex) {
-        // Keep window sequence number if the new position is still in the same window.
-        windowSequenceNumber = periodId.windowSequenceNumber;
-      }
-    }
-    return new MediaPeriodId(timeline.getUidOfPeriod(firstPeriodIndex), windowSequenceNumber);
-  }
-
   /** Returns dummy period id for an empty timeline. */
   /** Returns dummy period id for an empty timeline. */
-  public MediaPeriodId getDummyPeriodForEmptyTimeline() {
+  public static MediaPeriodId getDummyPeriodForEmptyTimeline() {
     return DUMMY_MEDIA_PERIOD_ID;
     return DUMMY_MEDIA_PERIOD_ID;
   }
   }
 
 

library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java

@@ -202,7 +202,7 @@ public final class MediaPeriodQueueTest {
     setAdGroupLoaded(/* adGroupIndex= */ 1);
     setAdGroupLoaded(/* adGroupIndex= */ 1);
     boolean changeHandled =
     boolean changeHandled =
         mediaPeriodQueue.updateQueuedPeriods(
         mediaPeriodQueue.updateQueuedPeriods(
-            /* rendererPositionUs= */ 0, /* maxRendererReadPositionUs= */ 0);
+            playbackInfo.timeline, /* rendererPositionUs= */ 0, /* maxRendererReadPositionUs= */ 0);
 
 
     assertThat(changeHandled).isTrue();
     assertThat(changeHandled).isTrue();
     assertThat(getQueueLength()).isEqualTo(3);
     assertThat(getQueueLength()).isEqualTo(3);
@@ -228,7 +228,9 @@ public final class MediaPeriodQueueTest {
     setAdGroupLoaded(/* adGroupIndex= */ 1);
     setAdGroupLoaded(/* adGroupIndex= */ 1);
     boolean changeHandled =
     boolean changeHandled =
         mediaPeriodQueue.updateQueuedPeriods(
         mediaPeriodQueue.updateQueuedPeriods(
-            /* rendererPositionUs= */ 0, /* maxRendererReadPositionUs= */ FIRST_AD_START_TIME_US);
+            playbackInfo.timeline,
+            /* rendererPositionUs= */ 0,
+            /* maxRendererReadPositionUs= */ FIRST_AD_START_TIME_US);
 
 
     assertThat(changeHandled).isFalse();
     assertThat(changeHandled).isFalse();
     assertThat(getQueueLength()).isEqualTo(1);
     assertThat(getQueueLength()).isEqualTo(1);
@@ -256,6 +258,7 @@ public final class MediaPeriodQueueTest {
     long readingPositionAtStartOfContentBetweenAds = FIRST_AD_START_TIME_US + AD_DURATION_US;
     long readingPositionAtStartOfContentBetweenAds = FIRST_AD_START_TIME_US + AD_DURATION_US;
     boolean changeHandled =
     boolean changeHandled =
         mediaPeriodQueue.updateQueuedPeriods(
         mediaPeriodQueue.updateQueuedPeriods(
+            playbackInfo.timeline,
             /* rendererPositionUs= */ 0,
             /* rendererPositionUs= */ 0,
             /* maxRendererReadPositionUs= */ readingPositionAtStartOfContentBetweenAds);
             /* maxRendererReadPositionUs= */ readingPositionAtStartOfContentBetweenAds);
 
 
@@ -285,6 +288,7 @@ public final class MediaPeriodQueueTest {
     long readingPositionAtEndOfContentBetweenAds = SECOND_AD_START_TIME_US + AD_DURATION_US;
     long readingPositionAtEndOfContentBetweenAds = SECOND_AD_START_TIME_US + AD_DURATION_US;
     boolean changeHandled =
     boolean changeHandled =
         mediaPeriodQueue.updateQueuedPeriods(
         mediaPeriodQueue.updateQueuedPeriods(
+            playbackInfo.timeline,
             /* rendererPositionUs= */ 0,
             /* rendererPositionUs= */ 0,
             /* maxRendererReadPositionUs= */ readingPositionAtEndOfContentBetweenAds);
             /* maxRendererReadPositionUs= */ readingPositionAtEndOfContentBetweenAds);
 
 
@@ -313,7 +317,9 @@ public final class MediaPeriodQueueTest {
     setAdGroupLoaded(/* adGroupIndex= */ 1);
     setAdGroupLoaded(/* adGroupIndex= */ 1);
     boolean changeHandled =
     boolean changeHandled =
         mediaPeriodQueue.updateQueuedPeriods(
         mediaPeriodQueue.updateQueuedPeriods(
-            /* rendererPositionUs= */ 0, /* maxRendererReadPositionUs= */ C.TIME_END_OF_SOURCE);
+            playbackInfo.timeline,
+            /* rendererPositionUs= */ 0,
+            /* maxRendererReadPositionUs= */ C.TIME_END_OF_SOURCE);
 
 
     assertThat(changeHandled).isFalse();
     assertThat(changeHandled).isFalse();
     assertThat(getQueueLength()).isEqualTo(3);
     assertThat(getQueueLength()).isEqualTo(3);
@@ -332,12 +338,11 @@ public final class MediaPeriodQueueTest {
 
 
     Timeline timeline = createPlaylistTimeline();
     Timeline timeline = createPlaylistTimeline();
     periodUid = timeline.getUidOfPeriod(/* periodIndex= */ 0);
     periodUid = timeline.getUidOfPeriod(/* periodIndex= */ 0);
-    mediaPeriodQueue.setTimeline(timeline);
 
 
     playbackInfo =
     playbackInfo =
         new PlaybackInfo(
         new PlaybackInfo(
             timeline,
             timeline,
-            mediaPeriodQueue.resolveMediaPeriodIdForAds(periodUid, /* positionUs= */ 0),
+            mediaPeriodQueue.resolveMediaPeriodIdForAds(timeline, periodUid, /* positionUs= */ 0),
             /* startPositionUs= */ 0,
             /* startPositionUs= */ 0,
             /* contentPositionUs= */ 0,
             /* contentPositionUs= */ 0,
             Player.STATE_READY,
             Player.STATE_READY,
@@ -361,7 +366,7 @@ public final class MediaPeriodQueueTest {
     SinglePeriodAdTimeline adTimeline =
     SinglePeriodAdTimeline adTimeline =
         new SinglePeriodAdTimeline(CONTENT_TIMELINE, adPlaybackState);
         new SinglePeriodAdTimeline(CONTENT_TIMELINE, adPlaybackState);
     fakeMediaSource.setNewSourceInfo(adTimeline, /* manifest */ null);
     fakeMediaSource.setNewSourceInfo(adTimeline, /* manifest */ null);
-    mediaPeriodQueue.setTimeline(createPlaylistTimeline());
+    playbackInfo = playbackInfo.copyWithTimeline(createPlaylistTimeline());
   }
   }
 
 
   private Playlist.PlaylistTimeline createPlaylistTimeline() {
   private Playlist.PlaylistTimeline createPlaylistTimeline() {