Remove dynamic data from ExoTrackSelection.Definition

PiperOrigin-RevId: 357587767

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

@@ -150,9 +150,7 @@ public class AdaptiveTrackSelection extends BaseTrackSelection {
                 ? new FixedTrackSelection(
                 ? new FixedTrackSelection(
                     definition.group,
                     definition.group,
                     /* track= */ definition.tracks[0],
                     /* track= */ definition.tracks[0],
-                    /* type= */ definition.type,
-                    /* reason= */ definition.reason,
-                    definition.data)
+                    /* type= */ definition.type)
                 : createAdaptiveTrackSelection(
                 : createAdaptiveTrackSelection(
                     definition.group,
                     definition.group,
                     definition.tracks,
                     definition.tracks,

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

@@ -1722,11 +1722,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
             override == null
             override == null
                 ? null
                 ? null
                 : new ExoTrackSelection.Definition(
                 : new ExoTrackSelection.Definition(
-                    rendererTrackGroups.get(override.groupIndex),
-                    override.tracks,
-                    override.type,
-                    C.SELECTION_REASON_MANUAL,
-                    /* data= */ null);
+                    rendererTrackGroups.get(override.groupIndex), override.tracks, override.type);
       }
       }
     }
     }
 
 

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

@@ -44,10 +44,6 @@ public interface ExoTrackSelection extends TrackSelection {
     public final int[] tracks;
     public final int[] tracks;
     /** The type that will be returned from {@link TrackSelection#getType()}. */
     /** The type that will be returned from {@link TrackSelection#getType()}. */
     public final int type;
     public final int type;
-    /** The track selection reason. One of the {@link C} SELECTION_REASON_ constants. */
-    public final int reason;
-    /** Optional data associated with this selection of tracks. */
-    @Nullable public final Object data;
 
 
     /**
     /**
      * @param group The {@link TrackGroup}. Must not be null.
      * @param group The {@link TrackGroup}. Must not be null.
@@ -55,7 +51,7 @@ public interface ExoTrackSelection extends TrackSelection {
      *     null or empty. May be in any order.
      *     null or empty. May be in any order.
      */
      */
     public Definition(TrackGroup group, int... tracks) {
     public Definition(TrackGroup group, int... tracks) {
-      this(group, tracks, TrackSelection.TYPE_UNSET, C.SELECTION_REASON_UNKNOWN, /* data= */ null);
+      this(group, tracks, TrackSelection.TYPE_UNSET);
     }
     }
 
 
     /**
     /**
@@ -63,15 +59,11 @@ public interface ExoTrackSelection extends TrackSelection {
      * @param tracks The indices of the selected tracks within the {@link TrackGroup}. Must not be
      * @param tracks The indices of the selected tracks within the {@link TrackGroup}. Must not be
      *     null or empty. May be in any order.
      *     null or empty. May be in any order.
      * @param type The type that will be returned from {@link TrackSelection#getType()}.
      * @param type The type that will be returned from {@link TrackSelection#getType()}.
-     * @param reason The track selection reason. One of the {@link C} SELECTION_REASON_ constants.
-     * @param data Optional data associated with this selection of tracks.
      */
      */
-    public Definition(TrackGroup group, int[] tracks, int type, int reason, @Nullable Object data) {
+    public Definition(TrackGroup group, int[] tracks, int type) {
       this.group = group;
       this.group = group;
       this.tracks = tracks;
       this.tracks = tracks;
       this.type = type;
       this.type = type;
-      this.reason = reason;
-      this.data = data;
     }
     }
   }
   }
 
 

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

@@ -35,10 +35,19 @@ public final class FixedTrackSelection extends BaseTrackSelection {
    * @param track The index of the selected track within the {@link TrackGroup}.
    * @param track The index of the selected track within the {@link TrackGroup}.
    */
    */
   public FixedTrackSelection(TrackGroup group, int track) {
   public FixedTrackSelection(TrackGroup group, int track) {
+    this(group, /* track= */ track, /* type= */ TrackSelection.TYPE_UNSET);
+  }
+
+  /**
+   * @param group The {@link TrackGroup}. Must not be null.
+   * @param track The index of the selected track within the {@link TrackGroup}.
+   * @param type The type that will be returned from {@link TrackSelection#getType()}.
+   */
+  public FixedTrackSelection(TrackGroup group, int track, int type) {
     this(
     this(
         group,
         group,
         /* track= */ track,
         /* track= */ track,
-        /* type= */ TrackSelection.TYPE_UNSET,
+        /* type= */ type,
         /* reason= */ C.SELECTION_REASON_UNKNOWN,
         /* reason= */ C.SELECTION_REASON_UNKNOWN,
         null);
         null);
   }
   }

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

@@ -64,11 +64,7 @@ public final class TrackSelectionUtil {
       } else {
       } else {
         selections[i] =
         selections[i] =
             new FixedTrackSelection(
             new FixedTrackSelection(
-                definition.group,
-                definition.tracks[0],
-                /* type= */ definition.type,
-                /* reason= */ definition.reason,
-                definition.data);
+                definition.group, definition.tracks[0], /* type= */ definition.type);
       }
       }
     }
     }
     return selections;
     return selections;