Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
0d5b3c0f
authored
Oct 16, 2019
by
ibaker
Committed by
Oliver Woodman
Oct 17, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Remove HlsMasterPlaylist from null-checking blacklist
PiperOrigin-RevId: 275052534
parent
23f545a0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java
View file @
0d5b3c0f
...
...
@@ -94,7 +94,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private
final
Format
[]
playlistFormats
;
private
final
HlsPlaylistTracker
playlistTracker
;
private
final
TrackGroup
trackGroup
;
private
final
List
<
Format
>
muxedCaptionFormats
;
@Nullable
private
final
List
<
Format
>
muxedCaptionFormats
;
private
final
FullSegmentEncryptionKeyCache
keyCache
;
private
boolean
isTimestampMaster
;
...
...
@@ -135,7 +135,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
HlsDataSourceFactory
dataSourceFactory
,
@Nullable
TransferListener
mediaTransferListener
,
TimestampAdjusterProvider
timestampAdjusterProvider
,
List
<
Format
>
muxedCaptionFormats
)
{
@Nullable
List
<
Format
>
muxedCaptionFormats
)
{
this
.
extractorFactory
=
extractorFactory
;
this
.
playlistTracker
=
playlistTracker
;
this
.
playlistUrls
=
playlistUrls
;
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
View file @
0d5b3c0f
...
...
@@ -735,7 +735,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
Uri
[]
playlistUrls
,
Format
[]
playlistFormats
,
Format
muxedAudioFormat
,
List
<
Format
>
muxedCaptionFormats
,
@Nullable
List
<
Format
>
muxedCaptionFormats
,
Map
<
String
,
DrmInitData
>
overridingDrmInitData
,
long
positionUs
)
{
HlsChunkSource
defaultChunkSource
=
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java
View file @
0d5b3c0f
...
...
@@ -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
* captions information.
*/
public
final
List
<
Format
>
muxedCaptionFormats
;
@Nullable
public
final
List
<
Format
>
muxedCaptionFormats
;
/** Contains variable definitions, as defined by the #EXT-X-DEFINE tag. */
public
final
Map
<
String
,
String
>
variableDefinitions
;
/** 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
>
closedCaptions
,
@Nullable
Format
muxedAudioFormat
,
List
<
Format
>
muxedCaptionFormats
,
@Nullable
List
<
Format
>
muxedCaptionFormats
,
boolean
hasIndependentSegments
,
Map
<
String
,
String
>
variableDefinitions
,
List
<
DrmInitData
>
sessionKeyDrmInitData
)
{
...
...
@@ -258,7 +258,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
List
<
Variant
>
variant
=
Collections
.
singletonList
(
Variant
.
createMediaPlaylistVariantUrl
(
Uri
.
parse
(
variantUrl
)));
return
new
HlsMasterPlaylist
(
/* baseUri= */
null
,
/* baseUri= */
""
,
/* tags= */
Collections
.
emptyList
(),
variant
,
/* videos= */
Collections
.
emptyList
(),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment