rename Playlist to MediaSourceList

This CL is a renaming only. It's mostly about finding a decent naming for the internal Playlist class. The plan is to have a public Playlist class in the converged Player API, so we need to rename the internal one.

PiperOrigin-RevId: 305266196

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

@@ -68,7 +68,7 @@ import java.util.concurrent.TimeoutException;
   private final CopyOnWriteArrayList<ListenerHolder> listeners;
   private final CopyOnWriteArrayList<ListenerHolder> listeners;
   private final Timeline.Period period;
   private final Timeline.Period period;
   private final ArrayDeque<Runnable> pendingListenerNotifications;
   private final ArrayDeque<Runnable> pendingListenerNotifications;
-  private final List<Playlist.MediaSourceHolder> mediaSourceHolders;
+  private final List<MediaSourceList.MediaSourceHolder> mediaSourceHolders;
   private final boolean useLazyPreparation;
   private final boolean useLazyPreparation;
   private final MediaSourceFactory mediaSourceFactory;
   private final MediaSourceFactory mediaSourceFactory;
 
 
@@ -401,7 +401,7 @@ import java.util.concurrent.TimeoutException;
     long currentPositionMs = getCurrentPosition();
     long currentPositionMs = getCurrentPosition();
     Timeline oldTimeline = getCurrentTimeline();
     Timeline oldTimeline = getCurrentTimeline();
     pendingOperationAcks++;
     pendingOperationAcks++;
-    List<Playlist.MediaSourceHolder> holders = addMediaSourceHolders(index, mediaSources);
+    List<MediaSourceList.MediaSourceHolder> holders = addMediaSourceHolders(index, mediaSources);
     PlaybackInfo playbackInfo =
     PlaybackInfo playbackInfo =
         maskTimelineAndWindowIndex(currentWindowIndex, currentPositionMs, oldTimeline);
         maskTimelineAndWindowIndex(currentWindowIndex, currentPositionMs, oldTimeline);
     internalPlayer.addMediaSources(index, holders, shuffleOrder);
     internalPlayer.addMediaSources(index, holders, shuffleOrder);
@@ -432,7 +432,7 @@ import java.util.concurrent.TimeoutException;
     Timeline oldTimeline = getCurrentTimeline();
     Timeline oldTimeline = getCurrentTimeline();
     pendingOperationAcks++;
     pendingOperationAcks++;
     newFromIndex = Math.min(newFromIndex, mediaSourceHolders.size() - (toIndex - fromIndex));
     newFromIndex = Math.min(newFromIndex, mediaSourceHolders.size() - (toIndex - fromIndex));
-    Playlist.moveMediaSourceHolders(mediaSourceHolders, fromIndex, toIndex, newFromIndex);
+    MediaSourceList.moveMediaSourceHolders(mediaSourceHolders, fromIndex, toIndex, newFromIndex);
     PlaybackInfo playbackInfo =
     PlaybackInfo playbackInfo =
         maskTimelineAndWindowIndex(currentWindowIndex, currentPositionMs, oldTimeline);
         maskTimelineAndWindowIndex(currentWindowIndex, currentPositionMs, oldTimeline);
     internalPlayer.moveMediaSources(fromIndex, toIndex, newFromIndex, shuffleOrder);
     internalPlayer.moveMediaSources(fromIndex, toIndex, newFromIndex, shuffleOrder);
@@ -977,7 +977,8 @@ import java.util.concurrent.TimeoutException;
       removeMediaSourceHolders(
       removeMediaSourceHolders(
           /* fromIndex= */ 0, /* toIndexExclusive= */ mediaSourceHolders.size());
           /* fromIndex= */ 0, /* toIndexExclusive= */ mediaSourceHolders.size());
     }
     }
