Rename TracksInfo and TrackGroupInfo

1. TracksInfo is renamed to Tracks 2. TracksInfo.TrackGroupInfo is renamed to Tracks.Group PiperOrigin-RevId: 441232373

Rename TracksInfo and TrackGroupInfo
1. TracksInfo is renamed to Tracks 2. TracksInfo.TrackGroupInfo is renamed to Tracks.Group PiperOrigin-RevId: 441232373
0ad508b1 · olly · Ian Baker · 3f47c1ea · 0ad508b1 · 0ad508b1
Commit 0ad508b1 authored Apr 12, 2022 by olly Committed by Ian Baker Apr 26, 2022
Showing with 514 additions and 532 deletions
demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
docs/track-selection.md
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/AdTagLoader.java
extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeExoPlayer.java
library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
library/common/src/main/java/com/google/android/exoplayer2/Player.java
library/common/src/main/java/com/google/android/exoplayer2/TracksInfo.java → library/common/src/main/java/com/google/android/exoplayer2/Tracks.java
library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionOverride.java
library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
library/common/src/test/java/com/google/android/exoplayer2/TracksInfoTest.java
library/common/src/test/java/com/google/android/exoplayer2/TracksTest.java
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollector.java
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
@@ -25,7 +25,7 @@ import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Player.DiscontinuityReason;
 import com.google.android.exoplayer2.Player.TimelineChangeReason;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.ext.cast.CastPlayer;
 import com.google.android.exoplayer2.ext.cast.SessionAvailabilityListener;
 import com.google.android.exoplayer2.ui.StyledPlayerControlView;
@@ -57,7 +57,7 @@ import java.util.ArrayList;
  private final ArrayList<MediaItem> mediaQueue;
  private final Listener listener;
-  private TracksInfo lastSeenTrackGroupInfo;
+  private Tracks lastSeenTracks;
  private int currentItemIndex;
  private Player currentPlayer;
@@ -219,19 +219,19 @@ import java.util.ArrayList;
  }
  @Override
