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

Allow non-strict webvtt parsing.

Browse source
This commit is contained in:
Oliver Woodman 2014-11-26 11:23:15 +00:00
parent 7dfebc2e11
commit ab00a4da03
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttParser.java
View file

@ -63,6 +63,16 @@ public class WebvttParser implements SubtitleParser {
private static final Pattern MEDIA_TIMESTAMP_OFFSET = Pattern.compile(OFFSET + "\\d+");
private static final Pattern MEDIA_TIMESTAMP = Pattern.compile("MPEGTS:\\d+");
private final boolean strictParsing;
public WebvttParser() {
this(true);
}
public WebvttParser(boolean strictParsing) {
this.strictParsing = strictParsing;
}
@Override
public WebvttSubtitle parse(InputStream inputStream, String inputEncoding, long startTimeUs)
throws IOException {
@ -108,7 +118,7 @@ public class WebvttParser implements SubtitleParser {
Matcher matcher = WEBVTT_METADATA_HEADER.matcher(line);
if (!matcher.find()) {
throw new ParserException("Expected webvtt metadata header; got: " + line);
handleNoncompliantLine(line);
}
if (line.startsWith("X-TIMESTAMP-MAP")) {
@ -182,6 +192,12 @@ public class WebvttParser implements SubtitleParser {
return startTimeUs;
}
protected void handleNoncompliantLine(String line) throws ParserException {
if (strictParsing) {
throw new ParserException("Unexpected line: " + line);
}
}
private static long parseTimestampUs(String s) throws NumberFormatException {
if (!s.matches(WEBVTT_TIMESTAMP_STRING)) {
throw new NumberFormatException("has invalid format");