EME contentType checks DolbyVision

media/base/eme_constants.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_EME_CONSTANTS_H_
 #define MEDIA_BASE_EME_CONSTANTS_H_
 
 #include <stdint.h>
 
 #include "media/media_features.h"
@@ skipping 13 matching lines @@
   // codec support because they may be extended to include more codecs.
   EME_CODEC_NONE = 0,
   EME_CODEC_WEBM_OPUS = 1 << 0,
   EME_CODEC_WEBM_VORBIS = 1 << 1,
   EME_CODEC_WEBM_VP8 = 1 << 2,
   EME_CODEC_WEBM_VP9 = 1 << 3,
   EME_CODEC_MP4_AAC = 1 << 4,
   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),
   EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL),
 #else
   EME_CODEC_AUDIO_ALL = EME_CODEC_WEBM_AUDIO_ALL,
   EME_CODEC_VIDEO_ALL = EME_CODEC_WEBM_VIDEO_ALL,
   EME_CODEC_ALL = EME_CODEC_WEBM_ALL,
 #endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
 };
@@ skipping 66 matching lines @@
   // This rule only has meaning on platforms that distinguish hardware-secure
   // codecs (ie. Android).
   HW_SECURE_CODECS_REQUIRED,
   // The configuration option is supported without conditions.
   SUPPORTED,
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_EME_CONSTANTS_H_