EME contentType checks DolbyVision

media/base/key_systems.cc

Index: media/base/key_systems.cc
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index 41f83b58d89b38e106dda1fe84c3a82e20a0a96d..c9dabace28759d23661659804c42c0e24d387d62 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -45,7 +45,7 @@ static const NamedCodec kMimeTypeToCodecMasks[] = {
     {"video/webm", EME_CODEC_WEBM_VIDEO_ALL},
 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
     {"audio/mp4", EME_CODEC_MP4_AUDIO_ALL},
-    {"video/mp4", EME_CODEC_MP4_VIDEO_ALL}
+    {"video/mp4", EME_CODEC_MP4_VIDEO_ALL},
 #endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
 };
 
@@ -66,6 +66,12 @@ static const NamedCodec kCodecStrings[] = {
     {"hev1", EME_CODEC_MP4_HEVC},  // HEV1.
     {"hvc1", EME_CODEC_MP4_HEVC},  // HVC1.
 #endif
+#if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
+    {"dva1", EME_CODEC_MP4_DV_AVC},   // DolbyVision AVC
+    {"dvav", EME_CODEC_MP4_DV_AVC},   // DolbyVision AVC
+    {"dvh1", EME_CDOEC_MP4_DV_HEVC},  // DolbyVision HEVC
+    {"dvhe", EME_CDOEC_MP4_DV_HEVC},  // DolbyVision HEVC

[erickung1, 2017/04/11 16:57:34]

dvh1 and dvhe should also be protected inside  ENABLE_HEVC_DEMUXING

[yucliu1, 2017/04/11 18:23:09]

Done.

+#endif
 #endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
 };