sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-17 13:15:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change HlsPlaylistParser.LineIterator#next()

Browse source 
Update it to throw if hasNext() is false, to match Java's Iterator
interface.

This also simplifies the null-checking annotations required

PiperOrigin-RevId: 277059766
This commit is contained in:
ibaker 2019-10-28 14:37:59 +00:00 committed by Oliver Woodman
parent bae2b1e4bc
commit 87c30c0ba8
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
View file

@ -48,10 +48,12 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Queue;
import java.util.TreeMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
import org.checkerframework.checker.nullness.qual.PolyNull;
/**
@ -273,7 +275,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
String line;
while (iterator.hasNext()) {
line = Assertions.checkNotNull(iterator.next());
line = iterator.next();
if (line.startsWith(TAG_PREFIX)) {
// We expose all tags through the playlist.
@ -338,10 +340,12 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
parseOptionalStringAttr(line, REGEX_SUBTITLES, variableDefinitions);
String closedCaptionsGroupId =
parseOptionalStringAttr(line, REGEX_CLOSED_CAPTIONS, variableDefinitions);
if (!iterator.hasNext()) {
throw new ParserException("#EXT-X-STREAM-INF tag must be followed by another line");
}
line =
replaceVariableReferences(
Assertions.checkNotNull(iterator.next()),
variableDefinitions); // #EXT-X-STREAM-INF's URI.
iterator.next(), variableDefinitions); // #EXT-X-STREAM-INF's URI.
Uri uri = UriUtil.resolveToUri(baseUri, line);
Format format =
Format.createVideoContainerFormat(
@ -596,7 +600,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
String line;
while (iterator.hasNext()) {
line = Assertions.checkNotNull(iterator.next());
line = iterator.next();
if (line.startsWith(TAG_PREFIX)) {
// We expose all tags through the playlist.
@ -943,12 +947,13 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
this.reader = reader;
}
@EnsuresNonNullIf(expression = "next", result = true)
public boolean hasNext() throws IOException {
if (next != null) {
return true;
}
if (!extraLines.isEmpty()) {
next = extraLines.poll();
next = Assertions.checkNotNull(extraLines.poll());
return true;
}
while ((next = reader.readLine()) != null) {
@ -960,14 +965,15 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
return false;
}
@Nullable
/** Return the next line, or throw {@link NoSuchElementException} if none. */
public String next() throws IOException {
String result = null;
if (hasNext()) {
result = next;
String result = next;
next = null;
return result;
} else {
throw new NoSuchElementException();
}
return result;
}
}