-    List<Playlist.MediaSourceHolder> holders = addMediaSourceHolders(/* index= */ 0, mediaItems);
+    List<MediaSourceList.MediaSourceHolder> holders =
+        addMediaSourceHolders(/* index= */ 0, mediaItems);
     PlaybackInfo playbackInfo = maskTimeline();
     PlaybackInfo playbackInfo = maskTimeline();
     Timeline timeline = playbackInfo.timeline;
     Timeline timeline = playbackInfo.timeline;
     if (!timeline.isEmpty() && startWindowIndex >= timeline.getWindowCount()) {
     if (!timeline.isEmpty() && startWindowIndex >= timeline.getWindowCount()) {
@@ -1016,12 +1017,12 @@ import java.util.concurrent.TimeoutException;
         /* seekProcessed= */ false);
         /* seekProcessed= */ false);
   }
   }
 
 
-  private List<Playlist.MediaSourceHolder> addMediaSourceHolders(
+  private List<MediaSourceList.MediaSourceHolder> addMediaSourceHolders(
       int index, List<MediaSource> mediaSources) {
       int index, List<MediaSource> mediaSources) {
-    List<Playlist.MediaSourceHolder> holders = new ArrayList<>();
+    List<MediaSourceList.MediaSourceHolder> holders = new ArrayList<>();
     for (int i = 0; i < mediaSources.size(); i++) {
     for (int i = 0; i < mediaSources.size(); i++) {
-      Playlist.MediaSourceHolder holder =
-          new Playlist.MediaSourceHolder(mediaSources.get(i), useLazyPreparation);
+      MediaSourceList.MediaSourceHolder holder =
+          new MediaSourceList.MediaSourceHolder(mediaSources.get(i), useLazyPreparation);
       holders.add(holder);
       holders.add(holder);
       mediaSourceHolders.add(i + index, holder);
       mediaSourceHolders.add(i + index, holder);
     }
     }
@@ -1062,9 +1063,9 @@ import java.util.concurrent.TimeoutException;
         /* seekProcessed= */ false);
         /* seekProcessed= */ false);
   }
   }
 
 
