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

Remove HlsPlaylistParser from null-checking blacklist

Browse Source 
PiperOrigin-RevId: 276671167
This commit is contained in:
ibaker 2019-10-25 13:26:50 +01:00 committed by Oliver Woodman
parent 620b9110bf
commit ac722a7a68
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
View File

@ -273,7 +273,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
String line; String line;
while (iterator.hasNext()) { while (iterator.hasNext()) {
line = iterator.next(); line = Assertions.checkNotNull(iterator.next());
if (line.startsWith(TAG_PREFIX)) { if (line.startsWith(TAG_PREFIX)) {
// We expose all tags through the playlist. // We expose all tags through the playlist.
@ -340,7 +340,8 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
parseOptionalStringAttr(line, REGEX_CLOSED_CAPTIONS, variableDefinitions); parseOptionalStringAttr(line, REGEX_CLOSED_CAPTIONS, variableDefinitions);
line = line =
replaceVariableReferences( replaceVariableReferences(
iterator.next(), variableDefinitions); // #EXT-X-STREAM-INF's URI. Assertions.checkNotNull(iterator.next()),
variableDefinitions); // #EXT-X-STREAM-INF's URI.
Uri uri = UriUtil.resolveToUri(baseUri, line); Uri uri = UriUtil.resolveToUri(baseUri, line);
Format format = Format format =
Format.createVideoContainerFormat( Format.createVideoContainerFormat(
@ -381,7 +382,9 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
Assertions.checkState(variant.format.metadata == null); Assertions.checkState(variant.format.metadata == null);
HlsTrackMetadataEntry hlsMetadataEntry = HlsTrackMetadataEntry hlsMetadataEntry =
new HlsTrackMetadataEntry( new HlsTrackMetadataEntry(
/* groupId= */ null, /* name= */ null, urlToVariantInfos.get(variant.url)); /* groupId= */ null,
/* name= */ null,
Assertions.checkNotNull(urlToVariantInfos.get(variant.url)));
deduplicatedVariants.add( deduplicatedVariants.add(
variant.copyWithFormat( variant.copyWithFormat(
variant.format.copyWithMetadata(new Metadata(hlsMetadataEntry)))); variant.format.copyWithMetadata(new Metadata(hlsMetadataEntry))));
@ -536,6 +539,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
sessionKeyDrmInitData); sessionKeyDrmInitData);
} }
@Nullable
private static Variant getVariantWithAudioGroup(ArrayList<Variant> variants, String groupId) { private static Variant getVariantWithAudioGroup(ArrayList<Variant> variants, String groupId) {
for (int i = 0; i < variants.size(); i++) { for (int i = 0; i < variants.size(); i++) {
Variant variant = variants.get(i); Variant variant = variants.get(i);
@ -546,6 +550,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
return null; return null;
} }
@Nullable
private static Variant getVariantWithVideoGroup(ArrayList<Variant> variants, String groupId) { private static Variant getVariantWithVideoGroup(ArrayList<Variant> variants, String groupId) {
for (int i = 0; i < variants.size(); i++) { for (int i = 0; i < variants.size(); i++) {
Variant variant = variants.get(i); Variant variant = variants.get(i);
@ -591,7 +596,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
String line; String line;
while (iterator.hasNext()) { while (iterator.hasNext()) {
line = iterator.next(); line = Assertions.checkNotNull(iterator.next());
if (line.startsWith(TAG_PREFIX)) { if (line.startsWith(TAG_PREFIX)) {
// We expose all tags through the playlist. // We expose all tags through the playlist.
@ -931,7 +936,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
private final BufferedReader reader; private final BufferedReader reader;
private final Queue<String> extraLines; private final Queue<String> extraLines;
private String next; @Nullable private String next;
public LineIterator(Queue<String> extraLines, BufferedReader reader) { public LineIterator(Queue<String> extraLines, BufferedReader reader) {
this.extraLines = extraLines; this.extraLines = extraLines;
@ -955,6 +960,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
return false; return false;
} }
@Nullable
public String next() throws IOException { public String next() throws IOException {
String result = null; String result = null;
if (hasNext()) { if (hasNext()) {