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

Unified Diff: media/base/eme_constants.h

Issue 2881443002: Add EME contentType checks for mp2t (Closed)
Patch Set: Created 3 years, 7 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 7364e761ebf1ce65fb44230964d05636def3d63c..a2b28db2c1edbad74010eefa8a8d3fe7429440c5 100644
--- a/media/base/eme_constants.h
+++ b/media/base/eme_constants.h
@@ -28,7 +28,7 @@ enum EmeCodec {
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_AVC1 = 1 << 5,
EME_CODEC_COMMON_VP9 = 1 << 6,
EME_CODEC_MP4_HEVC = 1 << 7,
EME_CODEC_MP4_DV_AVC = 1 << 8,
@@ -47,7 +47,7 @@ enum EmeCodec {
EME_CODEC_MP4_EAC3
#endif // BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
),
- EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_AVC1 | EME_CODEC_COMMON_VP9
+ EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_COMMON_AVC1 | EME_CODEC_COMMON_VP9
#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
|
EME_CODEC_MP4_HEVC
@@ -62,9 +62,18 @@ enum EmeCodec {
#endif // BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
),
EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL),
+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
+ EME_CODEC_MP2T_VIDEO_ALL = EME_CODEC_COMMON_AVC1,
+ EME_CODEC_MP2T_ALL = EME_CODEC_MP2T_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_MP2T_VIDEO_ALL),
+ EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL | EME_CODEC_MP2T_ALL),
+#else
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),
+#endif // BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
#else
EME_CODEC_AUDIO_ALL = EME_CODEC_WEBM_AUDIO_ALL,
EME_CODEC_VIDEO_ALL = EME_CODEC_WEBM_VIDEO_ALL,

Powered by Google App Engine
This is Rietveld 408576698