Rename `DefaultTrackSelector.ParametersBuilder` to `Parameters.Builder`

We generally nest the `Builder` for `Foo` inside `Foo`. In this case,
there's already a `DefaultTrackSelector.Parameters.Builder` type visible
to a developer, it just happens to be the 'common'
`TrackSelectorParameters.Builder`, so using it is a bit weird. For
example this code snippet doesn't compile because
`DefaultTrackSelector.Parameters.Builder#build()` returns
`TrackSelectionParameters`. This CL fixes that problem and the code
snippet now compiles.

```java
DefaultTrackSelector.Parameters params =
   new DefaultTrackSelector.Parameters.Builder(context).build()
```

#minor-release

PiperOrigin-RevId: 453215702

RELEASENOTES.md

@@ -33,6 +33,10 @@
         `Tracks.Group`. `Player.getCurrentTracksInfo` and
         `Tracks.Group`. `Player.getCurrentTracksInfo` and
         `Player.Listener.onTracksInfoChanged` have also been renamed to
         `Player.Listener.onTracksInfoChanged` have also been renamed to
         `Player.getCurrentTracks` and `Player.Listener.onTracksChanged`.
         `Player.getCurrentTracks` and `Player.Listener.onTracksChanged`.
+    *   Change `DefaultTrackSelector.buildUponParameters` and
+        `DefaultTrackSelector.Parameters.buildUpon` to return
+        `DefaultTrackSelector.Parameters.Builder` instead of the deprecated
+        `DefaultTrackSelector.ParametersBuilder`.
 *   Video:
 *   Video:
     *   Rename `DummySurface` to `PlaceholderSurface`.
     *   Rename `DummySurface` to `PlaceholderSurface`.
     *   Add AV1 support to the `MediaCodecVideoRenderer.getCodecMaxInputSize`.
     *   Add AV1 support to the `MediaCodecVideoRenderer.getCodecMaxInputSize`.

libraries/common/src/test/java/androidx/media3/common/ForwardingPlayerTest.java

@@ -18,22 +18,17 @@ package androidx.media3.common;
 import static androidx.media3.common.Player.EVENT_IS_PLAYING_CHANGED;
 import static androidx.media3.common.Player.EVENT_IS_PLAYING_CHANGED;
 import static androidx.media3.common.Player.EVENT_MEDIA_ITEM_TRANSITION;
 import static androidx.media3.common.Player.EVENT_MEDIA_ITEM_TRANSITION;
 import static androidx.media3.common.Player.EVENT_TIMELINE_CHANGED;
 import static androidx.media3.common.Player.EVENT_TIMELINE_CHANGED;
-import static androidx.media3.common.util.Assertions.checkArgument;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verify;
 
 
 import androidx.media3.test.utils.StubPlayer;
 import androidx.media3.test.utils.StubPlayer;
+import androidx.media3.test.utils.TestUtil;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.lang.reflect.Method;
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.List;
-import java.util.Queue;
 import java.util.Set;
 import java.util.Set;
 import org.junit.Test;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runner.RunWith;
