Remove ExoPlayerImpl.maskingPeriodIndex

This value was always hard coded to zero. This may be misleading
if the maskingWindowIndex is updated to a non-zero value because
it's not generally possible to have periodIndex=0 and windowIndex>0
in a player state. We can remove the value and since we are just
pretending to know the player state after preparation, use the
same placeholder value as the already existing maskingWindowIndex.

PiperOrigin-RevId: 830881591

Author: tonihei

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java

@@ -243,7 +243,6 @@
 
   // Playback information when there is a pending seek/set source operation.
   private int maskingWindowIndex;
-  private int maskingPeriodIndex;
   private long maskingWindowPositionMs;
 
   @SuppressLint("HandlerLeak")
@@ -1170,7 +1169,7 @@ public PlayerMessage createMessage(Target target) {
   public int getCurrentPeriodIndex() {
     verifyApplicationThread();
     if (playbackInfo.timeline.isEmpty()) {
-      return maskingPeriodIndex;
+      return maskingWindowIndex == C.INDEX_UNSET ? 0 : maskingWindowIndex;
     } else {
       return playbackInfo.timeline.getIndexOfPeriod(playbackInfo.periodId.periodUid);
     }
@@ -2149,7 +2148,6 @@ private void handlePlaybackInfo(ExoPlayerImplInternal.PlaybackInfoUpdate playbac
         // ConcatenatingMediaSource has been cleared.
         maskingWindowIndex = C.INDEX_UNSET;
         maskingWindowPositionMs = 0;
-        maskingPeriodIndex = 0;
       }
       if (!newTimeline.isEmpty()) {
         List<Timeline> timelines = ((PlaylistTimeline) newTimeline).getChildTimelines();
@@ -2358,7 +2356,7 @@ private PositionInfo getPreviousPositionInfo(
     @Nullable Object oldWindowUid = null;
     @Nullable Object oldPeriodUid = null;
     int oldMediaItemIndex = oldMaskingMediaItemIndex;
-    int oldPeriodIndex = C.INDEX_UNSET;
+    int oldPeriodIndex = oldMaskingMediaItemIndex;
     @Nullable MediaItem oldMediaItem = null;
     Timeline.Period oldPeriod = new Timeline.Period();
     if (!oldPlaybackInfo.timeline.isEmpty()) {
@@ -2412,7 +2410,7 @@ private PositionInfo getPositionInfo(long discontinuityWindowStartPositionUs) {
     @Nullable Object newWindowUid = null;
     @Nullable Object newPeriodUid = null;
     int newMediaItemIndex = getCurrentMediaItemIndex();
-    int newPeriodIndex = C.INDEX_UNSET;
+    int newPeriodIndex = getCurrentPeriodIndex();
     @Nullable MediaItem newMediaItem = null;
     if (!playbackInfo.timeline.isEmpty()) {
       newPeriodUid = playbackInfo.periodId.periodUid;
@@ -2824,7 +2822,6 @@ private Pair<Object, Long> maskWindowPositionMsOrGetPeriodPositionUs(
       // If empty we store the initial seek in the masking variables.
       maskingWindowIndex = windowIndex;
       maskingWindowPositionMs = windowPositionMs == C.TIME_UNSET ? 0 : windowPositionMs;
-      maskingPeriodIndex = 0;
       return null;
     }
     if (windowIndex == C.INDEX_UNSET || windowIndex >= timeline.getWindowCount()) {

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java

@@ -12957,15 +12957,31 @@ public void seekTo_callsOnPositionDiscontinuity() throws Exception {
   }
 
   @Test
-  public void seekTo_whenTimelineEmpty_callsOnPositionDiscontinuity() {
+  public void seekTo_whenTimelineEmpty_callsOnPositionDiscontinuityAndSetsCorrectIndices() {
     ExoPlayer player = parameterizeTestExoPlayerBuilder(new TestExoPlayerBuilder(context)).build();
     Player.Listener listener = mock(Player.Listener.class);
     player.addListener(listener);
 
+    int mediaItemIndex0 = player.getCurrentMediaItemIndex();
+    int periodIndex0 = player.getCurrentPeriodIndex();
     player.seekTo(/* positionMs= */ 7 * C.MILLIS_PER_SECOND);
+    int mediaItemIndex1 = player.getCurrentMediaItemIndex();
+    int periodIndex1 = player.getCurrentPeriodIndex();
     player.seekTo(/* mediaItemIndex= */ 1, /* positionMs= */ C.MILLIS_PER_SECOND);
+    int mediaItemIndex2 = player.getCurrentMediaItemIndex();
+    int periodIndex2 = player.getCurrentPeriodIndex();
     player.seekTo(/* positionMs= */ 5 * C.MILLIS_PER_SECOND);
-
+    int mediaItemIndex3 = player.getCurrentMediaItemIndex();
+    int periodIndex3 = player.getCurrentPeriodIndex();
+
+    assertThat(mediaItemIndex0).isEqualTo(0);
+    assertThat(periodIndex0).isEqualTo(0);
+    assertThat(mediaItemIndex1).isEqualTo(0);
+    assertThat(periodIndex1).isEqualTo(0);
+    assertThat(mediaItemIndex2).isEqualTo(1);
+    assertThat(periodIndex2).isEqualTo(1);
+    assertThat(mediaItemIndex3).isEqualTo(1);
+    assertThat(periodIndex3).isEqualTo(1);
     ArgumentCaptor<Player.PositionInfo> oldPosition =
         ArgumentCaptor.forClass(Player.PositionInfo.class);
     ArgumentCaptor<Player.PositionInfo> newPosition =
@@ -12980,31 +12996,37 @@ public void seekTo_whenTimelineEmpty_callsOnPositionDiscontinuity() {
     // a seek from initial state to masked seek position
     assertThat(oldPositions.get(0).windowUid).isNull();
     assertThat(oldPositions.get(0).mediaItemIndex).isEqualTo(0);
+    assertThat(oldPositions.get(0).periodIndex).isEqualTo(0);
     assertThat(oldPositions.get(0).mediaItem).isNull();
     assertThat(oldPositions.get(0).positionMs).isEqualTo(0);
     assertThat(oldPositions.get(0).contentPositionMs).isEqualTo(0);
     assertThat(newPositions.get(0).mediaItemIndex).isEqualTo(0);
+    assertThat(newPositions.get(0).periodIndex).isEqualTo(0);
     assertThat(newPositions.get(0).windowUid).isNull();
     assertThat(newPositions.get(0).positionMs).isEqualTo(7_000);
     assertThat(newPositions.get(0).contentPositionMs).isEqualTo(7_000);
     // a seek from masked seek position to another masked position across windows
     assertThat(oldPositions.get(1).windowUid).isNull();
     assertThat(oldPositions.get(1).mediaItemIndex).isEqualTo(0);
+    assertThat(oldPositions.get(1).periodIndex).isEqualTo(0);
     assertThat(oldPositions.get(1).mediaItem).isNull();
     assertThat(oldPositions.get(1).positionMs).isEqualTo(7_000);
     assertThat(oldPositions.get(1).contentPositionMs).isEqualTo(7_000);
     assertThat(newPositions.get(1).windowUid).isNull();
     assertThat(newPositions.get(1).mediaItemIndex).isEqualTo(1);
+    assertThat(newPositions.get(1).periodIndex).isEqualTo(1);
     assertThat(newPositions.get(1).positionMs).isEqualTo(1_000);
     assertThat(newPositions.get(1).contentPositionMs).isEqualTo(1_000);
     // a seek from masked seek position to another masked position within media item
     assertThat(oldPositions.get(2).windowUid).isNull();
     assertThat(oldPositions.get(2).mediaItemIndex).isEqualTo(1);
+    assertThat(oldPositions.get(2).periodIndex).isEqualTo(1);
     assertThat(oldPositions.get(2).mediaItem).isNull();
     assertThat(oldPositions.get(2).positionMs).isEqualTo(1_000);
     assertThat(oldPositions.get(2).contentPositionMs).isEqualTo(1_000);
     assertThat(newPositions.get(2).windowUid).isNull();
     assertThat(newPositions.get(2).mediaItemIndex).isEqualTo(1);
+    assertThat(newPositions.get(2).periodIndex).isEqualTo(1);
     assertThat(newPositions.get(2).positionMs).isEqualTo(5_000);
     assertThat(newPositions.get(2).contentPositionMs).isEqualTo(5_000);
     player.release();