Parse CEA-708 codec for rawCC

Note that actually handling CEA-708 is not yet implemented, and so this is a no-op change from a behavior point of view. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=136038439
google · Oct 14, 2016 · a22390c · a22390c
1 parent e685edc
commit a22390c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.../src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/.../src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -655,7 +655,9 @@ private static String getSampleMimeType(String containerMimeType, String codecs)
       return MimeTypes.getVideoMediaMimeType(codecs);
     } else if (MimeTypes.APPLICATION_RAWCC.equals(containerMimeType)) {
       if (codecs != null) {
-        if (codecs.contains("eia608") || codecs.contains("cea608")) {
+        if (codecs.contains("cea708")) {
+          return MimeTypes.APPLICATION_CEA708;
+        } else if (codecs.contains("eia608") || codecs.contains("cea608")) {
           return MimeTypes.APPLICATION_CEA608;
         }
       }

diff --git a/library/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/library/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
@@ -65,6 +65,7 @@ public final class MimeTypes {
   public static final String APPLICATION_WEBM = BASE_TYPE_APPLICATION + "/webm";
   public static final String APPLICATION_ID3 = BASE_TYPE_APPLICATION + "/id3";
   public static final String APPLICATION_CEA608 = BASE_TYPE_APPLICATION + "/cea-608";
+  public static final String APPLICATION_CEA708 = BASE_TYPE_APPLICATION + "/cea-708";
   public static final String APPLICATION_SUBRIP = BASE_TYPE_APPLICATION + "/x-subrip";
   public static final String APPLICATION_TTML = BASE_TYPE_APPLICATION + "/ttml+xml";
   public static final String APPLICATION_M3U8 = BASE_TYPE_APPLICATION + "/x-mpegURL";