Skip to content

Commit 2826a55

Browse files
icbakermicrokatz
authored andcommitted
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 (cherry picked from commit 4fcc019)
1 parent 824cbf4 commit 2826a55

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2392,7 +2392,7 @@ private void setParametersInternal(Parameters parameters) {
23922392
selectTracks(
23932393
MappedTrackInfo mappedTrackInfo,
23942394
@Capabilities int[][][] rendererFormatSupports,
2395-
@AdaptiveSupport int[] rendererMixedMimeTypeAdaptationSupports,
2395+
@AdaptiveSupport int[] rendererMixedMimeTypeAdaptationSupport,
23962396
MediaPeriodId mediaPeriodId,
23972397
Timeline timeline)
23982398
throws ExoPlaybackException {
@@ -2412,7 +2412,7 @@ private void setParametersInternal(Parameters parameters) {
24122412
selectAllTracks(
24132413
mappedTrackInfo,
24142414
rendererFormatSupports,
2415-
rendererMixedMimeTypeAdaptationSupports,
2415+
rendererMixedMimeTypeAdaptationSupport,
24162416
parameters);
24172417

24182418
applyTrackSelectionOverrides(mappedTrackInfo, parameters, definitions);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ public final TrackSelectorResult selectTracks(
436436
* Given mapped track information, returns a track selection and configuration for each renderer.
437437
*
438438
* @param mappedTrackInfo Mapped track information.
439-
* @param rendererFormatSupports The {@link Capabilities} for ach mapped track, indexed by
439+
* @param rendererFormatSupports The {@link Capabilities} for each mapped track, indexed by
440440
* renderer, track group and track (in that order).
441441
* @param rendererMixedMimeTypeAdaptationSupport The {@link AdaptiveSupport} for mixed MIME type
442442
* adaptation for the renderer.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private static final class FakeMappingTrackSelector extends MappingTrackSelector
147147
protected Pair<RendererConfiguration[], ExoTrackSelection[]> selectTracks(
148148
MappedTrackInfo mappedTrackInfo,
149149
@Capabilities int[][][] rendererFormatSupports,
150-
@AdaptiveSupport int[] rendererMixedMimeTypeAdaptationSupports,
150+
@AdaptiveSupport int[] rendererMixedMimeTypeAdaptationSupport,
151151
MediaPeriodId mediaPeriodId,
152152
Timeline timeline) {
153153
int rendererCount = mappedTrackInfo.getRendererCount();

0 commit comments

Comments
 (0)