sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix parameter name mismatch in MappingTrackSelector.selectTracks

Browse source 
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
This commit is contained in:
ibaker 2022-11-10 12:21:14 +00:00 committed by microkatz
parent b24161a6f6
commit 4fcc019bbf
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelector.java
View file

@ -2392,7 +2392,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 {
@ -2412,7 +2412,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
selectAllTracks( selectAllTracks(
mappedTrackInfo, mappedTrackInfo,
rendererFormatSupports, rendererFormatSupports,
rendererMixedMimeTypeAdaptationSupports, rendererMixedMimeTypeAdaptationSupport,
parameters); parameters);
applyTrackSelectionOverrides(mappedTrackInfo, parameters, definitions); applyTrackSelectionOverrides(mappedTrackInfo, parameters, definitions);

2
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/MappingTrackSelector.java
View file

@ -436,7 +436,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.

2
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/trackselection/MappingTrackSelectorTest.java
View file

@ -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();