Commit ab501dd0 by ibaker Committed by microkatz

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 13ee34fa)
parent 386e2aff
...@@ -2385,7 +2385,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -2385,7 +2385,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
selectTracks( selectTracks(
MappedTrackInfo mappedTrackInfo, MappedTrackInfo mappedTrackInfo,
@Capabilities int[][][] rendererFormatSupports, @Capabilities int[][][] rendererFormatSupports,
@AdaptiveSupport int[] rendererMixedMimeTypeAdaptationSupports, @AdaptiveSupport int[] rendererMixedMimeTypeAdaptationSupport,
MediaPeriodId mediaPeriodId, MediaPeriodId mediaPeriodId,
Timeline timeline) Timeline timeline)
throws ExoPlaybackException { throws ExoPlaybackException {
...@@ -2405,7 +2405,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -2405,7 +2405,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
selectAllTracks( selectAllTracks(
mappedTrackInfo, mappedTrackInfo,
rendererFormatSupports, rendererFormatSupports,
rendererMixedMimeTypeAdaptationSupports, rendererMixedMimeTypeAdaptationSupport,
parameters); parameters);
applyTrackSelectionOverrides(mappedTrackInfo, parameters, definitions); applyTrackSelectionOverrides(mappedTrackInfo, parameters, definitions);
......
...@@ -434,7 +434,7 @@ public abstract class MappingTrackSelector extends TrackSelector { ...@@ -434,7 +434,7 @@ public abstract class MappingTrackSelector extends TrackSelector {
* Given mapped track information, returns a track selection and configuration for each renderer. * Given mapped track information, returns a track selection and configuration for each renderer.
* *
* @param mappedTrackInfo Mapped track information. * @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). * renderer, track group and track (in that order).
* @param rendererMixedMimeTypeAdaptationSupport The {@link AdaptiveSupport} for mixed MIME type * @param rendererMixedMimeTypeAdaptationSupport The {@link AdaptiveSupport} for mixed MIME type
* adaptation for the renderer. * adaptation for the renderer.
......
...@@ -147,7 +147,7 @@ public final class MappingTrackSelectorTest { ...@@ -147,7 +147,7 @@ public final class MappingTrackSelectorTest {
protected Pair<RendererConfiguration[], ExoTrackSelection[]> selectTracks( protected Pair<RendererConfiguration[], ExoTrackSelection[]> selectTracks(
MappedTrackInfo mappedTrackInfo, MappedTrackInfo mappedTrackInfo,
@Capabilities int[][][] rendererFormatSupports, @Capabilities int[][][] rendererFormatSupports,
@AdaptiveSupport int[] rendererMixedMimeTypeAdaptationSupports, @AdaptiveSupport int[] rendererMixedMimeTypeAdaptationSupport,
MediaPeriodId mediaPeriodId, MediaPeriodId mediaPeriodId,
Timeline timeline) { Timeline timeline) {
int rendererCount = mappedTrackInfo.getRendererCount(); int rendererCount = mappedTrackInfo.getRendererCount();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment