loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-10 00:59:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove HlsMasterPlaylist from null-checking blacklist

Browse Source 
PiperOrigin-RevId: 275052534
This commit is contained in:
ibaker 2019-10-16 17:49:23 +01:00 committed by Oliver Woodman
parent 23f545a0a4
commit 0d5b3c0fa4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
View File

@ -94,7 +94,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private final Format[] playlistFormats; private final Format[] playlistFormats;
private final HlsPlaylistTracker playlistTracker; private final HlsPlaylistTracker playlistTracker;
private final TrackGroup trackGroup; private final TrackGroup trackGroup;
private final List<Format> muxedCaptionFormats; @Nullable private final List<Format> muxedCaptionFormats;
private final FullSegmentEncryptionKeyCache keyCache; private final FullSegmentEncryptionKeyCache keyCache;
private boolean isTimestampMaster; private boolean isTimestampMaster;
@ -135,7 +135,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
HlsDataSourceFactory dataSourceFactory, HlsDataSourceFactory dataSourceFactory,
@Nullable TransferListener mediaTransferListener, @Nullable TransferListener mediaTransferListener,
TimestampAdjusterProvider timestampAdjusterProvider, TimestampAdjusterProvider timestampAdjusterProvider,
List<Format> muxedCaptionFormats) { @Nullable List<Format> muxedCaptionFormats) {
this.extractorFactory = extractorFactory; this.extractorFactory = extractorFactory;
this.playlistTracker = playlistTracker; this.playlistTracker = playlistTracker;
this.playlistUrls = playlistUrls; this.playlistUrls = playlistUrls;

2
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
View File

@ -735,7 +735,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
Uri[] playlistUrls, Uri[] playlistUrls,
Format[] playlistFormats, Format[] playlistFormats,
Format muxedAudioFormat, Format muxedAudioFormat,
List<Format> muxedCaptionFormats, @Nullable List<Format> muxedCaptionFormats,
Map<String, DrmInitData> overridingDrmInitData, Map<String, DrmInitData> overridingDrmInitData,
long positionUs) { long positionUs) {
HlsChunkSource defaultChunkSource = HlsChunkSource defaultChunkSource =

6
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
View File

@ -180,7 +180,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
* explicitly declares no captions are available, or null if the playlist does not declare any * explicitly declares no captions are available, or null if the playlist does not declare any
* captions information. * captions information.
*/ */
public final List<Format> muxedCaptionFormats; @Nullable public final List<Format> muxedCaptionFormats;
/** Contains variable definitions, as defined by the #EXT-X-DEFINE tag. */ /** Contains variable definitions, as defined by the #EXT-X-DEFINE tag. */
public final Map<String, String> variableDefinitions; public final Map<String, String> variableDefinitions;
/** DRM initialization data derived from #EXT-X-SESSION-KEY tags. */ /** DRM initialization data derived from #EXT-X-SESSION-KEY tags. */
@ -209,7 +209,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
List<Rendition> subtitles, List<Rendition> subtitles,
List<Rendition> closedCaptions, List<Rendition> closedCaptions,
@Nullable Format muxedAudioFormat, @Nullable Format muxedAudioFormat,
List<Format> muxedCaptionFormats, @Nullable List<Format> muxedCaptionFormats,
boolean hasIndependentSegments, boolean hasIndependentSegments,
Map<String, String> variableDefinitions, Map<String, String> variableDefinitions,
List<DrmInitData> sessionKeyDrmInitData) { List<DrmInitData> sessionKeyDrmInitData) {
@ -258,7 +258,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
List<Variant> variant = List<Variant> variant =
Collections.singletonList(Variant.createMediaPlaylistVariantUrl(Uri.parse(variantUrl))); Collections.singletonList(Variant.createMediaPlaylistVariantUrl(Uri.parse(variantUrl)));
return new HlsMasterPlaylist( return new HlsMasterPlaylist(
/* baseUri= */ null, /* baseUri= */ "",
/* tags= */ Collections.emptyList(), /* tags= */ Collections.emptyList(),
variant, variant,
/* videos= */ Collections.emptyList(), /* videos= */ Collections.emptyList(),