9432 : Added filtering for forced text track + tweaking trackSelection params

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

@@ -98,6 +98,7 @@ public static class Builder {
     private ImmutableList<String> preferredTextLanguages;
     private @C.RoleFlags int preferredTextRoleFlags;
     private boolean selectUndeterminedTextLanguage;
+    private @C.SelectionFlags int disabledTextTrackSelectionFlags;
     // General
     private boolean forceLowestBitrate;
     private boolean forceHighestSupportedBitrate;
@@ -130,6 +131,7 @@ public Builder() {
       preferredTextLanguages = ImmutableList.of();
       preferredTextRoleFlags = 0;
       selectUndeterminedTextLanguage = false;
+      disabledTextTrackSelectionFlags = 0;
       // General
       forceLowestBitrate = false;
       forceHighestSupportedBitrate = false;
@@ -231,6 +233,10 @@ protected Builder(Bundle bundle) {
           bundle.getBoolean(
               keyForField(FIELD_SELECT_UNDETERMINED_TEXT_LANGUAGE),
               DEFAULT_WITHOUT_CONTEXT.selectUndeterminedTextLanguage);
+      disabledTextTrackSelectionFlags = bundle.getInt(
+          keyForField(FIELD_DISABLED_TEXT_TRACK_SELECTION_FLAGS),
+          DEFAULT_WITHOUT_CONTEXT.disabledTextTrackSelectionFlags);
+
       // General
       forceLowestBitrate =
           bundle.getBoolean(
@@ -264,7 +270,7 @@ protected Builder(Bundle bundle) {
       "preferredAudioMimeTypes",
       "preferredTextLanguages",
       "overrides",
-      "disabledTrackTypes",
+      "disabledTrackTypes"
     })
     private void init(@UnknownInitialization Builder this, TrackSelectionParameters parameters) {
       // Video
@@ -291,6 +297,7 @@ private void init(@UnknownInitialization Builder this, TrackSelectionParameters
       preferredTextLanguages = parameters.preferredTextLanguages;
       preferredTextRoleFlags = parameters.preferredTextRoleFlags;
       selectUndeterminedTextLanguage = parameters.selectUndeterminedTextLanguage;
+      disabledTextTrackSelectionFlags = parameters.disabledTextTrackSelectionFlags;
       // General
       forceLowestBitrate = parameters.forceLowestBitrate;
       forceHighestSupportedBitrate = parameters.forceHighestSupportedBitrate;
@@ -757,6 +764,12 @@ private static ImmutableList<String> normalizeLanguageCodes(String[] preferredTe
       }
       return listBuilder.build();
     }
+
+    public Builder setDisabledTextTrackSelectionFlags(
+        @C.SelectionFlags int disabledTextTrackSelectionFlags) {
+      this.disabledTextTrackSelectionFlags = disabledTextTrackSelectionFlags;
+      return this;
+    }
   }
 
   /**
@@ -924,6 +937,12 @@ public static TrackSelectionParameters getDefaults(Context context) {
    */
   public final ImmutableSet<@C.TrackType Integer> disabledTrackTypes;
 
+  /**
+   * The track selectionFlags bitmap that are disabled. No track of a disabled selectionFlag will be selected,
+   * thus no track selectionFlag contained in the bitmap will be played. The default value is that no selectionFlag is disabled(0)
+   */
+  public final @C.SelectionFlags int disabledTextTrackSelectionFlags;
+
   protected TrackSelectionParameters(Builder builder) {
     // Video
     this.maxVideoWidth = builder.maxVideoWidth;
@@ -949,6 +968,7 @@ protected TrackSelectionParameters(Builder builder) {
     this.preferredTextLanguages = builder.preferredTextLanguages;
     this.preferredTextRoleFlags = builder.preferredTextRoleFlags;
     this.selectUndeterminedTextLanguage = builder.selectUndeterminedTextLanguage;
+    this.disabledTextTrackSelectionFlags = builder.disabledTextTrackSelectionFlags;
     // General
     this.forceLowestBitrate = builder.forceLowestBitrate;
     this.forceHighestSupportedBitrate = builder.forceHighestSupportedBitrate;
@@ -998,7 +1018,8 @@ public boolean equals(@Nullable Object obj) {
         && forceLowestBitrate == other.forceLowestBitrate
         && forceHighestSupportedBitrate == other.forceHighestSupportedBitrate
         && overrides.equals(other.overrides)
-        && disabledTrackTypes.equals(other.disabledTrackTypes);
+        && disabledTrackTypes.equals(other.disabledTrackTypes)
+        && disabledTextTrackSelectionFlags == other.disabledTextTrackSelectionFlags;
   }
 
   @Override
@@ -1033,6 +1054,7 @@ public int hashCode() {
     result = 31 * result + (forceHighestSupportedBitrate ? 1 : 0);
     result = 31 * result + overrides.hashCode();
     result = 31 * result + disabledTrackTypes.hashCode();
+    result = 31 * result + disabledTextTrackSelectionFlags;
     return result;
   }
 
@@ -1065,7 +1087,8 @@ public int hashCode() {
     FIELD_FORCE_HIGHEST_SUPPORTED_BITRATE,
     FIELD_SELECTION_OVERRIDES,
     FIELD_DISABLED_TRACK_TYPE,
-    FIELD_PREFERRED_VIDEO_ROLE_FLAGS
+    FIELD_PREFERRED_VIDEO_ROLE_FLAGS,
+    FIELD_DISABLED_TEXT_TRACK_SELECTION_FLAGS
   })
   private @interface FieldNumber {}
 
@@ -1094,6 +1117,7 @@ public int hashCode() {
   private static final int FIELD_SELECTION_OVERRIDES = 23;
   private static final int FIELD_DISABLED_TRACK_TYPE = 24;
   private static final int FIELD_PREFERRED_VIDEO_ROLE_FLAGS = 25;
+  private static final int FIELD_DISABLED_TEXT_TRACK_SELECTION_FLAGS = 26;
 
   @Override
   public Bundle toBundle() {
@@ -1139,6 +1163,7 @@ public Bundle toBundle() {
     bundle.putParcelableArrayList(
         keyForField(FIELD_SELECTION_OVERRIDES), toBundleArrayList(overrides.values()));
     bundle.putIntArray(keyForField(FIELD_DISABLED_TRACK_TYPE), Ints.toArray(disabledTrackTypes));
+    bundle.putInt(keyForField(disabledTextTrackSelectionFlags), disabledTextTrackSelectionFlags);
 
     return bundle;
   }

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

@@ -573,6 +573,7 @@ public ParametersBuilder setSelectUndeterminedTextLanguage(
      */
     public ParametersBuilder setDisabledTextTrackSelectionFlags(
         @C.SelectionFlags int disabledTextTrackSelectionFlags) {
+      super.setDisabledTextTrackSelectionFlags(disabledTextTrackSelectionFlags);
       this.disabledTextTrackSelectionFlags = disabledTextTrackSelectionFlags;
       return this;
     }

library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java

@@ -59,6 +59,7 @@
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
+import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ForwardingPlayer;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Player.Events;
@@ -67,6 +68,7 @@
 import com.google.android.exoplayer2.TracksInfo;
 import com.google.android.exoplayer2.TracksInfo.TrackGroupInfo;
 import com.google.android.exoplayer2.source.TrackGroup;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.TrackSelectionOverride;
 import com.google.android.exoplayer2.trackselection.TrackSelectionParameters;
 import com.google.android.exoplayer2.util.Assertions;
@@ -1130,8 +1132,14 @@ private ImmutableList<TrackInformation> gatherSupportedTrackInfosOfType(
         if (!trackGroupInfo.isTrackSupported(trackIndex)) {
           continue;
         }
-        String trackName =
-            trackNameProvider.getTrackName(trackGroupInfo.getTrackFormat(trackIndex));
+
+        Format trackFormat = trackGroupInfo.getTrackFormat(trackIndex);
+
+        if (trackFormat.selectionFlags == C.SELECTION_FLAG_FORCED) {
+          continue;
+        }
+
+        String trackName = trackNameProvider.getTrackName(trackFormat);
         tracks.add(new TrackInformation(tracksInfo, trackGroupIndex, trackIndex, trackName));
       }
     }
@@ -1867,10 +1875,12 @@ public void onBindViewHolderAtZeroPosition(SubSettingViewHolder holder) {
             if (player != null) {
               TrackSelectionParameters trackSelectionParameters =
                   player.getTrackSelectionParameters();
+
               player.setTrackSelectionParameters(
                   trackSelectionParameters
                       .buildUpon()
-                      .setTrackTypeDisabled(C.TRACK_TYPE_TEXT, /* disabled= */ true)
+                      .clearOverridesOfType(C.TRACK_TYPE_TEXT)
+                      .setDisabledTextTrackSelectionFlags(~C.SELECTION_FLAG_FORCED)
                       .build());
               settingsWindow.dismiss();
             }