@@ -105,7 +100,7 @@ public class ForwardingPlayerTest {
   @Test
   @Test
   public void forwardingPlayer_overridesAllPlayerMethods() throws Exception {
   public void forwardingPlayer_overridesAllPlayerMethods() throws Exception {
     // Check with reflection that ForwardingPlayer overrides all Player methods.
     // Check with reflection that ForwardingPlayer overrides all Player methods.
-    List<Method> methods = getPublicMethods(Player.class);
+    List<Method> methods = TestUtil.getPublicMethods(Player.class);
     for (Method method : methods) {
     for (Method method : methods) {
       assertThat(
       assertThat(
               ForwardingPlayer.class
               ForwardingPlayer.class
@@ -119,7 +114,7 @@ public class ForwardingPlayerTest {
   public void forwardingListener_overridesAllListenerMethods() throws Exception {
   public void forwardingListener_overridesAllListenerMethods() throws Exception {
     // Check with reflection that ForwardingListener overrides all Listener methods.
     // Check with reflection that ForwardingListener overrides all Listener methods.
     Class<?> forwardingListenerClass = getInnerClass("ForwardingListener");
     Class<?> forwardingListenerClass = getInnerClass("ForwardingListener");
-    List<Method> methods = getPublicMethods(Player.Listener.class);
+    List<Method> methods = TestUtil.getPublicMethods(Player.Listener.class);
     for (Method method : methods) {
     for (Method method : methods) {
       assertThat(
       assertThat(
               forwardingListenerClass
               forwardingListenerClass
@@ -129,32 +124,6 @@ public class ForwardingPlayerTest {
     }
     }
   }
   }
 
 
-  /** Returns all the public methods of a Java interface. */
-  private static List<Method> getPublicMethods(Class<?> anInterface) {
-    checkArgument(anInterface.isInterface());
-    // Run a BFS over all extended interfaces to inspect them all.
-    Queue<Class<?>> interfacesQueue = new ArrayDeque<>();
-    interfacesQueue.add(anInterface);
-    Set<Class<?>> interfaces = new HashSet<>();
-    while (!interfacesQueue.isEmpty()) {
-      Class<?> currentInterface = interfacesQueue.remove();
-      if (interfaces.add(currentInterface)) {
-        Collections.addAll(interfacesQueue, currentInterface.getInterfaces());
-      }
-    }
-
-    List<Method> list = new ArrayList<>();
-    for (Class<?> currentInterface : interfaces) {
-      for (Method method : currentInterface.getDeclaredMethods()) {
-        if (Modifier.isPublic(method.getModifiers())) {
-          list.add(method);
-        }
-      }
-    }
-
-    return list;
-  }
-
   private static Class<?> getInnerClass(String className) {
   private static Class<?> getInnerClass(String className) {
     for (Class<?> innerClass : ForwardingPlayer.class.getDeclaredClasses()) {
     for (Class<?> innerClass : ForwardingPlayer.class.getDeclaredClasses()) {
       if (innerClass.getSimpleName().equals(className)) {
       if (innerClass.getSimpleName().equals(className)) {

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/DownloadHelper.java

@@ -746,7 +746,7 @@ public final class DownloadHelper {
       List<SelectionOverride> overrides) {
       List<SelectionOverride> overrides) {
     try {
     try {
       assertPreparedWithMedia();
       assertPreparedWithMedia();
-      DefaultTrackSelector.ParametersBuilder builder = trackSelectorParameters.buildUpon();
+      DefaultTrackSelector.Parameters.Builder builder = trackSelectorParameters.buildUpon();
       for (int i = 0; i < mappedTrackInfos[periodIndex].getRendererCount(); i++) {
       for (int i = 0; i < mappedTrackInfos[periodIndex].getRendererCount(); i++) {
         builder.setRendererDisabled(/* rendererIndex= */ i, /* disabled= */ i != rendererIndex);
         builder.setRendererDisabled(/* rendererIndex= */ i, /* disabled= */ i != rendererIndex);
       }
       }

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelector.java

@@ -102,11 +102,574 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 public class DefaultTrackSelector extends MappingTrackSelector {
 public class DefaultTrackSelector extends MappingTrackSelector {
 
 
   /**
   /**
-   * A builder for {@link Parameters}. See the {@link Parameters} documentation for explanations of
-   * the parameters that can be configured using this builder.
+   * @deprecated Use {@link Parameters.Builder} instead.
    */
    */
+  @Deprecated
   public static final class ParametersBuilder extends TrackSelectionParameters.Builder {
   public static final class ParametersBuilder extends TrackSelectionParameters.Builder {
 
 
+    private final Parameters.Builder delegate;
+
+    /**
+     * @deprecated {@link Context} constraints will not be set using this constructor. Use {@link
+     *     #ParametersBuilder(Context)} instead.
+     */
+    @Deprecated
+    @SuppressWarnings({"deprecation"})
+    public ParametersBuilder() {
+      delegate = new Parameters.Builder();
+    }
+
+    /**
+     * Creates a builder with default initial values.
+     *
+     * @param context Any context.
+     */
+    public ParametersBuilder(Context context) {
+      delegate = new Parameters.Builder(context);
+    }
+
+    @Override
+    protected ParametersBuilder set(TrackSelectionParameters parameters) {
+      delegate.set(parameters);
+      return this;
+    }
+
+    // Video
+
+    @Override
+    public DefaultTrackSelector.ParametersBuilder setMaxVideoSizeSd() {
+      delegate.setMaxVideoSizeSd();
+      return this;
+    }
+
+    @Override
+    public DefaultTrackSelector.ParametersBuilder clearVideoSizeConstraints() {
+      delegate.clearVideoSizeConstraints();
+      return this;
+    }
+
+    @Override
+    public DefaultTrackSelector.ParametersBuilder setMaxVideoSize(
+        int maxVideoWidth, int maxVideoHeight) {
+      delegate.setMaxVideoSize(maxVideoWidth, maxVideoHeight);
+      return this;
+    }
+
+    @Override
+    public DefaultTrackSelector.ParametersBuilder setMaxVideoFrameRate(int maxVideoFrameRate) {
+      delegate.setMaxVideoFrameRate(maxVideoFrameRate);
+      return this;
+    }
+
+    @Override
+    public DefaultTrackSelector.ParametersBuilder setMaxVideoBitrate(int maxVideoBitrate) {
+      delegate.setMaxVideoBitrate(maxVideoBitrate);
+      return this;
+    }
+
+    @Override
+    public DefaultTrackSelector.ParametersBuilder setMinVideoSize(
+        int minVideoWidth, int minVideoHeight) {
+      delegate.setMinVideoSize(minVideoWidth, minVideoHeight);
+      return this;
+    }
+
+    @Override
+    public DefaultTrackSelector.ParametersBuilder setMinVideoFrameRate(int minVideoFrameRate) {
+      delegate.setMinVideoFrameRate(minVideoFrameRate);
+      return this;
+    }
+
+    @Override
+    public DefaultTrackSelector.ParametersBuilder setMinVideoBitrate(int minVideoBitrate) {
+      delegate.setMinVideoBitrate(minVideoBitrate);
+      return this;
+    }
+
+    /**
+     * Sets whether to exceed the {@link #setMaxVideoBitrate}, {@link #setMaxVideoSize(int, int)}
+     * and {@link #setMaxVideoFrameRate} constraints when no selection can be made otherwise.
+     *
+     * @param exceedVideoConstraintsIfNecessary Whether to exceed video constraints when no
+     *     selection can be made otherwise.
+     * @return This builder.
+     */
+    public ParametersBuilder setExceedVideoConstraintsIfNecessary(
+        boolean exceedVideoConstraintsIfNecessary) {
+      delegate.setExceedVideoConstraintsIfNecessary(exceedVideoConstraintsIfNecessary);
+      return this;
+    }
+
+    /**
+     * Sets whether to allow adaptive video selections containing mixed MIME types.
+     *
+     * <p>Adaptations between different MIME types may not be completely seamless, in which case
+     * {@link #setAllowVideoNonSeamlessAdaptiveness(boolean)} also needs to be {@code true} for
+     * mixed MIME type selections to be made.
+     *
+     * @param allowVideoMixedMimeTypeAdaptiveness Whether to allow adaptive video selections
+     *     containing mixed MIME types.
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowVideoMixedMimeTypeAdaptiveness(
+        boolean allowVideoMixedMimeTypeAdaptiveness) {
+      delegate.setAllowVideoMixedMimeTypeAdaptiveness(allowVideoMixedMimeTypeAdaptiveness);
+      return this;
+    }
+
+    /**
+     * Sets whether to allow adaptive video selections where adaptation may not be completely
+     * seamless.
+     *
+     * @param allowVideoNonSeamlessAdaptiveness Whether to allow adaptive video selections where
+     *     adaptation may not be completely seamless.
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowVideoNonSeamlessAdaptiveness(
+        boolean allowVideoNonSeamlessAdaptiveness) {
+      delegate.setAllowVideoNonSeamlessAdaptiveness(allowVideoNonSeamlessAdaptiveness);
+      return this;
+    }
+
+    /**
+     * Sets whether to allow adaptive video selections with mixed levels of {@link
+     * RendererCapabilities.DecoderSupport} and {@link
+     * RendererCapabilities.HardwareAccelerationSupport}.
+     *
+     * @param allowVideoMixedDecoderSupportAdaptiveness Whether to allow adaptive video selections
+     *     with mixed levels of decoder and hardware acceleration support.
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowVideoMixedDecoderSupportAdaptiveness(
+        boolean allowVideoMixedDecoderSupportAdaptiveness) {
+      delegate.setAllowVideoMixedDecoderSupportAdaptiveness(
+          allowVideoMixedDecoderSupportAdaptiveness);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setViewportSizeToPhysicalDisplaySize(
+        Context context, boolean viewportOrientationMayChange) {
+      delegate.setViewportSizeToPhysicalDisplaySize(context, viewportOrientationMayChange);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder clearViewportSizeConstraints() {
+      delegate.clearViewportSizeConstraints();
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setViewportSize(
+        int viewportWidth, int viewportHeight, boolean viewportOrientationMayChange) {
+      delegate.setViewportSize(viewportWidth, viewportHeight, viewportOrientationMayChange);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setPreferredVideoMimeType(@Nullable String mimeType) {
+      delegate.setPreferredVideoMimeType(mimeType);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setPreferredVideoMimeTypes(String... mimeTypes) {
+      delegate.setPreferredVideoMimeTypes(mimeTypes);
+      return this;
+    }
+
+    @Override
+    public DefaultTrackSelector.ParametersBuilder setPreferredVideoRoleFlags(
+        @RoleFlags int preferredVideoRoleFlags) {
+      delegate.setPreferredVideoRoleFlags(preferredVideoRoleFlags);
+      return this;
+    }
+
+    // Audio
+
+    @Override
+    public ParametersBuilder setPreferredAudioLanguage(@Nullable String preferredAudioLanguage) {
+      delegate.setPreferredAudioLanguage(preferredAudioLanguage);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setPreferredAudioLanguages(String... preferredAudioLanguages) {
+      delegate.setPreferredAudioLanguages(preferredAudioLanguages);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setPreferredAudioRoleFlags(@C.RoleFlags int preferredAudioRoleFlags) {
+      delegate.setPreferredAudioRoleFlags(preferredAudioRoleFlags);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setMaxAudioChannelCount(int maxAudioChannelCount) {
+      delegate.setMaxAudioChannelCount(maxAudioChannelCount);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setMaxAudioBitrate(int maxAudioBitrate) {
+      delegate.setMaxAudioBitrate(maxAudioBitrate);
+      return this;
+    }
+
+    /**
+     * Sets whether to exceed the {@link #setMaxAudioChannelCount(int)} and {@link
+     * #setMaxAudioBitrate(int)} constraints when no selection can be made otherwise.
+     *
+     * @param exceedAudioConstraintsIfNecessary Whether to exceed audio constraints when no
+     *     selection can be made otherwise.
+     * @return This builder.
+     */
+    public ParametersBuilder setExceedAudioConstraintsIfNecessary(
+        boolean exceedAudioConstraintsIfNecessary) {
+      delegate.setExceedAudioConstraintsIfNecessary(exceedAudioConstraintsIfNecessary);
+      return this;
+    }
+
+    /**
+     * Sets whether to allow adaptive audio selections containing mixed MIME types.
+     *
+     * <p>Adaptations between different MIME types may not be completely seamless.
+     *
+     * @param allowAudioMixedMimeTypeAdaptiveness Whether to allow adaptive audio selections
+     *     containing mixed MIME types.
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowAudioMixedMimeTypeAdaptiveness(
+        boolean allowAudioMixedMimeTypeAdaptiveness) {
+      delegate.setAllowAudioMixedMimeTypeAdaptiveness(allowAudioMixedMimeTypeAdaptiveness);
+      return this;
+    }
+
+    /**
+     * Sets whether to allow adaptive audio selections containing mixed sample rates.
+     *
+     * <p>Adaptations between different sample rates may not be completely seamless.
+     *
+     * @param allowAudioMixedSampleRateAdaptiveness Whether to allow adaptive audio selections
+     *     containing mixed sample rates.
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowAudioMixedSampleRateAdaptiveness(
+        boolean allowAudioMixedSampleRateAdaptiveness) {
+      delegate.setAllowAudioMixedSampleRateAdaptiveness(allowAudioMixedSampleRateAdaptiveness);
+      return this;
+    }
+
+    /**
+     * Sets whether to allow adaptive audio selections containing mixed channel counts.
+     *
+     * <p>Adaptations between different channel counts may not be completely seamless.
+     *
+     * @param allowAudioMixedChannelCountAdaptiveness Whether to allow adaptive audio selections
+     *     containing mixed channel counts.
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowAudioMixedChannelCountAdaptiveness(
+        boolean allowAudioMixedChannelCountAdaptiveness) {
+      delegate.setAllowAudioMixedChannelCountAdaptiveness(allowAudioMixedChannelCountAdaptiveness);
+      return this;
+    }
+
+    /**
+     * Sets whether to allow adaptive audio selections with mixed levels of {@link
+     * RendererCapabilities.DecoderSupport} and {@link
+     * RendererCapabilities.HardwareAccelerationSupport}.
+     *
+     * @param allowAudioMixedDecoderSupportAdaptiveness Whether to allow adaptive audio selections
+     *     with mixed levels of decoder and hardware acceleration support.
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowAudioMixedDecoderSupportAdaptiveness(
+        boolean allowAudioMixedDecoderSupportAdaptiveness) {
+      delegate.setAllowAudioMixedDecoderSupportAdaptiveness(
+          allowAudioMixedDecoderSupportAdaptiveness);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setPreferredAudioMimeType(@Nullable String mimeType) {
+      delegate.setPreferredAudioMimeType(mimeType);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setPreferredAudioMimeTypes(String... mimeTypes) {
+      delegate.setPreferredAudioMimeTypes(mimeTypes);
+      return this;
+    }
+
+    // Text
+
+    @Override
+    public ParametersBuilder setPreferredTextLanguageAndRoleFlagsToCaptioningManagerSettings(
+        Context context) {
+      delegate.setPreferredTextLanguageAndRoleFlagsToCaptioningManagerSettings(context);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setPreferredTextLanguage(@Nullable String preferredTextLanguage) {
+      delegate.setPreferredTextLanguage(preferredTextLanguage);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setPreferredTextLanguages(String... preferredTextLanguages) {
+      delegate.setPreferredTextLanguages(preferredTextLanguages);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setPreferredTextRoleFlags(@C.RoleFlags int preferredTextRoleFlags) {
+      delegate.setPreferredTextRoleFlags(preferredTextRoleFlags);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setIgnoredTextSelectionFlags(
+        @C.SelectionFlags int ignoredTextSelectionFlags) {
+      delegate.setIgnoredTextSelectionFlags(ignoredTextSelectionFlags);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setSelectUndeterminedTextLanguage(
+        boolean selectUndeterminedTextLanguage) {
+      delegate.setSelectUndeterminedTextLanguage(selectUndeterminedTextLanguage);
+      return this;
+    }
+
+    /**
+     * @deprecated Use {@link #setIgnoredTextSelectionFlags}.
+     */
+    @Deprecated
+    public ParametersBuilder setDisabledTextTrackSelectionFlags(
+        @C.SelectionFlags int disabledTextTrackSelectionFlags) {
+      delegate.setDisabledTextTrackSelectionFlags(disabledTextTrackSelectionFlags);
+      return this;
+    }
+
+    // General
+
+    @Override
+    public ParametersBuilder setForceLowestBitrate(boolean forceLowestBitrate) {
+      delegate.setForceLowestBitrate(forceLowestBitrate);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setForceHighestSupportedBitrate(boolean forceHighestSupportedBitrate) {
+      delegate.setForceHighestSupportedBitrate(forceHighestSupportedBitrate);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder addOverride(TrackSelectionOverride override) {
+      delegate.addOverride(override);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder clearOverride(TrackGroup trackGroup) {
+      delegate.clearOverride(trackGroup);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setOverrideForType(TrackSelectionOverride override) {
+      delegate.setOverrideForType(override);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder clearOverridesOfType(@C.TrackType int trackType) {
+      delegate.clearOverridesOfType(trackType);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder clearOverrides() {
+      delegate.clearOverrides();
+      return this;
+    }
+
+    /**
+     * @deprecated Use {@link #setTrackTypeDisabled(int, boolean)}.
+     */
+    @Override
+    @Deprecated
+    @SuppressWarnings("deprecation")
+    public ParametersBuilder setDisabledTrackTypes(Set<@C.TrackType Integer> disabledTrackTypes) {
+      delegate.setDisabledTrackTypes(disabledTrackTypes);
+      return this;
+    }
+
+    @Override
+    public ParametersBuilder setTrackTypeDisabled(@C.TrackType int trackType, boolean disabled) {
+      delegate.setTrackTypeDisabled(trackType, disabled);
+      return this;
+    }
+
+    /**
+     * Sets whether to exceed renderer capabilities when no selection can be made otherwise.
+     *
+     * <p>This parameter applies when all of the tracks available for a renderer exceed the
+     * renderer's reported capabilities. If the parameter is {@code true} then the lowest quality
+     * track will still be selected. Playback may succeed if the renderer has under-reported its
+     * true capabilities. If {@code false} then no track will be selected.
+     *
+     * @param exceedRendererCapabilitiesIfNecessary Whether to exceed renderer capabilities when no
+     *     selection can be made otherwise.
+     * @return This builder.
+     */
+    public ParametersBuilder setExceedRendererCapabilitiesIfNecessary(
+        boolean exceedRendererCapabilitiesIfNecessary) {
+      delegate.setExceedRendererCapabilitiesIfNecessary(exceedRendererCapabilitiesIfNecessary);
+      return this;
+    }
+
+    /**
+     * Sets whether to enable tunneling if possible. Tunneling will only be enabled if it's
+     * supported by the audio and video renderers for the selected tracks.
+     *
+     * <p>Tunneling is known to have many device specific issues and limitations. Manual testing is
+     * strongly recommended to check that the media plays correctly when this option is enabled. See
+     * [#9661](https://github.com/google/ExoPlayer/issues/9661),
+     * [#9133](https://github.com/google/ExoPlayer/issues/9133),
+     * [#9317](https://github.com/google/ExoPlayer/issues/9317),
+     * [#9502](https://github.com/google/ExoPlayer/issues/9502).
+     *
+     * @param tunnelingEnabled Whether to enable tunneling if possible.
+     * @return This builder.
+     */
+    public ParametersBuilder setTunnelingEnabled(boolean tunnelingEnabled) {
+      delegate.setTunnelingEnabled(tunnelingEnabled);
+      return this;
+    }
+
+    /**
+     * Sets whether multiple adaptive selections with more than one track are allowed.
+     *
+     * @param allowMultipleAdaptiveSelections Whether multiple adaptive selections are allowed.
+     * @return This builder.
+     */
+    public ParametersBuilder setAllowMultipleAdaptiveSelections(
+        boolean allowMultipleAdaptiveSelections) {
+      delegate.setAllowMultipleAdaptiveSelections(allowMultipleAdaptiveSelections);
+      return this;
+    }
+
+    // Overrides
+
+    /**
+     * Sets whether the renderer at the specified index is disabled. Disabling a renderer prevents
+     * the selector from selecting any tracks for it.
+     *
+     * @param rendererIndex The renderer index.
+     * @param disabled Whether the renderer is disabled.
+     * @return This builder.
+     */
+    public final ParametersBuilder setRendererDisabled(int rendererIndex, boolean disabled) {
+      delegate.setRendererDisabled(rendererIndex, disabled);
+      return this;
+    }
+
+    /**
+     * Overrides the track selection for the renderer at the specified index.
+     *
+     * <p>When the {@link TrackGroupArray} mapped to the renderer matches the one provided, the
+     * override is applied. When the {@link TrackGroupArray} does not match, the override has no
+     * effect. The override replaces any previous override for the specified {@link TrackGroupArray}
+     * for the specified {@link Renderer}.
+     *
+     * <p>Passing a {@code null} override will cause the renderer to be disabled when the {@link
+     * TrackGroupArray} mapped to it matches the one provided. When the {@link TrackGroupArray} does
+     * not match a {@code null} override has no effect. Hence a {@code null} override differs from
+     * disabling the renderer using {@link #setRendererDisabled(int, boolean)} because the renderer
+     * is disabled conditionally on the {@link TrackGroupArray} mapped to it, where-as {@link
+     * #setRendererDisabled(int, boolean)} disables the renderer unconditionally.
+     *
+     * <p>To remove overrides use {@link #clearSelectionOverride(int, TrackGroupArray)}, {@link
+     * #clearSelectionOverrides(int)} or {@link #clearSelectionOverrides()}.
+     *
+     * @param rendererIndex The renderer index.
+     * @param groups The {@link TrackGroupArray} for which the override should be applied.
+     * @param override The override.
+     * @return This builder.
+     * @deprecated Use {@link TrackSelectionParameters.Builder#addOverride(TrackSelectionOverride)}.
+     */
+    @Deprecated
+    public final ParametersBuilder setSelectionOverride(
+        int rendererIndex, TrackGroupArray groups, @Nullable SelectionOverride override) {
+      delegate.setSelectionOverride(rendererIndex, groups, override);
+      return this;
+    }
+
+    /**
+     * Clears a track selection override for the specified renderer and {@link TrackGroupArray}.
+     *
+     * @param rendererIndex The renderer index.
+     * @param groups The {@link TrackGroupArray} for which the override should be cleared.
+     * @return This builder.
+     * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverride(TrackGroup)}.
+     */
+    @Deprecated
+    public final ParametersBuilder clearSelectionOverride(
+        int rendererIndex, TrackGroupArray groups) {
+      delegate.clearSelectionOverride(rendererIndex, groups);
+      return this;
+    }
+
+    /**
+     * Clears all track selection overrides for the specified renderer.
+     *
+     * @param rendererIndex The renderer index.
+     * @return This builder.
+     * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverridesOfType(int)}.
+     */
+    @Deprecated
+    public final ParametersBuilder clearSelectionOverrides(int rendererIndex) {
+      delegate.clearSelectionOverrides(rendererIndex);
+      return this;
+    }
+
+    /**
+     * Clears all track selection overrides for all renderers.
+     *
+     * @return This builder.
+     * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverrides()}.
+     */
+    @Deprecated
+    public final ParametersBuilder clearSelectionOverrides() {
+      delegate.clearSelectionOverrides();
+      return this;
+    }
+
+    /** Builds a {@link Parameters} instance with the selected values. */
+    @Override
+    public Parameters build() {
+      return delegate.build();
+    }
+  }
+
+  /**
+   * Extends {@link Parameters} by adding fields that are specific to {@link DefaultTrackSelector}.
+   */
+  public static final class Parameters extends TrackSelectionParameters implements Bundleable {
+
+    /**
+     * A builder for {@link Parameters}. See the {@link Parameters} documentation for explanations
+     * of the parameters that can be configured using this builder.
+     */
+    public static final class Builder extends TrackSelectionParameters.Builder {
+
       // Video
       // Video
       private boolean exceedVideoConstraintsIfNecessary;
       private boolean exceedVideoConstraintsIfNecessary;
       private boolean allowVideoMixedMimeTypeAdaptiveness;
       private boolean allowVideoMixedMimeTypeAdaptiveness;
@@ -129,11 +692,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
 
       /**
       /**
        * @deprecated {@link Context} constraints will not be set using this constructor. Use {@link
        * @deprecated {@link Context} constraints will not be set using this constructor. Use {@link
-     *     #ParametersBuilder(Context)} instead.
+       *     #Builder(Context)} instead.
        */
        */
       @Deprecated
       @Deprecated
       @SuppressWarnings({"deprecation"})
       @SuppressWarnings({"deprecation"})
-    public ParametersBuilder() {
+      public Builder() {
         super();
         super();
         selectionOverrides = new SparseArray<>();
         selectionOverrides = new SparseArray<>();
         rendererDisabledFlags = new SparseBooleanArray();
         rendererDisabledFlags = new SparseBooleanArray();
@@ -145,7 +708,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        *
        *
        * @param context Any context.
        * @param context Any context.
        */
        */
-    public ParametersBuilder(Context context) {
+      public Builder(Context context) {
         super(context);
         super(context);
         selectionOverrides = new SparseArray<>();
         selectionOverrides = new SparseArray<>();
         rendererDisabledFlags = new SparseBooleanArray();
         rendererDisabledFlags = new SparseBooleanArray();
@@ -153,10 +716,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       }
       }
 
 
       /**
       /**
-     * @param initialValues The {@link Parameters} from which the initial values of the builder are
-     *     obtained.
+       * @param initialValues The {@link Parameters} from which the initial values of the builder
+       *     are obtained.
        */
        */
-    private ParametersBuilder(Parameters initialValues) {
+      private Builder(Parameters initialValues) {
         super(initialValues);
         super(initialValues);
         // Video
         // Video
         exceedVideoConstraintsIfNecessary = initialValues.exceedVideoConstraintsIfNecessary;
         exceedVideoConstraintsIfNecessary = initialValues.exceedVideoConstraintsIfNecessary;
@@ -182,7 +745,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       }
       }
 
 
       @SuppressWarnings("method.invocation") // Only setter are invoked.
       @SuppressWarnings("method.invocation") // Only setter are invoked.
-    private ParametersBuilder(Bundle bundle) {
+      private Builder(Bundle bundle) {
         super(bundle);
         super(bundle);
         Parameters defaultValue = Parameters.DEFAULT_WITHOUT_CONTEXT;
         Parameters defaultValue = Parameters.DEFAULT_WITHOUT_CONTEXT;
         // Video
         // Video
@@ -218,7 +781,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
                 defaultValue.allowAudioMixedSampleRateAdaptiveness));
                 defaultValue.allowAudioMixedSampleRateAdaptiveness));
         setAllowAudioMixedChannelCountAdaptiveness(
         setAllowAudioMixedChannelCountAdaptiveness(
             bundle.getBoolean(
             bundle.getBoolean(
-              Parameters.keyForField(Parameters.FIELD_ALLOW_AUDIO_MIXED_CHANNEL_COUNT_ADAPTIVENESS),
+                Parameters.keyForField(
+                    Parameters.FIELD_ALLOW_AUDIO_MIXED_CHANNEL_COUNT_ADAPTIVENESS),
                 defaultValue.allowAudioMixedChannelCountAdaptiveness));
                 defaultValue.allowAudioMixedChannelCountAdaptiveness));
         setAllowAudioMixedDecoderSupportAdaptiveness(
         setAllowAudioMixedDecoderSupportAdaptiveness(
             bundle.getBoolean(
             bundle.getBoolean(
@@ -248,7 +812,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       }
       }
 
 
       @Override
       @Override
-    protected ParametersBuilder set(TrackSelectionParameters parameters) {
+      protected Builder set(TrackSelectionParameters parameters) {
         super.set(parameters);
         super.set(parameters);
         return this;
         return this;
       }
       }
@@ -256,51 +820,49 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       // Video
       // Video
 
 
       @Override
       @Override
-    public DefaultTrackSelector.ParametersBuilder setMaxVideoSizeSd() {
+      public Builder setMaxVideoSizeSd() {
         super.setMaxVideoSizeSd();
         super.setMaxVideoSizeSd();
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public DefaultTrackSelector.ParametersBuilder clearVideoSizeConstraints() {
+      public Builder clearVideoSizeConstraints() {
         super.clearVideoSizeConstraints();
         super.clearVideoSizeConstraints();
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public DefaultTrackSelector.ParametersBuilder setMaxVideoSize(
-        int maxVideoWidth, int maxVideoHeight) {
+      public Builder setMaxVideoSize(int maxVideoWidth, int maxVideoHeight) {
         super.setMaxVideoSize(maxVideoWidth, maxVideoHeight);
         super.setMaxVideoSize(maxVideoWidth, maxVideoHeight);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public DefaultTrackSelector.ParametersBuilder setMaxVideoFrameRate(int maxVideoFrameRate) {
+      public Builder setMaxVideoFrameRate(int maxVideoFrameRate) {
         super.setMaxVideoFrameRate(maxVideoFrameRate);
         super.setMaxVideoFrameRate(maxVideoFrameRate);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public DefaultTrackSelector.ParametersBuilder setMaxVideoBitrate(int maxVideoBitrate) {
+      public Builder setMaxVideoBitrate(int maxVideoBitrate) {
         super.setMaxVideoBitrate(maxVideoBitrate);
         super.setMaxVideoBitrate(maxVideoBitrate);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public DefaultTrackSelector.ParametersBuilder setMinVideoSize(
-        int minVideoWidth, int minVideoHeight) {
+      public Builder setMinVideoSize(int minVideoWidth, int minVideoHeight) {
         super.setMinVideoSize(minVideoWidth, minVideoHeight);
         super.setMinVideoSize(minVideoWidth, minVideoHeight);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public DefaultTrackSelector.ParametersBuilder setMinVideoFrameRate(int minVideoFrameRate) {
+      public Builder setMinVideoFrameRate(int minVideoFrameRate) {
         super.setMinVideoFrameRate(minVideoFrameRate);
         super.setMinVideoFrameRate(minVideoFrameRate);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public DefaultTrackSelector.ParametersBuilder setMinVideoBitrate(int minVideoBitrate) {
+      public Builder setMinVideoBitrate(int minVideoBitrate) {
         super.setMinVideoBitrate(minVideoBitrate);
         super.setMinVideoBitrate(minVideoBitrate);
         return this;
         return this;
       }
       }
@@ -313,7 +875,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        *     selection can be made otherwise.
        *     selection can be made otherwise.
        * @return This builder.
        * @return This builder.
        */
        */
-    public ParametersBuilder setExceedVideoConstraintsIfNecessary(
+      public Builder setExceedVideoConstraintsIfNecessary(
           boolean exceedVideoConstraintsIfNecessary) {
           boolean exceedVideoConstraintsIfNecessary) {
         this.exceedVideoConstraintsIfNecessary = exceedVideoConstraintsIfNecessary;
         this.exceedVideoConstraintsIfNecessary = exceedVideoConstraintsIfNecessary;
         return this;
         return this;
@@ -330,7 +892,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        *     containing mixed MIME types.
        *     containing mixed MIME types.
        * @return This builder.
        * @return This builder.
        */
        */
-    public ParametersBuilder setAllowVideoMixedMimeTypeAdaptiveness(
+      public Builder setAllowVideoMixedMimeTypeAdaptiveness(
           boolean allowVideoMixedMimeTypeAdaptiveness) {
           boolean allowVideoMixedMimeTypeAdaptiveness) {
         this.allowVideoMixedMimeTypeAdaptiveness = allowVideoMixedMimeTypeAdaptiveness;
         this.allowVideoMixedMimeTypeAdaptiveness = allowVideoMixedMimeTypeAdaptiveness;
         return this;
         return this;
@@ -344,7 +906,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        *     adaptation may not be completely seamless.
        *     adaptation may not be completely seamless.
        * @return This builder.
        * @return This builder.
        */
        */
-    public ParametersBuilder setAllowVideoNonSeamlessAdaptiveness(
+      public Builder setAllowVideoNonSeamlessAdaptiveness(
           boolean allowVideoNonSeamlessAdaptiveness) {
           boolean allowVideoNonSeamlessAdaptiveness) {
         this.allowVideoNonSeamlessAdaptiveness = allowVideoNonSeamlessAdaptiveness;
         this.allowVideoNonSeamlessAdaptiveness = allowVideoNonSeamlessAdaptiveness;
         return this;
         return this;
@@ -359,47 +921,46 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        *     with mixed levels of decoder and hardware acceleration support.
        *     with mixed levels of decoder and hardware acceleration support.
        * @return This builder.
        * @return This builder.
        */
        */
-    public ParametersBuilder setAllowVideoMixedDecoderSupportAdaptiveness(
+      public Builder setAllowVideoMixedDecoderSupportAdaptiveness(
           boolean allowVideoMixedDecoderSupportAdaptiveness) {
           boolean allowVideoMixedDecoderSupportAdaptiveness) {
         this.allowVideoMixedDecoderSupportAdaptiveness = allowVideoMixedDecoderSupportAdaptiveness;
         this.allowVideoMixedDecoderSupportAdaptiveness = allowVideoMixedDecoderSupportAdaptiveness;
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setViewportSizeToPhysicalDisplaySize(
+      public Builder setViewportSizeToPhysicalDisplaySize(
           Context context, boolean viewportOrientationMayChange) {
           Context context, boolean viewportOrientationMayChange) {
         super.setViewportSizeToPhysicalDisplaySize(context, viewportOrientationMayChange);
         super.setViewportSizeToPhysicalDisplaySize(context, viewportOrientationMayChange);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder clearViewportSizeConstraints() {
+      public Builder clearViewportSizeConstraints() {
         super.clearViewportSizeConstraints();
         super.clearViewportSizeConstraints();
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setViewportSize(
+      public Builder setViewportSize(
           int viewportWidth, int viewportHeight, boolean viewportOrientationMayChange) {
           int viewportWidth, int viewportHeight, boolean viewportOrientationMayChange) {
         super.setViewportSize(viewportWidth, viewportHeight, viewportOrientationMayChange);
         super.setViewportSize(viewportWidth, viewportHeight, viewportOrientationMayChange);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setPreferredVideoMimeType(@Nullable String mimeType) {
+      public Builder setPreferredVideoMimeType(@Nullable String mimeType) {
         super.setPreferredVideoMimeType(mimeType);
         super.setPreferredVideoMimeType(mimeType);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setPreferredVideoMimeTypes(String... mimeTypes) {
+      public Builder setPreferredVideoMimeTypes(String... mimeTypes) {
         super.setPreferredVideoMimeTypes(mimeTypes);
         super.setPreferredVideoMimeTypes(mimeTypes);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public DefaultTrackSelector.ParametersBuilder setPreferredVideoRoleFlags(
-        @RoleFlags int preferredVideoRoleFlags) {
+      public Builder setPreferredVideoRoleFlags(@RoleFlags int preferredVideoRoleFlags) {
         super.setPreferredVideoRoleFlags(preferredVideoRoleFlags);
         super.setPreferredVideoRoleFlags(preferredVideoRoleFlags);
         return this;
         return this;
       }
       }
@@ -407,31 +968,31 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       // Audio
       // Audio
 
 
       @Override
       @Override
-    public ParametersBuilder setPreferredAudioLanguage(@Nullable String preferredAudioLanguage) {
+      public Builder setPreferredAudioLanguage(@Nullable String preferredAudioLanguage) {
         super.setPreferredAudioLanguage(preferredAudioLanguage);
         super.setPreferredAudioLanguage(preferredAudioLanguage);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setPreferredAudioLanguages(String... preferredAudioLanguages) {
+      public Builder setPreferredAudioLanguages(String... preferredAudioLanguages) {
         super.setPreferredAudioLanguages(preferredAudioLanguages);
         super.setPreferredAudioLanguages(preferredAudioLanguages);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setPreferredAudioRoleFlags(@C.RoleFlags int preferredAudioRoleFlags) {
+      public Builder setPreferredAudioRoleFlags(@C.RoleFlags int preferredAudioRoleFlags) {
         super.setPreferredAudioRoleFlags(preferredAudioRoleFlags);
         super.setPreferredAudioRoleFlags(preferredAudioRoleFlags);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setMaxAudioChannelCount(int maxAudioChannelCount) {
+      public Builder setMaxAudioChannelCount(int maxAudioChannelCount) {
         super.setMaxAudioChannelCount(maxAudioChannelCount);
         super.setMaxAudioChannelCount(maxAudioChannelCount);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setMaxAudioBitrate(int maxAudioBitrate) {
+      public Builder setMaxAudioBitrate(int maxAudioBitrate) {
         super.setMaxAudioBitrate(maxAudioBitrate);
         super.setMaxAudioBitrate(maxAudioBitrate);
         return this;
         return this;
       }
       }
@@ -444,7 +1005,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        *     selection can be made otherwise.
        *     selection can be made otherwise.
        * @return This builder.
        * @return This builder.
        */
        */
-    public ParametersBuilder setExceedAudioConstraintsIfNecessary(
+      public Builder setExceedAudioConstraintsIfNecessary(
           boolean exceedAudioConstraintsIfNecessary) {
           boolean exceedAudioConstraintsIfNecessary) {
         this.exceedAudioConstraintsIfNecessary = exceedAudioConstraintsIfNecessary;
         this.exceedAudioConstraintsIfNecessary = exceedAudioConstraintsIfNecessary;
         return this;
         return this;
@@ -459,7 +1020,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        *     containing mixed MIME types.
        *     containing mixed MIME types.
        * @return This builder.
        * @return This builder.
        */
        */
-    public ParametersBuilder setAllowAudioMixedMimeTypeAdaptiveness(
+      public Builder setAllowAudioMixedMimeTypeAdaptiveness(
           boolean allowAudioMixedMimeTypeAdaptiveness) {
           boolean allowAudioMixedMimeTypeAdaptiveness) {
         this.allowAudioMixedMimeTypeAdaptiveness = allowAudioMixedMimeTypeAdaptiveness;
         this.allowAudioMixedMimeTypeAdaptiveness = allowAudioMixedMimeTypeAdaptiveness;
         return this;
         return this;
@@ -474,7 +1035,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        *     containing mixed sample rates.
        *     containing mixed sample rates.
        * @return This builder.
        * @return This builder.
        */
        */
-    public ParametersBuilder setAllowAudioMixedSampleRateAdaptiveness(
+      public Builder setAllowAudioMixedSampleRateAdaptiveness(
           boolean allowAudioMixedSampleRateAdaptiveness) {
           boolean allowAudioMixedSampleRateAdaptiveness) {
         this.allowAudioMixedSampleRateAdaptiveness = allowAudioMixedSampleRateAdaptiveness;
         this.allowAudioMixedSampleRateAdaptiveness = allowAudioMixedSampleRateAdaptiveness;
         return this;
         return this;
@@ -489,7 +1050,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        *     containing mixed channel counts.
        *     containing mixed channel counts.
        * @return This builder.
        * @return This builder.
        */
        */
-    public ParametersBuilder setAllowAudioMixedChannelCountAdaptiveness(
+      public Builder setAllowAudioMixedChannelCountAdaptiveness(
           boolean allowAudioMixedChannelCountAdaptiveness) {
           boolean allowAudioMixedChannelCountAdaptiveness) {
         this.allowAudioMixedChannelCountAdaptiveness = allowAudioMixedChannelCountAdaptiveness;
         this.allowAudioMixedChannelCountAdaptiveness = allowAudioMixedChannelCountAdaptiveness;
         return this;
         return this;
@@ -504,20 +1065,20 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        *     with mixed levels of decoder and hardware acceleration support.
        *     with mixed levels of decoder and hardware acceleration support.
        * @return This builder.
        * @return This builder.
        */
        */
-    public ParametersBuilder setAllowAudioMixedDecoderSupportAdaptiveness(
+      public Builder setAllowAudioMixedDecoderSupportAdaptiveness(
           boolean allowAudioMixedDecoderSupportAdaptiveness) {
           boolean allowAudioMixedDecoderSupportAdaptiveness) {
         this.allowAudioMixedDecoderSupportAdaptiveness = allowAudioMixedDecoderSupportAdaptiveness;
         this.allowAudioMixedDecoderSupportAdaptiveness = allowAudioMixedDecoderSupportAdaptiveness;
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setPreferredAudioMimeType(@Nullable String mimeType) {
+      public Builder setPreferredAudioMimeType(@Nullable String mimeType) {
         super.setPreferredAudioMimeType(mimeType);
         super.setPreferredAudioMimeType(mimeType);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setPreferredAudioMimeTypes(String... mimeTypes) {
+      public Builder setPreferredAudioMimeTypes(String... mimeTypes) {
         super.setPreferredAudioMimeTypes(mimeTypes);
         super.setPreferredAudioMimeTypes(mimeTypes);
         return this;
         return this;
       }
       }
@@ -525,40 +1086,38 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       // Text
       // Text
 
 
       @Override
       @Override
-    public ParametersBuilder setPreferredTextLanguageAndRoleFlagsToCaptioningManagerSettings(
+      public Builder setPreferredTextLanguageAndRoleFlagsToCaptioningManagerSettings(
           Context context) {
           Context context) {
         super.setPreferredTextLanguageAndRoleFlagsToCaptioningManagerSettings(context);
         super.setPreferredTextLanguageAndRoleFlagsToCaptioningManagerSettings(context);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setPreferredTextLanguage(@Nullable String preferredTextLanguage) {
+      public Builder setPreferredTextLanguage(@Nullable String preferredTextLanguage) {
         super.setPreferredTextLanguage(preferredTextLanguage);
         super.setPreferredTextLanguage(preferredTextLanguage);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setPreferredTextLanguages(String... preferredTextLanguages) {
+      public Builder setPreferredTextLanguages(String... preferredTextLanguages) {
         super.setPreferredTextLanguages(preferredTextLanguages);
         super.setPreferredTextLanguages(preferredTextLanguages);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setPreferredTextRoleFlags(@C.RoleFlags int preferredTextRoleFlags) {
+      public Builder setPreferredTextRoleFlags(@C.RoleFlags int preferredTextRoleFlags) {
         super.setPreferredTextRoleFlags(preferredTextRoleFlags);
         super.setPreferredTextRoleFlags(preferredTextRoleFlags);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setIgnoredTextSelectionFlags(
-        @C.SelectionFlags int ignoredTextSelectionFlags) {
+      public Builder setIgnoredTextSelectionFlags(@C.SelectionFlags int ignoredTextSelectionFlags) {
         super.setIgnoredTextSelectionFlags(ignoredTextSelectionFlags);
         super.setIgnoredTextSelectionFlags(ignoredTextSelectionFlags);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setSelectUndeterminedTextLanguage(
-        boolean selectUndeterminedTextLanguage) {
+      public Builder setSelectUndeterminedTextLanguage(boolean selectUndeterminedTextLanguage) {
         super.setSelectUndeterminedTextLanguage(selectUndeterminedTextLanguage);
         super.setSelectUndeterminedTextLanguage(selectUndeterminedTextLanguage);
         return this;
         return this;
       }
       }
@@ -567,7 +1126,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        * @deprecated Use {@link #setIgnoredTextSelectionFlags}.
        * @deprecated Use {@link #setIgnoredTextSelectionFlags}.
        */
        */
       @Deprecated
       @Deprecated
-    public ParametersBuilder setDisabledTextTrackSelectionFlags(
+      public Builder setDisabledTextTrackSelectionFlags(
           @C.SelectionFlags int disabledTextTrackSelectionFlags) {
           @C.SelectionFlags int disabledTextTrackSelectionFlags) {
         return setIgnoredTextSelectionFlags(disabledTextTrackSelectionFlags);
         return setIgnoredTextSelectionFlags(disabledTextTrackSelectionFlags);
       }
       }
@@ -575,43 +1134,43 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       // General
       // General
 
 
       @Override
       @Override
-    public ParametersBuilder setForceLowestBitrate(boolean forceLowestBitrate) {
+      public Builder setForceLowestBitrate(boolean forceLowestBitrate) {
         super.setForceLowestBitrate(forceLowestBitrate);
         super.setForceLowestBitrate(forceLowestBitrate);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setForceHighestSupportedBitrate(boolean forceHighestSupportedBitrate) {
+      public Builder setForceHighestSupportedBitrate(boolean forceHighestSupportedBitrate) {
         super.setForceHighestSupportedBitrate(forceHighestSupportedBitrate);
         super.setForceHighestSupportedBitrate(forceHighestSupportedBitrate);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder addOverride(TrackSelectionOverride override) {
+      public Builder addOverride(TrackSelectionOverride override) {
         super.addOverride(override);
         super.addOverride(override);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder clearOverride(TrackGroup trackGroup) {
+      public Builder clearOverride(TrackGroup trackGroup) {
         super.clearOverride(trackGroup);
         super.clearOverride(trackGroup);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setOverrideForType(TrackSelectionOverride override) {
+      public Builder setOverrideForType(TrackSelectionOverride override) {
         super.setOverrideForType(override);
         super.setOverrideForType(override);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder clearOverridesOfType(@C.TrackType int trackType) {
+      public Builder clearOverridesOfType(@C.TrackType int trackType) {
         super.clearOverridesOfType(trackType);
         super.clearOverridesOfType(trackType);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder clearOverrides() {
+      public Builder clearOverrides() {
         super.clearOverrides();
         super.clearOverrides();
         return this;
         return this;
       }
       }
@@ -622,13 +1181,13 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       @Override
       @Override
       @Deprecated
       @Deprecated
       @SuppressWarnings("deprecation")
       @SuppressWarnings("deprecation")
-    public ParametersBuilder setDisabledTrackTypes(Set<@C.TrackType Integer> disabledTrackTypes) {
+      public Builder setDisabledTrackTypes(Set<@C.TrackType Integer> disabledTrackTypes) {
         super.setDisabledTrackTypes(disabledTrackTypes);
         super.setDisabledTrackTypes(disabledTrackTypes);
         return this;
         return this;
       }
       }
 
 
       @Override
       @Override
-    public ParametersBuilder setTrackTypeDisabled(@C.TrackType int trackType, boolean disabled) {
+      public Builder setTrackTypeDisabled(@C.TrackType int trackType, boolean disabled) {
         super.setTrackTypeDisabled(trackType, disabled);
         super.setTrackTypeDisabled(trackType, disabled);
         return this;
         return this;
       }
       }
@@ -641,11 +1200,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        * track will still be selected. Playback may succeed if the renderer has under-reported its
        * track will still be selected. Playback may succeed if the renderer has under-reported its
        * true capabilities. If {@code false} then no track will be selected.
        * true capabilities. If {@code false} then no track will be selected.
        *
        *
-     * @param exceedRendererCapabilitiesIfNecessary Whether to exceed renderer capabilities when no
-     *     selection can be made otherwise.
+       * @param exceedRendererCapabilitiesIfNecessary Whether to exceed renderer capabilities when
+       *     no selection can be made otherwise.
        * @return This builder.
        * @return This builder.
        */
        */
-    public ParametersBuilder setExceedRendererCapabilitiesIfNecessary(
+      public Builder setExceedRendererCapabilitiesIfNecessary(
           boolean exceedRendererCapabilitiesIfNecessary) {
           boolean exceedRendererCapabilitiesIfNecessary) {
         this.exceedRendererCapabilitiesIfNecessary = exceedRendererCapabilitiesIfNecessary;
         this.exceedRendererCapabilitiesIfNecessary = exceedRendererCapabilitiesIfNecessary;
         return this;
         return this;
@@ -655,9 +1214,9 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        * Sets whether to enable tunneling if possible. Tunneling will only be enabled if it's
        * Sets whether to enable tunneling if possible. Tunneling will only be enabled if it's
        * supported by the audio and video renderers for the selected tracks.
        * supported by the audio and video renderers for the selected tracks.
        *
        *
-     * <p>Tunneling is known to have many device specific issues and limitations. Manual testing is
-     * strongly recommended to check that the media plays correctly when this option is enabled. See
-     * [#9661](https://github.com/google/ExoPlayer/issues/9661),
+       * <p>Tunneling is known to have many device specific issues and limitations. Manual testing
+       * is strongly recommended to check that the media plays correctly when this option is
+       * enabled. See [#9661](https://github.com/google/ExoPlayer/issues/9661),
        * [#9133](https://github.com/google/ExoPlayer/issues/9133),
        * [#9133](https://github.com/google/ExoPlayer/issues/9133),
        * [#9317](https://github.com/google/ExoPlayer/issues/9317),
        * [#9317](https://github.com/google/ExoPlayer/issues/9317),
        * [#9502](https://github.com/google/ExoPlayer/issues/9502).
        * [#9502](https://github.com/google/ExoPlayer/issues/9502).
@@ -665,7 +1224,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        * @param tunnelingEnabled Whether to enable tunneling if possible.
        * @param tunnelingEnabled Whether to enable tunneling if possible.
        * @return This builder.
        * @return This builder.
        */
        */
-    public ParametersBuilder setTunnelingEnabled(boolean tunnelingEnabled) {
+      public Builder setTunnelingEnabled(boolean tunnelingEnabled) {
         this.tunnelingEnabled = tunnelingEnabled;
         this.tunnelingEnabled = tunnelingEnabled;
         return this;
         return this;
       }
       }
@@ -676,8 +1235,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        * @param allowMultipleAdaptiveSelections Whether multiple adaptive selections are allowed.
        * @param allowMultipleAdaptiveSelections Whether multiple adaptive selections are allowed.
        * @return This builder.
        * @return This builder.
        */
        */
-    public ParametersBuilder setAllowMultipleAdaptiveSelections(
-        boolean allowMultipleAdaptiveSelections) {
+      public Builder setAllowMultipleAdaptiveSelections(boolean allowMultipleAdaptiveSelections) {
         this.allowMultipleAdaptiveSelections = allowMultipleAdaptiveSelections;
         this.allowMultipleAdaptiveSelections = allowMultipleAdaptiveSelections;
         return this;
         return this;
       }
       }
@@ -692,7 +1250,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        * @param disabled Whether the renderer is disabled.
        * @param disabled Whether the renderer is disabled.
        * @return This builder.
        * @return This builder.
        */
        */
-    public final ParametersBuilder setRendererDisabled(int rendererIndex, boolean disabled) {
+      public final Builder setRendererDisabled(int rendererIndex, boolean disabled) {
         if (rendererDisabledFlags.get(rendererIndex) == disabled) {
         if (rendererDisabledFlags.get(rendererIndex) == disabled) {
           // The disabled flag is unchanged.
           // The disabled flag is unchanged.
           return this;
           return this;
@@ -711,15 +1269,15 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        *
        *
        * <p>When the {@link TrackGroupArray} mapped to the renderer matches the one provided, the
        * <p>When the {@link TrackGroupArray} mapped to the renderer matches the one provided, the
        * override is applied. When the {@link TrackGroupArray} does not match, the override has no
        * override is applied. When the {@link TrackGroupArray} does not match, the override has no
-     * effect. The override replaces any previous override for the specified {@link TrackGroupArray}
-     * for the specified {@link Renderer}.
+       * effect. The override replaces any previous override for the specified {@link
+       * TrackGroupArray} for the specified {@link Renderer}.
        *
        *
        * <p>Passing a {@code null} override will cause the renderer to be disabled when the {@link
        * <p>Passing a {@code null} override will cause the renderer to be disabled when the {@link
-     * TrackGroupArray} mapped to it matches the one provided. When the {@link TrackGroupArray} does
-     * not match a {@code null} override has no effect. Hence a {@code null} override differs from
-     * disabling the renderer using {@link #setRendererDisabled(int, boolean)} because the renderer
-     * is disabled conditionally on the {@link TrackGroupArray} mapped to it, where-as {@link
-     * #setRendererDisabled(int, boolean)} disables the renderer unconditionally.
+       * TrackGroupArray} mapped to it matches the one provided. When the {@link TrackGroupArray}
+       * does not match a {@code null} override has no effect. Hence a {@code null} override differs
+       * from disabling the renderer using {@link #setRendererDisabled(int, boolean)} because the
+       * renderer is disabled conditionally on the {@link TrackGroupArray} mapped to it, where-as
+       * {@link #setRendererDisabled(int, boolean)} disables the renderer unconditionally.
        *
        *
        * <p>To remove overrides use {@link #clearSelectionOverride(int, TrackGroupArray)}, {@link
        * <p>To remove overrides use {@link #clearSelectionOverride(int, TrackGroupArray)}, {@link
        * #clearSelectionOverrides(int)} or {@link #clearSelectionOverrides()}.
        * #clearSelectionOverrides(int)} or {@link #clearSelectionOverrides()}.
@@ -728,10 +1286,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        * @param groups The {@link TrackGroupArray} for which the override should be applied.
        * @param groups The {@link TrackGroupArray} for which the override should be applied.
        * @param override The override.
        * @param override The override.
        * @return This builder.
        * @return This builder.
-     * @deprecated Use {@link TrackSelectionParameters.Builder#addOverride(TrackSelectionOverride)}.
+       * @deprecated Use {@link
+       *     TrackSelectionParameters.Builder#addOverride(TrackSelectionOverride)}.
        */
        */
       @Deprecated
       @Deprecated
-    public final ParametersBuilder setSelectionOverride(
+      public final Builder setSelectionOverride(
           int rendererIndex, TrackGroupArray groups, @Nullable SelectionOverride override) {
           int rendererIndex, TrackGroupArray groups, @Nullable SelectionOverride override) {
         Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
         Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
             selectionOverrides.get(rendererIndex);
             selectionOverrides.get(rendererIndex);
@@ -756,8 +1315,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverride(TrackGroup)}.
        * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverride(TrackGroup)}.
        */
        */
       @Deprecated
       @Deprecated
-    public final ParametersBuilder clearSelectionOverride(
-        int rendererIndex, TrackGroupArray groups) {
+      public final Builder clearSelectionOverride(int rendererIndex, TrackGroupArray groups) {
         Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
         Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
             selectionOverrides.get(rendererIndex);
             selectionOverrides.get(rendererIndex);
         if (overrides == null || !overrides.containsKey(groups)) {
         if (overrides == null || !overrides.containsKey(groups)) {
@@ -779,7 +1337,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverridesOfType(int)}.
        * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverridesOfType(int)}.
        */
        */
       @Deprecated
       @Deprecated
-    public final ParametersBuilder clearSelectionOverrides(int rendererIndex) {
+      public final Builder clearSelectionOverrides(int rendererIndex) {
         Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
         Map<TrackGroupArray, @NullableType SelectionOverride> overrides =
             selectionOverrides.get(rendererIndex);
             selectionOverrides.get(rendererIndex);
         if (overrides == null || overrides.isEmpty()) {
         if (overrides == null || overrides.isEmpty()) {
@@ -797,7 +1355,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
        * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverrides()}.
        * @deprecated Use {@link TrackSelectionParameters.Builder#clearOverrides()}.
        */
        */
       @Deprecated
       @Deprecated
-    public final ParametersBuilder clearSelectionOverrides() {
+      public final Builder clearSelectionOverrides() {
         if (selectionOverrides.size() == 0) {
         if (selectionOverrides.size() == 0) {
           // Nothing to clear.
           // Nothing to clear.
           return this;
           return this;
@@ -812,7 +1370,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         return new Parameters(this);
         return new Parameters(this);
       }
       }
 
 
-    private void init(ParametersBuilder this) {
+      private void init(Builder this) {
         // Video
         // Video
         exceedVideoConstraintsIfNecessary = true;
         exceedVideoConstraintsIfNecessary = true;
         allowVideoMixedMimeTypeAdaptiveness = false;
         allowVideoMixedMimeTypeAdaptiveness = false;
@@ -832,7 +1390,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
 
       private static SparseArray<Map<TrackGroupArray, @NullableType SelectionOverride>>
       private static SparseArray<Map<TrackGroupArray, @NullableType SelectionOverride>>
           cloneSelectionOverrides(
           cloneSelectionOverrides(
-            SparseArray<Map<TrackGroupArray, @NullableType SelectionOverride>> selectionOverrides) {
+              SparseArray<Map<TrackGroupArray, @NullableType SelectionOverride>>
+                  selectionOverrides) {
         SparseArray<Map<TrackGroupArray, @NullableType SelectionOverride>> clone =
         SparseArray<Map<TrackGroupArray, @NullableType SelectionOverride>> clone =
             new SparseArray<>();
             new SparseArray<>();
         for (int i = 0; i < selectionOverrides.size(); i++) {
         for (int i = 0; i < selectionOverrides.size(); i++) {
@@ -888,11 +1447,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     }
     }
 
 
     /**
     /**
-   * Extends {@link Parameters} by adding fields that are specific to {@link DefaultTrackSelector}.
-   */
-  public static final class Parameters extends TrackSelectionParameters implements Bundleable {
-
-    /**
      * An instance with default values, except those obtained from the {@link Context}.
      * An instance with default values, except those obtained from the {@link Context}.
      *
      *
      * <p>If possible, use {@link #getDefaults(Context)} instead.
      * <p>If possible, use {@link #getDefaults(Context)} instead.
@@ -900,16 +1454,16 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      * <p>This instance will not have the following settings:
      * <p>This instance will not have the following settings:
      *
      *
      * <ul>
      * <ul>
-     *   <li>{@link ParametersBuilder#setViewportSizeToPhysicalDisplaySize(Context, boolean)
-     *       Viewport constraints} configured for the primary display.
-     *   <li>{@link
-     *       ParametersBuilder#setPreferredTextLanguageAndRoleFlagsToCaptioningManagerSettings(Context)
+     *   <li>{@linkplain Builder#setViewportSizeToPhysicalDisplaySize(Context, boolean) Viewport
+     *       constraints} configured for the primary display.
+     *   <li>{@linkplain
+     *       Builder#setPreferredTextLanguageAndRoleFlagsToCaptioningManagerSettings(Context)
      *       Preferred text language and role flags} configured to the accessibility settings of
      *       Preferred text language and role flags} configured to the accessibility settings of
      *       {@link android.view.accessibility.CaptioningManager}.
      *       {@link android.view.accessibility.CaptioningManager}.
      * </ul>
      * </ul>
      */
      */
     @SuppressWarnings("deprecation")
     @SuppressWarnings("deprecation")
-    public static final Parameters DEFAULT_WITHOUT_CONTEXT = new ParametersBuilder().build();
+    public static final Parameters DEFAULT_WITHOUT_CONTEXT = new Builder().build();
     /**
     /**
      * @deprecated This instance is not configured using {@link Context} constraints. Use {@link
      * @deprecated This instance is not configured using {@link Context} constraints. Use {@link
      *     #getDefaults(Context)} instead.
      *     #getDefaults(Context)} instead.
@@ -918,7 +1472,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
 
     /** Returns an instance configured with default values. */
     /** Returns an instance configured with default values. */
     public static Parameters getDefaults(Context context) {
     public static Parameters getDefaults(Context context) {
-      return new ParametersBuilder(context).build();
+      return new Parameters.Builder(context).build();
     }
     }
 
 
     // Video
     // Video
@@ -1000,7 +1554,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
         selectionOverrides;
         selectionOverrides;
     private final SparseBooleanArray rendererDisabledFlags;
     private final SparseBooleanArray rendererDisabledFlags;
 
 
-    private Parameters(ParametersBuilder builder) {
+    private Parameters(Builder builder) {
       super(builder);
       super(builder);
       // Video
       // Video
       exceedVideoConstraintsIfNecessary = builder.exceedVideoConstraintsIfNecessary;
       exceedVideoConstraintsIfNecessary = builder.exceedVideoConstraintsIfNecessary;
@@ -1039,8 +1593,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      * @param groups The {@link TrackGroupArray}.
      * @param groups The {@link TrackGroupArray}.
      * @return Whether there is an override.
      * @return Whether there is an override.
      * @deprecated Only works to retrieve the overrides set with the deprecated {@link
      * @deprecated Only works to retrieve the overrides set with the deprecated {@link
-     *     ParametersBuilder#setSelectionOverride(int, TrackGroupArray, SelectionOverride)}. Use
-     *     {@link TrackSelectionParameters#overrides} instead.
+     *     Builder#setSelectionOverride(int, TrackGroupArray, SelectionOverride)}. Use {@link
+     *     TrackSelectionParameters#overrides} instead.
      */
      */
     @Deprecated
     @Deprecated
     public final boolean hasSelectionOverride(int rendererIndex, TrackGroupArray groups) {
     public final boolean hasSelectionOverride(int rendererIndex, TrackGroupArray groups) {
@@ -1057,8 +1611,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
      * @param groups The {@link TrackGroupArray}.
      * @param groups The {@link TrackGroupArray}.
      * @return The override, or null if no override exists.
      * @return The override, or null if no override exists.
      * @deprecated Only works to retrieve the overrides set with the deprecated {@link
      * @deprecated Only works to retrieve the overrides set with the deprecated {@link
-     *     ParametersBuilder#setSelectionOverride(int, TrackGroupArray, SelectionOverride)}. Use
-     *     {@link TrackSelectionParameters#overrides} instead.
+     *     Builder#setSelectionOverride(int, TrackGroupArray, SelectionOverride)}. Use {@link
+     *     TrackSelectionParameters#overrides} instead.
      */
      */
     @Deprecated
     @Deprecated
     @Nullable
     @Nullable
@@ -1069,10 +1623,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       return overrides != null ? overrides.get(groups) : null;
       return overrides != null ? overrides.get(groups) : null;
     }
     }
 
 
-    /** Creates a new {@link ParametersBuilder}, copying the initial values from this instance. */
+    /** Creates a new {@link Parameters.Builder}, copying the initial values from this instance. */
     @Override
     @Override
-    public ParametersBuilder buildUpon() {
-      return new ParametersBuilder(this);
+    public Parameters.Builder buildUpon() {
+      return new Parameters.Builder(this);
     }
     }
 
 
     @SuppressWarnings("EqualsGetClass") // Class is not final for backward-compatibility reason.
     @SuppressWarnings("EqualsGetClass") // Class is not final for backward-compatibility reason.
@@ -1231,7 +1785,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
 
     /** Object that can restore {@code Parameters} from a {@link Bundle}. */
     /** Object that can restore {@code Parameters} from a {@link Bundle}. */
     public static final Creator<Parameters> CREATOR =
     public static final Creator<Parameters> CREATOR =
-        bundle -> new ParametersBuilder(bundle).build();
+        bundle -> new Parameters.Builder(bundle).build();
 
 
     private static String keyForField(@FieldNumber int field) {
     private static String keyForField(@FieldNumber int field) {
       return Integer.toString(field, Character.MAX_RADIX);
       return Integer.toString(field, Character.MAX_RADIX);
@@ -1539,21 +2093,30 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     }
     }
     // Only add the fields of `TrackSelectionParameters` to `parameters`.
     // Only add the fields of `TrackSelectionParameters` to `parameters`.
     Parameters mergedParameters =
     Parameters mergedParameters =
-        new ParametersBuilder(parametersReference.get()).set(parameters).build();
+        new Parameters.Builder(parametersReference.get()).set(parameters).build();
     setParametersInternal(mergedParameters);
     setParametersInternal(mergedParameters);
   }
   }
 
 
   /**
   /**
+   * @deprecated Use {@link #setParameters(Parameters.Builder)} instead.
+   */
+  @Deprecated
+  @SuppressWarnings("deprecation") // Allow setting the deprecated builder
+  public void setParameters(ParametersBuilder parametersBuilder) {
+    setParametersInternal(parametersBuilder.build());
+  }
+
+  /**
    * Atomically sets the provided parameters for track selection.
    * Atomically sets the provided parameters for track selection.
    *
    *
    * @param parametersBuilder A builder from which to obtain the parameters for track selection.
    * @param parametersBuilder A builder from which to obtain the parameters for track selection.
    */
    */
-  public void setParameters(ParametersBuilder parametersBuilder) {
+  public void setParameters(Parameters.Builder parametersBuilder) {
     setParametersInternal(parametersBuilder.build());
     setParametersInternal(parametersBuilder.build());
   }
   }
 
 
-  /** Returns a new {@link ParametersBuilder} initialized with the current selection parameters. */
-  public ParametersBuilder buildUponParameters() {
+  /** Returns a new {@link Parameters.Builder} initialized with the current selection parameters. */
+  public Parameters.Builder buildUponParameters() {
     return getParameters().buildUpon();
     return getParameters().buildUpon();
   }
   }
 
 

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/TrackSelectionUtil.java

@@ -98,7 +98,7 @@ public final class TrackSelectionUtil {
       TrackGroupArray trackGroupArray,
       TrackGroupArray trackGroupArray,
       boolean isDisabled,
       boolean isDisabled,
       @Nullable SelectionOverride override) {
       @Nullable SelectionOverride override) {
-    DefaultTrackSelector.ParametersBuilder builder =
+    DefaultTrackSelector.Parameters.Builder builder =
         parameters
         parameters
             .buildUpon()
             .buildUpon()
             .clearSelectionOverrides(rendererIndex)
             .clearSelectionOverrides(rendererIndex)

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelectorTest.java

@@ -41,6 +41,7 @@ import androidx.media3.common.MimeTypes;
 import androidx.media3.common.Timeline;
 import androidx.media3.common.Timeline;
 import androidx.media3.common.TrackGroup;
 import androidx.media3.common.TrackGroup;
 import androidx.media3.common.TrackSelectionOverride;
 import androidx.media3.common.TrackSelectionOverride;
+import androidx.media3.common.TrackSelectionParameters;
 import androidx.media3.common.Tracks;
 import androidx.media3.common.Tracks;
 import androidx.media3.common.util.Util;
 import androidx.media3.common.util.Util;
 import androidx.media3.exoplayer.ExoPlaybackException;
 import androidx.media3.exoplayer.ExoPlaybackException;
@@ -50,17 +51,19 @@ import androidx.media3.exoplayer.RendererConfiguration;
 import androidx.media3.exoplayer.source.MediaSource.MediaPeriodId;
 import androidx.media3.exoplayer.source.MediaSource.MediaPeriodId;
 import androidx.media3.exoplayer.source.TrackGroupArray;
 import androidx.media3.exoplayer.source.TrackGroupArray;
 import androidx.media3.exoplayer.trackselection.DefaultTrackSelector.Parameters;
 import androidx.media3.exoplayer.trackselection.DefaultTrackSelector.Parameters;
-import androidx.media3.exoplayer.trackselection.DefaultTrackSelector.ParametersBuilder;
 import androidx.media3.exoplayer.trackselection.DefaultTrackSelector.SelectionOverride;
 import androidx.media3.exoplayer.trackselection.DefaultTrackSelector.SelectionOverride;
 import androidx.media3.exoplayer.trackselection.TrackSelector.InvalidationListener;
 import androidx.media3.exoplayer.trackselection.TrackSelector.InvalidationListener;
 import androidx.media3.exoplayer.upstream.BandwidthMeter;
 import androidx.media3.exoplayer.upstream.BandwidthMeter;
 import androidx.media3.test.utils.FakeTimeline;
 import androidx.media3.test.utils.FakeTimeline;
+import androidx.media3.test.utils.TestUtil;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import org.junit.After;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Before;
@@ -516,7 +519,7 @@ public final class DefaultTrackSelectorTest {
    */
    */
   @Test
   @Test
   public void setParameterWithNonDefaultParameterNotifyInvalidationListener() {
   public void setParameterWithNonDefaultParameterNotifyInvalidationListener() {
-    ParametersBuilder builder = defaultParameters.buildUpon().setPreferredAudioLanguage("eng");
+    Parameters.Builder builder = defaultParameters.buildUpon().setPreferredAudioLanguage("eng");
     trackSelector.setParameters(builder);
     trackSelector.setParameters(builder);
     verify(invalidationListener).onTrackSelectionsInvalidated();
     verify(invalidationListener).onTrackSelectionsInvalidated();
   }
   }
@@ -528,7 +531,7 @@ public final class DefaultTrackSelectorTest {
    */
    */
   @Test
   @Test
   public void setParameterWithSameParametersDoesNotNotifyInvalidationListenerAgain() {
   public void setParameterWithSameParametersDoesNotNotifyInvalidationListenerAgain() {
-    ParametersBuilder builder = defaultParameters.buildUpon().setPreferredAudioLanguage("eng");
+    Parameters.Builder builder = defaultParameters.buildUpon().setPreferredAudioLanguage("eng");
     trackSelector.setParameters(builder);
     trackSelector.setParameters(builder);
     trackSelector.setParameters(builder);
     trackSelector.setParameters(builder);
     verify(invalidationListener, times(1)).onTrackSelectionsInvalidated();
     verify(invalidationListener, times(1)).onTrackSelectionsInvalidated();
@@ -1268,7 +1271,7 @@ public final class DefaultTrackSelectorTest {
     result = trackSelector.selectTracks(textRendererCapabilites, trackGroups, periodId, TIMELINE);
     result = trackSelector.selectTracks(textRendererCapabilites, trackGroups, periodId, TIMELINE);
     assertFixedSelection(result.selections[0], trackGroups, undeterminedUnd);
     assertFixedSelection(result.selections[0], trackGroups, undeterminedUnd);
 
 
-    ParametersBuilder builder = defaultParameters.buildUpon().setPreferredTextLanguage("spa");
+    Parameters.Builder builder = defaultParameters.buildUpon().setPreferredTextLanguage("spa");
     trackSelector.setParameters(builder);
     trackSelector.setParameters(builder);
     result = trackSelector.selectTracks(textRendererCapabilites, trackGroups, periodId, TIMELINE);
     result = trackSelector.selectTracks(textRendererCapabilites, trackGroups, periodId, TIMELINE);
     assertFixedSelection(result.selections[0], trackGroups, spanish);
     assertFixedSelection(result.selections[0], trackGroups, spanish);
@@ -2264,6 +2267,30 @@ public final class DefaultTrackSelectorTest {
     assertThat(selectionOverrideFromBundle).isEqualTo(selectionOverrideToBundle);
     assertThat(selectionOverrideFromBundle).isEqualTo(selectionOverrideToBundle);
   }
   }
 
 
+  /**
+   * The deprecated {@link DefaultTrackSelector.ParametersBuilder} is implemented by delegating to
+   * an instance of {@link DefaultTrackSelector.Parameters.Builder}. However, it <b>also</b> extends
+   * {@link TrackSelectionParameters.Builder}, and for the delegation-pattern to work correctly it
+   * needs to override <b>every</b> setter method from the superclass (otherwise the setter won't be
+   * propagated to the delegate). This test ensures that invariant.
+   *
+   * <p>The test can be removed when the deprecated {@link DefaultTrackSelector.ParametersBuilder}
+   * is removed.
+   */
+  @SuppressWarnings("deprecation") // Testing deprecated builder
+  @Test
+  public void deprecatedParametersBuilderOverridesAllTrackSelectionParametersBuilderMethods()
+      throws Exception {
+    List<Method> methods = TestUtil.getPublicMethods(TrackSelectionParameters.Builder.class);
+    for (Method method : methods) {
+      assertThat(
+              DefaultTrackSelector.ParametersBuilder.class
+                  .getDeclaredMethod(method.getName(), method.getParameterTypes())
+                  .getDeclaringClass())
+          .isEqualTo(DefaultTrackSelector.ParametersBuilder.class);
+    }
+  }
+
   private static void assertSelections(TrackSelectorResult result, TrackSelection[] expected) {
   private static void assertSelections(TrackSelectorResult result, TrackSelection[] expected) {
     assertThat(result.length).isEqualTo(expected.length);
     assertThat(result.length).isEqualTo(expected.length);
     for (int i = 0; i < expected.length; i++) {
     for (int i = 0; i < expected.length; i++) {

libraries/test_utils/src/main/java/androidx/media3/test/utils/TestUtil.java

@@ -25,6 +25,7 @@ import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.Color;
 import android.media.MediaCodec;
 import android.media.MediaCodec;
 import android.net.Uri;
 import android.net.Uri;
+import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.C;
 import androidx.media3.common.Timeline;
 import androidx.media3.common.Timeline;
 import androidx.media3.common.util.Assertions;
 import androidx.media3.common.util.Assertions;
@@ -47,9 +48,17 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.nio.ByteBuffer;
 import java.nio.ByteBuffer;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.List;
+import java.util.Queue;
 import java.util.Random;
 import java.util.Random;
+import java.util.Set;
 
 
 /** Utility methods for tests. */
 /** Utility methods for tests. */
 @UnstableApi
 @UnstableApi
@@ -454,4 +463,35 @@ public class TestUtil {
     buffer.data.flip();
     buffer.data.flip();
     return buffer;
     return buffer;
   }
   }
+
+  /** Returns all the public methods of a Java class (except those defined by {@link Object}). */
+  public static List<Method> getPublicMethods(Class<?> clazz) {
+    // Run a BFS over all extended types to inspect them all.
+    Queue<Class<?>> supertypeQueue = new ArrayDeque<>();
+    supertypeQueue.add(clazz);
+    Set<Class<?>> supertypes = new HashSet<>();
+    Object object = new Object();
+    while (!supertypeQueue.isEmpty()) {
+      Class<?> currentSupertype = supertypeQueue.remove();
+      if (supertypes.add(currentSupertype)) {
+        @Nullable Class<?> superclass = currentSupertype.getSuperclass();
+        if (superclass != null && !superclass.isInstance(object)) {
+          supertypeQueue.add(superclass);
+        }
+
+        Collections.addAll(supertypeQueue, currentSupertype.getInterfaces());
+      }
+    }
+
+    List<Method> list = new ArrayList<>();
+    for (Class<?> supertype : supertypes) {
+      for (Method method : supertype.getDeclaredMethods()) {
+        if (Modifier.isPublic(method.getModifiers())) {
+          list.add(method);
+        }
+      }
+    }
+
+    return list;
+  }
 }
 }