Rename indexes to indices in TrackSelectionOverrides

And in a couple of related places.

This is for consistency with the rest of the codebase where
we exclusively use indices.

#minor-release

PiperOrigin-RevId: 408273372

library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionOverrides.java

@@ -113,7 +113,7 @@ public final class TrackSelectionOverrides implements Bundleable {
   }
 
   /**
-   * Forces the selection of {@link #trackIndexes} for a {@link TrackGroup}.
+   * Forces the selection of {@link #trackIndices} for a {@link TrackGroup}.
    *
    * <p>If multiple {link #tracks} are overridden, as many as possible will be selected depending on
    * the player capabilities.
@@ -126,10 +126,10 @@ public final class TrackSelectionOverrides implements Bundleable {
    */
   public static final class TrackSelectionOverride implements Bundleable {
 
-    /** The {@link TrackGroup} whose {@link #trackIndexes} are forced to be selected. */
+    /** The {@link TrackGroup} whose {@link #trackIndices} are forced to be selected. */
     public final TrackGroup trackGroup;
-    /** The index of tracks in a {@link TrackGroup} to be selected. */
-    public final ImmutableList<Integer> trackIndexes;
+    /** The indices of tracks in a {@link TrackGroup} to be selected. */
+    public final ImmutableList<Integer> trackIndices;
 
     /** Constructs an instance to force all tracks in {@code trackGroup} to be selected. */
     public TrackSelectionOverride(TrackGroup trackGroup) {
@@ -138,23 +138,23 @@ public final class TrackSelectionOverrides implements Bundleable {
       for (int i = 0; i < trackGroup.length; i++) {
         builder.add(i);
       }
-      this.trackIndexes = builder.build();
+      this.trackIndices = builder.build();
     }
 
     /**
-     * Constructs an instance to force {@code trackIndexes} in {@code trackGroup} to be selected.
+     * Constructs an instance to force {@code trackIndices} in {@code trackGroup} to be selected.
      *
      * @param trackGroup The {@link TrackGroup} for which to override the track selection.
-     * @param trackIndexes The indexes of the tracks in the {@link TrackGroup} to select.
+     * @param trackIndices The indices of the tracks in the {@link TrackGroup} to select.
      */
-    public TrackSelectionOverride(TrackGroup trackGroup, List<Integer> trackIndexes) {
-      if (!trackIndexes.isEmpty()) {
-        if (min(trackIndexes) < 0 || max(trackIndexes) >= trackGroup.length) {
+    public TrackSelectionOverride(TrackGroup trackGroup, List<Integer> trackIndices) {
+      if (!trackIndices.isEmpty()) {
+        if (min(trackIndices) < 0 || max(trackIndices) >= trackGroup.length) {
           throw new IndexOutOfBoundsException();
         }
       }
       this.trackGroup = trackGroup;
-      this.trackIndexes = ImmutableList.copyOf(trackIndexes);
+      this.trackIndices = ImmutableList.copyOf(trackIndices);
     }
 
     @Override
@@ -166,12 +166,12 @@ public final class TrackSelectionOverrides implements Bundleable {
         return false;
       }
       TrackSelectionOverride that = (TrackSelectionOverride) obj;
-      return trackGroup.equals(that.trackGroup) && trackIndexes.equals(that.trackIndexes);
+      return trackGroup.equals(that.trackGroup) && trackIndices.equals(that.trackIndices);
     }
 
     @Override
     public int hashCode() {
-      return trackGroup.hashCode() + 31 * trackIndexes.hashCode();
+      return trackGroup.hashCode() + 31 * trackIndices.hashCode();
     }
 
     private @C.TrackType int getTrackType() {
@@ -195,7 +195,7 @@ public final class TrackSelectionOverrides implements Bundleable {
     public Bundle toBundle() {
       Bundle bundle = new Bundle();
       bundle.putBundle(keyForField(FIELD_TRACK_GROUP), trackGroup.toBundle());
-      bundle.putIntArray(keyForField(FIELD_TRACKS), Ints.toArray(trackIndexes));
+      bundle.putIntArray(keyForField(FIELD_TRACKS), Ints.toArray(trackIndices));
       return bundle;
     }
 

library/common/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionOverridesTest.java

@@ -49,7 +49,7 @@ public final class TrackSelectionOverridesTest {
         new TrackSelectionOverride(newTrackGroupWithIds(1, 2));
 
     assertThat(trackSelectionOverride.trackGroup).isEqualTo(newTrackGroupWithIds(1, 2));
-    assertThat(trackSelectionOverride.trackIndexes).containsExactly(0, 1).inOrder();
+    assertThat(trackSelectionOverride.trackIndices).containsExactly(0, 1).inOrder();
   }
 
   @Test
@@ -58,7 +58,7 @@ public final class TrackSelectionOverridesTest {
         new TrackSelectionOverride(newTrackGroupWithIds(1, 2), ImmutableList.of(1));
 
     assertThat(trackSelectionOverride.trackGroup).isEqualTo(newTrackGroupWithIds(1, 2));
-    assertThat(trackSelectionOverride.trackIndexes).containsExactly(1);
+    assertThat(trackSelectionOverride.trackIndices).containsExactly(1);
   }
 
   @Test
@@ -67,7 +67,7 @@ public final class TrackSelectionOverridesTest {
         new TrackSelectionOverride(newTrackGroupWithIds(1, 2), ImmutableList.of());
 
     assertThat(trackSelectionOverride.trackGroup).isEqualTo(newTrackGroupWithIds(1, 2));
-    assertThat(trackSelectionOverride.trackIndexes).isEmpty();
+    assertThat(trackSelectionOverride.trackIndices).isEmpty();
   }
 
   @Test
@@ -118,9 +118,9 @@ public final class TrackSelectionOverridesTest {
   public void addOverride_onSameGroup_replacesOverride() {
     TrackGroup trackGroup = newTrackGroupWithIds(1, 2, 3);
     TrackSelectionOverride override1 =
-        new TrackSelectionOverride(trackGroup, /* trackIndexes= */ ImmutableList.of(0));
+        new TrackSelectionOverride(trackGroup, /* trackIndices= */ ImmutableList.of(0));
     TrackSelectionOverride override2 =
-        new TrackSelectionOverride(trackGroup, /* trackIndexes= */ ImmutableList.of(1));
+        new TrackSelectionOverride(trackGroup, /* trackIndices= */ ImmutableList.of(1));
 
     TrackSelectionOverrides trackSelectionOverrides =
         new TrackSelectionOverrides.Builder().addOverride(override1).addOverride(override2).build();

library/common/src/test/java/com/google/android/exoplayer2/trackselection/TrackSelectionParametersTest.java

@@ -77,7 +77,7 @@ public final class TrackSelectionParametersTest {
                     new TrackGroup(
                         new Format.Builder().setId(4).build(),
                         new Format.Builder().setId(5).build()),
-                    /* trackIndexes= */ ImmutableList.of(1)))
+                    /* trackIndices= */ ImmutableList.of(1)))
             .build();
     TrackSelectionParameters parameters =
         TrackSelectionParameters.DEFAULT_WITHOUT_CONTEXT

library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java

@@ -307,7 +307,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       rendererDisabledFlags =
           makeSparseBooleanArrayFromTrueKeys(
               bundle.getIntArray(
-                  Parameters.keyForField(Parameters.FIELD_RENDERER_DISABLED_INDEXES)));
+                  Parameters.keyForField(Parameters.FIELD_RENDERER_DISABLED_INDICES)));
     }
 
     @Override
@@ -825,9 +825,9 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
     private void setSelectionOverridesFromBundle(Bundle bundle) {
       @Nullable
-      int[] rendererIndexes =
+      int[] rendererIndices =
           bundle.getIntArray(
-              Parameters.keyForField(Parameters.FIELD_SELECTION_OVERRIDES_RENDERER_INDEXES));
+              Parameters.keyForField(Parameters.FIELD_SELECTION_OVERRIDES_RENDERER_INDICES));
       List<TrackGroupArray> trackGroupArrays =
           BundleableUtil.fromBundleNullableList(
               TrackGroupArray.CREATOR,
@@ -841,11 +841,11 @@ public class DefaultTrackSelector extends MappingTrackSelector {
                   Parameters.keyForField(Parameters.FIELD_SELECTION_OVERRIDES)),
               /* defaultValue= */ new SparseArray<>());
 
-      if (rendererIndexes == null || rendererIndexes.length != trackGroupArrays.size()) {
+      if (rendererIndices == null || rendererIndices.length != trackGroupArrays.size()) {
         return; // Incorrect format, ignore all overrides.
       }
-      for (int i = 0; i < rendererIndexes.length; i++) {
-        int rendererIndex = rendererIndexes[i];
+      for (int i = 0; i < rendererIndices.length; i++) {
+        int rendererIndex = rendererIndices[i];
         TrackGroupArray groups = trackGroupArrays.get(i);
         @Nullable SelectionOverride selectionOverride = selectionOverrides.get(i);
         setSelectionOverride(rendererIndex, groups, selectionOverride);
@@ -1107,10 +1107,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       FIELD_EXCEED_RENDERER_CAPABILITIES_IF_NECESSARY,
       FIELD_TUNNELING_ENABLED,
       FIELD_ALLOW_MULTIPLE_ADAPTIVE_SELECTIONS,
-      FIELD_SELECTION_OVERRIDES_RENDERER_INDEXES,
+      FIELD_SELECTION_OVERRIDES_RENDERER_INDICES,
       FIELD_SELECTION_OVERRIDES_TRACK_GROUP_ARRAYS,
       FIELD_SELECTION_OVERRIDES,
-      FIELD_RENDERER_DISABLED_INDEXES,
+      FIELD_RENDERER_DISABLED_INDICES,
     })
     private @interface FieldNumber {}
 
@@ -1126,10 +1126,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     private static final int FIELD_EXCEED_RENDERER_CAPABILITIES_IF_NECESSARY = 1008;
     private static final int FIELD_TUNNELING_ENABLED = 1009;
     private static final int FIELD_ALLOW_MULTIPLE_ADAPTIVE_SELECTIONS = 1010;
-    private static final int FIELD_SELECTION_OVERRIDES_RENDERER_INDEXES = 1011;
+    private static final int FIELD_SELECTION_OVERRIDES_RENDERER_INDICES = 1011;
     private static final int FIELD_SELECTION_OVERRIDES_TRACK_GROUP_ARRAYS = 1012;
     private static final int FIELD_SELECTION_OVERRIDES = 1013;
-    private static final int FIELD_RENDERER_DISABLED_INDEXES = 1014;
+    private static final int FIELD_RENDERER_DISABLED_INDICES = 1014;
 
     @Override
     public Bundle toBundle() {
@@ -1172,7 +1172,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       putSelectionOverridesToBundle(bundle, selectionOverrides);
       // Only true values are put into rendererDisabledFlags.
       bundle.putIntArray(
-          keyForField(FIELD_RENDERER_DISABLED_INDEXES),
+          keyForField(FIELD_RENDERER_DISABLED_INDICES),
           getKeysFromSparseBooleanArray(rendererDisabledFlags));
 
       return bundle;
@@ -1194,7 +1194,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
     private static void putSelectionOverridesToBundle(
         Bundle bundle,
         SparseArray<Map<TrackGroupArray, @NullableType SelectionOverride>> selectionOverrides) {
-      ArrayList<Integer> rendererIndexes = new ArrayList<>();
+      ArrayList<Integer> rendererIndices = new ArrayList<>();
       ArrayList<TrackGroupArray> trackGroupArrays = new ArrayList<>();
       SparseArray<SelectionOverride> selections = new SparseArray<>();
 
@@ -1207,10 +1207,10 @@ public class DefaultTrackSelector extends MappingTrackSelector {
             selections.put(trackGroupArrays.size(), selection);
           }
           trackGroupArrays.add(override.getKey());
-          rendererIndexes.add(rendererIndex);
+          rendererIndices.add(rendererIndex);
         }
         bundle.putIntArray(
-            keyForField(FIELD_SELECTION_OVERRIDES_RENDERER_INDEXES), Ints.toArray(rendererIndexes));
+            keyForField(FIELD_SELECTION_OVERRIDES_RENDERER_INDICES), Ints.toArray(rendererIndices));
         bundle.putParcelableArrayList(
             keyForField(FIELD_SELECTION_OVERRIDES_TRACK_GROUP_ARRAYS),
             BundleableUtil.toBundleArrayList(trackGroupArrays));
@@ -1571,7 +1571,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
       TrackSelectionOverride overrideTracks =
           params.trackSelectionOverrides.getOverride(trackGroup);
       if (overrideTracks != null) {
-        if (overrideTracks.trackIndexes.isEmpty()) {
+        if (overrideTracks.trackIndices.isEmpty()) {
           // TrackGroup is disabled. Deselect the currentDefinition if applicable. Otherwise ignore.
           if (currentDefinition != null && currentDefinition.group.equals(trackGroup)) {
             currentDefinition = null;
@@ -1580,7 +1580,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
           // Override current definition with new selection.
           currentDefinition =
               new ExoTrackSelection.Definition(
-                  trackGroup, Ints.toArray(overrideTracks.trackIndexes));
+                  trackGroup, Ints.toArray(overrideTracks.trackIndices));
         }
       }
     }

library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java

@@ -465,7 +465,7 @@ public final class DefaultBandwidthMeter implements BandwidthMeter, TransferList
 
   /**
    * Returns initial bitrate group assignments for a {@code country}. The initial bitrate is a list
-   * of indexes for [Wifi, 2G, 3G, 4G, 5G_NSA, 5G_SA].
+   * of indices for [Wifi, 2G, 3G, 4G, 5G_NSA, 5G_SA].
    */
   private static int[] getInitialBitrateCountryGroupAssignment(String country) {
     switch (country) {

library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java

@@ -220,13 +220,13 @@ public final class DefaultTrackSelectorTest {
                 new TrackSelectionOverrides.Builder()
                     .addOverride(
                         new TrackSelectionOverride(
-                            videoGroupHighBitrate, /* trackIndexes= */ ImmutableList.of()))
+                            videoGroupHighBitrate, /* trackIndices= */ ImmutableList.of()))
                     .addOverride(
                         new TrackSelectionOverride(
-                            videoGroupMidBitrate, /* trackIndexes= */ ImmutableList.of(0)))
+                            videoGroupMidBitrate, /* trackIndices= */ ImmutableList.of(0)))
                     .addOverride(
                         new TrackSelectionOverride(
-                            videoGroupLowBitrate, /* trackIndexes= */ ImmutableList.of()))
+                            videoGroupLowBitrate, /* trackIndices= */ ImmutableList.of()))
                     .build()));
 
     TrackSelectorResult result =
@@ -1933,7 +1933,7 @@ public final class DefaultTrackSelectorTest {
                 .setOverrideForType(
                     new TrackSelectionOverride(
                         new TrackGroup(AUDIO_FORMAT, AUDIO_FORMAT, AUDIO_FORMAT, AUDIO_FORMAT),
-                        /* trackIndexes= */ ImmutableList.of(0, 2, 3)))
+                        /* trackIndices= */ ImmutableList.of(0, 2, 3)))
                 .build())
         .setDisabledTrackTypes(ImmutableSet.of(C.TRACK_TYPE_AUDIO))
         .build();