Implement addMediaItems(List) and clearMediaItems() in BasePlayer

PiperOrigin-RevId: 361487730

extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java

@@ -317,11 +317,6 @@ public final class CastPlayer extends BasePlayer {
   }
   }
 
 
   @Override
   @Override
-  public void addMediaItems(List<MediaItem> mediaItems) {
-    addMediaItemsInternal(toMediaQueueItems(mediaItems), MediaQueueItem.INVALID_ITEM_ID);
-  }
-
-  @Override
   public void addMediaItems(int index, List<MediaItem> mediaItems) {
   public void addMediaItems(int index, List<MediaItem> mediaItems) {
     Assertions.checkArgument(index >= 0);
     Assertions.checkArgument(index >= 0);
     int uid = MediaQueueItem.INVALID_ITEM_ID;
     int uid = MediaQueueItem.INVALID_ITEM_ID;
@@ -353,8 +348,8 @@ public final class CastPlayer extends BasePlayer {
 
 
   @Override
   @Override
   public void removeMediaItems(int fromIndex, int toIndex) {
   public void removeMediaItems(int fromIndex, int toIndex) {
-    Assertions.checkArgument(
-        fromIndex >= 0 && toIndex >= fromIndex && toIndex <= currentTimeline.getWindowCount());
+    Assertions.checkArgument(fromIndex >= 0 && toIndex >= fromIndex);
+    toIndex = min(toIndex, currentTimeline.getWindowCount());
     if (fromIndex == toIndex) {
     if (fromIndex == toIndex) {
       // Do nothing.
       // Do nothing.
       return;
       return;
@@ -367,11 +362,6 @@ public final class CastPlayer extends BasePlayer {
   }
   }
 
 
   @Override
   @Override
-  public void clearMediaItems() {
-    removeMediaItems(/* fromIndex= */ 0, /* toIndex= */ currentTimeline.getWindowCount());
-  }
-
-  @Override
   public boolean isCommandAvailable(@Command int command) {
   public boolean isCommandAvailable(@Command int command) {
     return availableCommands.contains(command);
     return availableCommands.contains(command);
   }
   }

library/common/src/main/java/com/google/android/exoplayer2/BasePlayer.java

@@ -60,6 +60,11 @@ public abstract class BasePlayer implements Player {
   }
   }
 
 
   @Override
   @Override
+  public final void addMediaItems(List<MediaItem> mediaItems) {
+    addMediaItems(/* index= */ Integer.MAX_VALUE, mediaItems);
+  }
+
+  @Override
   public final void moveMediaItem(int currentIndex, int newIndex) {
   public final void moveMediaItem(int currentIndex, int newIndex) {
     if (currentIndex != newIndex) {
     if (currentIndex != newIndex) {
       moveMediaItems(/* fromIndex= */ currentIndex, /* toIndex= */ currentIndex + 1, newIndex);
       moveMediaItems(/* fromIndex= */ currentIndex, /* toIndex= */ currentIndex + 1, newIndex);
@@ -72,6 +77,11 @@ public abstract class BasePlayer implements Player {
   }
   }
 
 
   @Override
   @Override
+  public final void clearMediaItems() {
+    removeMediaItems(/* fromIndex= */ 0, /* toIndex= */ Integer.MAX_VALUE);
+  }
+
+  @Override
   public final void play() {
   public final void play() {
     setPlayWhenReady(true);
     setPlayWhenReady(true);
   }
   }

library/common/src/main/java/com/google/android/exoplayer2/Player.java

@@ -1153,7 +1153,8 @@ public interface Player {
   /**
   /**
    * Adds a media item at the given index of the playlist.
    * Adds a media item at the given index of the playlist.
    *
    *
-   * @param index The index at which to add the item.
+   * @param index The index at which to add the media item. If the index is larger than the size of
+   *     the playlist, the media item is added to the end of the playlist.
    * @param mediaItem The {@link MediaItem} to add.
    * @param mediaItem The {@link MediaItem} to add.
    */
    */
   void addMediaItem(int index, MediaItem mediaItem);
   void addMediaItem(int index, MediaItem mediaItem);
@@ -1168,7 +1169,8 @@ public interface Player {
   /**
   /**
    * Adds a list of media items at the given index of the playlist.
    * Adds a list of media items at the given index of the playlist.
    *
    *
-   * @param index The index at which to add the media items.
+   * @param index The index at which to add the media items. If the index is larger than the size of
+   *     the playlist, the media items are added to the end of the playlist.
    * @param mediaItems The {@link MediaItem MediaItems} to add.
    * @param mediaItems The {@link MediaItem MediaItems} to add.
    */
    */
   void addMediaItems(int index, List<MediaItem> mediaItems);
   void addMediaItems(int index, List<MediaItem> mediaItems);
@@ -1204,7 +1206,8 @@ public interface Player {
    * Removes a range of media items from the playlist.
    * Removes a range of media items from the playlist.
    *
    *
    * @param fromIndex The index at which to start removing media items.
    * @param fromIndex The index at which to start removing media items.
-   * @param toIndex The index of the first item to be kept (exclusive).
+   * @param toIndex The index of the first item to be kept (exclusive). If the index is larger than
+   *     the size of the playlist, media items to the end of the playlist are removed.
    */
    */
   void removeMediaItems(int fromIndex, int toIndex);
   void removeMediaItems(int fromIndex, int toIndex);
 
 

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

@@ -416,12 +416,8 @@ import java.util.List;
   }
   }
 
 
   @Override
   @Override
-  public void addMediaItems(List<MediaItem> mediaItems) {
-    addMediaItems(/* index= */ mediaSourceHolderSnapshots.size(), mediaItems);
-  }
-
-  @Override
   public void addMediaItems(int index, List<MediaItem> mediaItems) {
   public void addMediaItems(int index, List<MediaItem> mediaItems) {
+    index = min(index, mediaSourceHolderSnapshots.size());
     addMediaSources(index, createMediaSources(mediaItems));
     addMediaSources(index, createMediaSources(mediaItems));
   }
   }
 
 
@@ -464,6 +460,7 @@ import java.util.List;
 
 
   @Override
   @Override
   public void removeMediaItems(int fromIndex, int toIndex) {
   public void removeMediaItems(int fromIndex, int toIndex) {
+    toIndex = min(toIndex, mediaSourceHolderSnapshots.size());
     PlaybackInfo playbackInfo = removeMediaItemsInternal(fromIndex, toIndex);
     PlaybackInfo playbackInfo = removeMediaItemsInternal(fromIndex, toIndex);
     updatePlaybackInfo(
     updatePlaybackInfo(
         playbackInfo,
         playbackInfo,
@@ -502,11 +499,6 @@ import java.util.List;
   }
   }
 
 
   @Override
   @Override
-  public void clearMediaItems() {
-    removeMediaItems(/* fromIndex= */ 0, /* toIndex= */ mediaSourceHolderSnapshots.size());
-  }
-
-  @Override
   public void setShuffleOrder(ShuffleOrder shuffleOrder) {
   public void setShuffleOrder(ShuffleOrder shuffleOrder) {
     Timeline timeline = createMaskingTimeline();
     Timeline timeline = createMaskingTimeline();
     PlaybackInfo newPlaybackInfo =
     PlaybackInfo newPlaybackInfo =

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

@@ -1358,12 +1358,6 @@ public class SimpleExoPlayer extends BasePlayer
   }
   }
 
 
   @Override
   @Override
-  public void addMediaItems(List<MediaItem> mediaItems) {
-    verifyApplicationThread();
-    player.addMediaItems(mediaItems);
-  }
-
-  @Override
   public void addMediaItems(int index, List<MediaItem> mediaItems) {
   public void addMediaItems(int index, List<MediaItem> mediaItems) {
     verifyApplicationThread();
     verifyApplicationThread();
     player.addMediaItems(index, mediaItems);
     player.addMediaItems(index, mediaItems);
@@ -1406,12 +1400,6 @@ public class SimpleExoPlayer extends BasePlayer
   }
   }
 
 
   @Override
   @Override
-  public void clearMediaItems() {
-    verifyApplicationThread();
-    player.clearMediaItems();
-  }
-
-  @Override
   public void setShuffleOrder(ShuffleOrder shuffleOrder) {
   public void setShuffleOrder(ShuffleOrder shuffleOrder) {
     verifyApplicationThread();
     verifyApplicationThread();
     player.setShuffleOrder(shuffleOrder);
     player.setShuffleOrder(shuffleOrder);

testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java

@@ -193,11 +193,6 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
   }
   }
 
 
   @Override
   @Override
-  public void addMediaItems(List<MediaItem> mediaItems) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
   public void addMediaItems(int index, List<MediaItem> mediaItems) {
   public void addMediaItems(int index, List<MediaItem> mediaItems) {
     throw new UnsupportedOperationException();
     throw new UnsupportedOperationException();
   }
   }
@@ -233,11 +228,6 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
   }
   }
 
 
   @Override
   @Override
-  public void clearMediaItems() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
   public boolean isCommandAvailable(int command) {
   public boolean isCommandAvailable(int command) {
     throw new UnsupportedOperationException();
     throw new UnsupportedOperationException();
   }
   }