Support HEVC through EME

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 26fedb0a62ab54d79049eb8d2ba478f353106453..099e275635eee895b0e57928b9d13245c8f41122 100644
--- a/media/base/eme_constants.h
+++ b/media/base/eme_constants.h
@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include "media/media_features.h"
+
 namespace media {
 
 // Defines values that specify registered Initialization Data Types used
@@ -38,7 +40,13 @@ enum EmeCodec {
   EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC,
   EME_CODEC_MP4_AVC1 = 1 << 5,
   EME_CODEC_MP4_VP9 = 1 << 6,
+#if !BUILDFLAG(ENABLE_HEVC_DEMUXING)

[ddorwin, 2016/05/18 19:51:13]

You might need to update cdm_message_filter_android.cc if you want to support
Android.

[servolk, 2016/05/19 00:43:43]

Done.

   EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_AVC1 | EME_CODEC_MP4_VP9),
+#else
+  EME_CODEC_MP4_HEVC = 1 << 7,

[ddorwin, 2016/05/18 19:51:13]

This CL alone does not enable this anywhere.

[servolk, 2016/05/19 00:43:43]

Done.

+  EME_CODEC_MP4_VIDEO_ALL =
+      (EME_CODEC_MP4_AVC1 | EME_CODEC_MP4_VP9 | EME_CODEC_MP4_HEVC),
+#endif
   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),