EME contentType checks DolbyVision

media/base/eme_constants.h

Index: media/base/eme_constants.h
diff --git a/media/base/eme_constants.h b/media/base/eme_constants.h
index 1d9fd910df11a8d7074ff9479aa67cf50605a1c2..aa8120ae82a8ff2bf245e645aaef19767cdd206b 100644
--- a/media/base/eme_constants.h
+++ b/media/base/eme_constants.h
@@ -31,18 +31,25 @@ enum EmeCodec {
   EME_CODEC_MP4_AVC1 = 1 << 5,
   EME_CODEC_COMMON_VP9 = 1 << 6,
   EME_CODEC_MP4_HEVC = 1 << 7,
+  EME_CODEC_MP4_DV_AVC = 1 << 8,
+  EME_CODEC_MP4_DV_HEVC = 1 << 9,
   EME_CODEC_WEBM_AUDIO_ALL = EME_CODEC_WEBM_OPUS | EME_CODEC_WEBM_VORBIS,
   EME_CODEC_WEBM_VIDEO_ALL =
       (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9 | EME_CODEC_COMMON_VP9),
   EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL),
 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
   EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC,
-#if !BUILDFLAG(ENABLE_HEVC_DEMUXING)
-  EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_AVC1 | EME_CODEC_COMMON_VP9),
-#else
-  EME_CODEC_MP4_VIDEO_ALL =
-      (EME_CODEC_MP4_AVC1 | EME_CODEC_COMMON_VP9 | EME_CODEC_MP4_HEVC),
-#endif
+  EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_AVC1 | EME_CODEC_COMMON_VP9
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
+                             |
+                             EME_CODEC_MP4_HEVC
+#endif  // BUILDFLAG(ENABLE_HEVC_DEMUXING)
+#if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
+                             |
+                             EME_CODEC_MP4_DV_AVC |
+                             EME_CODEC_MP4_DV_HEVC

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

EME_CODEC_MP4_DV_HEVC should be inside #if BUILDFLAG(ENABLE_HEVC_DEMUXING) as
well

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

Done.

+#endif  // BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
+                             ),
   EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL),
   EME_CODEC_AUDIO_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_MP4_AUDIO_ALL),
   EME_CODEC_VIDEO_ALL = (EME_CODEC_WEBM_VIDEO_ALL | EME_CODEC_MP4_VIDEO_ALL),