loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-17 12:39:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support commas in ISO-8601 date/time format for millis

Browse Source
This commit is contained in:
Ben Wilber 2017-03-09 19:46:24 -05:00
parent a9079f67aa
commit 578b9545f0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java
View File

@ -142,8 +142,10 @@ public class UtilTest extends TestCase {
public void testParseXsDateTime() throws Exception {
assertEquals(1403219262000L, Util.parseXsDateTime("2014-06-19T23:07:42"));
assertEquals(1407322800000L, Util.parseXsDateTime("2014-08-06T11:00:00Z"));
assertEquals(1407322800000L, Util.parseXsDateTime("2014-08-06T11:00:00,000Z"));
assertEquals(1411161535000L, Util.parseXsDateTime("2014-09-19T13:18:55-08:00"));
assertEquals(1411161535000L, Util.parseXsDateTime("2014-09-19T13:18:55-0800"));
assertEquals(1411161535000L, Util.parseXsDateTime("2014-09-19T13:18:55.000-0800"));
}
public void testUnescapeInvalidFileName() {

2
library/src/main/java/com/google/android/exoplayer2/util/Util.java
View File

@ -94,7 +94,7 @@ public final class Util {
private static final String TAG = "Util";
private static final Pattern XS_DATE_TIME_PATTERN = Pattern.compile(
"(\\d\\d\\d\\d)\\-(\\d\\d)\\-(\\d\\d)[Tt]"
+ "(\\d\\d):(\\d\\d):(\\d\\d)(\\.(\\d+))?"
+ "(\\d\\d):(\\d\\d):(\\d\\d)([\\.,](\\d+))?"
+ "([Zz]|((\\+|\\-)(\\d\\d):?(\\d\\d)))?");
private static final Pattern XS_DURATION_PATTERN =
Pattern.compile("^(-)?P(([0-9]*)Y)?(([0-9]*)M)?(([0-9]*)D)?"