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

Iso8601Parser improved to be able to parse timestamp offsets from UTC

Browse Source
This commit is contained in:
Pavel Stambrecht 2017-12-04 15:52:12 +01:00 committed by Oliver Woodman
parent e175bf9e42
commit ee05b60a19
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View File

@ -935,10 +935,9 @@ public final class DashMediaSource implements MediaSource {
private static final class Iso8601Parser implements ParsingLoadable.Parser<Long> { private static final class Iso8601Parser implements ParsingLoadable.Parser<Long> {
private static final String ISO_8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'"; private static final String ISO_8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
private static final String ISO_8601_FORMAT_2 = "yyyy-MM-dd'T'HH:mm:ssZ"; private static final String ISO_8601_WITH_OFFSET_FORMAT = "yyyy-MM-dd'T'HH:mm:ssZ";
private static final String ISO_8601_FORMAT_3 = "yyyy-MM-dd'T'HH:mm:ssZ"; private static final String ISO_8601_WITH_OFFSET_FORMAT_REGEX_PATTERN = ".*[+\\-]\\d{2}:\\d{2}$";
private static final String ISO_8601_FORMAT_2_REGEX_PATTERN = ".*[+\\-]\\d{2}:\\d{2}$"; private static final String ISO_8601_WITH_OFFSET_FORMAT_REGEX_PATTERN_2 = ".*[+\\-]\\d{4}$";
private static final String ISO_8601_FORMAT_3_REGEX_PATTERN = ".*[+\\-]\\d{4}$";
@Override @Override
public Long parse(Uri uri, InputStream inputStream) throws IOException { public Long parse(Uri uri, InputStream inputStream) throws IOException {
@ -947,10 +946,10 @@ public final class DashMediaSource implements MediaSource {
if (firstLine != null) { if (firstLine != null) {
//determine format pattern //determine format pattern
String formatPattern; String formatPattern;
if (firstLine.matches(ISO_8601_FORMAT_2_REGEX_PATTERN)) { if (firstLine.matches(ISO_8601_WITH_OFFSET_FORMAT_REGEX_PATTERN)) {
formatPattern = ISO_8601_FORMAT_2; formatPattern = ISO_8601_WITH_OFFSET_FORMAT;
} else if (firstLine.matches(ISO_8601_FORMAT_3_REGEX_PATTERN)) { } else if (firstLine.matches(ISO_8601_WITH_OFFSET_FORMAT_REGEX_PATTERN_2)) {
formatPattern = ISO_8601_FORMAT_3; formatPattern = ISO_8601_WITH_OFFSET_FORMAT;
} else { } else {
formatPattern = ISO_8601_FORMAT; formatPattern = ISO_8601_FORMAT;
} }
@ -967,6 +966,7 @@ public final class DashMediaSource implements MediaSource {
throw new ParserException("Unable to parse ISO 8601. Input value is null"); throw new ParserException("Unable to parse ISO 8601. Input value is null");
} }
} }
}
}
} }