loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TrackSelectionView: Use same "isAdaptive" logic in updateViews and onClick.

Browse Source 
We currently do not show check boxes if the renderer does not support adaptive
switches between tracks in one group. However, we assume check boxes in the
onClick method.

Use same logic for both methods to be consistent.

PiperOrigin-RevId: 236118372
This commit is contained in:
tonihei 2019-02-28 15:31:09 +00:00 committed by Oliver Woodman
parent 2ae07936ba
commit 0bb123aa4c
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
View File

@ -37,6 +37,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.RequiresNonNull;
/** A view for making track selections. */ /** A view for making track selections. */
public class TrackSelectionView extends LinearLayout { public class TrackSelectionView extends LinearLayout {
@ -257,11 +258,7 @@ public class TrackSelectionView extends LinearLayout {
allowMultipleOverrides && trackGroups.length > 1; allowMultipleOverrides && trackGroups.length > 1;
for (int groupIndex = 0; groupIndex < trackGroups.length; groupIndex++) { for (int groupIndex = 0; groupIndex < trackGroups.length; groupIndex++) {
TrackGroup group = trackGroups.get(groupIndex); TrackGroup group = trackGroups.get(groupIndex);
boolean enableMultipleChoiceForAdaptiveSelections = boolean enableMultipleChoiceForAdaptiveSelections = shouldEnableAdaptiveSelection(groupIndex);
allowAdaptiveSelections
&& trackGroups.get(groupIndex).length > 1
&& mappedTrackInfo.getAdaptiveSupport(rendererIndex, groupIndex, false)
!= RendererCapabilities.ADAPTIVE_NOT_SUPPORTED;
trackViews[groupIndex] = new CheckedTextView[group.length]; trackViews[groupIndex] = new CheckedTextView[group.length];
for (int trackIndex = 0; trackIndex < group.length; trackIndex++) { for (int trackIndex = 0; trackIndex < group.length; trackIndex++) {
if (trackIndex == 0) { if (trackIndex == 0) {
@ -334,11 +331,13 @@ public class TrackSelectionView extends LinearLayout {
int groupIndex = tag.first; int groupIndex = tag.first;
int trackIndex = tag.second; int trackIndex = tag.second;
SelectionOverride override = overrides.get(groupIndex); SelectionOverride override = overrides.get(groupIndex);
Assertions.checkNotNull(mappedTrackInfo);
boolean adaptiveSelectionsEnabled = shouldEnableAdaptiveSelection(groupIndex);
if (!allowMultipleOverrides && override == null && overrides.size() > 0) { if (!allowMultipleOverrides && override == null && overrides.size() > 0) {
// A new override is being started and we don't allow multiple overrides. // A new override is being started and we don't allow multiple overrides.
overrides.clear(); overrides.clear();
} }
if (override == null || !allowAdaptiveSelections) { if (override == null || !adaptiveSelectionsEnabled) {
// Update override for current group. // Update override for current group.
if (((CheckedTextView) view).isChecked()) { if (((CheckedTextView) view).isChecked()) {
overrides.remove(groupIndex); overrides.remove(groupIndex);
@ -371,6 +370,14 @@ public class TrackSelectionView extends LinearLayout {
} }
} }
@RequiresNonNull("mappedTrackInfo")
private boolean shouldEnableAdaptiveSelection(int groupIndex) {
return allowAdaptiveSelections
&& trackGroups.get(groupIndex).length > 1
&& mappedTrackInfo.getAdaptiveSupport(rendererIndex, groupIndex, false)
!= RendererCapabilities.ADAPTIVE_NOT_SUPPORTED;
}
private static int[] getTracksAdding(int[] tracks, int addedTrack) { private static int[] getTracksAdding(int[] tracks, int addedTrack) {
tracks = Arrays.copyOf(tracks, tracks.length + 1); tracks = Arrays.copyOf(tracks, tracks.length + 1);
tracks[tracks.length - 1] = addedTrack; tracks[tracks.length - 1] = addedTrack;