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

Unified Diff: media/base/eme_constants.h

Issue 2853123003: EME contentType checks for AC3/EAC3 (Closed)
Patch Set: int32 Created 3 years, 8 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
« no previous file with comments | « components/cdm/browser/cdm_message_filter_android.cc ('k') | media/base/key_systems.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/eme_constants.h
diff --git a/media/base/eme_constants.h b/media/base/eme_constants.h
index a3acdb94445399f3558bf85eeda0a2a243136447..7364e761ebf1ce65fb44230964d05636def3d63c 100644
--- a/media/base/eme_constants.h
+++ b/media/base/eme_constants.h
@@ -33,12 +33,20 @@ enum EmeCodec {
EME_CODEC_MP4_HEVC = 1 << 7,
EME_CODEC_MP4_DV_AVC = 1 << 8,
EME_CODEC_MP4_DV_HEVC = 1 << 9,
+ EME_CODEC_MP4_AC3 = 1 << 10,
+ EME_CODEC_MP4_EAC3 = 1 << 11,
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,
+ EME_CODEC_MP4_AUDIO_ALL = (EME_CODEC_MP4_AAC
+#if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
+ |
+ EME_CODEC_MP4_AC3 |
+ EME_CODEC_MP4_EAC3
+#endif // BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
+ ),
EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_AVC1 | EME_CODEC_COMMON_VP9
#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
|
« no previous file with comments | « components/cdm/browser/cdm_message_filter_android.cc ('k') | media/base/key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698