Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Unified Diff: media/base/eme_constants.h

Issue 1909313002: Support HEVC through EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR feedback Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/eme_constants.h
diff --git a/media/base/eme_constants.h b/media/base/eme_constants.h
index c4a0097acbca9d615acafd034a22d963b4b385e3..51b117f4a620ae6d8037f22a1ec71f7ec211bf06 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)
EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_AVC1 | EME_CODEC_MP4_VP9),
+#else
+ EME_CODEC_MP4_HEVC = 1 << 7,
+ 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),

Powered by Google App Engine
This is Rietveld 408576698