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

Iso8601Parser improved to be able to parse timestamp offsets from UTC

Browse source
This commit is contained in:
Pavel Stambrecht 2017-12-04 15:45:54 +01:00
parent 117608edef
commit ad16efdf56
1 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file

@ -962,19 +962,39 @@ 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_2 = "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_FORMAT_2_REGEX_PATTERN = ".*[+\\-]\\d{2}:\\d{2}$";
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 {
String firstLine = new BufferedReader(new InputStreamReader(inputStream)).readLine(); String firstLine = new BufferedReader(new InputStreamReader(inputStream)).readLine();
try {
// TODO: It may be necessary to handle timestamp offsets from UTC. if (firstLine != null) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US); //determine format pattern
format.setTimeZone(TimeZone.getTimeZone("UTC")); String formatPattern;
return format.parse(firstLine).getTime(); if (firstLine.matches(ISO_8601_FORMAT_2_REGEX_PATTERN)) {
} catch (ParseException e) { formatPattern = ISO_8601_FORMAT_2;
throw new ParserException(e); } else if (firstLine.matches(ISO_8601_FORMAT_3_REGEX_PATTERN)) {
formatPattern = ISO_8601_FORMAT_3;
} else {
formatPattern = ISO_8601_FORMAT;
}
//parse
try {
SimpleDateFormat format = new SimpleDateFormat(formatPattern, Locale.US);
format.setTimeZone(TimeZone.getTimeZone("UTC"));
return format.parse(firstLine).getTime();
} catch (ParseException e) {
throw new ParserException(e);
}
} else {
throw new ParserException("Unable to parse ISO 8601. Input value is null");
} }
} }
} }
} }