-  public void onTracksInfoChanged(TracksInfo tracksInfo) {
+  public void onTracksChanged(Tracks tracks) {
-    if (currentPlayer != localPlayer || tracksInfo == lastSeenTrackGroupInfo) {
+    if (currentPlayer != localPlayer || tracks == lastSeenTracks) {
      return;
    }
-    if (tracksInfo.containsType(C.TRACK_TYPE_VIDEO)
+    if (tracks.containsType(C.TRACK_TYPE_VIDEO)
-        && !tracksInfo.isTypeSupported(C.TRACK_TYPE_VIDEO, /* allowExceedsCapabilities= */ true)) {
+        && !tracks.isTypeSupported(C.TRACK_TYPE_VIDEO, /* allowExceedsCapabilities= */ true)) {
      listener.onUnsupportedTrack(C.TRACK_TYPE_VIDEO);
    }
-    if (tracksInfo.containsType(C.TRACK_TYPE_AUDIO)
+    if (tracks.containsType(C.TRACK_TYPE_AUDIO)
-        && !tracksInfo.isTypeSupported(C.TRACK_TYPE_AUDIO, /* allowExceedsCapabilities= */ true)) {
+        && !tracks.isTypeSupported(C.TRACK_TYPE_AUDIO, /* allowExceedsCapabilities= */ true)) {
      listener.onUnsupportedTrack(C.TRACK_TYPE_AUDIO);
    }
-    lastSeenTrackGroupInfo = tracksInfo;
+    lastSeenTracks = tracks;
  }
  // CastPlayer.SessionAvailabilityListener implementation.

--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -28,7 +28,7 @@ import androidx.fragment.app.FragmentManager;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.RenderersFactory;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmSession;
 import com.google.android.exoplayer2.drm.DrmSessionEventListener;
@@ -301,17 +301,17 @@ public class DownloadTracker {
        return;
      }
-      TracksInfo tracksInfo = downloadHelper.getTracksInfo(/* periodIndex= */ 0);
+      Tracks tracks = downloadHelper.getTracks(/* periodIndex= */ 0);
-      if (!TrackSelectionDialog.willHaveContent(tracksInfo)) {
+      if (!TrackSelectionDialog.willHaveContent(tracks)) {
        Log.d(TAG, "No dialog content. Downloading entire stream.");
        startDownload();
        downloadHelper.release();
        return;
      }
      trackSelectionDialog =
-          TrackSelectionDialog.createForTracksInfoAndParameters(
+          TrackSelectionDialog.createForTracksAndParameters(
              /* titleId= */ R.string.exo_download_description,
-              tracksInfo,
+              tracks,
              DownloadHelper.getDefaultTrackSelectorParameters(context),
              /* allowAdaptiveSelections= */ false,
              /* allowMultipleOverrides= */ true,

--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -35,7 +35,7 @@ import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.RenderersFactory;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.drm.FrameworkMediaDrm;
 import com.google.android.exoplayer2.ext.ima.ImaAdsLoader;
@@ -82,7 +82,7 @@ public class PlayerActivity extends AppCompatActivity
  private List<MediaItem> mediaItems;
  private TrackSelectionParameters trackSelectionParameters;
  private DebugTextViewHelper debugViewHelper;
-  private TracksInfo lastSeenTracksInfo;
+  private Tracks lastSeenTracks;
  private boolean startAutoPlay;
  private int startItemIndex;
  private long startPosition;
@@ -275,7 +275,7 @@ public class PlayerActivity extends AppCompatActivity
      RenderersFactory renderersFactory =
          DemoUtil.buildRenderersFactory(/* context= */ this, preferExtensionDecoders);
-      lastSeenTracksInfo = TracksInfo.EMPTY;
+      lastSeenTracks = Tracks.EMPTY;
      player =
          new ExoPlayer.Builder(/* context= */ this)
              .setRenderersFactory(renderersFactory)
@@ -455,22 +455,20 @@ public class PlayerActivity extends AppCompatActivity
    @Override
    @SuppressWarnings("ReferenceEquality")
-    public void onTracksInfoChanged(TracksInfo tracksInfo) {
+    public void onTracksChanged(Tracks tracks) {
      updateButtonVisibility();
-      if (tracksInfo == lastSeenTracksInfo) {
+      if (tracks == lastSeenTracks) {
        return;
      }
-      if (tracksInfo.containsType(C.TRACK_TYPE_VIDEO)
+      if (tracks.containsType(C.TRACK_TYPE_VIDEO)
-          && !tracksInfo.isTypeSupported(
+          && !tracks.isTypeSupported(C.TRACK_TYPE_VIDEO, /* allowExceedsCapabilities= */ true)) {
-              C.TRACK_TYPE_VIDEO, /* allowExceedsCapabilities= */ true)) {
        showToast(R.string.error_unsupported_video);
      }
-      if (tracksInfo.containsType(C.TRACK_TYPE_AUDIO)
+      if (tracks.containsType(C.TRACK_TYPE_AUDIO)
-          && !tracksInfo.isTypeSupported(
+          && !tracks.isTypeSupported(C.TRACK_TYPE_AUDIO, /* allowExceedsCapabilities= */ true)) {
-              C.TRACK_TYPE_AUDIO, /* allowExceedsCapabilities= */ true)) {
        showToast(R.string.error_unsupported_audio);
      }
-      lastSeenTracksInfo = tracksInfo;
+      lastSeenTracks = tracks;
    }
  }

--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -33,8 +33,7 @@ import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
-import com.google.android.exoplayer2.TracksInfo.TrackGroupInfo;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.trackselection.TrackSelectionOverride;
 import com.google.android.exoplayer2.trackselection.TrackSelectionParameters;
@@ -79,16 +78,16 @@ public final class TrackSelectionDialog extends DialogFragment {
   * specified {@link Player}.
   */
  public static boolean willHaveContent(Player player) {
-    return willHaveContent(player.getCurrentTracksInfo());
+    return willHaveContent(player.getCurrentTracks());
  }
  /**
   * Returns whether a track selection dialog will have content to display if initialized with the
-   * specified {@link TracksInfo}.
+   * specified {@link Tracks}.
   */
-  public static boolean willHaveContent(TracksInfo tracksInfo) {
+  public static boolean willHaveContent(Tracks tracks) {
-    for (TrackGroupInfo trackGroupInfo : tracksInfo.getTrackGroupInfos()) {
+    for (Tracks.Group trackGroup : tracks.getGroups()) {
-      if (SUPPORTED_TRACK_TYPES.contains(trackGroupInfo.getTrackType())) {
+      if (SUPPORTED_TRACK_TYPES.contains(trackGroup.getType())) {
        return true;
      }
    }
@@ -105,9 +104,9 @@ public final class TrackSelectionDialog extends DialogFragment {
   */
  public static TrackSelectionDialog createForPlayer(
      Player player, DialogInterface.OnDismissListener onDismissListener) {
-    return createForTracksInfoAndParameters(
+    return createForTracksAndParameters(
        R.string.track_selection_title,
-        player.getCurrentTracksInfo(),
+        player.getCurrentTracks(),
        player.getTrackSelectionParameters(),
        /* allowAdaptiveSelections= */ true,
        /* allowMultipleOverrides= */ false,
@@ -116,10 +115,10 @@ public final class TrackSelectionDialog extends DialogFragment {
  }
  /**
-   * Creates a dialog for given {@link TracksInfo} and {@link TrackSelectionParameters}.
+   * Creates a dialog for given {@link Tracks} and {@link TrackSelectionParameters}.
   *
   * @param titleId The resource id of the dialog title.
-   * @param tracksInfo The {@link TracksInfo} describing the tracks to display.
+   * @param tracks The {@link Tracks} describing the tracks to display.
   * @param trackSelectionParameters The initial {@link TrackSelectionParameters}.
   * @param allowAdaptiveSelections Whether adaptive selections (consisting of more than one track)
   *     can be made.
@@ -128,9 +127,9 @@ public final class TrackSelectionDialog extends DialogFragment {
   * @param onDismissListener {@link DialogInterface.OnDismissListener} called when the dialog is
   *     dismissed.
   */
-  public static TrackSelectionDialog createForTracksInfoAndParameters(
+  public static TrackSelectionDialog createForTracksAndParameters(
      int titleId,
-      TracksInfo tracksInfo,
+      Tracks tracks,
      TrackSelectionParameters trackSelectionParameters,
      boolean allowAdaptiveSelections,
      boolean allowMultipleOverrides,
@@ -138,7 +137,7 @@ public final class TrackSelectionDialog extends DialogFragment {
      DialogInterface.OnDismissListener onDismissListener) {
    TrackSelectionDialog trackSelectionDialog = new TrackSelectionDialog();
    trackSelectionDialog.init(
-        tracksInfo,
+        tracks,
        trackSelectionParameters,
        titleId,
        allowAdaptiveSelections,
@@ -169,7 +168,7 @@ public final class TrackSelectionDialog extends DialogFragment {
  }
  private void init(
-      TracksInfo tracksInfo,
+      Tracks tracks,
      TrackSelectionParameters trackSelectionParameters,
      int titleId,
      boolean allowAdaptiveSelections,
@@ -182,16 +181,16 @@ public final class TrackSelectionDialog extends DialogFragment {
    for (int i = 0; i < SUPPORTED_TRACK_TYPES.size(); i++) {
      @C.TrackType int trackType = SUPPORTED_TRACK_TYPES.get(i);
-      ArrayList<TrackGroupInfo> trackGroupInfos = new ArrayList<>();
+      ArrayList<Tracks.Group> trackGroups = new ArrayList<>();
-      for (TrackGroupInfo trackGroupInfo : tracksInfo.getTrackGroupInfos()) {
+      for (Tracks.Group trackGroup : tracks.getGroups()) {
-        if (trackGroupInfo.getTrackType() == trackType) {
+        if (trackGroup.getType() == trackType) {
-          trackGroupInfos.add(trackGroupInfo);
+          trackGroups.add(trackGroup);
        }
      }
-      if (!trackGroupInfos.isEmpty()) {
+      if (!trackGroups.isEmpty()) {
        TrackSelectionViewFragment tabFragment = new TrackSelectionViewFragment();
        tabFragment.init(
-            trackGroupInfos,
+            trackGroups,
            trackSelectionParameters.disabledTrackTypes.contains(trackType),
            trackSelectionParameters.overrides,
            allowAdaptiveSelections,
@@ -300,7 +299,7 @@ public final class TrackSelectionDialog extends DialogFragment {
  public static final class TrackSelectionViewFragment extends Fragment
      implements TrackSelectionView.TrackSelectionListener {
-    private List<TrackGroupInfo> trackGroupInfos;
+    private List<Tracks.Group> trackGroups;
    private boolean allowAdaptiveSelections;
    private boolean allowMultipleOverrides;
@@ -313,12 +312,12 @@ public final class TrackSelectionDialog extends DialogFragment {
    }
    public void init(
-        List<TrackGroupInfo> trackGroupInfos,
+        List<Tracks.Group> trackGroups,
        boolean isDisabled,
        Map<TrackGroup, TrackSelectionOverride> overrides,
        boolean allowAdaptiveSelections,
        boolean allowMultipleOverrides) {
-      this.trackGroupInfos = trackGroupInfos;
+      this.trackGroups = trackGroups;
      this.isDisabled = isDisabled;
      this.allowAdaptiveSelections = allowAdaptiveSelections;
      this.allowMultipleOverrides = allowMultipleOverrides;
@@ -326,8 +325,7 @@ public final class TrackSelectionDialog extends DialogFragment {
      // handle the case where the TrackSelectionView is never created.
      this.overrides =
          new HashMap<>(
-              TrackSelectionView.filterOverrides(
+              TrackSelectionView.filterOverrides(overrides, trackGroups, allowMultipleOverrides));
-                  overrides, trackGroupInfos, allowMultipleOverrides));
    }
    @Override
@@ -343,7 +341,7 @@ public final class TrackSelectionDialog extends DialogFragment {
      trackSelectionView.setAllowMultipleOverrides(allowMultipleOverrides);
      trackSelectionView.setAllowAdaptiveSelections(allowAdaptiveSelections);
      trackSelectionView.init(
-          trackGroupInfos,
+          trackGroups,
          isDisabled,
          overrides,
          /* trackFormatComparator= */ null,

--- a/docs/track-selection.md
+++ b/docs/track-selection.md
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -37,8 +37,7 @@ import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
-import com.google.android.exoplayer2.TracksInfo.TrackGroupInfo;
 import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.text.Cue;
@@ -134,7 +133,7 @@ public final class CastPlayer extends BasePlayer {
  private final StateHolder<PlaybackParameters> playbackParameters;
  @Nullable private RemoteMediaClient remoteMediaClient;
  private CastTimeline currentTimeline;
-  private TracksInfo currentTracksInfo;
+  private Tracks currentTracks;
  private Commands availableCommands;
  private @Player.State int playbackState;
  private int currentWindowIndex;
@@ -210,7 +209,7 @@ public final class CastPlayer extends BasePlayer {
    playbackParameters = new StateHolder<>(PlaybackParameters.DEFAULT);
    playbackState = STATE_IDLE;
    currentTimeline = CastTimeline.EMPTY_CAST_TIMELINE;
-    currentTracksInfo = TracksInfo.EMPTY;
+    currentTracks = Tracks.EMPTY;
    availableCommands = new Commands.Builder().addAll(PERMANENT_AVAILABLE_COMMANDS).build();
    pendingSeekWindowIndex = C.INDEX_UNSET;
    pendingSeekPositionMs = C.TIME_UNSET;
@@ -542,8 +541,8 @@ public final class CastPlayer extends BasePlayer {
  }
  @Override
-  public TracksInfo getCurrentTracksInfo() {
+  public Tracks getCurrentTracks() {
-    return currentTracksInfo;
+    return currentTracks;
  }
  @Override
@@ -816,7 +815,7 @@ public final class CastPlayer extends BasePlayer {
    }
    if (updateTracksAndSelectionsAndNotifyIfChanged()) {
      listeners.queueEvent(
-          Player.EVENT_TRACKS_CHANGED, listener -> listener.onTracksInfoChanged(currentTracksInfo));
+          Player.EVENT_TRACKS_CHANGED, listener -> listener.onTracksChanged(currentTracks));
    }
    updateAvailableCommandsAndNotifyIfChanged();
    listeners.flushEvents();
@@ -976,8 +975,8 @@ public final class CastPlayer extends BasePlayer {
    @Nullable
    List<MediaTrack> castMediaTracks = mediaInfo != null ? mediaInfo.getMediaTracks() : null;
    if (castMediaTracks == null || castMediaTracks.isEmpty()) {
-      boolean hasChanged = !TracksInfo.EMPTY.equals(currentTracksInfo);
+      boolean hasChanged = !Tracks.EMPTY.equals(currentTracks);
-      currentTracksInfo = TracksInfo.EMPTY;
+      currentTracks = Tracks.EMPTY;
      return hasChanged;
    }
    @Nullable long[] activeTrackIds = mediaStatus.getActiveTrackIds();
@@ -985,20 +984,19 @@ public final class CastPlayer extends BasePlayer {
      activeTrackIds = EMPTY_TRACK_ID_ARRAY;
    }
-    TrackGroupInfo[] trackGroupInfos = new TrackGroupInfo[castMediaTracks.size()];
+    Tracks.Group[] trackGroups = new Tracks.Group[castMediaTracks.size()];
    for (int i = 0; i < castMediaTracks.size(); i++) {
      MediaTrack mediaTrack = castMediaTracks.get(i);
      TrackGroup trackGroup =
          new TrackGroup(/* id= */ Integer.toString(i), CastUtils.mediaTrackToFormat(mediaTrack));
      @C.FormatSupport int[] trackSupport = new int[] {C.FORMAT_HANDLED};
      boolean[] trackSelected = new boolean[] {isTrackActive(mediaTrack.getId(), activeTrackIds)};
-      trackGroupInfos[i] =
+      trackGroups[i] =
-          new TrackGroupInfo(
+          new Tracks.Group(trackGroup, /* adaptiveSupported= */ false, trackSupport, trackSelected);
-              trackGroup, /* adaptiveSupported= */ false, trackSupport, trackSelected);
    }
-    TracksInfo newTracksInfo = new TracksInfo(ImmutableList.copyOf(trackGroupInfos));
+    Tracks newTracks = new Tracks(ImmutableList.copyOf(trackGroups));
-    if (!newTracksInfo.equals(currentTracksInfo)) {
+    if (!newTracks.equals(currentTracks)) {
-      currentTracksInfo = newTracksInfo;
+      currentTracks = newTracks;
      return true;
    }
    return false;

--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/AdTagLoader.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/AdTagLoader.java
@@ -710,7 +710,7 @@ import java.util.Map;
    }
    // Check for a selected track using an audio renderer.
-    return player.getCurrentTracksInfo().isTypeSelected(C.TRACK_TYPE_AUDIO) ? 100 : 0;
+    return player.getCurrentTracks().isTypeSelected(C.TRACK_TYPE_AUDIO) ? 100 : 0;
  }
  private void handleAdEvent(AdEvent adEvent) {

--- a/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeExoPlayer.java
+++ b/extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakeExoPlayer.java
@@ -24,7 +24,7 @@ import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.testutil.StubExoPlayer;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.trackselection.TrackSelectionParameters;
@@ -266,8 +266,8 @@ import com.google.android.exoplayer2.util.Util;
  }
  @Override
-  public TracksInfo getCurrentTracksInfo() {
+  public Tracks getCurrentTracks() {
-    return TracksInfo.EMPTY;
+    return Tracks.EMPTY;
  }
  @Override

--- a/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
@@ -444,10 +444,10 @@ public class ForwardingPlayer implements Player {
    player.release();
  }
-  /** Calls {@link Player#getCurrentTracksInfo()} on the delegate and returns the result. */
+  /** Calls {@link Player#getCurrentTracks()} on the delegate and returns the result. */
  @Override
-  public TracksInfo getCurrentTracksInfo() {
+  public Tracks getCurrentTracks() {
-    return player.getCurrentTracksInfo();
+    return player.getCurrentTracks();
  }
  /** Calls {@link Player#getTrackSelectionParameters()} on the delegate and returns the result. */
@@ -833,8 +833,8 @@ public class ForwardingPlayer implements Player {
    }
    @Override
-    public void onTracksInfoChanged(TracksInfo tracksInfo) {
+    public void onTracksChanged(Tracks tracks) {
-      listener.onTracksInfoChanged(tracksInfo);
+      listener.onTracksChanged(tracks);
    }
    @Override

--- a/library/common/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/Player.java
@@ -61,8 +61,8 @@ import java.util.List;
 * <ul>
 *   <li>They can provide a {@link Timeline} representing the structure of the media being played,
 *       which can be obtained by calling {@link #getCurrentTimeline()}.
- *   <li>They can provide a {@link TracksInfo} defining the currently available tracks and which are
+ *   <li>They can provide a {@link Tracks} defining the currently available tracks and which are
- *       selected to be rendered, which can be obtained by calling {@link #getCurrentTracksInfo()}.
+ *       selected to be rendered, which can be obtained by calling {@link #getCurrentTracks()}.
 * </ul>
 */
 public interface Player {
@@ -673,14 +673,14 @@ public interface Player {
        @Nullable MediaItem mediaItem, @MediaItemTransitionReason int reason) {}
    /**
-     * Called when the available or selected tracks change.
+     * Called when the tracks change.
     *
     * <p>{@link #onEvents(Player, Events)} will also be called to report this event along with
     * other events that happen in the same {@link Looper} message queue iteration.
     *
-     * @param tracksInfo The available tracks information. Never null, but may be of length zero.
+     * @param tracks The available tracks information. Never null, but may be of length zero.
     */
-    default void onTracksInfoChanged(TracksInfo tracksInfo) {}
+    default void onTracksChanged(Tracks tracks) {}
    /**
     * Called when the combined {@link MediaMetadata} changes.
@@ -1299,7 +1299,7 @@ public interface Player {
  int EVENT_TIMELINE_CHANGED = 0;
  /** {@link #getCurrentMediaItem()} changed or the player started repeating the current item. */
  int EVENT_MEDIA_ITEM_TRANSITION = 1;
-  /** {@link #getCurrentTracksInfo()} changed. */
+  /** {@link #getCurrentTracks()} changed. */
  int EVENT_TRACKS_CHANGED = 2;
  /** {@link #isLoading()} ()} changed. */
  int EVENT_IS_LOADING_CHANGED = 3;
@@ -2074,11 +2074,11 @@ public interface Player {
  void release();
  /**
-   * Returns information about the current tracks.
+   * Returns the current tracks.
   *
-   * @see Listener#onTracksInfoChanged(TracksInfo)
+   * @see Listener#onTracksChanged(Tracks)
   */
-  TracksInfo getCurrentTracksInfo();
+  Tracks getCurrentTracks();
  /**
   * Returns the parameters constraining the track selection.

--- a/library/common/src/main/java/com/google/android/exoplayer2/TracksInfo.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/TracksInfo.java
--- a/library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionOverride.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionOverride.java
@@ -94,7 +94,7 @@ public final class TrackSelectionOverride implements Bundleable {
  }
  /** Returns the {@link C.TrackType} of the overridden track group. */
-  public @C.TrackType int getTrackType() {
+  public @C.TrackType int getType() {
    return trackGroup.type;
  }

--- a/library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java
@@ -682,7 +682,7 @@ public class TrackSelectionParameters implements Bundleable {
    /** Sets an override, replacing all existing overrides with the same track type. */
    public Builder setOverrideForType(TrackSelectionOverride override) {
-      clearOverridesOfType(override.getTrackType());
+      clearOverridesOfType(override.getType());
      overrides.put(override.trackGroup, override);
      return this;
    }
@@ -698,7 +698,7 @@ public class TrackSelectionParameters implements Bundleable {
      Iterator<TrackSelectionOverride> it = overrides.values().iterator();
      while (it.hasNext()) {
        TrackSelectionOverride override = it.next();
-        if (override.getTrackType() == trackType) {
+        if (override.getType() == trackType) {
          it.remove();
        }
      }

--- a/library/common/src/test/java/com/google/android/exoplayer2/TracksInfoTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/TracksInfoTest.java
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2;
-import static com.google.android.exoplayer2.util.MimeTypes.AUDIO_AAC;
-import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_H264;
-import static com.google.common.truth.Truth.assertThat;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.android.exoplayer2.TracksInfo.TrackGroupInfo;
-import com.google.android.exoplayer2.source.TrackGroup;
-import com.google.common.collect.ImmutableList;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-/** Unit test for {@link TracksInfo}. */
-@RunWith(AndroidJUnit4.class)
-public class TracksInfoTest {
-  @Test
-  public void roundTripViaBundle_ofEmptyTracksInfo_yieldsEqualInstance() {
-    TracksInfo before = TracksInfo.EMPTY;
-    TracksInfo after = TracksInfo.CREATOR.fromBundle(before.toBundle());
-    assertThat(after).isEqualTo(before);
-  }
-  @Test
-  public void roundTripViaBundle_ofTracksInfo_yieldsEqualInstance() {
-    TracksInfo before =
-        new TracksInfo(
-            ImmutableList.of(
-                new TrackGroupInfo(
-                    new TrackGroup(new Format.Builder().setSampleMimeType(AUDIO_AAC).build()),
-                    /* adaptiveSupported= */ false,
-                    new int[] {C.FORMAT_EXCEEDS_CAPABILITIES},
-                    /* tracksSelected= */ new boolean[] {true}),
-                new TrackGroupInfo(
-                    new TrackGroup(
-                        new Format.Builder().setSampleMimeType(VIDEO_H264).build(),
-                        new Format.Builder().setSampleMimeType(VIDEO_H264).build()),
-                    /* adaptiveSupported= */ true,
-                    new int[] {C.FORMAT_UNSUPPORTED_DRM, C.FORMAT_UNSUPPORTED_TYPE},
-                    /* tracksSelected= */ new boolean[] {false, true})));
-    TracksInfo after = TracksInfo.CREATOR.fromBundle(before.toBundle());
-    assertThat(after).isEqualTo(before);
-  }
-  @Test
-  public void tracksInfoGetters_withoutTrack_returnExpectedValues() {
-    TracksInfo tracksInfo = new TracksInfo(ImmutableList.of());
-    assertThat(tracksInfo.containsType(C.TRACK_TYPE_AUDIO)).isFalse();
-    assertThat(tracksInfo.isTypeSupported(C.TRACK_TYPE_AUDIO)).isFalse();
-    assertThat(tracksInfo.isTypeSupported(C.TRACK_TYPE_AUDIO, /* allowExceedsCapabilities= */ true))
-        .isFalse();
-    assertThat(tracksInfo.isTypeSelected(C.TRACK_TYPE_AUDIO)).isFalse();
-    ImmutableList<TrackGroupInfo> trackGroupInfos = tracksInfo.getTrackGroupInfos();
-    assertThat(trackGroupInfos).isEmpty();
-  }
-  @Test
-  public void tracksInfo_emptyStaticInstance_isEmpty() {
-    TracksInfo tracksInfo = TracksInfo.EMPTY;
-    assertThat(tracksInfo.getTrackGroupInfos()).isEmpty();
-    assertThat(tracksInfo).isEqualTo(new TracksInfo(ImmutableList.of()));
-  }
-  @Test
-  public void tracksInfoGetters_ofComplexTracksInfo_returnExpectedValues() {
-    TrackGroupInfo trackGroupInfo0 =
-        new TrackGroupInfo(
-            new TrackGroup(new Format.Builder().setSampleMimeType(AUDIO_AAC).build()),
-            /* adaptiveSupported= */ false,
-            new int[] {C.FORMAT_EXCEEDS_CAPABILITIES},
-            /* tracksSelected= */ new boolean[] {false});
-    TrackGroupInfo trackGroupInfo1 =
-        new TrackGroupInfo(
-            new TrackGroup(
-                new Format.Builder().setSampleMimeType(VIDEO_H264).build(),
-                new Format.Builder().setSampleMimeType(VIDEO_H264).build()),
-            /* adaptiveSupported= */ true,
-            new int[] {C.FORMAT_UNSUPPORTED_DRM, C.FORMAT_HANDLED},
-            /* tracksSelected= */ new boolean[] {false, true});
-    TracksInfo tracksInfo = new TracksInfo(ImmutableList.of(trackGroupInfo0, trackGroupInfo1));
-    assertThat(tracksInfo.containsType(C.TRACK_TYPE_AUDIO)).isTrue();
-    assertThat(tracksInfo.containsType(C.TRACK_TYPE_VIDEO)).isTrue();
-    assertThat(tracksInfo.containsType(C.TRACK_TYPE_TEXT)).isFalse();
-    assertThat(tracksInfo.isTypeSupported(C.TRACK_TYPE_AUDIO)).isFalse();
-    assertThat(tracksInfo.isTypeSupported(C.TRACK_TYPE_VIDEO)).isTrue();
-    assertThat(tracksInfo.isTypeSupported(C.TRACK_TYPE_TEXT)).isFalse();
-    assertThat(tracksInfo.isTypeSupported(C.TRACK_TYPE_AUDIO, /* allowExceedsCapabilities= */ true))
-        .isTrue();
-    assertThat(tracksInfo.isTypeSupported(C.TRACK_TYPE_VIDEO, /* allowExceedsCapabilities= */ true))
-        .isTrue();
-    assertThat(tracksInfo.isTypeSupported(C.TRACK_TYPE_TEXT, /* allowExceedsCapabilities= */ true))
-        .isFalse();
-    assertThat(tracksInfo.isTypeSelected(C.TRACK_TYPE_AUDIO)).isFalse();
-    assertThat(tracksInfo.isTypeSelected(C.TRACK_TYPE_VIDEO)).isTrue();
-    ImmutableList<TrackGroupInfo> trackGroupInfos = tracksInfo.getTrackGroupInfos();
-    assertThat(trackGroupInfos).hasSize(2);
-    assertThat(trackGroupInfos.get(0)).isSameInstanceAs(trackGroupInfo0);
-    assertThat(trackGroupInfos.get(1)).isSameInstanceAs(trackGroupInfo1);
-    assertThat(trackGroupInfos.get(0).isTrackSupported(0)).isFalse();
-    assertThat(trackGroupInfos.get(1).isTrackSupported(0)).isFalse();
-    assertThat(trackGroupInfos.get(1).isTrackSupported(1)).isTrue();
-    assertThat(trackGroupInfos.get(0).getTrackSupport(0)).isEqualTo(C.FORMAT_EXCEEDS_CAPABILITIES);
-    assertThat(trackGroupInfos.get(1).getTrackSupport(0)).isEqualTo(C.FORMAT_UNSUPPORTED_DRM);
-    assertThat(trackGroupInfos.get(1).getTrackSupport(1)).isEqualTo(C.FORMAT_HANDLED);
-    assertThat(trackGroupInfos.get(0).isTrackSelected(0)).isFalse();
-    assertThat(trackGroupInfos.get(1).isTrackSelected(0)).isFalse();
-    assertThat(trackGroupInfos.get(1).isTrackSelected(1)).isTrue();
-    assertThat(trackGroupInfos.get(0).getTrackType()).isEqualTo(C.TRACK_TYPE_AUDIO);
-    assertThat(trackGroupInfos.get(1).getTrackType()).isEqualTo(C.TRACK_TYPE_VIDEO);
-  }
-  /**
-   * Tests that {@link TrackGroupInfo#isAdaptiveSupported} returns false if the group only contains
-   * a single track, even if true is passed to the constructor.
-   */
-  @Test
-  public void trackGroupInfo_withSingleTrack_isNotAdaptive() {
-    TrackGroupInfo trackGroupInfo0 =
-        new TrackGroupInfo(
-            new TrackGroup(new Format.Builder().setSampleMimeType(AUDIO_AAC).build()),
-            /* adaptiveSupported= */ true,
-            new int[] {C.FORMAT_EXCEEDS_CAPABILITIES},
-            /* tracksSelected= */ new boolean[] {false});
-    assertThat(trackGroupInfo0.isAdaptiveSupported()).isFalse();
-  }
-}
--- a/library/common/src/test/java/com/google/android/exoplayer2/TracksTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/TracksTest.java
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer2;
+import static com.google.android.exoplayer2.util.MimeTypes.AUDIO_AAC;
+import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_H264;
+import static com.google.common.truth.Truth.assertThat;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.source.TrackGroup;
+import com.google.common.collect.ImmutableList;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+/** Unit test for {@link Tracks}. */
+@RunWith(AndroidJUnit4.class)
+public class TracksTest {
+  @Test
+  public void roundTripViaBundle_ofEmptyTracks_yieldsEqualInstance() {
+    Tracks before = Tracks.EMPTY;
+    Tracks after = Tracks.CREATOR.fromBundle(before.toBundle());
+    assertThat(after).isEqualTo(before);
+  }
+  @Test
+  public void roundTripViaBundle_ofTracks_yieldsEqualInstance() {
+    Tracks before =
+        new Tracks(
+            ImmutableList.of(
+                new Tracks.Group(
+                    new TrackGroup(new Format.Builder().setSampleMimeType(AUDIO_AAC).build()),
+                    /* adaptiveSupported= */ false,
+                    new int[] {C.FORMAT_EXCEEDS_CAPABILITIES},
+                    /* trackSelected= */ new boolean[] {true}),
+                new Tracks.Group(
+                    new TrackGroup(
+                        new Format.Builder().setSampleMimeType(VIDEO_H264).build(),
+                        new Format.Builder().setSampleMimeType(VIDEO_H264).build()),
+                    /* adaptiveSupported= */ true,
+                    new int[] {C.FORMAT_UNSUPPORTED_DRM, C.FORMAT_UNSUPPORTED_TYPE},
+                    /* trackSelected= */ new boolean[] {false, true})));
+    Tracks after = Tracks.CREATOR.fromBundle(before.toBundle());
+    assertThat(after).isEqualTo(before);
+  }
+  @Test
+  public void getters_withoutTrack_returnExpectedValues() {
+    Tracks tracks = new Tracks(ImmutableList.of());
+    assertThat(tracks.containsType(C.TRACK_TYPE_AUDIO)).isFalse();
+    assertThat(tracks.isTypeSupported(C.TRACK_TYPE_AUDIO)).isFalse();
+    assertThat(tracks.isTypeSupported(C.TRACK_TYPE_AUDIO, /* allowExceedsCapabilities= */ true))
+        .isFalse();
+    assertThat(tracks.isTypeSelected(C.TRACK_TYPE_AUDIO)).isFalse();
+    ImmutableList<Tracks.Group> trackGroups = tracks.getGroups();
+    assertThat(trackGroups).isEmpty();
+  }
+  @Test
+  public void emptyStaticInstance_isEmpty() {
+    Tracks tracks = Tracks.EMPTY;
+    assertThat(tracks.getGroups()).isEmpty();
+    assertThat(tracks).isEqualTo(new Tracks(ImmutableList.of()));
+  }
+  @Test
+  public void getters_ofComplexTracks_returnExpectedValues() {
+    Tracks.Group trackGroup0 =
+        new Tracks.Group(
+            new TrackGroup(new Format.Builder().setSampleMimeType(AUDIO_AAC).build()),
+            /* adaptiveSupported= */ false,
+            new int[] {C.FORMAT_EXCEEDS_CAPABILITIES},
+            /* trackSelected= */ new boolean[] {false});
+    Tracks.Group trackGroup1 =
+        new Tracks.Group(
+            new TrackGroup(
+                new Format.Builder().setSampleMimeType(VIDEO_H264).build(),
+                new Format.Builder().setSampleMimeType(VIDEO_H264).build()),
+            /* adaptiveSupported= */ true,
+            new int[] {C.FORMAT_UNSUPPORTED_DRM, C.FORMAT_HANDLED},
+            /* trackSelected= */ new boolean[] {false, true});
+    Tracks tracks = new Tracks(ImmutableList.of(trackGroup0, trackGroup1));
+    assertThat(tracks.containsType(C.TRACK_TYPE_AUDIO)).isTrue();
+    assertThat(tracks.containsType(C.TRACK_TYPE_VIDEO)).isTrue();
+    assertThat(tracks.containsType(C.TRACK_TYPE_TEXT)).isFalse();
+    assertThat(tracks.isTypeSupported(C.TRACK_TYPE_AUDIO)).isFalse();
+    assertThat(tracks.isTypeSupported(C.TRACK_TYPE_VIDEO)).isTrue();
+    assertThat(tracks.isTypeSupported(C.TRACK_TYPE_TEXT)).isFalse();
+    assertThat(tracks.isTypeSupported(C.TRACK_TYPE_AUDIO, /* allowExceedsCapabilities= */ true))
+        .isTrue();
+    assertThat(tracks.isTypeSupported(C.TRACK_TYPE_VIDEO, /* allowExceedsCapabilities= */ true))
+        .isTrue();
+    assertThat(tracks.isTypeSupported(C.TRACK_TYPE_TEXT, /* allowExceedsCapabilities= */ true))
+        .isFalse();
+    assertThat(tracks.isTypeSelected(C.TRACK_TYPE_AUDIO)).isFalse();
+    assertThat(tracks.isTypeSelected(C.TRACK_TYPE_VIDEO)).isTrue();
+    ImmutableList<Tracks.Group> trackGroups = tracks.getGroups();
+    assertThat(trackGroups).hasSize(2);
+    assertThat(trackGroups.get(0)).isSameInstanceAs(trackGroup0);
+    assertThat(trackGroups.get(1)).isSameInstanceAs(trackGroup1);
+    assertThat(trackGroups.get(0).isTrackSupported(0)).isFalse();
+    assertThat(trackGroups.get(1).isTrackSupported(0)).isFalse();
+    assertThat(trackGroups.get(1).isTrackSupported(1)).isTrue();
+    assertThat(trackGroups.get(0).getTrackSupport(0)).isEqualTo(C.FORMAT_EXCEEDS_CAPABILITIES);
+    assertThat(trackGroups.get(1).getTrackSupport(0)).isEqualTo(C.FORMAT_UNSUPPORTED_DRM);
+    assertThat(trackGroups.get(1).getTrackSupport(1)).isEqualTo(C.FORMAT_HANDLED);
+    assertThat(trackGroups.get(0).isTrackSelected(0)).isFalse();
+    assertThat(trackGroups.get(1).isTrackSelected(0)).isFalse();
+    assertThat(trackGroups.get(1).isTrackSelected(1)).isTrue();
+    assertThat(trackGroups.get(0).getType()).isEqualTo(C.TRACK_TYPE_AUDIO);
+    assertThat(trackGroups.get(1).getType()).isEqualTo(C.TRACK_TYPE_VIDEO);
+  }
+  /**
+   * Tests that {@link Tracks.Group#isAdaptiveSupported} returns false if the group only contains a
+   * single track, even if true is passed to the constructor.
+   */
+  @Test
+  public void groupWithSingleTrack_isNotAdaptive() {
+    Tracks.Group trackGroup =
+        new Tracks.Group(
+            new TrackGroup(new Format.Builder().setSampleMimeType(AUDIO_AAC).build()),
+            /* adaptiveSupported= */ true,
+            new int[] {C.FORMAT_EXCEEDS_CAPABILITIES},
+            /* trackSelected= */ new boolean[] {false});
+    assertThat(trackGroup.isAdaptiveSupported()).isFalse();
+  }
+}
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -1172,8 +1172,8 @@ public interface ExoPlayer extends Player {
  /**
   * Returns the available track groups.
   *
-   * @see Listener#onTracksInfoChanged(TracksInfo)
+   * @see Listener#onTracksChanged(Tracks)
-   * @deprecated Use {@link #getCurrentTracksInfo()}.
+   * @deprecated Use {@link #getCurrentTracks()}.
   */
  @Deprecated
  TrackGroupArray getCurrentTrackGroups();
@@ -1182,8 +1182,8 @@ public interface ExoPlayer extends Player {
   * Returns the current track selections for each renderer, which may include {@code null} elements
   * if some renderers do not have any selected tracks.
   *
-   * @see Listener#onTracksInfoChanged(TracksInfo)
+   * @see Listener#onTracksChanged(Tracks)
-   * @deprecated Use {@link #getCurrentTracksInfo()}.
+   * @deprecated Use {@link #getCurrentTracks()}.
   */
  @Deprecated
  TrackSelectionArray getCurrentTrackSelections();

--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -266,7 +266,7 @@ import java.util.concurrent.TimeoutException;
          new TrackSelectorResult(
              new RendererConfiguration[renderers.length],
              new ExoTrackSelection[renderers.length],
-              TracksInfo.EMPTY,
+              Tracks.EMPTY,
              /* info= */ null);
      period = new Timeline.Period();
      permanentAvailableCommands =
@@ -1136,9 +1136,9 @@ import java.util.concurrent.TimeoutException;
  }
  @Override
-  public TracksInfo getCurrentTracksInfo() {
+  public Tracks getCurrentTracks() {
    verifyApplicationThread();
-    return playbackInfo.trackSelectorResult.tracksInfo;
+    return playbackInfo.trackSelectorResult.tracks;
  }
  @Override
@@ -1887,7 +1887,7 @@ import java.util.concurrent.TimeoutException;
      trackSelector.onSelectionActivated(newPlaybackInfo.trackSelectorResult.info);
      listeners.queueEvent(
          Player.EVENT_TRACKS_CHANGED,
-          listener -> listener.onTracksInfoChanged(newPlaybackInfo.trackSelectorResult.tracksInfo));
+          listener -> listener.onTracksChanged(newPlaybackInfo.trackSelectorResult.tracks));
    }
    if (metadataChanged) {
      final MediaMetadata finalMediaMetadata = mediaMetadata;

--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -1049,9 +1049,9 @@ public class SimpleExoPlayer extends BasePlayer
  }
  @Override
-  public TracksInfo getCurrentTracksInfo() {
+  public Tracks getCurrentTracks() {
    blockUntilConstructorFinished();
-    return player.getCurrentTracksInfo();
+    return player.getCurrentTracks();
  }
  @Override

--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsListener.java
@@ -42,7 +42,7 @@ import com.google.android.exoplayer2.Player.DiscontinuityReason;
 import com.google.android.exoplayer2.Player.PlaybackSuppressionReason;
 import com.google.android.exoplayer2.Player.TimelineChangeReason;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.audio.AudioSink;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
@@ -236,7 +236,7 @@ public interface AnalyticsListener {
   * {@link Player#getCurrentMediaItem()} changed or the player started repeating the current item.
   */
  int EVENT_MEDIA_ITEM_TRANSITION = Player.EVENT_MEDIA_ITEM_TRANSITION;
-  /** {@link Player#getCurrentTracksInfo()} changed. */
+  /** {@link Player#getCurrentTracks()} changed. */
  int EVENT_TRACKS_CHANGED = Player.EVENT_TRACKS_CHANGED;
  /** {@link Player#isLoading()} ()} changed. */
  int EVENT_IS_LOADING_CHANGED = Player.EVENT_IS_LOADING_CHANGED;
@@ -704,12 +704,12 @@ public interface AnalyticsListener {
  default void onPlayerErrorChanged(EventTime eventTime, @Nullable PlaybackException error) {}
  /**
-   * Called when the available or selected tracks change.
+   * Called when the tracks change.
   *
   * @param eventTime The event time.
-   * @param tracksInfo The available tracks information. Never null, but may be of length zero.
+   * @param tracks The tracks. Never null, but may be of length zero.
   */
-  default void onTracksInfoChanged(EventTime eventTime, TracksInfo tracksInfo) {}
+  default void onTracksChanged(EventTime eventTime, Tracks tracks) {}
  /**
   * Called when track selection parameters change.

--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollector.java
@@ -37,7 +37,7 @@ import com.google.android.exoplayer2.Player.PlaybackSuppressionReason;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Timeline.Period;
 import com.google.android.exoplayer2.Timeline.Window;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.analytics.AnalyticsListener.EventTime;
 import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
@@ -481,12 +481,12 @@ public class DefaultAnalyticsCollector implements AnalyticsCollector {
  }
  @Override
-  public void onTracksInfoChanged(TracksInfo tracksInfo) {
+  public void onTracksChanged(Tracks tracks) {
    EventTime eventTime = generateCurrentPlayerMediaPeriodEventTime();
    sendEvent(
        eventTime,
        AnalyticsListener.EVENT_TRACKS_CHANGED,
-        listener -> listener.onTracksInfoChanged(eventTime, tracksInfo));
+        listener -> listener.onTracksChanged(eventTime, tracks));
  }
  @SuppressWarnings("deprecation") // Implementing deprecated method.

--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/MediaMetricsListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/MediaMetricsListener.java
@@ -49,8 +49,7 @@ import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
-import com.google.android.exoplayer2.TracksInfo.TrackGroupInfo;
 import com.google.android.exoplayer2.audio.AudioSink;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
@@ -338,8 +337,7 @@ public final class MediaMetricsListener
      }
    }
    if (events.contains(EVENT_TRACKS_CHANGED) && metricsBuilder != null) {
-      @Nullable
+      @Nullable DrmInitData drmInitData = getDrmInitData(player.getCurrentTracks().getGroups());
-      DrmInitData drmInitData = getDrmInitData(player.getCurrentTracksInfo().getTrackGroupInfos());
      if (drmInitData != null) {
        castNonNull(metricsBuilder).setDrmType(getDrmType(drmInitData));
      }
@@ -370,10 +368,10 @@ public final class MediaMetricsListener
  private void maybeReportTrackChanges(Player player, Events events, long realtimeMs) {
    if (events.contains(EVENT_TRACKS_CHANGED)) {
-      TracksInfo tracksInfo = player.getCurrentTracksInfo();
+      Tracks tracks = player.getCurrentTracks();
-      boolean isVideoSelected = tracksInfo.isTypeSelected(C.TRACK_TYPE_VIDEO);
+      boolean isVideoSelected = tracks.isTypeSelected(C.TRACK_TYPE_VIDEO);
-      boolean isAudioSelected = tracksInfo.isTypeSelected(C.TRACK_TYPE_AUDIO);
+      boolean isAudioSelected = tracks.isTypeSelected(C.TRACK_TYPE_AUDIO);
-      boolean isTextSelected = tracksInfo.isTypeSelected(C.TRACK_TYPE_TEXT);
+      boolean isTextSelected = tracks.isTypeSelected(C.TRACK_TYPE_TEXT);
      if (isVideoSelected || isAudioSelected || isTextSelected) {
        // Ignore updates with insufficient information where no tracks are selected.
        if (!isVideoSelected) {
@@ -820,11 +818,11 @@ public final class MediaMetricsListener
  }
  @Nullable
-  private static DrmInitData getDrmInitData(ImmutableList<TrackGroupInfo> trackGroupInfos) {
+  private static DrmInitData getDrmInitData(ImmutableList<Tracks.Group> trackGroups) {
-    for (TrackGroupInfo trackGroupInfo : trackGroupInfos) {
+    for (Tracks.Group trackGroup : trackGroups) {
-      for (int trackIndex = 0; trackIndex < trackGroupInfo.length; trackIndex++) {
+      for (int trackIndex = 0; trackIndex < trackGroup.length; trackIndex++) {
-        if (trackGroupInfo.isTrackSelected(trackIndex)) {
+        if (trackGroup.isTrackSelected(trackIndex)) {
-          @Nullable DrmInitData drmInitData = trackGroupInfo.getTrackFormat(trackIndex).drmInitData;
+          @Nullable DrmInitData drmInitData = trackGroup.getTrackFormat(trackIndex).drmInitData;
          if (drmInitData != null) {
            return drmInitData;
          }

--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java
@@ -27,7 +27,7 @@ import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Timeline.Period;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.analytics.PlaybackStats.EventTimeAndException;
 import com.google.android.exoplayer2.analytics.PlaybackStats.EventTimeAndFormat;
 import com.google.android.exoplayer2.analytics.PlaybackStats.EventTimeAndPlaybackState;
@@ -522,11 +522,11 @@ public final class PlaybackStatsListener
        hasFatalError = false;
      }
      if (isForeground && !isInterruptedByAd) {
-        TracksInfo currentTracksInfo = player.getCurrentTracksInfo();
+        Tracks currentTracks = player.getCurrentTracks();
-        if (!currentTracksInfo.isTypeSelected(C.TRACK_TYPE_VIDEO)) {
+        if (!currentTracks.isTypeSelected(C.TRACK_TYPE_VIDEO)) {
          maybeUpdateVideoFormat(eventTime, /* newFormat= */ null);
        }
-        if (!currentTracksInfo.isTypeSelected(C.TRACK_TYPE_AUDIO)) {
+        if (!currentTracks.isTypeSelected(C.TRACK_TYPE_AUDIO)) {
          maybeUpdateAudioFormat(eventTime, /* newFormat= */ null);
        }
      }

--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -32,7 +32,7 @@ import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.analytics.PlayerId;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
@@ -543,16 +543,16 @@ public final class DownloadHelper {
  }
  /**
-   * Returns {@link TracksInfo} for the given period. Must not be called until after preparation
+   * Returns {@link Tracks} for the given period. Must not be called until after preparation
   * completes.
   *
   * @param periodIndex The period index.
-   * @return The {@link TracksInfo} for the period. May be {@link TracksInfo#EMPTY} for single
+   * @return The {@link Tracks} for the period. May be {@link Tracks#EMPTY} for single stream
-   *     stream content.
+   *     content.
   */
-  public TracksInfo getTracksInfo(int periodIndex) {
+  public Tracks getTracks(int periodIndex) {
    assertPreparedWithMedia();
-    return TrackSelectionUtil.buildTracksInfo(
+    return TrackSelectionUtil.buildTracks(
        mappedTrackInfos[periodIndex], immutableTrackSelectionsByPeriodAndRenderer[periodIndex]);
  }

--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -1955,12 +1955,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      if (override == null) {
        continue;
      }
-      @Nullable
+      @Nullable TrackSelectionOverride existingOverride = overridesByType.get(override.getType());
-      TrackSelectionOverride existingOverride = overridesByType.get(override.getTrackType());
      // Only replace an existing override if it's empty and the one being considered is not.
      if (existingOverride == null
          || (existingOverride.trackIndices.isEmpty() && !override.trackIndices.isEmpty())) {
-        overridesByType.put(override.getTrackType(), override);
+        overridesByType.put(override.getType(), override);
      }
    }
  }

--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java
@@ -36,7 +36,7 @@ import com.google.android.exoplayer2.RendererCapabilities.AdaptiveSupport;
 import com.google.android.exoplayer2.RendererCapabilities.Capabilities;
 import com.google.android.exoplayer2.RendererConfiguration;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -425,9 +425,9 @@ public abstract class MappingTrackSelector extends TrackSelector {
            periodId,
            timeline);
-    TracksInfo tracksInfo = TrackSelectionUtil.buildTracksInfo(mappedTrackInfo, result.second);
+    Tracks tracks = TrackSelectionUtil.buildTracks(mappedTrackInfo, result.second);
-    return new TrackSelectorResult(result.first, result.second, tracksInfo, mappedTrackInfo);
+    return new TrackSelectorResult(result.first, result.second, tracks, mappedTrackInfo);
  }
  /**

--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtil.java
@@ -19,8 +19,7 @@ import android.os.SystemClock;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.RendererCapabilities;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
-import com.google.android.exoplayer2.TracksInfo.TrackGroupInfo;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
@@ -134,16 +133,16 @@ public final class TrackSelectionUtil {
  }
  /**
-   * Returns {@link TracksInfo} built from {@link MappingTrackSelector.MappedTrackInfo} and {@link
+   * Returns {@link Tracks} built from {@link MappingTrackSelector.MappedTrackInfo} and {@link
   * TrackSelection TrackSelections} for each renderer.
   *
   * @param mappedTrackInfo The {@link MappingTrackSelector.MappedTrackInfo}
   * @param selections The track selections, indexed by renderer. A null entry indicates that a
   *     renderer does not have any selected tracks.
-   * @return The corresponding {@link TracksInfo}.
+   * @return The corresponding {@link Tracks}.
   */
  @SuppressWarnings({"unchecked", "rawtypes"}) // Initialization of array of Lists.
-  public static TracksInfo buildTracksInfo(
+  public static Tracks buildTracks(
      MappingTrackSelector.MappedTrackInfo mappedTrackInfo,
      @NullableType TrackSelection[] selections) {
    List<? extends TrackSelection>[] listSelections = new List[selections.length];
@@ -151,22 +150,22 @@ public final class TrackSelectionUtil {
      @Nullable TrackSelection selection = selections[i];
      listSelections[i] = selection != null ? ImmutableList.of(selection) : ImmutableList.of();
    }
-    return buildTracksInfo(mappedTrackInfo, listSelections);
+    return buildTracks(mappedTrackInfo, listSelections);
  }
  /**
-   * Returns {@link TracksInfo} built from {@link MappingTrackSelector.MappedTrackInfo} and {@link
+   * Returns {@link Tracks} built from {@link MappingTrackSelector.MappedTrackInfo} and {@link
   * TrackSelection TrackSelections} for each renderer.
   *
   * @param mappedTrackInfo The {@link MappingTrackSelector.MappedTrackInfo}
   * @param selections The track selections, indexed by renderer. Null entries are not permitted. An
   *     empty list indicates that a renderer does not have any selected tracks.
-   * @return The corresponding {@link TracksInfo}.
+   * @return The corresponding {@link Tracks}.
   */
-  public static TracksInfo buildTracksInfo(
+  public static Tracks buildTracks(
      MappingTrackSelector.MappedTrackInfo mappedTrackInfo,
      List<? extends TrackSelection>[] selections) {
-    ImmutableList.Builder<TrackGroupInfo> trackGroupInfos = new ImmutableList.Builder<>();
+    ImmutableList.Builder<Tracks.Group> trackGroups = new ImmutableList.Builder<>();
    for (int rendererIndex = 0;
        rendererIndex < mappedTrackInfo.getRendererCount();
        rendererIndex++) {
@@ -194,8 +193,7 @@ public final class TrackSelectionUtil {
          }
          selected[trackIndex] = isTrackSelected;
        }
-        trackGroupInfos.add(
+        trackGroups.add(new Tracks.Group(trackGroup, adaptiveSupported, trackSupport, selected));
-            new TrackGroupInfo(trackGroup, adaptiveSupported, trackSupport, selected));
      }
    }
    TrackGroupArray unmappedTrackGroups = mappedTrackInfo.getUnmappedTrackGroups();
@@ -204,9 +202,9 @@ public final class TrackSelectionUtil {
      @C.FormatSupport int[] trackSupport = new int[trackGroup.length];
      Arrays.fill(trackSupport, C.FORMAT_UNSUPPORTED_TYPE);
      boolean[] selected = new boolean[trackGroup.length];
-      trackGroupInfos.add(
+      trackGroups.add(
-          new TrackGroupInfo(trackGroup, /* adaptiveSupported= */ false, trackSupport, selected));
+          new Tracks.Group(trackGroup, /* adaptiveSupported= */ false, trackSupport, selected));
    }
-    return new TracksInfo(trackGroupInfos.build());
+    return new Tracks(trackGroups.build());
  }
 }
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java
@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.trackselection;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.RendererConfiguration;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.util.Util;
 import org.checkerframework.checker.nullness.compatqual.NullableType;
@@ -34,7 +34,7 @@ public final class TrackSelectorResult {
  /** A {@link ExoTrackSelection} array containing the track selection for each renderer. */
  public final @NullableType ExoTrackSelection[] selections;
  /** Describe the tracks and which one were selected. */
-  public final TracksInfo tracksInfo;
+  public final Tracks tracks;
  /**
   * An opaque object that will be returned to {@link TrackSelector#onSelectionActivated(Object)}
   * should the selections be activated.
@@ -49,21 +49,21 @@ public final class TrackSelectorResult {
   *     TrackSelector#onSelectionActivated(Object)} should the selection be activated. May be
   *     {@code null}.
   * @deprecated Use {@link #TrackSelectorResult(RendererConfiguration[], ExoTrackSelection[],
-   *     TracksInfo, Object)}.
+   *     Tracks, Object)}.
   */
  @Deprecated
  public TrackSelectorResult(
      @NullableType RendererConfiguration[] rendererConfigurations,
      @NullableType ExoTrackSelection[] selections,
      @Nullable Object info) {
-    this(rendererConfigurations, selections, TracksInfo.EMPTY, info);
+    this(rendererConfigurations, selections, Tracks.EMPTY, info);
  }
  /**
   * @param rendererConfigurations A {@link RendererConfiguration} for each renderer. A null entry
   *     indicates the corresponding renderer should be disabled.
   * @param selections A {@link ExoTrackSelection} array containing the selection for each renderer.
-   * @param tracksInfo Description of the available tracks and which one were selected.
+   * @param tracks Description of the available tracks and which one were selected.
   * @param info An opaque object that will be returned to {@link
   *     TrackSelector#onSelectionActivated(Object)} should the selection be activated. May be
   *     {@code null}.
@@ -71,11 +71,11 @@ public final class TrackSelectorResult {
  public TrackSelectorResult(
      @NullableType RendererConfiguration[] rendererConfigurations,
      @NullableType ExoTrackSelection[] selections,
-      TracksInfo tracksInfo,
+      Tracks tracks,
      @Nullable Object info) {
    this.rendererConfigurations = rendererConfigurations;
    this.selections = selections.clone();
-    this.tracksInfo = tracksInfo;
+    this.tracks = tracks;
    this.info = info;
    length = rendererConfigurations.length;
  }

--- a/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
@@ -29,7 +29,7 @@ import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Player.PlaybackSuppressionReason;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.analytics.AnalyticsListener;
 import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
@@ -258,23 +258,23 @@ public class EventLogger implements AnalyticsListener {
  }
  @Override
-  public void onTracksInfoChanged(EventTime eventTime, TracksInfo tracksInfo) {
+  public void onTracksChanged(EventTime eventTime, Tracks tracks) {
    logd("tracks [" + getEventTimeString(eventTime));
    // Log tracks associated to renderers.
-    ImmutableList<TracksInfo.TrackGroupInfo> trackGroupInfos = tracksInfo.getTrackGroupInfos();
+    ImmutableList<Tracks.Group> trackGroups = tracks.getGroups();
-    for (int groupIndex = 0; groupIndex < trackGroupInfos.size(); groupIndex++) {
+    for (int groupIndex = 0; groupIndex < trackGroups.size(); groupIndex++) {
-      TracksInfo.TrackGroupInfo trackGroupInfo = trackGroupInfos.get(groupIndex);
+      Tracks.Group trackGroup = trackGroups.get(groupIndex);
      logd("  group [");
-      for (int trackIndex = 0; trackIndex < trackGroupInfo.length; trackIndex++) {
+      for (int trackIndex = 0; trackIndex < trackGroup.length; trackIndex++) {
-        String status = getTrackStatusString(trackGroupInfo.isTrackSelected(trackIndex));
+        String status = getTrackStatusString(trackGroup.isTrackSelected(trackIndex));
-        String formatSupport = getFormatSupportString(trackGroupInfo.getTrackSupport(trackIndex));
+        String formatSupport = getFormatSupportString(trackGroup.getTrackSupport(trackIndex));
        logd(
            "    "
                + status
                + " Track:"
                + trackIndex
                + ", "
-                + Format.toLogString(trackGroupInfo.getTrackFormat(trackIndex))
+                + Format.toLogString(trackGroup.getTrackFormat(trackIndex))
                + ", supported="
                + formatSupport);
      }
@@ -283,8 +283,8 @@ public class EventLogger implements AnalyticsListener {
    // TODO: Replace this with an override of onMediaMetadataChanged.
    // Log metadata for at most one of the selected tracks.
    boolean loggedMetadata = false;
-    for (int groupIndex = 0; !loggedMetadata && groupIndex < trackGroupInfos.size(); groupIndex++) {
+    for (int groupIndex = 0; !loggedMetadata && groupIndex < trackGroups.size(); groupIndex++) {
-      TracksInfo.TrackGroupInfo trackGroup = trackGroupInfos.get(groupIndex);
+      Tracks.Group trackGroup = trackGroups.get(groupIndex);
      for (int trackIndex = 0; !loggedMetadata && trackIndex < trackGroup.length; trackIndex++) {
        if (trackGroup.isTrackSelected(trackIndex)) {
          @Nullable Metadata metadata = trackGroup.getTrackFormat(trackIndex).metadata;

--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -96,7 +96,6 @@ import com.google.android.exoplayer2.Player.DiscontinuityReason;
 import com.google.android.exoplayer2.Player.Listener;
 import com.google.android.exoplayer2.Player.PositionInfo;
 import com.google.android.exoplayer2.Timeline.Window;
-import com.google.android.exoplayer2.TracksInfo.TrackGroupInfo;
 import com.google.android.exoplayer2.analytics.AnalyticsListener;
 import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.drm.DrmSessionEventListener;
@@ -267,15 +266,15 @@ public final class ExoPlayerTest {
            argThat(noUid(timeline)), eq(Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE));
    inOrder
        .verify(mockListener)
-        .onTracksInfoChanged(
+        .onTracksChanged(
            eq(
-                new TracksInfo(
+                new Tracks(
                    ImmutableList.of(
-                        new TrackGroupInfo(
+                        new Tracks.Group(
                            new TrackGroup(ExoPlayerTestRunner.VIDEO_FORMAT),
                            /* adaptiveSupported= */ false,
                            new int[] {C.FORMAT_HANDLED},
-                            /* tracksSelected= */ new boolean[] {true})))));
+                            /* trackSelected= */ new boolean[] {true})))));
    inOrder.verify(mockListener, never()).onPositionDiscontinuity(anyInt());
    inOrder.verify(mockListener, never()).onPositionDiscontinuity(any(), any(), anyInt());
    assertThat(renderer.getFormatsRead()).containsExactly(ExoPlayerTestRunner.VIDEO_FORMAT);
@@ -646,15 +645,15 @@ public final class ExoPlayerTest {
            argThat(noUid(thirdTimeline)), eq(Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE));
    inOrder
        .verify(mockPlayerListener)
-        .onTracksInfoChanged(
+        .onTracksChanged(
            eq(
-                new TracksInfo(
+                new Tracks(
                    ImmutableList.of(
-                        new TrackGroupInfo(
+                        new Tracks.Group(
                            new TrackGroup(ExoPlayerTestRunner.VIDEO_FORMAT),
                            /* adaptiveSupported= */ false,
                            new int[] {C.FORMAT_HANDLED},
-                            /* tracksSelected= */ new boolean[] {true})))));
+                            /* trackSelected= */ new boolean[] {true})))));
    assertThat(renderer.isEnded).isTrue();
  }
@@ -3416,7 +3415,7 @@ public final class ExoPlayerTest {
            .waitForPendingPlayerCommands()
            .play()
            .build();
-    List<TracksInfo> tracksInfoList = new ArrayList<>();
+    List<Tracks> tracksList = new ArrayList<>();
    new ExoPlayerTestRunner.Builder(context)
        .setMediaSources(mediaSource)
        .setSupportedFormats(ExoPlayerTestRunner.VIDEO_FORMAT, ExoPlayerTestRunner.AUDIO_FORMAT)
@@ -3424,21 +3423,21 @@ public final class ExoPlayerTest {
        .setPlayerListener(
            new Player.Listener() {
              @Override
-              public void onTracksInfoChanged(TracksInfo tracksInfo) {
+              public void onTracksChanged(Tracks tracks) {
-                tracksInfoList.add(tracksInfo);
+                tracksList.add(tracks);
              }
            })
        .build()
        .start()
        .blockUntilEnded(TIMEOUT_MS);
-    assertThat(tracksInfoList).hasSize(3);
+    assertThat(tracksList).hasSize(3);
    // First track groups of the 1st period are reported.
    // Then the seek to an unprepared period will result in empty track groups being returned.
    // Then the track groups of the 2nd period are reported.
-    assertThat(tracksInfoList.get(0).getTrackGroupInfos().get(0).getTrackFormat(0))
+    assertThat(tracksList.get(0).getGroups().get(0).getTrackFormat(0))
        .isEqualTo(ExoPlayerTestRunner.VIDEO_FORMAT);
-    assertThat(tracksInfoList.get(1)).isEqualTo(TracksInfo.EMPTY);
+    assertThat(tracksList.get(1)).isEqualTo(Tracks.EMPTY);
-    assertThat(tracksInfoList.get(2).getTrackGroupInfos().get(0).getTrackFormat(0))
+    assertThat(tracksList.get(2).getGroups().get(0).getTrackFormat(0))
        .isEqualTo(ExoPlayerTestRunner.AUDIO_FORMAT);
  }
@@ -7983,7 +7982,7 @@ public final class ExoPlayerTest {
          }
        };
    AtomicReference<Timeline> timelineAfterError = new AtomicReference<>();
-    AtomicReference<TracksInfo> trackInfosAfterError = new AtomicReference<>();
+    AtomicReference<Tracks> trackInfosAfterError = new AtomicReference<>();
    AtomicInteger mediaItemIndexAfterError = new AtomicInteger();
    ActionSchedule actionSchedule =
        new ActionSchedule.Builder(TAG)
@@ -7996,7 +7995,7 @@ public final class ExoPlayerTest {
                          @Override
                          public void onPlayerError(EventTime eventTime, PlaybackException error) {
                            timelineAfterError.set(player.getCurrentTimeline());
-                            trackInfosAfterError.set(player.getCurrentTracksInfo());
+                            trackInfosAfterError.set(player.getCurrentTracks());
                            mediaItemIndexAfterError.set(player.getCurrentMediaItemIndex());
                          }
                        });
@@ -8025,8 +8024,8 @@ public final class ExoPlayerTest {
    assertThat(timelineAfterError.get().getWindowCount()).isEqualTo(1);
    assertThat(mediaItemIndexAfterError.get()).isEqualTo(0);
-    assertThat(trackInfosAfterError.get().getTrackGroupInfos()).hasSize(1);
+    assertThat(trackInfosAfterError.get().getGroups()).hasSize(1);
-    assertThat(trackInfosAfterError.get().getTrackGroupInfos().get(0).getTrackFormat(0))
+    assertThat(trackInfosAfterError.get().getGroups().get(0).getTrackFormat(0))
        .isEqualTo(ExoPlayerTestRunner.AUDIO_FORMAT);
    assertThat(trackInfosAfterError.get().isTypeSelected(C.TRACK_TYPE_VIDEO)).isFalse();
    assertThat(trackInfosAfterError.get().isTypeSelected(C.TRACK_TYPE_AUDIO)).isTrue();
@@ -10413,7 +10412,7 @@ public final class ExoPlayerTest {
    verify(listener, atLeastOnce()).onShuffleModeEnabledChanged(anyBoolean());
    verify(listener, atLeastOnce()).onPlaybackStateChanged(anyInt());
    verify(listener, atLeastOnce()).onIsLoadingChanged(anyBoolean());
-    verify(listener, atLeastOnce()).onTracksInfoChanged(any());
+    verify(listener, atLeastOnce()).onTracksChanged(any());
    verify(listener, atLeastOnce()).onMediaMetadataChanged(any());
    verify(listener, atLeastOnce()).onPlayWhenReadyChanged(anyBoolean(), anyInt());
    verify(listener, atLeastOnce()).onIsPlayingChanged(anyBoolean());

--- a/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
@@ -1135,7 +1135,7 @@ public final class MediaPeriodQueueTest {
        new TrackSelectorResult(
            new RendererConfiguration[0],
            new ExoTrackSelection[0],
-            TracksInfo.EMPTY,
+            Tracks.EMPTY,
            /* info= */ null));
  }

--- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultAnalyticsCollectorTest.java
@@ -83,7 +83,7 @@ import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Timeline.Window;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
 import com.google.android.exoplayer2.drm.DrmInitData;
@@ -1729,7 +1729,7 @@ public final class DefaultAnalyticsCollectorTest {
    ArgumentCaptor<AnalyticsListener.EventTime> individualTracksChangedEventTimes =
        ArgumentCaptor.forClass(AnalyticsListener.EventTime.class);
    verify(listener, atLeastOnce())
-        .onTracksInfoChanged(individualTracksChangedEventTimes.capture(), any());
+        .onTracksChanged(individualTracksChangedEventTimes.capture(), any());
    ArgumentCaptor<AnalyticsListener.EventTime> individualPlayWhenReadyChangedEventTimes =
        ArgumentCaptor.forClass(AnalyticsListener.EventTime.class);
    verify(listener, atLeastOnce())
@@ -2243,7 +2243,7 @@ public final class DefaultAnalyticsCollectorTest {
    }
    @Override
-    public void onTracksInfoChanged(EventTime eventTime, TracksInfo tracksInfo) {
+    public void onTracksChanged(EventTime eventTime, Tracks tracks) {
      reportedEvents.add(new ReportedEvent(EVENT_TRACKS_CHANGED, eventTime));
    }

--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -44,7 +44,7 @@ import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.RendererCapabilities.Capabilities;
 import com.google.android.exoplayer2.RendererConfiguration;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -2223,10 +2223,10 @@ public final class DefaultTrackSelectorTest {
  public void selectTracks_multipleRenderer_allSelected() throws Exception {
    RendererCapabilities[] rendererCapabilities =
        new RendererCapabilities[] {VIDEO_CAPABILITIES, AUDIO_CAPABILITIES, AUDIO_CAPABILITIES};
-    TrackGroupArray trackGroups = new TrackGroupArray(AUDIO_TRACK_GROUP);
+    TrackGroupArray trackGroupArray = new TrackGroupArray(AUDIO_TRACK_GROUP);
    TrackSelectorResult result =
-        trackSelector.selectTracks(rendererCapabilities, trackGroups, periodId, TIMELINE);
+        trackSelector.selectTracks(rendererCapabilities, trackGroupArray, periodId, TIMELINE);
    assertThat(result.length).isEqualTo(3);
    assertThat(result.rendererConfigurations)
@@ -2234,14 +2234,14 @@ public final class DefaultTrackSelectorTest {
        .containsExactly(null, DEFAULT, null)
        .inOrder();
    assertThat(result.selections[0]).isNull();
-    assertFixedSelection(result.selections[1], trackGroups, trackGroups.get(0).getFormat(0));
+    assertFixedSelection(
+        result.selections[1], trackGroupArray, trackGroupArray.get(0).getFormat(0));
    assertThat(result.selections[2]).isNull();
-    ImmutableList<TracksInfo.TrackGroupInfo> trackGroupInfos =
+    ImmutableList<Tracks.Group> trackGroups = result.tracks.getGroups();
-        result.tracksInfo.getTrackGroupInfos();
+    assertThat(trackGroups).hasSize(1);
-    assertThat(trackGroupInfos).hasSize(1);
+    assertThat(trackGroups.get(0).getTrackGroup()).isEqualTo(AUDIO_TRACK_GROUP);
-    assertThat(trackGroupInfos.get(0).getTrackGroup()).isEqualTo(AUDIO_TRACK_GROUP);
+    assertThat(trackGroups.get(0).isTrackSelected(0)).isTrue();
-    assertThat(trackGroupInfos.get(0).isTrackSelected(0)).isTrue();
+    assertThat(trackGroups.get(0).getTrackSupport(0)).isEqualTo(FORMAT_HANDLED);
-    assertThat(trackGroupInfos.get(0).getTrackSupport(0)).isEqualTo(FORMAT_HANDLED);
  }
  /** Tests {@link SelectionOverride}'s {@link Bundleable} implementation. */

--- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionUtilTest.java
@@ -32,8 +32,7 @@ import static com.google.common.truth.Truth.assertThat;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
-import com.google.android.exoplayer2.TracksInfo.TrackGroupInfo;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.common.collect.ImmutableList;
@@ -73,32 +72,32 @@ public class TrackSelectionUtilTest {
          new FixedTrackSelection(mappedTrackInfo.getTrackGroups(1).get(0), 1)
        };
-    TracksInfo tracksInfo = TrackSelectionUtil.buildTracksInfo(mappedTrackInfo, selections);
+    Tracks tracks = TrackSelectionUtil.buildTracks(mappedTrackInfo, selections);
-    ImmutableList<TracksInfo.TrackGroupInfo> trackGroupInfos = tracksInfo.getTrackGroupInfos();
+    ImmutableList<Tracks.Group> trackGroups = tracks.getGroups();
-    assertThat(trackGroupInfos).hasSize(4);
+    assertThat(trackGroups).hasSize(4);
-    assertThat(trackGroupInfos.get(0).getTrackGroup())
+    assertThat(trackGroups.get(0).getTrackGroup())
        .isEqualTo(mappedTrackInfo.getTrackGroups(0).get(0));
-    assertThat(trackGroupInfos.get(1).getTrackGroup())
+    assertThat(trackGroups.get(1).getTrackGroup())
        .isEqualTo(mappedTrackInfo.getTrackGroups(0).get(1));
-    assertThat(trackGroupInfos.get(2).getTrackGroup())
+    assertThat(trackGroups.get(2).getTrackGroup())
        .isEqualTo(mappedTrackInfo.getTrackGroups(1).get(0));
-    assertThat(trackGroupInfos.get(3).getTrackGroup())
+    assertThat(trackGroups.get(3).getTrackGroup())
        .isEqualTo(mappedTrackInfo.getUnmappedTrackGroups().get(0));
-    assertThat(trackGroupInfos.get(0).getTrackSupport(0)).isEqualTo(FORMAT_HANDLED);
+    assertThat(trackGroups.get(0).getTrackSupport(0)).isEqualTo(FORMAT_HANDLED);
-    assertThat(trackGroupInfos.get(1).getTrackSupport(0)).isEqualTo(FORMAT_UNSUPPORTED_SUBTYPE);
+    assertThat(trackGroups.get(1).getTrackSupport(0)).isEqualTo(FORMAT_UNSUPPORTED_SUBTYPE);
-    assertThat(trackGroupInfos.get(2).getTrackSupport(0)).isEqualTo(FORMAT_UNSUPPORTED_DRM);
+    assertThat(trackGroups.get(2).getTrackSupport(0)).isEqualTo(FORMAT_UNSUPPORTED_DRM);
-    assertThat(trackGroupInfos.get(2).getTrackSupport(1)).isEqualTo(FORMAT_EXCEEDS_CAPABILITIES);
+    assertThat(trackGroups.get(2).getTrackSupport(1)).isEqualTo(FORMAT_EXCEEDS_CAPABILITIES);
-    assertThat(trackGroupInfos.get(3).getTrackSupport(0)).isEqualTo(FORMAT_UNSUPPORTED_TYPE);
+    assertThat(trackGroups.get(3).getTrackSupport(0)).isEqualTo(FORMAT_UNSUPPORTED_TYPE);
-    assertThat(trackGroupInfos.get(0).isTrackSelected(0)).isFalse();
+    assertThat(trackGroups.get(0).isTrackSelected(0)).isFalse();
-    assertThat(trackGroupInfos.get(1).isTrackSelected(0)).isTrue();
+    assertThat(trackGroups.get(1).isTrackSelected(0)).isTrue();
-    assertThat(trackGroupInfos.get(2).isTrackSelected(0)).isFalse();
+    assertThat(trackGroups.get(2).isTrackSelected(0)).isFalse();
-    assertThat(trackGroupInfos.get(2).isTrackSelected(1)).isTrue();
+    assertThat(trackGroups.get(2).isTrackSelected(1)).isTrue();
-    assertThat(trackGroupInfos.get(3).isTrackSelected(0)).isFalse();
+    assertThat(trackGroups.get(3).isTrackSelected(0)).isFalse();
-    assertThat(trackGroupInfos.get(0).getTrackType()).isEqualTo(TRACK_TYPE_AUDIO);
+    assertThat(trackGroups.get(0).getType()).isEqualTo(TRACK_TYPE_AUDIO);
-    assertThat(trackGroupInfos.get(1).getTrackType()).isEqualTo(TRACK_TYPE_AUDIO);
+    assertThat(trackGroups.get(1).getType()).isEqualTo(TRACK_TYPE_AUDIO);
-    assertThat(trackGroupInfos.get(2).getTrackType()).isEqualTo(TRACK_TYPE_VIDEO);
+    assertThat(trackGroups.get(2).getType()).isEqualTo(TRACK_TYPE_VIDEO);
-    assertThat(trackGroupInfos.get(3).getTrackType()).isEqualTo(TRACK_TYPE_UNKNOWN);
+    assertThat(trackGroups.get(3).getType()).isEqualTo(TRACK_TYPE_UNKNOWN);
  }
  @Test
@@ -132,21 +131,21 @@ public class TrackSelectionUtilTest {
          ImmutableList.of()
        };
-    TracksInfo tracksInfo = TrackSelectionUtil.buildTracksInfo(mappedTrackInfo, selections);
+    Tracks tracks = TrackSelectionUtil.buildTracks(mappedTrackInfo, selections);
-    ImmutableList<TrackGroupInfo> trackGroupInfos = tracksInfo.getTrackGroupInfos();
+    ImmutableList<Tracks.Group> trackGroups = tracks.getGroups();
-    assertThat(trackGroupInfos).hasSize(2);
+    assertThat(trackGroups).hasSize(2);
-    assertThat(trackGroupInfos.get(0).getTrackGroup())
+    assertThat(trackGroups.get(0).getTrackGroup())
        .isEqualTo(mappedTrackInfo.getTrackGroups(0).get(0));
-    assertThat(trackGroupInfos.get(1).getTrackGroup())
+    assertThat(trackGroups.get(1).getTrackGroup())
        .isEqualTo(mappedTrackInfo.getTrackGroups(0).get(1));
-    assertThat(trackGroupInfos.get(0).getTrackSupport(0)).isEqualTo(FORMAT_HANDLED);
+    assertThat(trackGroups.get(0).getTrackSupport(0)).isEqualTo(FORMAT_HANDLED);
-    assertThat(trackGroupInfos.get(1).getTrackSupport(0)).isEqualTo(FORMAT_HANDLED);
+    assertThat(trackGroups.get(1).getTrackSupport(0)).isEqualTo(FORMAT_HANDLED);
-    assertThat(trackGroupInfos.get(1).getTrackSupport(1)).isEqualTo(FORMAT_HANDLED);
+    assertThat(trackGroups.get(1).getTrackSupport(1)).isEqualTo(FORMAT_HANDLED);
-    assertThat(trackGroupInfos.get(0).isTrackSelected(0)).isTrue();
+    assertThat(trackGroups.get(0).isTrackSelected(0)).isTrue();
-    assertThat(trackGroupInfos.get(1).isTrackSelected(0)).isFalse();
+    assertThat(trackGroups.get(1).isTrackSelected(0)).isFalse();
-    assertThat(trackGroupInfos.get(1).isTrackSelected(1)).isTrue();
+    assertThat(trackGroups.get(1).isTrackSelected(1)).isTrue();
-    assertThat(trackGroupInfos.get(0).getTrackType()).isEqualTo(TRACK_TYPE_AUDIO);
+    assertThat(trackGroups.get(0).getType()).isEqualTo(TRACK_TYPE_AUDIO);
-    assertThat(trackGroupInfos.get(1).getTrackType()).isEqualTo(TRACK_TYPE_AUDIO);
+    assertThat(trackGroups.get(1).getType()).isEqualTo(TRACK_TYPE_AUDIO);
  }
 }
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
@@ -44,7 +44,7 @@ import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
 import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
 import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor;
@@ -947,7 +947,7 @@ public final class Transformer {
    }
    @Override
-    public void onTracksInfoChanged(TracksInfo tracksInfo) {
+    public void onTracksChanged(Tracks tracks) {
      if (muxerWrapper.getTrackCount() == 0) {
        handleTransformationEnded(
            TransformationException.createForUnexpected(

--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -53,7 +53,7 @@ import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Player.DiscontinuityReason;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Timeline.Period;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
 import com.google.android.exoplayer2.util.Assertions;
@@ -1230,7 +1230,7 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
    @Nullable Player player = this.player;
    if (player == null
        || !player.isCommandAvailable(Player.COMMAND_GET_TRACK_INFOS)
-        || player.getCurrentTracksInfo().getTrackGroupInfos().isEmpty()) {
+        || player.getCurrentTracks().isEmpty()) {
      if (!keepContentOnPlayerReset) {
        hideArtwork();
        closeShutter();
@@ -1242,7 +1242,7 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
      // Hide any video from the previous player.
      closeShutter();
    }
-    if (player.getCurrentTracksInfo().isTypeSelected(C.TRACK_TYPE_VIDEO)) {
+    if (player.getCurrentTracks().isTypeSelected(C.TRACK_TYPE_VIDEO)) {
      // Video enabled, so artwork must be hidden. If the shutter is closed, it will be opened
      // in onRenderedFirstFrame().
      hideArtwork();
@@ -1474,7 +1474,7 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
    }
    @Override
-    public void onTracksInfoChanged(TracksInfo tracksInfo) {
+    public void onTracksChanged(Tracks tracks) {
      // Suppress the update if transitioning to an unprepared period within the same window. This
      // is necessary to avoid closing the shutter when such a transition occurs. See:
      // https://github.com/google/ExoPlayer/issues/5507.
@@ -1482,7 +1482,7 @@ public class PlayerView extends FrameLayout implements AdViewProvider {
      Timeline timeline = player.getCurrentTimeline();
      if (timeline.isEmpty()) {
        lastPeriodUidWithTracks = null;
-      } else if (!player.getCurrentTracksInfo().getTrackGroupInfos().isEmpty()) {
+      } else if (!player.getCurrentTracks().isEmpty()) {
        lastPeriodUidWithTracks =
            timeline.getPeriod(player.getCurrentPeriodIndex(), period, /* setIds= */ true).uid;
      } else if (lastPeriodUidWithTracks != null) {

--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
@@ -65,8 +65,7 @@ import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Player.Events;
 import com.google.android.exoplayer2.Player.State;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
-import com.google.android.exoplayer2.TracksInfo.TrackGroupInfo;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.trackselection.TrackSelectionOverride;
 import com.google.android.exoplayer2.trackselection.TrackSelectionParameters;
@@ -1107,39 +1106,37 @@ public class StyledPlayerControlView extends FrameLayout {
        || !player.isCommandAvailable(Player.COMMAND_SET_TRACK_SELECTION_PARAMETERS)) {
      return;
    }
-    TracksInfo tracksInfo = player.getCurrentTracksInfo();
+    Tracks tracks = player.getCurrentTracks();
-    audioTrackSelectionAdapter.init(
+    audioTrackSelectionAdapter.init(gatherSupportedTrackInfosOfType(tracks, C.TRACK_TYPE_AUDIO));
-        gatherSupportedTrackInfosOfType(tracksInfo, C.TRACK_TYPE_AUDIO));
    if (controlViewLayoutManager.getShowButton(subtitleButton)) {
-      textTrackSelectionAdapter.init(
+      textTrackSelectionAdapter.init(gatherSupportedTrackInfosOfType(tracks, C.TRACK_TYPE_TEXT));
-          gatherSupportedTrackInfosOfType(tracksInfo, C.TRACK_TYPE_TEXT));
    } else {
      textTrackSelectionAdapter.init(ImmutableList.of());
    }
  }
  private ImmutableList<TrackInformation> gatherSupportedTrackInfosOfType(
-      TracksInfo tracksInfo, @C.TrackType int trackType) {
+      Tracks tracks, @C.TrackType int trackType) {
-    ImmutableList.Builder<TrackInformation> tracks = new ImmutableList.Builder<>();
+    ImmutableList.Builder<TrackInformation> trackInfos = new ImmutableList.Builder<>();
-    List<TrackGroupInfo> trackGroupInfos = tracksInfo.getTrackGroupInfos();
+    List<Tracks.Group> trackGroups = tracks.getGroups();
-    for (int trackGroupIndex = 0; trackGroupIndex < trackGroupInfos.size(); trackGroupIndex++) {
+    for (int trackGroupIndex = 0; trackGroupIndex < trackGroups.size(); trackGroupIndex++) {
-      TrackGroupInfo trackGroupInfo = trackGroupInfos.get(trackGroupIndex);
+      Tracks.Group trackGroup = trackGroups.get(trackGroupIndex);
-      if (trackGroupInfo.getTrackType() != trackType) {
+      if (trackGroup.getType() != trackType) {
        continue;
      }
-      for (int trackIndex = 0; trackIndex < trackGroupInfo.length; trackIndex++) {
+      for (int trackIndex = 0; trackIndex < trackGroup.length; trackIndex++) {
-        if (!trackGroupInfo.isTrackSupported(trackIndex)) {
+        if (!trackGroup.isTrackSupported(trackIndex)) {
          continue;
        }
-        Format trackFormat = trackGroupInfo.getTrackFormat(trackIndex);
+        Format trackFormat = trackGroup.getTrackFormat(trackIndex);
        if ((trackFormat.selectionFlags & C.SELECTION_FLAG_FORCED) != 0) {
          continue;
        }
        String trackName = trackNameProvider.getTrackName(trackFormat);
-        tracks.add(new TrackInformation(tracksInfo, trackGroupIndex, trackIndex, trackName));
+        trackInfos.add(new TrackInformation(tracks, trackGroupIndex, trackIndex, trackName));
      }
    }
-    return tracks.build();
+    return trackInfos.build();
  }
  private void updateTimeline() {
@@ -1818,19 +1815,18 @@ public class StyledPlayerControlView extends FrameLayout {
  private static final class TrackInformation {
-    public final TrackGroupInfo trackGroupInfo;
+    public final Tracks.Group trackGroup;
    public final int trackIndex;
    public final String trackName;
-    public TrackInformation(
+    public TrackInformation(Tracks tracks, int trackGroupIndex, int trackIndex, String trackName) {
-        TracksInfo tracksInfo, int trackGroupIndex, int trackIndex, String trackName) {
+      this.trackGroup = tracks.getGroups().get(trackGroupIndex);
-      this.trackGroupInfo = tracksInfo.getTrackGroupInfos().get(trackGroupIndex);
      this.trackIndex = trackIndex;
      this.trackName = trackName;
    }
    public boolean isSelected() {
-      return trackGroupInfo.isTrackSelected(trackIndex);
+      return trackGroup.isTrackSelected(trackIndex);
    }
  }
@@ -1930,7 +1926,7 @@ public class StyledPlayerControlView extends FrameLayout {
    private boolean hasSelectionOverride(TrackSelectionParameters trackSelectionParameters) {
      for (int i = 0; i < tracks.size(); i++) {
-        TrackGroup trackGroup = tracks.get(i).trackGroupInfo.getTrackGroup();
+        TrackGroup trackGroup = tracks.get(i).trackGroup.getTrackGroup();
        if (trackSelectionParameters.overrides.containsKey(trackGroup)) {
          return true;
        }
@@ -2004,7 +2000,7 @@ public class StyledPlayerControlView extends FrameLayout {
        onBindViewHolderAtZeroPosition(holder);
      } else {
        TrackInformation track = tracks.get(position - 1);
-        TrackGroup trackGroup = track.trackGroupInfo.getTrackGroup();
+        TrackGroup trackGroup = track.trackGroup.getTrackGroup();
        TrackSelectionParameters params = player.getTrackSelectionParameters();
        boolean explicitlySelected = params.overrides.get(trackGroup) != null && track.isSelected();
        holder.textView.setText(track.trackName);
@@ -2019,8 +2015,7 @@ public class StyledPlayerControlView extends FrameLayout {
                      .setOverrideForType(
                          new TrackSelectionOverride(
                              trackGroup, ImmutableList.of(track.trackIndex)))
-                      .setTrackTypeDisabled(
+                      .setTrackTypeDisabled(track.trackGroup.getType(), /* disabled= */ false)
-                          track.trackGroupInfo.getTrackType(), /* disabled= */ false)
                      .build());
              onTrackSelection(track.trackName);
              settingsWindow.dismiss();

--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java
@@ -55,7 +55,7 @@ import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Player.DiscontinuityReason;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Timeline.Period;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
 import com.google.android.exoplayer2.util.Assertions;
@@ -1177,7 +1177,7 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider {
  private void updateForCurrentTrackSelections(boolean isNewPlayer) {
    @Nullable Player player = this.player;
-    if (player == null || player.getCurrentTracksInfo().getTrackGroupInfos().isEmpty()) {
+    if (player == null || player.getCurrentTracks().isEmpty()) {
      if (!keepContentOnPlayerReset) {
        hideArtwork();
        closeShutter();
@@ -1190,7 +1190,7 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider {
      closeShutter();
    }
-    if (player.getCurrentTracksInfo().isTypeSelected(C.TRACK_TYPE_VIDEO)) {
+    if (player.getCurrentTracks().isTypeSelected(C.TRACK_TYPE_VIDEO)) {
      // Video enabled, so artwork must be hidden. If the shutter is closed, it will be opened
      // in onRenderedFirstFrame().
      hideArtwork();
@@ -1422,7 +1422,7 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider {
    }
    @Override
-    public void onTracksInfoChanged(TracksInfo tracksInfo) {
+    public void onTracksChanged(Tracks tracks) {
      // Suppress the update if transitioning to an unprepared period within the same window. This
      // is necessary to avoid closing the shutter when such a transition occurs. See:
      // https://github.com/google/ExoPlayer/issues/5507.
@@ -1430,7 +1430,7 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider {
      Timeline timeline = player.getCurrentTimeline();
      if (timeline.isEmpty()) {
        lastPeriodUidWithTracks = null;
-      } else if (!player.getCurrentTracksInfo().getTrackGroupInfos().isEmpty()) {
+      } else if (!player.getCurrentTracks().isEmpty()) {
        lastPeriodUidWithTracks =
            timeline.getPeriod(player.getCurrentPeriodIndex(), period, /* setIds= */ true).uid;
      } else if (lastPeriodUidWithTracks != null) {

--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
@@ -26,7 +26,7 @@ import androidx.annotation.StyleRes;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.TracksInfo.TrackGroupInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.trackselection.TrackSelectionOverride;
 import com.google.android.exoplayer2.trackselection.TrackSelectionParameters;
@@ -56,7 +56,7 @@ public final class TrackSelectionDialogBuilder {
  private final Context context;
  private final CharSequence title;
-  private final List<TrackGroupInfo> trackGroupInfos;
+  private final List<Tracks.Group> trackGroups;
  private final DialogCallback callback;
  @StyleRes private int themeResId;
@@ -73,17 +73,17 @@ public final class TrackSelectionDialogBuilder {
   *
   * @param context The context of the dialog.
   * @param title The title of the dialog.
-   * @param trackGroupInfos The {@link TrackGroupInfo TrackGroupInfos} for the track groups.
+   * @param trackGroups The {@link Tracks.Group track groups}.
   * @param callback The {@link DialogCallback} invoked when a track selection has been made.
   */
  public TrackSelectionDialogBuilder(
      Context context,
      CharSequence title,
-      List<TrackGroupInfo> trackGroupInfos,
+      List<Tracks.Group> trackGroups,
      DialogCallback callback) {
    this.context = context;
    this.title = title;
-    this.trackGroupInfos = ImmutableList.copyOf(trackGroupInfos);
+    this.trackGroups = ImmutableList.copyOf(trackGroups);
    this.callback = callback;
    overrides = Collections.emptyMap();
  }
@@ -100,12 +100,12 @@ public final class TrackSelectionDialogBuilder {
      Context context, CharSequence title, Player player, @C.TrackType int trackType) {
    this.context = context;
    this.title = title;
-    List<TrackGroupInfo> allTrackGroupInfos = player.getCurrentTracksInfo().getTrackGroupInfos();
+    List<Tracks.Group> allTrackGroups = player.getCurrentTracks().getGroups();
-    trackGroupInfos = new ArrayList<>();
+    trackGroups = new ArrayList<>();
-    for (int i = 0; i < allTrackGroupInfos.size(); i++) {
+    for (int i = 0; i < allTrackGroups.size(); i++) {
-      TrackGroupInfo trackGroupInfo = allTrackGroupInfos.get(i);
+      Tracks.Group trackGroup = allTrackGroups.get(i);
-      if (trackGroupInfo.getTrackType() == trackType) {
+      if (trackGroup.getType() == trackType) {
-        trackGroupInfos.add(trackGroupInfo);
+        trackGroups.add(trackGroup);
      }
    }
    overrides = Collections.emptyMap();
@@ -156,11 +156,11 @@ public final class TrackSelectionDialogBuilder {
  }
  /**
-   * Sets the initial track overrides. Any overrides that do not correspond to track groups
+   * Sets the initial track overrides. Any overrides that do not correspond to track groups that
-   * described by {@code trackGroupInfos} that have been given to this instance will be ignored. If
+   * were passed to the constructor will be ignored. If {@link #setAllowMultipleOverrides(boolean)}
-   * {@link #setAllowMultipleOverrides(boolean)} hasn't been set to {@code true} then all but one
+   * hasn't been set to {@code true} then all but one override will be ignored. The retained
-   * override will be ignored. The retained override will be the one whose track group is described
+   * override will be the one whose track group was first in the list of track groups passed to the
-   * first in {@code trackGroupInfos}.
+   * constructor.
   *
   * @param overrides The initially selected track overrides.
   * @return This builder, for convenience.
@@ -296,7 +296,7 @@ public final class TrackSelectionDialogBuilder {
      selectionView.setTrackNameProvider(trackNameProvider);
    }
    selectionView.init(
-        trackGroupInfos, isDisabled, overrides, trackFormatComparator, /* listener= */ null);
+        trackGroups, isDisabled, overrides, trackFormatComparator, /* listener= */ null);
    return (dialog, which) ->
        callback.onTracksSelected(selectionView.getIsDisabled(), selectionView.getOverrides());
  }

--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubPlayer.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubPlayer.java
@@ -29,7 +29,7 @@ import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.TracksInfo;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.trackselection.TrackSelectionParameters;
@@ -189,7 +189,7 @@ public class StubPlayer extends BasePlayer {
  }
  @Override
-  public TracksInfo getCurrentTracksInfo() {
+  public Tracks getCurrentTracks() {
    throw new UnsupportedOperationException();
  }