From 29f6351b192b192618bff721f63fc8c14669ea9a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 4 Dec 2017 06:56:04 -0800
Subject: [PATCH] Support timezone offsets in ISO8601 timestamps

Issue: #3524

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=177808106
---
 RELEASENOTES.md                               |  3 +
 .../source/dash/DashMediaSource.java          | 56 ++++++++++---------
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 51ac077cef8..a55044ad7e3 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -4,6 +4,9 @@
 
 * Add Builder to ExtractorMediaSource, HlsMediaSource, SsMediaSource,
   DashMediaSource, SingleSampleMediaSource.
+* DASH:
+  * Support time zone designators in ISO8601 UTCTiming elements
+    ([#3524](https://github.com/google/ExoPlayer/issues/3524)).
 * Support 32-bit PCM float output from `DefaultAudioSink`, and add an option to
   use this with `FfmpegAudioRenderer`.
 * Support extraction and decoding of Dolby Atmos
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
index 548811cf920..22bc2b08ecb 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -19,6 +19,7 @@
 import android.os.Handler;
 import android.os.SystemClock;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 import com.google.android.exoplayer2.C;
@@ -48,6 +49,8 @@
 import java.text.SimpleDateFormat;
 import java.util.Locale;
 import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * A DASH {@link MediaSource}.
@@ -926,41 +929,42 @@ public Long parse(Uri uri, InputStream inputStream) throws IOException {
 
   }
 
-  private static final class Iso8601Parser implements ParsingLoadable.Parser<Long> {
+  /* package */ 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_WITH_OFFSET_FORMAT = "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_WITH_OFFSET_FORMAT_REGEX_PATTERN_2 = ".*[+\\-]\\d{4}$";
+    private static final Pattern TIMESTAMP_WITH_TIMEZONE_PATTERN =
+        Pattern.compile("(.+?)(Z|((\\+|-|−)(\\d\\d)(:?(\\d\\d))?))");
 
     @Override
     public Long parse(Uri uri, InputStream inputStream) throws IOException {
       String firstLine = new BufferedReader(new InputStreamReader(inputStream)).readLine();
-
-      if (firstLine != null) {
-        //determine format pattern
-        String formatPattern;
-        if (firstLine.matches(ISO_8601_WITH_OFFSET_FORMAT_REGEX_PATTERN)) {
-          formatPattern = ISO_8601_WITH_OFFSET_FORMAT;
-        } else if (firstLine.matches(ISO_8601_WITH_OFFSET_FORMAT_REGEX_PATTERN_2)) {
-          formatPattern = ISO_8601_WITH_OFFSET_FORMAT;
-        } else {
-          formatPattern = ISO_8601_FORMAT;
+      try {
+        Matcher matcher = TIMESTAMP_WITH_TIMEZONE_PATTERN.matcher(firstLine);
+        if (!matcher.matches()) {
+          throw new ParserException("Couldn't parse timestamp: " + firstLine);
         }
-        //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);
+        // Parse the timestamp.
+        String timestampWithoutTimezone = matcher.group(1);
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US);
+        format.setTimeZone(TimeZone.getTimeZone("UTC"));
+        long timestampMs = format.parse(timestampWithoutTimezone).getTime();
+        // Parse the timezone.
+        String timezone = matcher.group(2);
+        if ("Z".equals(timezone)) {
+          // UTC (no offset).
+        } else {
+          long sign = "+".equals(matcher.group(4)) ? 1 : -1;
+          long hours = Long.parseLong(matcher.group(5));
+          String minutesString = matcher.group(7);
+          long minutes = TextUtils.isEmpty(minutesString) ? 0 : Long.parseLong(minutesString);
+          long timestampOffsetMs = sign * (((hours * 60) + minutes) * 60 * 1000);
+          timestampMs -= timestampOffsetMs;
         }
-
-      } else {
-        throw new ParserException("Unable to parse ISO 8601. Input value is null");
+        return timestampMs;
+      } catch (ParseException e) {
+        throw new ParserException(e);
       }
     }
 
   }
-  
+
 }