From fb36f85e0d5e4c9f7c5e0d92586b004b71f43496 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Thu, 12 Mar 2015 19:42:00 +0000
Subject: [PATCH] Simplify encryption handling in HLS.

---
 .../android/exoplayer/hls/HlsChunkSource.java      |  2 +-
 .../android/exoplayer/hls/HlsMediaPlaylist.java    |  9 +++++----
 .../android/exoplayer/hls/HlsPlaylistParser.java   |  6 +++++-
 .../exoplayer/hls/HlsMediaPlaylistParserTest.java  | 14 +++++++-------
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsChunkSource.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsChunkSource.java
index cd46f11052..f1be4678b3 100644
--- a/library/src/main/java/com/google/android/exoplayer/hls/HlsChunkSource.java
+++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsChunkSource.java
@@ -306,7 +306,7 @@ public class HlsChunkSource {
     Uri chunkUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, segment.url);
 
     // Check if encryption is specified.
-    if (HlsMediaPlaylist.ENCRYPTION_METHOD_AES_128.equals(segment.encryptionMethod)) {
+    if (segment.isEncrypted) {
       Uri keyUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, segment.encryptionKeyUri);
       if (!keyUri.equals(encryptionKeyUri)) {
         // Encryption is specified and the key has changed.
diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsMediaPlaylist.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsMediaPlaylist.java
index 16e90083d0..ec4c538155 100644
--- a/library/src/main/java/com/google/android/exoplayer/hls/HlsMediaPlaylist.java
+++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsMediaPlaylist.java
@@ -28,24 +28,25 @@ public final class HlsMediaPlaylist extends HlsPlaylist {
    * Media segment reference.
    */
   public static final class Segment implements Comparable<Long> {
+
     public final boolean discontinuity;
     public final double durationSecs;
     public final String url;
     public final long startTimeUs;
-    public final String encryptionMethod;
+    public final boolean isEncrypted;
     public final String encryptionKeyUri;
     public final String encryptionIV;
     public final int byterangeOffset;
     public final int byterangeLength;
 
     public Segment(String uri, double durationSecs, boolean discontinuity, long startTimeUs,
-        String encryptionMethod, String encryptionKeyUri, String encryptionIV,
-        int byterangeOffset, int byterangeLength) {
+        boolean isEncrypted, String encryptionKeyUri, String encryptionIV, int byterangeOffset,
+        int byterangeLength) {
       this.url = uri;
       this.durationSecs = durationSecs;
       this.discontinuity = discontinuity;
       this.startTimeUs = startTimeUs;
-      this.encryptionMethod = encryptionMethod;
+      this.isEncrypted = isEncrypted;
       this.encryptionKeyUri = encryptionKeyUri;
       this.encryptionIV = encryptionIV;
       this.byterangeOffset = byterangeOffset;
diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java
index 5c7b23f865..95453eb103 100644
--- a/library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java
+++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java
@@ -64,6 +64,9 @@ public final class HlsPlaylistParser implements NetworkLoadable.Parser<HlsPlayli
   private static final String SUBTITLES_TYPE = "SUBTITLES";
   private static final String CLOSED_CAPTIONS_TYPE = "CLOSED-CAPTIONS";
 
+  private static final String METHOD_NONE = "NONE";
+  private static final String METHOD_AES128 = "AES-128";
+
   private static final Pattern BANDWIDTH_ATTR_REGEX =
       Pattern.compile(BANDWIDTH_ATTR + "=(\\d+)\\b");
   private static final Pattern CODECS_ATTR_REGEX =
@@ -80,8 +83,9 @@ public final class HlsPlaylistParser implements NetworkLoadable.Parser<HlsPlayli
       Pattern.compile(VERSION_TAG + ":(\\d+)\\b");
   private static final Pattern BYTERANGE_REGEX =
       Pattern.compile(BYTERANGE_TAG + ":(\\d+(?:@\\d+)?)\\b");
+
   private static final Pattern METHOD_ATTR_REGEX =
-      Pattern.compile(METHOD_ATTR + "=([^,.*]+)");
+      Pattern.compile(METHOD_ATTR + "=(" + METHOD_NONE + "|" + METHOD_AES128 + ")");
   private static final Pattern URI_ATTR_REGEX =
       Pattern.compile(URI_ATTR + "=\"(.+)\"");
   private static final Pattern IV_ATTR_REGEX =
diff --git a/library/src/test/java/com/google/android/exoplayer/hls/HlsMediaPlaylistParserTest.java b/library/src/test/java/com/google/android/exoplayer/hls/HlsMediaPlaylistParserTest.java
index 7d63db1efe..beec89e4a6 100644
--- a/library/src/test/java/com/google/android/exoplayer/hls/HlsMediaPlaylistParserTest.java
+++ b/library/src/test/java/com/google/android/exoplayer/hls/HlsMediaPlaylistParserTest.java
@@ -81,7 +81,7 @@ public class HlsMediaPlaylistParserTest extends TestCase {
 
       assertEquals(false, segments.get(0).discontinuity);
       assertEquals(7.975, segments.get(0).durationSecs);
-      assertEquals(null, segments.get(0).encryptionMethod);
+      assertEquals(false, segments.get(0).isEncrypted);
       assertEquals(null, segments.get(0).encryptionKeyUri);
       assertEquals(null, segments.get(0).encryptionIV);
       assertEquals(51370, segments.get(0).byterangeLength);
@@ -90,7 +90,7 @@ public class HlsMediaPlaylistParserTest extends TestCase {
 
       assertEquals(false, segments.get(1).discontinuity);
       assertEquals(7.975, segments.get(1).durationSecs);
-      assertEquals("AES-128", segments.get(1).encryptionMethod);
+      assertEquals(true, segments.get(1).isEncrypted);
       assertEquals("https://priv.example.com/key.php?r=2680", segments.get(1).encryptionKeyUri);
       assertEquals("0x1566B", segments.get(1).encryptionIV);
       assertEquals(51501, segments.get(1).byterangeLength);
@@ -99,7 +99,7 @@ public class HlsMediaPlaylistParserTest extends TestCase {
 
       assertEquals(false, segments.get(2).discontinuity);
       assertEquals(7.941, segments.get(2).durationSecs);
-      assertEquals(HlsMediaPlaylist.ENCRYPTION_METHOD_NONE, segments.get(2).encryptionMethod);
+      assertEquals(false, segments.get(2).isEncrypted);
       assertEquals(null, segments.get(2).encryptionKeyUri);
       assertEquals(null, segments.get(2).encryptionIV);
       assertEquals(51501, segments.get(2).byterangeLength);
@@ -108,7 +108,7 @@ public class HlsMediaPlaylistParserTest extends TestCase {
 
       assertEquals(true, segments.get(3).discontinuity);
       assertEquals(7.975, segments.get(3).durationSecs);
-      assertEquals("AES-128", segments.get(3).encryptionMethod);
+      assertEquals(true, segments.get(3).isEncrypted);
       assertEquals("https://priv.example.com/key.php?r=2682", segments.get(3).encryptionKeyUri);
       // 0xA7A == 2682.
       assertNotNull(segments.get(3).encryptionIV);
@@ -119,11 +119,11 @@ public class HlsMediaPlaylistParserTest extends TestCase {
 
       assertEquals(false, segments.get(4).discontinuity);
       assertEquals(7.975, segments.get(4).durationSecs);
-      assertEquals("AES-128", segments.get(4).encryptionMethod);
+      assertEquals(true, segments.get(4).isEncrypted);
       assertEquals("https://priv.example.com/key.php?r=2682", segments.get(4).encryptionKeyUri);
-      // 0xA7A == 2682.
+      // 0xA7B == 2683.
       assertNotNull(segments.get(4).encryptionIV);
-      assertEquals("A7A", segments.get(4).encryptionIV.toUpperCase(Locale.getDefault()));
+      assertEquals("A7B", segments.get(4).encryptionIV.toUpperCase(Locale.getDefault()));
       assertEquals(C.LENGTH_UNBOUNDED, segments.get(4).byterangeLength);
       assertEquals(0, segments.get(4).byterangeOffset);
       assertEquals("https://priv.example.com/fileSequence2683.ts", segments.get(4).url);