sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-27 09:45:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove IntDef warning suppression from DefaultTrackSelector

Browse source 
The problem is not the IntDef array, it's the fact the lint tool
is unable to correctly infer the annotations on the lambda parameters
without them being explicitly annotated. It seems explicitly annotating
is better than suppressing all IntDef warnings in the whole method.

PiperOrigin-RevId: 437969271
This commit is contained in:
ibaker 2022-03-29 10:07:23 +01:00 committed by Ian Baker
parent 930709e592
commit 479e8ea36e
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
View file

@ -1729,7 +1729,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* renderer index, or null if no selection was made.
* @throws ExoPlaybackException If an error occurs while selecting the tracks.
*/
@SuppressLint("WrongConstant") // Lint doesn't understand arrays of IntDefs.
@Nullable
protected Pair<ExoTrackSelection.Definition, Integer> selectVideoTrack(
MappedTrackInfo mappedTrackInfo,
@ -1741,7 +1740,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
C.TRACK_TYPE_VIDEO,
mappedTrackInfo,
rendererFormatSupports,
(rendererIndex, group, support) ->
(int rendererIndex, TrackGroup group, @Capabilities int[] support) ->
VideoTrackInfo.createForTrackGroup(
rendererIndex, group, params, support, mixedMimeTypeSupports[rendererIndex]),
VideoTrackInfo::compareSelections);
@ -1763,7 +1762,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* renderer index, or null if no selection was made.
* @throws ExoPlaybackException If an error occurs while selecting the tracks.
*/
@SuppressLint("WrongConstant") // Lint doesn't understand arrays of IntDefs.
@Nullable
protected Pair<ExoTrackSelection.Definition, Integer> selectAudioTrack(
MappedTrackInfo mappedTrackInfo,
@ -1784,7 +1782,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
C.TRACK_TYPE_AUDIO,
mappedTrackInfo,
rendererFormatSupports,
(rendererIndex, group, support) ->
(int rendererIndex, TrackGroup group, @Capabilities int[] support) ->
AudioTrackInfo.createForTrackGroup(
rendererIndex, group, params, support, hasVideoRendererWithMappedTracksFinal),
AudioTrackInfo::compareSelections);
@ -1806,7 +1804,6 @@ public class DefaultTrackSelector extends MappingTrackSelector {
* renderer index, or null if no selection was made.
* @throws ExoPlaybackException If an error occurs while selecting the tracks.
*/
@SuppressLint("WrongConstant") // Lint doesn't understand arrays of IntDefs.
@Nullable
protected Pair<ExoTrackSelection.Definition, Integer> selectTextTrack(
MappedTrackInfo mappedTrackInfo,
@ -1818,7 +1815,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
C.TRACK_TYPE_TEXT,
mappedTrackInfo,
rendererFormatSupports,
(rendererIndex, group, support) ->
(int rendererIndex, TrackGroup group, @Capabilities int[] support) ->
TextTrackInfo.createForTrackGroup(
rendererIndex, group, params, support, selectedAudioLanguage),
TextTrackInfo::compareSelections);