Fix track selection with mixed empty/non-empty overrides

When we have multiple overrides for TrackGroups associated with
one renderer, we need to look at all of them to find the non-empty
one. Empty ones should only be used to remove previously selected
tracks for this group and otherwise be ignored.

Currently this is broken because the first override (no matter if
it's empty or not) is used as the final selection for this renderer.

Issue: google/ExoPlayer#9649

#minor-release

PiperOrigin-RevId: 407792330
This commit is contained in:
tonihei 2021-11-05 11:34:33 +00:00
parent 8552345f8f
commit 0b48570bb3
3 changed files with 54 additions and 5 deletions

View File

@ -3,6 +3,9 @@
### dev-v2 (not yet released) ### dev-v2 (not yet released)
* Core Library: * Core Library:
* Fix track selection issue where a mixture of non-empty and empty track
overrides is not applied correctly
([#9649](https://github.com/google/ExoPlayer/issues/9649).
* Add protected method `DefaultRenderersFactory.getCodecAdapterFactory()` * Add protected method `DefaultRenderersFactory.getCodecAdapterFactory()`
so that subclasses of `DefaultRenderersFactory` that override so that subclasses of `DefaultRenderersFactory` that override
`buildVideoRenderers()` or `buildAudioRenderers()` can access the codec `buildVideoRenderers()` or `buildAudioRenderers()` can access the codec

View File

@ -1553,7 +1553,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|| params.disabledTrackTypes.contains(rendererType)) { || params.disabledTrackTypes.contains(rendererType)) {
return null; return null;
} }
// Per TrackGroupArray override // Per TrackGroupArray overrides.
TrackGroupArray rendererTrackGroups = mappedTrackInfo.getTrackGroups(rendererIndex); TrackGroupArray rendererTrackGroups = mappedTrackInfo.getTrackGroups(rendererIndex);
if (params.hasSelectionOverride(rendererIndex, rendererTrackGroups)) { if (params.hasSelectionOverride(rendererIndex, rendererTrackGroups)) {
@Nullable @Nullable
@ -1564,18 +1564,27 @@ public class DefaultTrackSelector extends MappingTrackSelector {
return new ExoTrackSelection.Definition( return new ExoTrackSelection.Definition(
rendererTrackGroups.get(override.groupIndex), override.tracks, override.type); rendererTrackGroups.get(override.groupIndex), override.tracks, override.type);
} }
// Per TrackGroup override // Per TrackGroup overrides.
for (int j = 0; j < rendererTrackGroups.length; j++) { for (int j = 0; j < rendererTrackGroups.length; j++) {
TrackGroup trackGroup = rendererTrackGroups.get(j); TrackGroup trackGroup = rendererTrackGroups.get(j);
@Nullable @Nullable
TrackSelectionOverride overrideTracks = TrackSelectionOverride overrideTracks =
params.trackSelectionOverrides.getOverride(trackGroup); params.trackSelectionOverrides.getOverride(trackGroup);
if (overrideTracks != null) { if (overrideTracks != null) {
return new ExoTrackSelection.Definition( if (overrideTracks.trackIndexes.isEmpty()) {
// TrackGroup is disabled. Deselect the currentDefinition if applicable. Otherwise ignore.
if (currentDefinition != null && currentDefinition.group.equals(trackGroup)) {
currentDefinition = null;
}
} else {
// Override current definition with new selection.
currentDefinition =
new ExoTrackSelection.Definition(
trackGroup, Ints.toArray(overrideTracks.trackIndexes)); trackGroup, Ints.toArray(overrideTracks.trackIndexes));
} }
} }
return currentDefinition; // No override }
return currentDefinition;
} }
// Track selection prior to overrides and disabled flags being applied. // Track selection prior to overrides and disabled flags being applied.

View File

@ -204,6 +204,43 @@ public final class DefaultTrackSelectorTest {
.isEqualTo(new RendererConfiguration[] {DEFAULT, DEFAULT}); .isEqualTo(new RendererConfiguration[] {DEFAULT, DEFAULT});
} }
@Test
public void selectTrack_withMixedEmptyAndNonEmptyTrackOverrides_appliesNonEmptyOverride()
throws Exception {
TrackGroup videoGroupHighBitrate =
new TrackGroup(VIDEO_FORMAT.buildUpon().setAverageBitrate(1_000_000).build());
TrackGroup videoGroupMidBitrate =
new TrackGroup(VIDEO_FORMAT.buildUpon().setAverageBitrate(500_000).build());
TrackGroup videoGroupLowBitrate =
new TrackGroup(VIDEO_FORMAT.buildUpon().setAverageBitrate(100_000).build());
trackSelector.setParameters(
trackSelector
.buildUponParameters()
.setTrackSelectionOverrides(
new TrackSelectionOverrides.Builder()
.addOverride(
new TrackSelectionOverride(
videoGroupHighBitrate, /* trackIndexes= */ ImmutableList.of()))
.addOverride(
new TrackSelectionOverride(
videoGroupMidBitrate, /* trackIndexes= */ ImmutableList.of(0)))
.addOverride(
new TrackSelectionOverride(
videoGroupLowBitrate, /* trackIndexes= */ ImmutableList.of()))
.build()));
TrackSelectorResult result =
trackSelector.selectTracks(
RENDERER_CAPABILITIES,
new TrackGroupArray(videoGroupHighBitrate, videoGroupMidBitrate, videoGroupLowBitrate),
periodId,
TIMELINE);
assertThat(result.selections)
.asList()
.containsExactly(new FixedTrackSelection(videoGroupMidBitrate, /* track= */ 0), null);
}
/** Tests that an empty override is not applied for a different set of available track groups. */ /** Tests that an empty override is not applied for a different set of available track groups. */
@Test @Test
public void selectTracks_withEmptyTrackOverrideForDifferentTracks_hasNoEffect() public void selectTracks_withEmptyTrackOverrideForDifferentTracks_hasNoEffect()