Store full accessibility descriptors in parsed DASH manifest

Issue: #2362 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=145402640
google · Jan 24, 2017 · c01c2c3 · c01c2c3
1 parent 4efdd14
commit c01c2c3
Show file tree

Hide file tree

Showing 6 changed files with 168 additions and 110 deletions.
diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
@@ -213,7 +213,7 @@ private static Period newPeriods(AdaptationSet... adaptationSets) {
   }
 
   private static AdaptationSet newAdaptationSets(Representation... representations) {
-    return new AdaptationSet(0, C.TRACK_TYPE_VIDEO, Arrays.asList(representations));
+    return new AdaptationSet(0, C.TRACK_TYPE_VIDEO, Arrays.asList(representations), null);
   }
 
   private static Representation newRepresentations(DrmInitData drmInitData) {

diff --git a/...dTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/...dTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
@@ -20,6 +20,8 @@
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Unit tests for {@link DashManifestParser}.
@@ -70,34 +72,57 @@ public void testParseMediaPresentationDescriptionWithSegmentTemplate() throws IO
   }
 
   public void testParseCea608AccessibilityChannel() {
-    assertEquals(1, DashManifestParser.parseCea608AccessibilityChannel("CC1=eng"));
-    assertEquals(2, DashManifestParser.parseCea608AccessibilityChannel("CC2=eng"));
-    assertEquals(3, DashManifestParser.parseCea608AccessibilityChannel("CC3=eng"));
-    assertEquals(4, DashManifestParser.parseCea608AccessibilityChannel("CC4=eng"));
+    assertEquals(1, DashManifestParser.parseCea608AccessibilityChannel(
+        buildCea608AccessibilityDescriptors("CC1=eng")));
+    assertEquals(2, DashManifestParser.parseCea608AccessibilityChannel(
+        buildCea608AccessibilityDescriptors("CC2=eng")));
+    assertEquals(3, DashManifestParser.parseCea608AccessibilityChannel(
+        buildCea608AccessibilityDescriptors("CC3=eng")));
+    assertEquals(4, DashManifestParser.parseCea608AccessibilityChannel(
+        buildCea608AccessibilityDescriptors("CC4=eng")));
 
-    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea608AccessibilityChannel(null));
-    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea608AccessibilityChannel(""));
-    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea608AccessibilityChannel("CC0=eng"));
-    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea608AccessibilityChannel("CC5=eng"));
-    assertEquals(Format.NO_VALUE,
-        DashManifestParser.parseCea608AccessibilityChannel("Wrong format"));
+    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea608AccessibilityChannel(
+        buildCea608AccessibilityDescriptors(null)));
+    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea608AccessibilityChannel(
+        buildCea608AccessibilityDescriptors("")));
+    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea608AccessibilityChannel(
+        buildCea608AccessibilityDescriptors("CC0=eng")));
+    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea608AccessibilityChannel(
+        buildCea608AccessibilityDescriptors("CC5=eng")));
+    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea608AccessibilityChannel(
+        buildCea608AccessibilityDescriptors("Wrong format")));
   }
 
   public void testParseCea708AccessibilityChannel() {
-    assertEquals(1, DashManifestParser.parseCea708AccessibilityChannel("1=lang:eng"));
-    assertEquals(2, DashManifestParser.parseCea708AccessibilityChannel("2=lang:eng"));
-    assertEquals(3, DashManifestParser.parseCea708AccessibilityChannel("3=lang:eng"));
-    assertEquals(62, DashManifestParser.parseCea708AccessibilityChannel("62=lang:eng"));
-    assertEquals(63, DashManifestParser.parseCea708AccessibilityChannel("63=lang:eng"));
+    assertEquals(1, DashManifestParser.parseCea708AccessibilityChannel(
+        buildCea708AccessibilityDescriptors("1=lang:eng")));
+    assertEquals(2, DashManifestParser.parseCea708AccessibilityChannel(
+        buildCea708AccessibilityDescriptors("2=lang:eng")));
+    assertEquals(3, DashManifestParser.parseCea708AccessibilityChannel(
+        buildCea708AccessibilityDescriptors("3=lang:eng")));
+    assertEquals(62, DashManifestParser.parseCea708AccessibilityChannel(
+        buildCea708AccessibilityDescriptors("62=lang:eng")));
+    assertEquals(63, DashManifestParser.parseCea708AccessibilityChannel(
+        buildCea708AccessibilityDescriptors("63=lang:eng")));
 
-    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea708AccessibilityChannel(null));
-    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea708AccessibilityChannel(""));
-    assertEquals(Format.NO_VALUE,
-        DashManifestParser.parseCea708AccessibilityChannel("0=lang:eng"));
-    assertEquals(Format.NO_VALUE,
-        DashManifestParser.parseCea708AccessibilityChannel("64=lang:eng"));
-    assertEquals(Format.NO_VALUE,
-        DashManifestParser.parseCea708AccessibilityChannel("Wrong format"));
+    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea708AccessibilityChannel(
+        buildCea708AccessibilityDescriptors(null)));
+    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea708AccessibilityChannel(
+        buildCea708AccessibilityDescriptors("")));
+    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea708AccessibilityChannel(
+            buildCea708AccessibilityDescriptors("0=lang:eng")));
+    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea708AccessibilityChannel(
+            buildCea708AccessibilityDescriptors("64=lang:eng")));
+    assertEquals(Format.NO_VALUE, DashManifestParser.parseCea708AccessibilityChannel(
+            buildCea708AccessibilityDescriptors("Wrong format")));
+  }
+
+  private static List<SchemeValuePair> buildCea608AccessibilityDescriptors(String value) {
+    return Collections.singletonList(new SchemeValuePair("urn:scte:dash:cc:cea-608:2015", value));
+  }
+
+  private static List<SchemeValuePair> buildCea708AccessibilityDescriptors(String value) {
+    return Collections.singletonList(new SchemeValuePair("urn:scte:dash:cc:cea-708:2015", value));
   }
 
 }
diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/AdaptationSet.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/AdaptationSet.java
@@ -45,17 +45,27 @@ public class AdaptationSet {
    */
   public final List<Representation> representations;
 
+  /**
+   * The accessibility descriptors in the adaptation set.
+   */
+  public final List<SchemeValuePair> accessibilityDescriptors;
+
   /**
    * @param id A non-negative identifier for the adaptation set that's unique in the scope of its
    *     containing period, or {@link #ID_UNSET} if not specified.
    * @param type The type of the adaptation set. One of the {@link com.google.android.exoplayer2.C}
    *     {@code TRACK_TYPE_*} constants.
    * @param representations The {@link Representation}s in the adaptation set.
+   * @param accessibilityDescriptors The accessibility descriptors in the adaptation set.
    */
-  public AdaptationSet(int id, int type, List<Representation> representations) {
+  public AdaptationSet(int id, int type, List<Representation> representations,
+      List<SchemeValuePair> accessibilityDescriptors) {
     this.id = id;
     this.type = type;
     this.representations = Collections.unmodifiableList(representations);
+    this.accessibilityDescriptors = accessibilityDescriptors == null
+        ? Collections.<SchemeValuePair>emptyList()
+        : Collections.unmodifiableList(accessibilityDescriptors);
   }
 
 }