-  private List<Playlist.MediaSourceHolder> removeMediaSourceHolders(
+  private List<MediaSourceList.MediaSourceHolder> removeMediaSourceHolders(
       int fromIndex, int toIndexExclusive) {
       int fromIndex, int toIndexExclusive) {
-    List<Playlist.MediaSourceHolder> removed = new ArrayList<>();
+    List<MediaSourceList.MediaSourceHolder> removed = new ArrayList<>();
     for (int i = toIndexExclusive - 1; i >= fromIndex; i--) {
     for (int i = toIndexExclusive - 1; i >= fromIndex; i--) {
       removed.add(mediaSourceHolders.remove(i));
       removed.add(mediaSourceHolders.remove(i));
     }
     }
@@ -1076,7 +1077,7 @@ import java.util.concurrent.TimeoutException;
     return playbackInfo.copyWithTimeline(
     return playbackInfo.copyWithTimeline(
         mediaSourceHolders.isEmpty()
         mediaSourceHolders.isEmpty()
             ? Timeline.EMPTY
             ? Timeline.EMPTY
-            : new Playlist.PlaylistTimeline(mediaSourceHolders, shuffleOrder));
+            : new MediaSourceList.PlaylistTimeline(mediaSourceHolders, shuffleOrder));
   }
   }
 
 
   private PlaybackInfo maskTimelineAndWindowIndex(
   private PlaybackInfo maskTimelineAndWindowIndex(

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

@@ -62,7 +62,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   private final boolean[] mayRetainStreamFlags;
   private final boolean[] mayRetainStreamFlags;
   private final RendererCapabilities[] rendererCapabilities;
   private final RendererCapabilities[] rendererCapabilities;
   private final TrackSelector trackSelector;
   private final TrackSelector trackSelector;
-  private final Playlist playlist;
+  private final MediaSourceList mediaSourceList;
 
 
   @Nullable private MediaPeriodHolder next;
   @Nullable private MediaPeriodHolder next;
   private TrackGroupArray trackGroups;
   private TrackGroupArray trackGroups;
@@ -76,7 +76,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
    * @param rendererPositionOffsetUs The renderer time of the start of the period, in microseconds.
    * @param rendererPositionOffsetUs The renderer time of the start of the period, in microseconds.
    * @param trackSelector The track selector.
    * @param trackSelector The track selector.
    * @param allocator The allocator.
    * @param allocator The allocator.
-   * @param playlist The playlist.
+   * @param mediaSourceList The playlist.
    * @param info Information used to identify this media period in its timeline period.
    * @param info Information used to identify this media period in its timeline period.
    * @param emptyTrackSelectorResult A {@link TrackSelectorResult} with empty selections for each
    * @param emptyTrackSelectorResult A {@link TrackSelectorResult} with empty selections for each
    *     renderer.
    *     renderer.
@@ -86,13 +86,13 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       long rendererPositionOffsetUs,
       long rendererPositionOffsetUs,
       TrackSelector trackSelector,
       TrackSelector trackSelector,
       Allocator allocator,
       Allocator allocator,
-      Playlist playlist,
+      MediaSourceList mediaSourceList,
       MediaPeriodInfo info,
       MediaPeriodInfo info,
       TrackSelectorResult emptyTrackSelectorResult) {
       TrackSelectorResult emptyTrackSelectorResult) {
     this.rendererCapabilities = rendererCapabilities;
     this.rendererCapabilities = rendererCapabilities;
     this.rendererPositionOffsetUs = rendererPositionOffsetUs;
     this.rendererPositionOffsetUs = rendererPositionOffsetUs;
     this.trackSelector = trackSelector;
     this.trackSelector = trackSelector;
-    this.playlist = playlist;
+    this.mediaSourceList = mediaSourceList;
     this.uid = info.id.periodUid;
     this.uid = info.id.periodUid;
     this.info = info;
     this.info = info;
     this.trackGroups = TrackGroupArray.EMPTY;
     this.trackGroups = TrackGroupArray.EMPTY;
@@ -100,7 +100,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     sampleStreams = new SampleStream[rendererCapabilities.length];
     sampleStreams = new SampleStream[rendererCapabilities.length];
     mayRetainStreamFlags = new boolean[rendererCapabilities.length];
     mayRetainStreamFlags = new boolean[rendererCapabilities.length];
     mediaPeriod =
     mediaPeriod =
-        createMediaPeriod(info.id, playlist, allocator, info.startPositionUs, info.endPositionUs);
+        createMediaPeriod(
+            info.id, mediaSourceList, allocator, info.startPositionUs, info.endPositionUs);
   }
   }
 
 
   /**
   /**
@@ -315,7 +316,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   /** Releases the media period. No other method should be called after the release. */
   /** Releases the media period. No other method should be called after the release. */
   public void release() {
   public void release() {
     disableTrackSelectionsInResult();
     disableTrackSelectionsInResult();
-    releaseMediaPeriod(info.endPositionUs, playlist, mediaPeriod);
+    releaseMediaPeriod(info.endPositionUs, mediaSourceList, mediaPeriod);
   }
   }
 
 
   /**
   /**
@@ -412,11 +413,11 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   /** Returns a media period corresponding to the given {@code id}. */
   /** Returns a media period corresponding to the given {@code id}. */
   private static MediaPeriod createMediaPeriod(
   private static MediaPeriod createMediaPeriod(
       MediaPeriodId id,
       MediaPeriodId id,
-      Playlist playlist,
+      MediaSourceList mediaSourceList,
       Allocator allocator,
       Allocator allocator,
       long startPositionUs,
       long startPositionUs,
       long endPositionUs) {
       long endPositionUs) {
-    MediaPeriod mediaPeriod = playlist.createPeriod(id, allocator, startPositionUs);
+    MediaPeriod mediaPeriod = mediaSourceList.createPeriod(id, allocator, startPositionUs);
     if (endPositionUs != C.TIME_UNSET && endPositionUs != C.TIME_END_OF_SOURCE) {
     if (endPositionUs != C.TIME_UNSET && endPositionUs != C.TIME_END_OF_SOURCE) {
       mediaPeriod =
       mediaPeriod =
           new ClippingMediaPeriod(
           new ClippingMediaPeriod(
@@ -427,12 +428,12 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
 
   /** Releases the given {@code mediaPeriod}, logging and suppressing any errors. */
   /** Releases the given {@code mediaPeriod}, logging and suppressing any errors. */
   private static void releaseMediaPeriod(
   private static void releaseMediaPeriod(
-      long endPositionUs, Playlist playlist, MediaPeriod mediaPeriod) {
+      long endPositionUs, MediaSourceList mediaSourceList, MediaPeriod mediaPeriod) {
     try {
     try {
       if (endPositionUs != C.TIME_UNSET && endPositionUs != C.TIME_END_OF_SOURCE) {
       if (endPositionUs != C.TIME_UNSET && endPositionUs != C.TIME_END_OF_SOURCE) {
-        playlist.releasePeriod(((ClippingMediaPeriod) mediaPeriod).mediaPeriod);
+        mediaSourceList.releasePeriod(((ClippingMediaPeriod) mediaPeriod).mediaPeriod);
       } else {
       } else {
-        playlist.releasePeriod(mediaPeriod);
+        mediaSourceList.releasePeriod(mediaPeriod);
       }
       }
     } catch (RuntimeException e) {
     } catch (RuntimeException e) {
       // There's nothing we can do.
       // There's nothing we can do.

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

@@ -132,7 +132,7 @@ import com.google.android.exoplayer2.util.Assertions;
    * @param rendererCapabilities The renderer capabilities.
    * @param rendererCapabilities The renderer capabilities.
    * @param trackSelector The track selector.
    * @param trackSelector The track selector.
    * @param allocator The allocator.
    * @param allocator The allocator.
-   * @param playlist The playlist.
+   * @param mediaSourceList The list of media sources.
    * @param info Information used to identify this media period in its timeline period.
    * @param info Information used to identify this media period in its timeline period.
    * @param emptyTrackSelectorResult A {@link TrackSelectorResult} with empty selections for each
    * @param emptyTrackSelectorResult A {@link TrackSelectorResult} with empty selections for each
    *     renderer.
    *     renderer.
@@ -141,7 +141,7 @@ import com.google.android.exoplayer2.util.Assertions;
       RendererCapabilities[] rendererCapabilities,
       RendererCapabilities[] rendererCapabilities,
       TrackSelector trackSelector,
       TrackSelector trackSelector,
       Allocator allocator,
       Allocator allocator,
-      Playlist playlist,
+      MediaSourceList mediaSourceList,
       MediaPeriodInfo info,
       MediaPeriodInfo info,
       TrackSelectorResult emptyTrackSelectorResult) {
       TrackSelectorResult emptyTrackSelectorResult) {
     long rendererPositionOffsetUs =
     long rendererPositionOffsetUs =
@@ -156,7 +156,7 @@ import com.google.android.exoplayer2.util.Assertions;
             rendererPositionOffsetUs,
             rendererPositionOffsetUs,
             trackSelector,
             trackSelector,
             allocator,
             allocator,
-            playlist,
+            mediaSourceList,
             info,
             info,
             emptyTrackSelectorResult);
             emptyTrackSelectorResult);
     if (loading != null) {
     if (loading != null) {

library/core/src/main/java/com/google/android/exoplayer2/Playlist.java → library/core/src/main/java/com/google/android/exoplayer2/MediaSourceList.java

@@ -51,10 +51,10 @@ import java.util.Set;
  *
  *
  * <p>With the exception of the constructor, all methods are called on the playback thread.
  * <p>With the exception of the constructor, all methods are called on the playback thread.
  */
  */
-/* package */ class Playlist {
+/* package */ class MediaSourceList {
 
 
   /** Listener for source events. */
   /** Listener for source events. */
-  public interface PlaylistInfoRefreshListener {
+  public interface MediaSourceListInfoRefreshListener {
 
 
     /**
     /**
      * Called when the timeline of a media item has changed and a new timeline that reflects the
      * Called when the timeline of a media item has changed and a new timeline that reflects the
@@ -68,9 +68,9 @@ import java.util.Set;
   private final List<MediaSourceHolder> mediaSourceHolders;
   private final List<MediaSourceHolder> mediaSourceHolders;
   private final Map<MediaPeriod, MediaSourceHolder> mediaSourceByMediaPeriod;
   private final Map<MediaPeriod, MediaSourceHolder> mediaSourceByMediaPeriod;
   private final Map<Object, MediaSourceHolder> mediaSourceByUid;
   private final Map<Object, MediaSourceHolder> mediaSourceByUid;
-  private final PlaylistInfoRefreshListener playlistInfoListener;
+  private final MediaSourceListInfoRefreshListener mediaSourceListInfoListener;
   private final MediaSourceEventListener.EventDispatcher eventDispatcher;
   private final MediaSourceEventListener.EventDispatcher eventDispatcher;
-  private final HashMap<Playlist.MediaSourceHolder, MediaSourceAndListener> childSources;
+  private final HashMap<MediaSourceList.MediaSourceHolder, MediaSourceAndListener> childSources;
   private final Set<MediaSourceHolder> enabledMediaSourceHolders;
   private final Set<MediaSourceHolder> enabledMediaSourceHolders;
 
 
   private ShuffleOrder shuffleOrder;
   private ShuffleOrder shuffleOrder;
@@ -79,8 +79,8 @@ import java.util.Set;
   @Nullable private TransferListener mediaTransferListener;
   @Nullable private TransferListener mediaTransferListener;
 
 
   @SuppressWarnings("initialization")
   @SuppressWarnings("initialization")
-  public Playlist(PlaylistInfoRefreshListener listener) {
-    playlistInfoListener = listener;
+  public MediaSourceList(MediaSourceListInfoRefreshListener listener) {
+    mediaSourceListInfoListener = listener;
     shuffleOrder = new DefaultShuffleOrder(0);
     shuffleOrder = new DefaultShuffleOrder(0);
     mediaSourceByMediaPeriod = new IdentityHashMap<>();
     mediaSourceByMediaPeriod = new IdentityHashMap<>();
     mediaSourceByUid = new HashMap<>();
     mediaSourceByUid = new HashMap<>();
@@ -426,7 +426,7 @@ import java.util.Set;
   private void prepareChildSource(MediaSourceHolder holder) {
   private void prepareChildSource(MediaSourceHolder holder) {
     MediaSource mediaSource = holder.mediaSource;
     MediaSource mediaSource = holder.mediaSource;
     MediaSource.MediaSourceCaller caller =
     MediaSource.MediaSourceCaller caller =
-        (source, timeline) -> playlistInfoListener.onPlaylistUpdateRequested();
+        (source, timeline) -> mediaSourceListInfoListener.onPlaylistUpdateRequested();
     ForwardingEventListener eventListener = new ForwardingEventListener(holder);
     ForwardingEventListener eventListener = new ForwardingEventListener(holder);
     childSources.put(holder, new MediaSourceAndListener(mediaSource, caller, eventListener));
     childSources.put(holder, new MediaSourceAndListener(mediaSource, caller, eventListener));
     mediaSource.addEventListener(Util.createHandler(), eventListener);
     mediaSource.addEventListener(Util.createHandler(), eventListener);
@@ -594,11 +594,11 @@ import java.util.Set;
   private final class ForwardingEventListener
   private final class ForwardingEventListener
       implements MediaSourceEventListener, DrmSessionEventListener {
       implements MediaSourceEventListener, DrmSessionEventListener {
 
 
-    private final Playlist.MediaSourceHolder id;
+    private final MediaSourceList.MediaSourceHolder id;
     private EventDispatcher eventDispatcher;
     private EventDispatcher eventDispatcher;
 
 
-    public ForwardingEventListener(Playlist.MediaSourceHolder id) {
-      eventDispatcher = Playlist.this.eventDispatcher;
+    public ForwardingEventListener(MediaSourceList.MediaSourceHolder id) {
+      eventDispatcher = MediaSourceList.this.eventDispatcher;
       this.id = id;
       this.id = id;
     }
     }
 
 
@@ -750,7 +750,7 @@ import java.util.Set;
       if (eventDispatcher.windowIndex != windowIndex
       if (eventDispatcher.windowIndex != windowIndex
           || !Util.areEqual(eventDispatcher.mediaPeriodId, mediaPeriodId)) {
           || !Util.areEqual(eventDispatcher.mediaPeriodId, mediaPeriodId)) {
         eventDispatcher =
         eventDispatcher =
-            Playlist.this.eventDispatcher.withParameters(
+            MediaSourceList.this.eventDispatcher.withParameters(
                 windowIndex, mediaPeriodId, /* mediaTimeOffsetMs= */ 0L);
                 windowIndex, mediaPeriodId, /* mediaTimeOffsetMs= */ 0L);
       }
       }
       return true;
       return true;

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

@@ -63,14 +63,14 @@ public final class MediaPeriodQueueTest {
   private RendererCapabilities[] rendererCapabilities;
   private RendererCapabilities[] rendererCapabilities;
   private TrackSelector trackSelector;
   private TrackSelector trackSelector;
   private Allocator allocator;
   private Allocator allocator;
-  private Playlist playlist;
+  private MediaSourceList mediaSourceList;
   private FakeMediaSource fakeMediaSource;
   private FakeMediaSource fakeMediaSource;
-  private Playlist.MediaSourceHolder mediaSourceHolder;
+  private MediaSourceList.MediaSourceHolder mediaSourceHolder;
 
 
   @Before
   @Before
   public void setUp() {
   public void setUp() {
     mediaPeriodQueue = new MediaPeriodQueue();
     mediaPeriodQueue = new MediaPeriodQueue();
-    playlist = mock(Playlist.class);
+    mediaSourceList = mock(MediaSourceList.class);
     rendererCapabilities = new RendererCapabilities[0];
     rendererCapabilities = new RendererCapabilities[0];
     trackSelector = mock(TrackSelector.class);
     trackSelector = mock(TrackSelector.class);
     allocator = mock(Allocator.class);
     allocator = mock(Allocator.class);
@@ -403,7 +403,7 @@ public final class MediaPeriodQueueTest {
 
 
   private void setupTimeline(Timeline timeline) {
   private void setupTimeline(Timeline timeline) {
     fakeMediaSource = new FakeMediaSource(timeline);
     fakeMediaSource = new FakeMediaSource(timeline);
-    mediaSourceHolder = new Playlist.MediaSourceHolder(fakeMediaSource, false);
+    mediaSourceHolder = new MediaSourceList.MediaSourceHolder(fakeMediaSource, false);
     mediaSourceHolder.mediaSource.prepareSourceInternal(/* mediaTransferListener */ null);
     mediaSourceHolder.mediaSource.prepareSourceInternal(/* mediaTransferListener */ null);
 
 
     Timeline playlistTimeline = createPlaylistTimeline();
     Timeline playlistTimeline = createPlaylistTimeline();
@@ -441,8 +441,8 @@ public final class MediaPeriodQueueTest {
     playbackInfo = playbackInfo.copyWithTimeline(createPlaylistTimeline());
     playbackInfo = playbackInfo.copyWithTimeline(createPlaylistTimeline());
   }
   }
 
 
-  private Playlist.PlaylistTimeline createPlaylistTimeline() {
-    return new Playlist.PlaylistTimeline(
+  private MediaSourceList.PlaylistTimeline createPlaylistTimeline() {
+    return new MediaSourceList.PlaylistTimeline(
         Collections.singleton(mediaSourceHolder),
         Collections.singleton(mediaSourceHolder),
         new ShuffleOrder.DefaultShuffleOrder(/* length= */ 1));
         new ShuffleOrder.DefaultShuffleOrder(/* length= */ 1));
   }
   }
@@ -467,7 +467,7 @@ public final class MediaPeriodQueueTest {
         rendererCapabilities,
         rendererCapabilities,
         trackSelector,
         trackSelector,
         allocator,
         allocator,
-        playlist,
+        mediaSourceList,
         getNextMediaPeriodInfo(),
         getNextMediaPeriodInfo(),
         new TrackSelectorResult(
         new TrackSelectorResult(
             new RendererConfiguration[0], new TrackSelection[0], /* info= */ null));
             new RendererConfiguration[0], new TrackSelection[0], /* info= */ null));