loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up TTML timestamp parsing.

Browse Source
This commit is contained in:
Oliver Woodman 2014-09-23 11:13:54 +01:00
parent 7cb55e23f6
commit 1ed048dba8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlParser.java
View File

@ -233,22 +233,22 @@ public class TtmlParser implements SubtitleParser {
matcher = OFFSET_TIME.matcher(time); matcher = OFFSET_TIME.matcher(time);
if (matcher.matches()) { if (matcher.matches()) {
String timeValue = matcher.group(1); String timeValue = matcher.group(1);
double value = Double.parseDouble(timeValue); double offsetSeconds = Double.parseDouble(timeValue);
String unit = matcher.group(2); String unit = matcher.group(2);
if (unit.equals("h")) { if (unit.equals("h")) {
value *= 3600L * 1000000L; offsetSeconds *= 3600;
} else if (unit.equals("m")) { } else if (unit.equals("m")) {
value *= 60 * 1000000; offsetSeconds *= 60;
} else if (unit.equals("s")) { } else if (unit.equals("s")) {
value *= 1000000; // Do nothing.
} else if (unit.equals("ms")) { } else if (unit.equals("ms")) {
value *= 1000; offsetSeconds /= 1000;
} else if (unit.equals("f")) { } else if (unit.equals("f")) {
value = value / frameRate * 1000000; offsetSeconds /= frameRate;
} else if (unit.equals("t")) { } else if (unit.equals("t")) {
value = value / tickRate * 1000000; offsetSeconds /= tickRate;
} }
return (long) value; return (long) (offsetSeconds * 1000000);
} }
throw new NumberFormatException("Malformed time expression: " + time); throw new NumberFormatException("Malformed time expression: " + time);
} }