Skip to content

SDK / exoplayer

Go to a project
Commit b2a5298e by olly Committed by Ian Baker
Options

Decouple UI module from ExoPlayer 

This change rewrites the UI module's track selection
components to depend on the Player API, allowing us to
finally remove the UI module's dependency on ExoPlayer
as a concrete player implementation.

PiperOrigin-RevId: 432989318
parent 661d7dde
Inline Side-by-side
Showing with 309 additions and 349 deletions
RELEASENOTES.md
...@@ -29,6 +29,12 @@ ...@@ -29,6 +29,12 @@
`SubtitleConfiguration` field and fall back to the `Factory` value if `SubtitleConfiguration` field and fall back to the `Factory` value if
it's not set it's not set
([#10016](https://github.com/google/ExoPlayer/issues/10016)). ([#10016](https://github.com/google/ExoPlayer/issues/10016)).
* UI:
* Rewrite `TrackSelectionView` and `TrackSelectionDialogBuilder` to work
with the `Player` interface rather than `ExoPlayer`. This allows the
views to be used with other `Player` implementations, and removes the
dependency from the UI module to the ExoPlayer module. This is a
breaking change.
* RTSP: * RTSP:
* Add RTP reader for HEVC * Add RTP reader for HEVC
([#36](https://github.com/androidx/media/pull/36)). ([#36](https://github.com/androidx/media/pull/36)).
......
demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
...@@ -29,6 +29,7 @@ import androidx.fragment.app.FragmentManager; ...@@ -29,6 +29,7 @@ import androidx.fragment.app.FragmentManager;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.RenderersFactory; import com.google.android.exoplayer2.RenderersFactory;
import com.google.android.exoplayer2.TracksInfo;
import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.drm.DrmInitData;
import com.google.android.exoplayer2.drm.DrmSession; import com.google.android.exoplayer2.drm.DrmSession;
import com.google.android.exoplayer2.drm.DrmSessionEventListener; import com.google.android.exoplayer2.drm.DrmSessionEventListener;
...@@ -43,8 +44,8 @@ import com.google.android.exoplayer2.offline.DownloadRequest; ...@@ -43,8 +44,8 @@ import com.google.android.exoplayer2.offline.DownloadRequest;
import com.google.android.exoplayer2.offline.DownloadService; import com.google.android.exoplayer2.offline.DownloadService;
import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.source.TrackGroup;
import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo; import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
import com.google.android.exoplayer2.trackselection.TrackSelectionParameters;
import com.google.android.exoplayer2.upstream.HttpDataSource; import com.google.android.exoplayer2.upstream.HttpDataSource;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
...@@ -69,7 +70,6 @@ public class DownloadTracker { ...@@ -69,7 +70,6 @@ public class DownloadTracker {
private final CopyOnWriteArraySet<Listener> listeners; private final CopyOnWriteArraySet<Listener> listeners;
private final HashMap<Uri, Download> downloads; private final HashMap<Uri, Download> downloads;
private final DownloadIndex downloadIndex; private final DownloadIndex downloadIndex;
private final DefaultTrackSelector.Parameters trackSelectorParameters;
@Nullable private StartDownloadDialogHelper startDownloadDialogHelper; @Nullable private StartDownloadDialogHelper startDownloadDialogHelper;
...@@ -82,7 +82,6 @@ public class DownloadTracker { ...@@ -82,7 +82,6 @@ public class DownloadTracker {
listeners = new CopyOnWriteArraySet<>(); listeners = new CopyOnWriteArraySet<>();
downloads = new HashMap<>(); downloads = new HashMap<>();
downloadIndex = downloadManager.getDownloadIndex(); downloadIndex = downloadManager.getDownloadIndex();
trackSelectorParameters = DownloadHelper.getDefaultTrackSelectorParameters(context);
downloadManager.addListener(new DownloadManagerListener()); downloadManager.addListener(new DownloadManagerListener());
loadDownloads(); loadDownloads();
} }
...@@ -159,7 +158,7 @@ public class DownloadTracker { ...@@ -159,7 +158,7 @@ public class DownloadTracker {
private final class StartDownloadDialogHelper private final class StartDownloadDialogHelper
implements DownloadHelper.Callback, implements DownloadHelper.Callback,
DialogInterface.OnClickListener, TrackSelectionDialog.TrackSelectionListener,
DialogInterface.OnDismissListener { DialogInterface.OnDismissListener {
private final FragmentManager fragmentManager; private final FragmentManager fragmentManager;
...@@ -167,7 +166,6 @@ public class DownloadTracker { ...@@ -167,7 +166,6 @@ public class DownloadTracker {
private final MediaItem mediaItem; private final MediaItem mediaItem;
private TrackSelectionDialog trackSelectionDialog; private TrackSelectionDialog trackSelectionDialog;
private MappedTrackInfo mappedTrackInfo;
private WidevineOfflineLicenseFetchTask widevineOfflineLicenseFetchTask; private WidevineOfflineLicenseFetchTask widevineOfflineLicenseFetchTask;
@Nullable private byte[] keySetId; @Nullable private byte[] keySetId;
...@@ -237,21 +235,13 @@ public class DownloadTracker { ...@@ -237,21 +235,13 @@ public class DownloadTracker {
Log.e(TAG, logMessage, e); Log.e(TAG, logMessage, e);
} }
// DialogInterface.OnClickListener implementation. // TrackSelectionListener implementation.
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onTracksSelected(TrackSelectionParameters trackSelectionParameters) {
for (int periodIndex = 0; periodIndex < downloadHelper.getPeriodCount(); periodIndex++) { for (int periodIndex = 0; periodIndex < downloadHelper.getPeriodCount(); periodIndex++) {
downloadHelper.clearTrackSelections(periodIndex); downloadHelper.clearTrackSelections(periodIndex);
for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) { downloadHelper.addTrackSelection(periodIndex, trackSelectionParameters);
if (!trackSelectionDialog.getIsDisabled(/* rendererIndex= */ i)) {
downloadHelper.addTrackSelectionForSingleRenderer(
periodIndex,
/* rendererIndex= */ i,
trackSelectorParameters,
trackSelectionDialog.getOverrides(/* rendererIndex= */ i));
}
}
} }
DownloadRequest downloadRequest = buildDownloadRequest(); DownloadRequest downloadRequest = buildDownloadRequest();
if (downloadRequest.streamKeys.isEmpty()) { if (downloadRequest.streamKeys.isEmpty()) {
...@@ -316,21 +306,21 @@ public class DownloadTracker { ...@@ -316,21 +306,21 @@ public class DownloadTracker {
return; return;
} }
mappedTrackInfo = downloadHelper.getMappedTrackInfo(/* periodIndex= */ 0); TracksInfo tracksInfo = downloadHelper.getTracksInfo(/* periodIndex= */ 0);
if (!TrackSelectionDialog.willHaveContent(mappedTrackInfo)) { if (!TrackSelectionDialog.willHaveContent(tracksInfo)) {
Log.d(TAG, "No dialog content. Downloading entire stream."); Log.d(TAG, "No dialog content. Downloading entire stream.");
startDownload(); startDownload();
downloadHelper.release(); downloadHelper.release();
return; return;
} }
trackSelectionDialog = trackSelectionDialog =
TrackSelectionDialog.createForMappedTrackInfoAndParameters( TrackSelectionDialog.createForTracksInfoAndParameters(
/* titleId= */ R.string.exo_download_description, /* titleId= */ R.string.exo_download_description,
mappedTrackInfo, tracksInfo,
trackSelectorParameters, DownloadHelper.getDefaultTrackSelectorParameters(context),
/* allowAdaptiveSelections= */ false, /* allowAdaptiveSelections= */ false,
/* allowMultipleOverrides= */ true, /* allowMultipleOverrides= */ true,
/* onClickListener= */ this, /* onTracksSelectedListener= */ this,
/* onDismissListener= */ this); /* onDismissListener= */ this);
trackSelectionDialog.show(fragmentManager, /* tag= */ null); trackSelectionDialog.show(fragmentManager, /* tag= */ null);
} }
......
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
...@@ -45,7 +45,7 @@ import com.google.android.exoplayer2.offline.DownloadRequest; ...@@ -45,7 +45,7 @@ import com.google.android.exoplayer2.offline.DownloadRequest;
import com.google.android.exoplayer2.source.DefaultMediaSourceFactory; import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.ads.AdsLoader; import com.google.android.exoplayer2.source.ads.AdsLoader;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import com.google.android.exoplayer2.trackselection.TrackSelectionParameters;
import com.google.android.exoplayer2.ui.StyledPlayerControlView; import com.google.android.exoplayer2.ui.StyledPlayerControlView;
import com.google.android.exoplayer2.ui.StyledPlayerView; import com.google.android.exoplayer2.ui.StyledPlayerView;
import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSource;
...@@ -79,8 +79,7 @@ public class PlayerActivity extends AppCompatActivity ...@@ -79,8 +79,7 @@ public class PlayerActivity extends AppCompatActivity
private Button selectTracksButton; private Button selectTracksButton;
private DataSource.Factory dataSourceFactory; private DataSource.Factory dataSourceFactory;
private List<MediaItem> mediaItems; private List<MediaItem> mediaItems;
private DefaultTrackSelector trackSelector; private TrackSelectionParameters trackSelectionParameters;
private DefaultTrackSelector.Parameters trackSelectionParameters;
private DebugTextViewHelper debugViewHelper; private DebugTextViewHelper debugViewHelper;
private TracksInfo lastSeenTracksInfo; private TracksInfo lastSeenTracksInfo;
private boolean startAutoPlay; private boolean startAutoPlay;
...@@ -113,9 +112,8 @@ public class PlayerActivity extends AppCompatActivity ...@@ -113,9 +112,8 @@ public class PlayerActivity extends AppCompatActivity
playerView.requestFocus(); playerView.requestFocus();
if (savedInstanceState != null) { if (savedInstanceState != null) {
// Restore as DefaultTrackSelector.Parameters in case ExoPlayer specific parameters were set.
trackSelectionParameters = trackSelectionParameters =
DefaultTrackSelector.Parameters.CREATOR.fromBundle( TrackSelectionParameters.CREATOR.fromBundle(
savedInstanceState.getBundle(KEY_TRACK_SELECTION_PARAMETERS)); savedInstanceState.getBundle(KEY_TRACK_SELECTION_PARAMETERS));
startAutoPlay = savedInstanceState.getBoolean(KEY_AUTO_PLAY); startAutoPlay = savedInstanceState.getBoolean(KEY_AUTO_PLAY);
startItemIndex = savedInstanceState.getInt(KEY_ITEM_INDEX); startItemIndex = savedInstanceState.getInt(KEY_ITEM_INDEX);
...@@ -127,8 +125,7 @@ public class PlayerActivity extends AppCompatActivity ...@@ -127,8 +125,7 @@ public class PlayerActivity extends AppCompatActivity
adsLoaderStateBundle); adsLoaderStateBundle);
} }
} else { } else {
trackSelectionParameters = trackSelectionParameters = new TrackSelectionParameters.Builder(/* context= */ this).build();
new DefaultTrackSelector.ParametersBuilder(/* context= */ this).build();
clearStartPosition(); clearStartPosition();
} }
} }
...@@ -237,11 +234,11 @@ public class PlayerActivity extends AppCompatActivity ...@@ -237,11 +234,11 @@ public class PlayerActivity extends AppCompatActivity
public void onClick(View view) { public void onClick(View view) {
if (view == selectTracksButton if (view == selectTracksButton
&& !isShowingTrackSelectionDialog && !isShowingTrackSelectionDialog
&& TrackSelectionDialog.willHaveContent(trackSelector)) { && TrackSelectionDialog.willHaveContent(player)) {
isShowingTrackSelectionDialog = true; isShowingTrackSelectionDialog = true;
TrackSelectionDialog trackSelectionDialog = TrackSelectionDialog trackSelectionDialog =
TrackSelectionDialog.createForTrackSelector( TrackSelectionDialog.createForPlayer(
trackSelector, player,
/* onDismissListener= */ dismissedDialog -> isShowingTrackSelectionDialog = false); /* onDismissListener= */ dismissedDialog -> isShowingTrackSelectionDialog = false);
trackSelectionDialog.show(getSupportFragmentManager(), /* tag= */ null); trackSelectionDialog.show(getSupportFragmentManager(), /* tag= */ null);
} }
...@@ -277,13 +274,11 @@ public class PlayerActivity extends AppCompatActivity ...@@ -277,13 +274,11 @@ public class PlayerActivity extends AppCompatActivity
RenderersFactory renderersFactory = RenderersFactory renderersFactory =
DemoUtil.buildRenderersFactory(/* context= */ this, preferExtensionDecoders); DemoUtil.buildRenderersFactory(/* context= */ this, preferExtensionDecoders);
trackSelector = new DefaultTrackSelector(/* context= */ this);
lastSeenTracksInfo = TracksInfo.EMPTY; lastSeenTracksInfo = TracksInfo.EMPTY;
player = player =
new ExoPlayer.Builder(/* context= */ this) new ExoPlayer.Builder(/* context= */ this)
.setRenderersFactory(renderersFactory) .setRenderersFactory(renderersFactory)
.setMediaSourceFactory(createMediaSourceFactory()) .setMediaSourceFactory(createMediaSourceFactory())
.setTrackSelector(trackSelector)
.build(); .build();
player.setTrackSelectionParameters(trackSelectionParameters); player.setTrackSelectionParameters(trackSelectionParameters);
player.addListener(new PlayerEventListener()); player.addListener(new PlayerEventListener());
...@@ -400,10 +395,7 @@ public class PlayerActivity extends AppCompatActivity ...@@ -400,10 +395,7 @@ public class PlayerActivity extends AppCompatActivity
private void updateTrackSelectorParameters() { private void updateTrackSelectorParameters() {
if (player != null) { if (player != null) {
// Until the demo app is fully migrated to TrackSelectionParameters, rely on ExoPlayer to use trackSelectionParameters = player.getTrackSelectionParameters();
// DefaultTrackSelector by default.
trackSelectionParameters =
(DefaultTrackSelector.Parameters) player.getTrackSelectionParameters();
} }
} }
...@@ -424,8 +416,7 @@ public class PlayerActivity extends AppCompatActivity ...@@ -424,8 +416,7 @@ public class PlayerActivity extends AppCompatActivity
// User controls // User controls
private void updateButtonVisibility() { private void updateButtonVisibility() {
selectTracksButton.setEnabled( selectTracksButton.setEnabled(player != null && TrackSelectionDialog.willHaveContent(player));
player != null && TrackSelectionDialog.willHaveContent(trackSelector));
} }
private void showControls() { private void showControls() {
......
demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
...@@ -32,20 +32,41 @@ import androidx.fragment.app.FragmentManager; ...@@ -32,20 +32,41 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter; import androidx.fragment.app.FragmentPagerAdapter;
import androidx.viewpager.widget.ViewPager; import androidx.viewpager.widget.ViewPager;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import com.google.android.exoplayer2.TracksInfo;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride; import com.google.android.exoplayer2.TracksInfo.TrackGroupInfo;
import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo; import com.google.android.exoplayer2.source.TrackGroup;
import com.google.android.exoplayer2.trackselection.TrackSelectionOverride;
import com.google.android.exoplayer2.trackselection.TrackSelectionParameters;
import com.google.android.exoplayer2.ui.TrackSelectionView; import com.google.android.exoplayer2.ui.TrackSelectionView;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayout;
import com.google.common.collect.ImmutableList;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** Dialog to select tracks. */ /** Dialog to select tracks. */
public final class TrackSelectionDialog extends DialogFragment { public final class TrackSelectionDialog extends DialogFragment {
/** Called when tracks are selected. */
public interface TrackSelectionListener {
/**
* Called when tracks are selected.
*
* @param trackSelectionParameters A {@link TrackSelectionParameters} representing the selected
* tracks. Any manual selections are defined by {@link
* TrackSelectionParameters#disabledTrackTypes} and {@link
* TrackSelectionParameters#overrides}.
*/
void onTracksSelected(TrackSelectionParameters trackSelectionParameters);
}
public static final ImmutableList<Integer> SUPPORTED_TRACK_TYPES =
ImmutableList.of(C.TRACK_TYPE_VIDEO, C.TRACK_TYPE_AUDIO, C.TRACK_TYPE_TEXT);
private final SparseArray<TrackSelectionViewFragment> tabFragments; private final SparseArray<TrackSelectionViewFragment> tabFragments;
private final ArrayList<Integer> tabTrackTypes; private final ArrayList<Integer> tabTrackTypes;
...@@ -55,20 +76,19 @@ public final class TrackSelectionDialog extends DialogFragment { ...@@ -55,20 +76,19 @@ public final class TrackSelectionDialog extends DialogFragment {
/** /**
* Returns whether a track selection dialog will have content to display if initialized with the * Returns whether a track selection dialog will have content to display if initialized with the
* specified {@link DefaultTrackSelector} in its current state. * specified {@link Player}.
*/ */
public static boolean willHaveContent(DefaultTrackSelector trackSelector) { public static boolean willHaveContent(Player player) {
MappedTrackInfo mappedTrackInfo = trackSelector.getCurrentMappedTrackInfo(); return willHaveContent(player.getCurrentTracksInfo());
return mappedTrackInfo != null && willHaveContent(mappedTrackInfo);
} }
/** /**
* Returns whether a track selection dialog will have content to display if initialized with the * Returns whether a track selection dialog will have content to display if initialized with the
* specified {@link MappedTrackInfo}. * specified {@link TracksInfo}.
*/ */
public static boolean willHaveContent(MappedTrackInfo mappedTrackInfo) { public static boolean willHaveContent(TracksInfo tracksInfo) {
for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) { for (TrackGroupInfo trackGroupInfo : tracksInfo.getTrackGroupInfos()) {
if (showTabForRenderer(mappedTrackInfo, i)) { if (SUPPORTED_TRACK_TYPES.contains(trackGroupInfo.getTrackType())) {
return true; return true;
} }
} }
...@@ -76,78 +96,67 @@ public final class TrackSelectionDialog extends DialogFragment { ...@@ -76,78 +96,67 @@ public final class TrackSelectionDialog extends DialogFragment {
} }
/** /**
* Creates a dialog for a given {@link DefaultTrackSelector}, whose parameters will be * Creates a dialog for a given {@link Player}, whose parameters will be automatically updated
* automatically updated when tracks are selected. * when tracks are selected.
* *
* @param trackSelector The {@link DefaultTrackSelector}. * @param player The {@link Player}.
* @param onDismissListener A {@link DialogInterface.OnDismissListener} to call when the dialog is * @param onDismissListener A {@link DialogInterface.OnDismissListener} to call when the dialog is
* dismissed. * dismissed.
*/ */
public static TrackSelectionDialog createForTrackSelector( public static TrackSelectionDialog createForPlayer(
DefaultTrackSelector trackSelector, DialogInterface.OnDismissListener onDismissListener) { Player player, DialogInterface.OnDismissListener onDismissListener) {
MappedTrackInfo mappedTrackInfo = return createForTracksInfoAndParameters(
Assertions.checkNotNull(trackSelector.getCurrentMappedTrackInfo()); R.string.track_selection_title,
TrackSelectionDialog trackSelectionDialog = new TrackSelectionDialog(); player.getCurrentTracksInfo(),
DefaultTrackSelector.Parameters parameters = trackSelector.getParameters(); player.getTrackSelectionParameters(),
trackSelectionDialog.init(
/* titleId= */ R.string.track_selection_title,
mappedTrackInfo,
/* initialParameters = */ parameters,
/* allowAdaptiveSelections= */ true, /* allowAdaptiveSelections= */ true,
/* allowMultipleOverrides= */ false, /* allowMultipleOverrides= */ false,
/* onClickListener= */ (dialog, which) -> { player::setTrackSelectionParameters,
DefaultTrackSelector.ParametersBuilder builder = parameters.buildUpon();
for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
builder
.clearSelectionOverrides(/* rendererIndex= */ i)
.setRendererDisabled(
/* rendererIndex= */ i,
trackSelectionDialog.getIsDisabled(/* rendererIndex= */ i));
List<SelectionOverride> overrides =
trackSelectionDialog.getOverrides(/* rendererIndex= */ i);
if (!overrides.isEmpty()) {
builder.setSelectionOverride(
/* rendererIndex= */ i,
mappedTrackInfo.getTrackGroups(/* rendererIndex= */ i),
overrides.get(0));
}
}
trackSelector.setParameters(builder);
},
onDismissListener); onDismissListener);
return trackSelectionDialog;
} }
/** /**
* Creates a dialog for given {@link MappedTrackInfo} and {@link DefaultTrackSelector.Parameters}. * Creates a dialog for given {@link TracksInfo} and {@link TrackSelectionParameters}.
* *
* @param titleId The resource id of the dialog title. * @param titleId The resource id of the dialog title.
* @param mappedTrackInfo The {@link MappedTrackInfo} to display. * @param tracksInfo The {@link TracksInfo} describing the tracks to display.
* @param initialParameters The {@link DefaultTrackSelector.Parameters} describing the initial * @param trackSelectionParameters The initial {@link TrackSelectionParameters}.
* track selection.
* @param allowAdaptiveSelections Whether adaptive selections (consisting of more than one track) * @param allowAdaptiveSelections Whether adaptive selections (consisting of more than one track)
* can be made. * can be made.
* @param allowMultipleOverrides Whether tracks from multiple track groups can be selected. * @param allowMultipleOverrides Whether tracks from multiple track groups can be selected.
* @param onClickListener {@link DialogInterface.OnClickListener} called when tracks are selected. * @param trackSelectionListener Called when tracks are selected.
* @param onDismissListener {@link DialogInterface.OnDismissListener} called when the dialog is * @param onDismissListener {@link DialogInterface.OnDismissListener} called when the dialog is
* dismissed. * dismissed.
*/ */
public static TrackSelectionDialog createForMappedTrackInfoAndParameters( public static TrackSelectionDialog createForTracksInfoAndParameters(
int titleId, int titleId,
MappedTrackInfo mappedTrackInfo, TracksInfo tracksInfo,
DefaultTrackSelector.Parameters initialParameters, TrackSelectionParameters trackSelectionParameters,
boolean allowAdaptiveSelections, boolean allowAdaptiveSelections,
boolean allowMultipleOverrides, boolean allowMultipleOverrides,
DialogInterface.OnClickListener onClickListener, TrackSelectionListener trackSelectionListener,
DialogInterface.OnDismissListener onDismissListener) { DialogInterface.OnDismissListener onDismissListener) {
TrackSelectionDialog trackSelectionDialog = new TrackSelectionDialog(); TrackSelectionDialog trackSelectionDialog = new TrackSelectionDialog();
trackSelectionDialog.init( trackSelectionDialog.init(
tracksInfo,
trackSelectionParameters,
titleId, titleId,
mappedTrackInfo,
initialParameters,
allowAdaptiveSelections, allowAdaptiveSelections,
allowMultipleOverrides, allowMultipleOverrides,
onClickListener, /* onClickListener= */ (dialog, which) -> {
TrackSelectionParameters.Builder builder = trackSelectionParameters.buildUpon();
for (int i = 0; i < SUPPORTED_TRACK_TYPES.size(); i++) {
int trackType = SUPPORTED_TRACK_TYPES.get(i);
builder.setTrackTypeDisabled(trackType, trackSelectionDialog.getIsDisabled(trackType));
builder.clearOverridesOfType(trackType);
Map<TrackGroup, TrackSelectionOverride> overrides =
trackSelectionDialog.getOverrides(trackType);
for (TrackSelectionOverride override : overrides.values()) {
builder.addOverride(override);
}
}
trackSelectionListener.onTracksSelected(builder.build());
},
onDismissListener); onDismissListener);
return trackSelectionDialog; return trackSelectionDialog;
} }
...@@ -160,9 +169,9 @@ public final class TrackSelectionDialog extends DialogFragment { ...@@ -160,9 +169,9 @@ public final class TrackSelectionDialog extends DialogFragment {
} }
private void init( private void init(
TracksInfo tracksInfo,
TrackSelectionParameters trackSelectionParameters,
int titleId, int titleId,
MappedTrackInfo mappedTrackInfo,
DefaultTrackSelector.Parameters initialParameters,
boolean allowAdaptiveSelections, boolean allowAdaptiveSelections,
boolean allowMultipleOverrides, boolean allowMultipleOverrides,
DialogInterface.OnClickListener onClickListener, DialogInterface.OnClickListener onClickListener,
...@@ -170,45 +179,49 @@ public final class TrackSelectionDialog extends DialogFragment { ...@@ -170,45 +179,49 @@ public final class TrackSelectionDialog extends DialogFragment {
this.titleId = titleId; this.titleId = titleId;
this.onClickListener = onClickListener; this.onClickListener = onClickListener;
this.onDismissListener = onDismissListener; this.onDismissListener = onDismissListener;
for (int i = 0; i < mappedTrackInfo.getRendererCount(); i++) {
if (showTabForRenderer(mappedTrackInfo, i)) { for (int i = 0; i < SUPPORTED_TRACK_TYPES.size(); i++) {
int trackType = mappedTrackInfo.getRendererType(/* rendererIndex= */ i); @C.TrackType int trackType = SUPPORTED_TRACK_TYPES.get(i);
TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(i); ArrayList<TrackGroupInfo> trackGroupInfos = new ArrayList<>();
for (TrackGroupInfo trackGroupInfo : tracksInfo.getTrackGroupInfos()) {
if (trackGroupInfo.getTrackType() == trackType) {
trackGroupInfos.add(trackGroupInfo);
}
}
if (!trackGroupInfos.isEmpty()) {
TrackSelectionViewFragment tabFragment = new TrackSelectionViewFragment(); TrackSelectionViewFragment tabFragment = new TrackSelectionViewFragment();
tabFragment.init( tabFragment.init(
mappedTrackInfo, trackGroupInfos,
/* rendererIndex= */ i, trackSelectionParameters.disabledTrackTypes.contains(trackType),
initialParameters.getRendererDisabled(/* rendererIndex= */ i), trackSelectionParameters.overrides,
initialParameters.getSelectionOverride(/* rendererIndex= */ i, trackGroupArray),
allowAdaptiveSelections, allowAdaptiveSelections,
allowMultipleOverrides); allowMultipleOverrides);
tabFragments.put(i, tabFragment); tabFragments.put(trackType, tabFragment);
tabTrackTypes.add(trackType); tabTrackTypes.add(trackType);
} }
} }
} }
/** /**
* Returns whether a renderer is disabled. * Returns whether the disabled option is selected for the specified track type.
* *
* @param rendererIndex Renderer index. * @param trackType The track type.
* @return Whether the renderer is disabled. * @return Whether the disabled option is selected for the track type.
*/ */
public boolean getIsDisabled(int rendererIndex) { public boolean getIsDisabled(int trackType) {
TrackSelectionViewFragment rendererView = tabFragments.get(rendererIndex); TrackSelectionViewFragment trackView = tabFragments.get(trackType);
return rendererView != null && rendererView.isDisabled; return trackView != null && trackView.isDisabled;
} }
/** /**
* Returns the list of selected track selection overrides for the specified renderer. There will * Returns the selected track overrides for the specified track type.
* be at most one override for each track group.
* *
* @param rendererIndex Renderer index. * @param trackType The track type.
* @return The list of track selection overrides for this renderer. * @return The track overrides for the track type.
*/ */
public List<SelectionOverride> getOverrides(int rendererIndex) { public Map<TrackGroup, TrackSelectionOverride> getOverrides(int trackType) {
TrackSelectionViewFragment rendererView = tabFragments.get(rendererIndex); TrackSelectionViewFragment trackView = tabFragments.get(trackType);
return rendererView == null ? Collections.emptyList() : rendererView.overrides; return trackView == null ? Collections.emptyMap() : trackView.overrides;
} }
@Override @Override
...@@ -248,27 +261,7 @@ public final class TrackSelectionDialog extends DialogFragment { ...@@ -248,27 +261,7 @@ public final class TrackSelectionDialog extends DialogFragment {
return dialogView; return dialogView;
} }
private static boolean showTabForRenderer(MappedTrackInfo mappedTrackInfo, int rendererIndex) { private static String getTrackTypeString(Resources resources, @C.TrackType int trackType) {
TrackGroupArray trackGroupArray = mappedTrackInfo.getTrackGroups(rendererIndex);
if (trackGroupArray.length == 0) {
return false;
}
int trackType = mappedTrackInfo.getRendererType(rendererIndex);
return isSupportedTrackType(trackType);
}
private static boolean isSupportedTrackType(int trackType) {
switch (trackType) {
case C.TRACK_TYPE_VIDEO:
case C.TRACK_TYPE_AUDIO:
case C.TRACK_TYPE_TEXT:
return true;
default:
return false;
}
}
private static String getTrackTypeString(Resources resources, int trackType) {
switch (trackType) { switch (trackType) {
case C.TRACK_TYPE_VIDEO: case C.TRACK_TYPE_VIDEO:
return resources.getString(R.string.exo_track_selection_title_video); return resources.getString(R.string.exo_track_selection_title_video);
...@@ -289,12 +282,12 @@ public final class TrackSelectionDialog extends DialogFragment { ...@@ -289,12 +282,12 @@ public final class TrackSelectionDialog extends DialogFragment {
@Override @Override
public Fragment getItem(int position) { public Fragment getItem(int position) {
return tabFragments.valueAt(position); return tabFragments.get(tabTrackTypes.get(position));
} }
@Override @Override
public int getCount() { public int getCount() {
return tabFragments.size(); return tabTrackTypes.size();
} }
@Override @Override
...@@ -307,13 +300,12 @@ public final class TrackSelectionDialog extends DialogFragment { ...@@ -307,13 +300,12 @@ public final class TrackSelectionDialog extends DialogFragment {
public static final class TrackSelectionViewFragment extends Fragment public static final class TrackSelectionViewFragment extends Fragment
implements TrackSelectionView.TrackSelectionListener { implements TrackSelectionView.TrackSelectionListener {
private MappedTrackInfo mappedTrackInfo; private List<TrackGroupInfo> trackGroupInfos;
private int rendererIndex;
private boolean allowAdaptiveSelections; private boolean allowAdaptiveSelections;
private boolean allowMultipleOverrides; private boolean allowMultipleOverrides;
/* package */ boolean isDisabled; /* package */ boolean isDisabled;
/* package */ List<SelectionOverride> overrides; /* package */ Map<TrackGroup, TrackSelectionOverride> overrides;
public TrackSelectionViewFragment() { public TrackSelectionViewFragment() {
// Retain instance across activity re-creation to prevent losing access to init data. // Retain instance across activity re-creation to prevent losing access to init data.
...@@ -321,21 +313,21 @@ public final class TrackSelectionDialog extends DialogFragment { ...@@ -321,21 +313,21 @@ public final class TrackSelectionDialog extends DialogFragment {
} }
public void init( public void init(
MappedTrackInfo mappedTrackInfo, List<TrackGroupInfo> trackGroupInfos,
int rendererIndex, boolean isDisabled,
boolean initialIsDisabled, Map<TrackGroup, TrackSelectionOverride> overrides,
@Nullable SelectionOverride initialOverride,
boolean allowAdaptiveSelections, boolean allowAdaptiveSelections,
boolean allowMultipleOverrides) { boolean allowMultipleOverrides) {
this.mappedTrackInfo = mappedTrackInfo; this.trackGroupInfos = trackGroupInfos;
this.rendererIndex = rendererIndex; this.isDisabled = isDisabled;
this.isDisabled = initialIsDisabled;
this.overrides =
initialOverride == null
? Collections.emptyList()
: Collections.singletonList(initialOverride);
this.allowAdaptiveSelections = allowAdaptiveSelections; this.allowAdaptiveSelections = allowAdaptiveSelections;
this.allowMultipleOverrides = allowMultipleOverrides; this.allowMultipleOverrides = allowMultipleOverrides;
// TrackSelectionView does this filtering internally, but we need to do it here as well to
// handle the case where the TrackSelectionView is never created.
this.overrides =
new HashMap<>(
TrackSelectionView.filterOverrides(
overrides, trackGroupInfos, allowMultipleOverrides));
} }
@Override @Override
...@@ -351,8 +343,7 @@ public final class TrackSelectionDialog extends DialogFragment { ...@@ -351,8 +343,7 @@ public final class TrackSelectionDialog extends DialogFragment {
trackSelectionView.setAllowMultipleOverrides(allowMultipleOverrides); trackSelectionView.setAllowMultipleOverrides(allowMultipleOverrides);
trackSelectionView.setAllowAdaptiveSelections(allowAdaptiveSelections); trackSelectionView.setAllowAdaptiveSelections(allowAdaptiveSelections);
trackSelectionView.init( trackSelectionView.init(
mappedTrackInfo, trackGroupInfos,
rendererIndex,
isDisabled, isDisabled,
overrides, overrides,
/* trackFormatComparator= */ null, /* trackFormatComparator= */ null,
...@@ -361,7 +352,8 @@ public final class TrackSelectionDialog extends DialogFragment { ...@@ -361,7 +352,8 @@ public final class TrackSelectionDialog extends DialogFragment {
} }
@Override @Override
public void onTrackSelectionChanged(boolean isDisabled, List<SelectionOverride> overrides) { public void onTrackSelectionChanged(
boolean isDisabled, Map<TrackGroup, TrackSelectionOverride> overrides) {
this.isDisabled = isDisabled; this.isDisabled = isDisabled;
this.overrides = overrides; this.overrides = overrides;
} }
......
library/ui/build.gradle
...@@ -16,7 +16,7 @@ apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle" ...@@ -16,7 +16,7 @@ apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
android.buildTypes.debug.testCoverageEnabled true android.buildTypes.debug.testCoverageEnabled true
dependencies { dependencies {
implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-common')
api 'androidx.media:media:' + androidxMediaVersion api 'androidx.media:media:' + androidxMediaVersion
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
implementation 'androidx.recyclerview:recyclerview:' + androidxRecyclerViewVersion implementation 'androidx.recyclerview:recyclerview:' + androidxRecyclerViewVersion
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
*/ */
package com.google.android.exoplayer2.ui; package com.google.android.exoplayer2.ui;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
...@@ -25,16 +23,21 @@ import android.view.LayoutInflater; ...@@ -25,16 +23,21 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.StyleRes; import androidx.annotation.StyleRes;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import com.google.android.exoplayer2.TracksInfo.TrackGroupInfo;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride; import com.google.android.exoplayer2.source.TrackGroup;
import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo; import com.google.android.exoplayer2.trackselection.TrackSelectionOverride;
import com.google.android.exoplayer2.trackselection.TrackSelectionUtil; import com.google.android.exoplayer2.trackselection.TrackSelectionParameters;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map;
/** Builder for a dialog with a {@link TrackSelectionView}. */ /** Builder for a dialog with a {@link TrackSelectionView}. */
public final class TrackSelectionDialogBuilder { public final class TrackSelectionDialogBuilder {
...@@ -45,25 +48,24 @@ public final class TrackSelectionDialogBuilder { ...@@ -45,25 +48,24 @@ public final class TrackSelectionDialogBuilder {
/** /**
* Called when tracks are selected. * Called when tracks are selected.
* *
* @param isDisabled Whether the renderer is disabled. * @param isDisabled Whether the disabled option is selected.
* @param overrides List of selected track selection overrides for the renderer. * @param overrides The selected track overrides.
*/ */
void onTracksSelected(boolean isDisabled, List<SelectionOverride> overrides); void onTracksSelected(boolean isDisabled, Map<TrackGroup, TrackSelectionOverride> overrides);
} }
private final Context context; private final Context context;
@StyleRes private int themeResId;
private final CharSequence title; private final CharSequence title;
private final MappedTrackInfo mappedTrackInfo; private final List<TrackGroupInfo> trackGroupInfos;
private final int rendererIndex;
private final DialogCallback callback; private final DialogCallback callback;
@StyleRes private int themeResId;
private boolean allowAdaptiveSelections; private boolean allowAdaptiveSelections;
private boolean allowMultipleOverrides; private boolean allowMultipleOverrides;
private boolean showDisableOption; private boolean showDisableOption;
@Nullable private TrackNameProvider trackNameProvider; @Nullable private TrackNameProvider trackNameProvider;
private boolean isDisabled; private boolean isDisabled;
private List<SelectionOverride> overrides; private Map<TrackGroup, TrackSelectionOverride> overrides;
@Nullable private Comparator<Format> trackFormatComparator; @Nullable private Comparator<Format> trackFormatComparator;
/** /**
...@@ -71,59 +73,53 @@ public final class TrackSelectionDialogBuilder { ...@@ -71,59 +73,53 @@ public final class TrackSelectionDialogBuilder {
* *
* @param context The context of the dialog. * @param context The context of the dialog.
* @param title The title of the dialog. * @param title The title of the dialog.
* @param mappedTrackInfo The {@link MappedTrackInfo} containing the track information. * @param trackGroupInfos The {@link TrackGroupInfo TrackGroupInfos} for the track groups.
* @param rendererIndex The renderer index in the {@code mappedTrackInfo} for which the track
* selection is shown.
* @param callback The {@link DialogCallback} invoked when a track selection has been made. * @param callback The {@link DialogCallback} invoked when a track selection has been made.
*/ */
public TrackSelectionDialogBuilder( public TrackSelectionDialogBuilder(
Context context, Context context,
CharSequence title, CharSequence title,
MappedTrackInfo mappedTrackInfo, List<TrackGroupInfo> trackGroupInfos,
int rendererIndex,
DialogCallback callback) { DialogCallback callback) {
this.context = context; this.context = context;
this.title = title; this.title = title;
this.mappedTrackInfo = mappedTrackInfo; this.trackGroupInfos = ImmutableList.copyOf(trackGroupInfos);
this.rendererIndex = rendererIndex;
this.callback = callback; this.callback = callback;
overrides = Collections.emptyList(); overrides = Collections.emptyMap();
} }
/** /**
* Creates a builder for a track selection dialog which automatically updates a {@link * Creates a builder for a track selection dialog.
* DefaultTrackSelector}.
* *
* @param context The context of the dialog. * @param context The context of the dialog.
* @param title The title of the dialog. * @param title The title of the dialog.
* @param trackSelector A {@link DefaultTrackSelector} whose current selection is used to set up * @param player The {@link Player} whose tracks should be selected.
* the dialog and which is updated when new tracks are selected in the dialog. * @param trackType The type of tracks to show for selection.
* @param rendererIndex The renderer index in the {@code trackSelector} for which the track
* selection is shown.
*/ */
public TrackSelectionDialogBuilder( public TrackSelectionDialogBuilder(
Context context, CharSequence title, DefaultTrackSelector trackSelector, int rendererIndex) { Context context, CharSequence title, Player player, @C.TrackType int trackType) {
this.context = context; this.context = context;
this.title = title; this.title = title;
this.mappedTrackInfo = checkNotNull(trackSelector.getCurrentMappedTrackInfo()); List<TrackGroupInfo> allTrackGroupInfos = player.getCurrentTracksInfo().getTrackGroupInfos();
this.rendererIndex = rendererIndex; trackGroupInfos = new ArrayList<>();
for (int i = 0; i < allTrackGroupInfos.size(); i++) {
TrackGroupArray rendererTrackGroups = mappedTrackInfo.getTrackGroups(rendererIndex); TrackGroupInfo trackGroupInfo = allTrackGroupInfos.get(i);
DefaultTrackSelector.Parameters selectionParameters = trackSelector.getParameters(); if (trackGroupInfo.getTrackType() == trackType) {
isDisabled = selectionParameters.getRendererDisabled(rendererIndex); trackGroupInfos.add(trackGroupInfo);
SelectionOverride override = }
selectionParameters.getSelectionOverride(rendererIndex, rendererTrackGroups); }
overrides = override == null ? Collections.emptyList() : Collections.singletonList(override); overrides = Collections.emptyMap();
callback =
this.callback = (isDisabled, overrides) -> {
(newIsDisabled, newOverrides) -> TrackSelectionParameters.Builder parametersBuilder =
trackSelector.setParameters( player.getTrackSelectionParameters().buildUpon();
TrackSelectionUtil.updateParametersWithOverride( parametersBuilder.setTrackTypeDisabled(trackType, isDisabled);
selectionParameters, parametersBuilder.clearOverridesOfType(trackType);
rendererIndex, for (TrackSelectionOverride override : overrides.values()) {
rendererTrackGroups, parametersBuilder.addOverride(override);
newIsDisabled, }
newOverrides.isEmpty() ? null : newOverrides.get(0))); player.setTrackSelectionParameters(parametersBuilder.build());
};
} }
/** /**
...@@ -149,27 +145,28 @@ public final class TrackSelectionDialogBuilder { ...@@ -149,27 +145,28 @@ public final class TrackSelectionDialogBuilder {
} }
/** /**
* Sets the initial selection override to show. * Sets the single initial override.
* *
* @param override The initial override to show, or null for no override. * @param override The initial override, or {@code null} for no override.
* @return This builder, for convenience. * @return This builder, for convenience.
*/ */
public TrackSelectionDialogBuilder setOverride(@Nullable SelectionOverride override) { public TrackSelectionDialogBuilder setOverride(@Nullable TrackSelectionOverride override) {
return setOverrides( return setOverrides(
override == null ? Collections.emptyList() : Collections.singletonList(override)); override == null ? Collections.emptyMap() : ImmutableMap.of(override.trackGroup, override));
} }
/** /**
* Sets the list of initial selection overrides to show. * Sets the initial track overrides. Any overrides that do not correspond to track groups
* * described by {@code trackGroupInfos} that have been given to this instance will be ignored. If
* <p>Note that only the first override will be used unless {@link * {@link #setAllowMultipleOverrides(boolean)} hasn't been set to {@code true} then all but one
* #setAllowMultipleOverrides(boolean)} is set to {@code true}. * override will be ignored. The retained override will be the one whose track group is described
* first in {@code trackGroupInfos}.
* *
* @param overrides The list of initial overrides to show. There must be at most one override for * @param overrides The initially selected track overrides.
* each track group.
* @return This builder, for convenience. * @return This builder, for convenience.
*/ */
public TrackSelectionDialogBuilder setOverrides(List<SelectionOverride> overrides) { public TrackSelectionDialogBuilder setOverrides(
Map<TrackGroup, TrackSelectionOverride> overrides) {
this.overrides = overrides; this.overrides = overrides;
return this; return this;
} }
...@@ -299,12 +296,7 @@ public final class TrackSelectionDialogBuilder { ...@@ -299,12 +296,7 @@ public final class TrackSelectionDialogBuilder {
selectionView.setTrackNameProvider(trackNameProvider); selectionView.setTrackNameProvider(trackNameProvider);
} }
selectionView.init( selectionView.init(
mappedTrackInfo, trackGroupInfos, isDisabled, overrides, trackFormatComparator, /* listener= */ null);
rendererIndex,
isDisabled,
overrides,
trackFormatComparator,
/* listener= */ null);
return (dialog, which) -> return (dialog, which) ->
callback.onTracksSelected(selectionView.getIsDisabled(), selectionView.getOverrides()); callback.onTracksSelected(selectionView.getIsDisabled(), selectionView.getOverrides());
} }
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
...@@ -18,28 +18,24 @@ package com.google.android.exoplayer2.ui; ...@@ -18,28 +18,24 @@ package com.google.android.exoplayer2.ui;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.SparseArray;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.CheckedTextView; import android.widget.CheckedTextView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import androidx.annotation.AttrRes; import androidx.annotation.AttrRes;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.RendererCapabilities; import com.google.android.exoplayer2.TracksInfo.TrackGroupInfo;
import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.source.TrackGroup;
import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.trackselection.TrackSelectionOverride;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;
import com.google.android.exoplayer2.trackselection.MappingTrackSelector.MappedTrackInfo;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.common.collect.ImmutableList;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap;
import java.util.List; import java.util.List;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import java.util.Map;
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 {
...@@ -50,10 +46,36 @@ public class TrackSelectionView extends LinearLayout { ...@@ -50,10 +46,36 @@ public class TrackSelectionView extends LinearLayout {
/** /**
* Called when the selected tracks changed. * Called when the selected tracks changed.
* *
* @param isDisabled Whether the renderer is disabled. * @param isDisabled Whether the disabled option is selected.
* @param overrides List of selected track selection overrides for the renderer. * @param overrides The selected track overrides.
*/ */
void onTrackSelectionChanged(boolean isDisabled, List<SelectionOverride> overrides); void onTrackSelectionChanged(
boolean isDisabled, Map<TrackGroup, TrackSelectionOverride> overrides);
}
/**
* Returns the subset of {@code overrides} that apply to track groups in {@code trackGroupInfos}.
* If {@code allowMultipleOverrides} is {@code} then at most one override is retained, which will
* be the one whose track group is first in {@code trackGroupInfos}.
*
* @param overrides The overrides to filter.
* @param trackGroupInfos The track groups whose overrides should be retained.
* @param allowMultipleOverrides Whether more than one override can be retained.
* @return The filtered overrides.
*/
public static Map<TrackGroup, TrackSelectionOverride> filterOverrides(
Map<TrackGroup, TrackSelectionOverride> overrides,
List<TrackGroupInfo> trackGroupInfos,
boolean allowMultipleOverrides) {
HashMap<TrackGroup, TrackSelectionOverride> filteredOverrides = new HashMap<>();
for (int i = 0; i < trackGroupInfos.size(); i++) {
TrackGroupInfo trackGroupInfo = trackGroupInfos.get(i);
@Nullable TrackSelectionOverride override = overrides.get(trackGroupInfo.getTrackGroup());
if (override != null && (allowMultipleOverrides || filteredOverrides.isEmpty())) {
filteredOverrides.put(override.trackGroup, override);
}
}
return filteredOverrides;
} }
private final int selectableItemBackgroundResourceId; private final int selectableItemBackgroundResourceId;
...@@ -61,7 +83,8 @@ public class TrackSelectionView extends LinearLayout { ...@@ -61,7 +83,8 @@ public class TrackSelectionView extends LinearLayout {
private final CheckedTextView disableView; private final CheckedTextView disableView;
private final CheckedTextView defaultView; private final CheckedTextView defaultView;
private final ComponentListener componentListener; private final ComponentListener componentListener;
private final SparseArray<SelectionOverride> overrides; private final List<TrackGroupInfo> trackGroupInfos;
private final Map<TrackGroup, TrackSelectionOverride> overrides;
private boolean allowAdaptiveSelections; private boolean allowAdaptiveSelections;
private boolean allowMultipleOverrides; private boolean allowMultipleOverrides;
...@@ -69,9 +92,6 @@ public class TrackSelectionView extends LinearLayout { ...@@ -69,9 +92,6 @@ public class TrackSelectionView extends LinearLayout {
private TrackNameProvider trackNameProvider; private TrackNameProvider trackNameProvider;
private CheckedTextView[][] trackViews; private CheckedTextView[][] trackViews;
private @MonotonicNonNull MappedTrackInfo mappedTrackInfo;
private int rendererIndex;
private TrackGroupArray trackGroups;
private boolean isDisabled; private boolean isDisabled;
@Nullable private Comparator<TrackInfo> trackInfoComparator; @Nullable private Comparator<TrackInfo> trackInfoComparator;
@Nullable private TrackSelectionListener listener; @Nullable private TrackSelectionListener listener;
...@@ -92,9 +112,6 @@ public class TrackSelectionView extends LinearLayout { ...@@ -92,9 +112,6 @@ public class TrackSelectionView extends LinearLayout {
Context context, @Nullable AttributeSet attrs, @AttrRes int defStyleAttr) { Context context, @Nullable AttributeSet attrs, @AttrRes int defStyleAttr) {
super(context, attrs, defStyleAttr); super(context, attrs, defStyleAttr);
setOrientation(LinearLayout.VERTICAL); setOrientation(LinearLayout.VERTICAL);
overrides = new SparseArray<>();
// Don't save view hierarchy as it needs to be reinitialized with a call to init. // Don't save view hierarchy as it needs to be reinitialized with a call to init.
setSaveFromParentEnabled(false); setSaveFromParentEnabled(false);
...@@ -108,7 +125,8 @@ public class TrackSelectionView extends LinearLayout { ...@@ -108,7 +125,8 @@ public class TrackSelectionView extends LinearLayout {
inflater = LayoutInflater.from(context); inflater = LayoutInflater.from(context);
componentListener = new ComponentListener(); componentListener = new ComponentListener();
trackNameProvider = new DefaultTrackNameProvider(getResources()); trackNameProvider = new DefaultTrackNameProvider(getResources());
trackGroups = TrackGroupArray.EMPTY; trackGroupInfos = new ArrayList<>();
overrides = new HashMap<>();
// View for disabling the renderer. // View for disabling the renderer.
disableView = disableView =
...@@ -153,26 +171,28 @@ public class TrackSelectionView extends LinearLayout { ...@@ -153,26 +171,28 @@ public class TrackSelectionView extends LinearLayout {
/** /**
* Sets whether tracks from multiple track groups can be selected. This results in multiple {@link * Sets whether tracks from multiple track groups can be selected. This results in multiple {@link
* SelectionOverride SelectionOverrides} to be returned by {@link #getOverrides()}. * TrackSelectionOverride TrackSelectionOverrides} being returned by {@link #getOverrides()}.
* *
* @param allowMultipleOverrides Whether multiple track selection overrides can be selected. * @param allowMultipleOverrides Whether tracks from multiple track groups can be selected.
*/ */
public void setAllowMultipleOverrides(boolean allowMultipleOverrides) { public void setAllowMultipleOverrides(boolean allowMultipleOverrides) {
if (this.allowMultipleOverrides != allowMultipleOverrides) { if (this.allowMultipleOverrides != allowMultipleOverrides) {
this.allowMultipleOverrides = allowMultipleOverrides; this.allowMultipleOverrides = allowMultipleOverrides;
if (!allowMultipleOverrides && overrides.size() > 1) { if (!allowMultipleOverrides && overrides.size() > 1) {
for (int i = overrides.size() - 1; i > 0; i--) { // Re-filter the overrides to retain only one of them.
overrides.remove(i); Map<TrackGroup, TrackSelectionOverride> filteredOverrides =
} filterOverrides(overrides, trackGroupInfos, /* allowMultipleOverrides= */ false);
overrides.clear();
overrides.putAll(filteredOverrides);
} }
updateViews(); updateViews();
} }
} }
/** /**
* Sets whether an option is available for disabling the renderer. * Sets whether the disabled option can be selected.
* *
* @param showDisableOption Whether the disable option is shown. * @param showDisableOption Whether the disabled option can be selected.
*/ */
public void setShowDisableOption(boolean showDisableOption) { public void setShowDisableOption(boolean showDisableOption) {
disableView.setVisibility(showDisableOption ? View.VISIBLE : View.GONE); disableView.setVisibility(showDisableOption ? View.VISIBLE : View.GONE);
...@@ -190,57 +210,47 @@ public class TrackSelectionView extends LinearLayout { ...@@ -190,57 +210,47 @@ public class TrackSelectionView extends LinearLayout {
} }
/** /**
* Initialize the view to select tracks for a specified renderer using {@link MappedTrackInfo} and * Initialize the view to select tracks from a specified list of track groups.
* a set of {@link DefaultTrackSelector.Parameters}.
* *
* @param mappedTrackInfo The {@link MappedTrackInfo}. * @param trackGroupInfos {@link TrackGroupInfo TrackGroupInfos} for the track groups.
* @param rendererIndex The index of the renderer. * @param isDisabled Whether the disabled option should be initially selected.
* @param isDisabled Whether the renderer should be initially shown as disabled. * @param overrides The initially selected track overrides. Any overrides that do not correspond
* @param overrides List of initial overrides to be shown for this renderer. There must be at most * to track groups described in {@code trackGroupInfos} will be ignored. If {@link
* one override for each track group. If {@link #setAllowMultipleOverrides(boolean)} hasn't * #setAllowMultipleOverrides(boolean)} hasn't been set to {@code true} then all but one
* been set to {@code true}, only the first override is used. * override will be ignored. The retained override will be the one whose track group is
* described first in {@code trackGroupInfos}.
* @param trackFormatComparator An optional comparator used to determine the display order of the * @param trackFormatComparator An optional comparator used to determine the display order of the
* tracks within each track group. * tracks within each track group.
* @param listener An optional listener for track selection updates. * @param listener An optional listener to receive selection updates.
*/ */
public void init( public void init(
MappedTrackInfo mappedTrackInfo, List<TrackGroupInfo> trackGroupInfos,
int rendererIndex,
boolean isDisabled, boolean isDisabled,
List<SelectionOverride> overrides, Map<TrackGroup, TrackSelectionOverride> overrides,
@Nullable Comparator<Format> trackFormatComparator, @Nullable Comparator<Format> trackFormatComparator,
@Nullable TrackSelectionListener listener) { @Nullable TrackSelectionListener listener) {
this.mappedTrackInfo = mappedTrackInfo;
this.rendererIndex = rendererIndex;
this.isDisabled = isDisabled; this.isDisabled = isDisabled;
this.trackInfoComparator = this.trackInfoComparator =
trackFormatComparator == null trackFormatComparator == null
? null ? null
: (o1, o2) -> trackFormatComparator.compare(o1.format, o2.format); : (o1, o2) -> trackFormatComparator.compare(o1.getFormat(), o2.getFormat());
this.listener = listener; this.listener = listener;
int maxOverrides = allowMultipleOverrides ? overrides.size() : Math.min(overrides.size(), 1);
for (int i = 0; i < maxOverrides; i++) { this.trackGroupInfos.clear();
SelectionOverride override = overrides.get(i); this.trackGroupInfos.addAll(trackGroupInfos);
this.overrides.put(override.groupIndex, override); this.overrides.clear();
} this.overrides.putAll(filterOverrides(overrides, trackGroupInfos, allowMultipleOverrides));
updateViews(); updateViews();
} }
/** Returns whether the renderer is disabled. */ /** Returns whether the disabled option is selected. */
public boolean getIsDisabled() { public boolean getIsDisabled() {
return isDisabled; return isDisabled;
} }
/** /** Returns the selected track overrides. */
* Returns the list of selected track selection overrides. There will be at most one override for public Map<TrackGroup, TrackSelectionOverride> getOverrides() {
* each track group. return overrides;
*/
public List<SelectionOverride> getOverrides() {
List<SelectionOverride> overrideList = new ArrayList<>(overrides.size());
for (int i = 0; i < overrides.size(); i++) {
overrideList.add(overrides.valueAt(i));
}
return overrideList;
} }
// Private methods. // Private methods.
...@@ -251,7 +261,7 @@ public class TrackSelectionView extends LinearLayout { ...@@ -251,7 +261,7 @@ public class TrackSelectionView extends LinearLayout {
removeViewAt(i); removeViewAt(i);
} }
if (mappedTrackInfo == null) { if (trackGroupInfos.isEmpty()) {
// The view is not initialized. // The view is not initialized.
disableView.setEnabled(false); disableView.setEnabled(false);
defaultView.setEnabled(false); defaultView.setEnabled(false);
...@@ -260,19 +270,18 @@ public class TrackSelectionView extends LinearLayout { ...@@ -260,19 +270,18 @@ public class TrackSelectionView extends LinearLayout {
disableView.setEnabled(true); disableView.setEnabled(true);
defaultView.setEnabled(true); defaultView.setEnabled(true);
trackGroups = mappedTrackInfo.getTrackGroups(rendererIndex);
// Add per-track views. // Add per-track views.
trackViews = new CheckedTextView[trackGroups.length][]; trackViews = new CheckedTextView[trackGroupInfos.size()][];
boolean enableMultipleChoiceForMultipleOverrides = shouldEnableMultiGroupSelection(); boolean enableMultipleChoiceForMultipleOverrides = shouldEnableMultiGroupSelection();
for (int groupIndex = 0; groupIndex < trackGroups.length; groupIndex++) { for (int trackGroupIndex = 0; trackGroupIndex < trackGroupInfos.size(); trackGroupIndex++) {
TrackGroup group = trackGroups.get(groupIndex); TrackGroupInfo trackGroupInfo = trackGroupInfos.get(trackGroupIndex);
boolean enableMultipleChoiceForAdaptiveSelections = shouldEnableAdaptiveSelection(groupIndex); boolean enableMultipleChoiceForAdaptiveSelections =
trackViews[groupIndex] = new CheckedTextView[group.length]; shouldEnableAdaptiveSelection(trackGroupInfo);
trackViews[trackGroupIndex] = new CheckedTextView[trackGroupInfo.length];
TrackInfo[] trackInfos = new TrackInfo[group.length];
for (int trackIndex = 0; trackIndex < group.length; trackIndex++) { TrackInfo[] trackInfos = new TrackInfo[trackGroupInfo.length];
trackInfos[trackIndex] = new TrackInfo(groupIndex, trackIndex, group.getFormat(trackIndex)); for (int trackIndex = 0; trackIndex < trackGroupInfo.length; trackIndex++) {
trackInfos[trackIndex] = new TrackInfo(trackGroupInfo, trackIndex);
} }
if (trackInfoComparator != null) { if (trackInfoComparator != null) {
Arrays.sort(trackInfos, trackInfoComparator); Arrays.sort(trackInfos, trackInfoComparator);
...@@ -289,17 +298,16 @@ public class TrackSelectionView extends LinearLayout { ...@@ -289,17 +298,16 @@ public class TrackSelectionView extends LinearLayout {
CheckedTextView trackView = CheckedTextView trackView =
(CheckedTextView) inflater.inflate(trackViewLayoutId, this, false); (CheckedTextView) inflater.inflate(trackViewLayoutId, this, false);
trackView.setBackgroundResource(selectableItemBackgroundResourceId); trackView.setBackgroundResource(selectableItemBackgroundResourceId);
trackView.setText(trackNameProvider.getTrackName(trackInfos[trackIndex].format)); trackView.setText(trackNameProvider.getTrackName(trackInfos[trackIndex].getFormat()));
trackView.setTag(trackInfos[trackIndex]); trackView.setTag(trackInfos[trackIndex]);
if (mappedTrackInfo.getTrackSupport(rendererIndex, groupIndex, trackIndex) if (trackGroupInfo.isTrackSupported(trackIndex)) {
== C.FORMAT_HANDLED) {
trackView.setFocusable(true); trackView.setFocusable(true);
trackView.setOnClickListener(componentListener); trackView.setOnClickListener(componentListener);
} else { } else {
trackView.setFocusable(false); trackView.setFocusable(false);
trackView.setEnabled(false); trackView.setEnabled(false);
} }
trackViews[groupIndex][trackIndex] = trackView; trackViews[trackGroupIndex][trackIndex] = trackView;
addView(trackView); addView(trackView);
} }
} }
...@@ -311,11 +319,12 @@ public class TrackSelectionView extends LinearLayout { ...@@ -311,11 +319,12 @@ public class TrackSelectionView extends LinearLayout {
disableView.setChecked(isDisabled); disableView.setChecked(isDisabled);
defaultView.setChecked(!isDisabled && overrides.size() == 0); defaultView.setChecked(!isDisabled && overrides.size() == 0);
for (int i = 0; i < trackViews.length; i++) { for (int i = 0; i < trackViews.length; i++) {
SelectionOverride override = overrides.get(i); @Nullable
TrackSelectionOverride override = overrides.get(trackGroupInfos.get(i).getTrackGroup());
for (int j = 0; j < trackViews[i].length; j++) { for (int j = 0; j < trackViews[i].length; j++) {
if (override != null) { if (override != null) {
TrackInfo trackInfo = (TrackInfo) Assertions.checkNotNull(trackViews[i][j].getTag()); TrackInfo trackInfo = (TrackInfo) Assertions.checkNotNull(trackViews[i][j].getTag());
trackViews[i][j].setChecked(override.containsTrack(trackInfo.trackIndex)); trackViews[i][j].setChecked(override.trackIndices.contains(trackInfo.trackIndex));
} else { } else {
trackViews[i][j].setChecked(false); trackViews[i][j].setChecked(false);
} }
...@@ -350,74 +359,52 @@ public class TrackSelectionView extends LinearLayout { ...@@ -350,74 +359,52 @@ public class TrackSelectionView extends LinearLayout {
private void onTrackViewClicked(View view) { private void onTrackViewClicked(View view) {
isDisabled = false; isDisabled = false;
TrackInfo trackInfo = (TrackInfo) Assertions.checkNotNull(view.getTag()); TrackInfo trackInfo = (TrackInfo) Assertions.checkNotNull(view.getTag());
int groupIndex = trackInfo.groupIndex; TrackGroup trackGroup = trackInfo.trackGroupInfo.getTrackGroup();
int trackIndex = trackInfo.trackIndex; int trackIndex = trackInfo.trackIndex;
SelectionOverride override = overrides.get(groupIndex); @Nullable TrackSelectionOverride override = overrides.get(trackGroup);
Assertions.checkNotNull(mappedTrackInfo);
if (override == null) { if (override == null) {
// Start new override. // Start new override.
if (!allowMultipleOverrides && overrides.size() > 0) { if (!allowMultipleOverrides && overrides.size() > 0) {
// Removed other overrides if we don't allow multiple overrides. // Removed other overrides if we don't allow multiple overrides.
overrides.clear(); overrides.clear();
} }
overrides.put(groupIndex, new SelectionOverride(groupIndex, trackIndex)); overrides.put(
trackGroup, new TrackSelectionOverride(trackGroup, ImmutableList.of(trackIndex)));
} else { } else {
// An existing override is being modified. // An existing override is being modified.
int overrideLength = override.length; ArrayList<Integer> trackIndices = new ArrayList<>(override.trackIndices);
int[] overrideTracks = override.tracks;
boolean isCurrentlySelected = ((CheckedTextView) view).isChecked(); boolean isCurrentlySelected = ((CheckedTextView) view).isChecked();
boolean isAdaptiveAllowed = shouldEnableAdaptiveSelection(groupIndex); boolean isAdaptiveAllowed = shouldEnableAdaptiveSelection(trackInfo.trackGroupInfo);
boolean isUsingCheckBox = isAdaptiveAllowed || shouldEnableMultiGroupSelection(); boolean isUsingCheckBox = isAdaptiveAllowed || shouldEnableMultiGroupSelection();
if (isCurrentlySelected && isUsingCheckBox) { if (isCurrentlySelected && isUsingCheckBox) {
// Remove the track from the override. // Remove the track from the override.
if (overrideLength == 1) { trackIndices.remove((Integer) trackIndex);
// The last track is being removed, so the override becomes empty. if (trackIndices.isEmpty()) {
overrides.remove(groupIndex); // The last track has been removed, so remove the whole override.
overrides.remove(trackGroup);
} else { } else {
int[] tracks = getTracksRemoving(overrideTracks, trackIndex); overrides.put(trackGroup, new TrackSelectionOverride(trackGroup, trackIndices));
overrides.put(groupIndex, new SelectionOverride(groupIndex, tracks));
} }
} else if (!isCurrentlySelected) { } else if (!isCurrentlySelected) {
if (isAdaptiveAllowed) { if (isAdaptiveAllowed) {
// Add new track to adaptive override. // Add new track to adaptive override.
int[] tracks = getTracksAdding(overrideTracks, trackIndex); trackIndices.add(trackIndex);
overrides.put(groupIndex, new SelectionOverride(groupIndex, tracks)); overrides.put(trackGroup, new TrackSelectionOverride(trackGroup, trackIndices));
} else { } else {
// Replace existing track in override. // Replace existing track in override.
overrides.put(groupIndex, new SelectionOverride(groupIndex, trackIndex)); overrides.put(
trackGroup, new TrackSelectionOverride(trackGroup, ImmutableList.of(trackIndex)));
} }
} }
} }
} }
@RequiresNonNull("mappedTrackInfo") private boolean shouldEnableAdaptiveSelection(TrackGroupInfo trackGroupInfo) {
private boolean shouldEnableAdaptiveSelection(int groupIndex) { return allowAdaptiveSelections && trackGroupInfo.isAdaptiveSupported();
return allowAdaptiveSelections
&& trackGroups.get(groupIndex).length > 1
&& mappedTrackInfo.getAdaptiveSupport(
rendererIndex, groupIndex, /* includeCapabilitiesExceededTracks= */ false)
!= RendererCapabilities.ADAPTIVE_NOT_SUPPORTED;
} }
private boolean shouldEnableMultiGroupSelection() { private boolean shouldEnableMultiGroupSelection() {
return allowMultipleOverrides && trackGroups.length > 1; return allowMultipleOverrides && trackGroupInfos.size() > 1;
}
private static int[] getTracksAdding(int[] tracks, int addedTrack) {
tracks = Arrays.copyOf(tracks, tracks.length + 1);
tracks[tracks.length - 1] = addedTrack;
return tracks;
}
private static int[] getTracksRemoving(int[] tracks, int removedTrack) {
int[] newTracks = new int[tracks.length - 1];
int trackCount = 0;
for (int track : tracks) {
if (track != removedTrack) {
newTracks[trackCount++] = track;
}
}
return newTracks;
} }
// Internal classes. // Internal classes.
...@@ -431,14 +418,16 @@ public class TrackSelectionView extends LinearLayout { ...@@ -431,14 +418,16 @@ public class TrackSelectionView extends LinearLayout {
} }
private static final class TrackInfo { private static final class TrackInfo {
public final int groupIndex; public final TrackGroupInfo trackGroupInfo;
public final int trackIndex; public final int trackIndex;
public final Format format;
public TrackInfo(int groupIndex, int trackIndex, Format format) { public TrackInfo(TrackGroupInfo trackGroupInfo, int trackIndex) {
this.groupIndex = groupIndex; this.trackGroupInfo = trackGroupInfo;
this.trackIndex = trackIndex; this.trackIndex = trackIndex;
this.format = format; }
public Format getFormat() {
return trackGroupInfo.getTrackFormat(trackIndex);
} }
} }
} }
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