Fix parameter name mismatch in MappingTrackSelector.selectTracks

It's not clear to me why presubmit didn't catch this, I briefly investigated but couldn't work it out - so I'm just going to fix it and move on. #minor-release PiperOrigin-RevId: 487497827
google · Nov 10, 2022 · 13ee34f · 13ee34f
1 parent 97589f1
commit 13ee34f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/...core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
@@ -2385,7 +2385,7 @@ private void setParametersInternal(Parameters parameters) {
       selectTracks(
           MappedTrackInfo mappedTrackInfo,
           @Capabilities int[][][] rendererFormatSupports,
-          @AdaptiveSupport int[] rendererMixedMimeTypeAdaptationSupports,
+          @AdaptiveSupport int[] rendererMixedMimeTypeAdaptationSupport,
           MediaPeriodId mediaPeriodId,
           Timeline timeline)
           throws ExoPlaybackException {
@@ -2405,7 +2405,7 @@ private void setParametersInternal(Parameters parameters) {
         selectAllTracks(
             mappedTrackInfo,
             rendererFormatSupports,
-            rendererMixedMimeTypeAdaptationSupports,
+            rendererMixedMimeTypeAdaptationSupport,
             parameters);
 
     applyTrackSelectionOverrides(mappedTrackInfo, parameters, definitions);

diff --git a/...core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java b/...core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java
@@ -434,7 +434,7 @@ public final TrackSelectorResult selectTracks(
    * Given mapped track information, returns a track selection and configuration for each renderer.
    *
    * @param mappedTrackInfo Mapped track information.
-   * @param rendererFormatSupports The {@link Capabilities} for ach mapped track, indexed by
+   * @param rendererFormatSupports The {@link Capabilities} for each mapped track, indexed by
    *     renderer, track group and track (in that order).
    * @param rendererMixedMimeTypeAdaptationSupport The {@link AdaptiveSupport} for mixed MIME type
    *     adaptation for the renderer.

diff --git a/.../src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java b/.../src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
@@ -147,7 +147,7 @@ private static final class FakeMappingTrackSelector extends MappingTrackSelector
     protected Pair<RendererConfiguration[], ExoTrackSelection[]> selectTracks(
         MappedTrackInfo mappedTrackInfo,
         @Capabilities int[][][] rendererFormatSupports,
-        @AdaptiveSupport int[] rendererMixedMimeTypeAdaptationSupports,
+        @AdaptiveSupport int[] rendererMixedMimeTypeAdaptationSupport,
         MediaPeriodId mediaPeriodId,
         Timeline timeline) {
       int rendererCount = mappedTrackInfo.getRendererCount();