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

Unified Diff: media/base/key_systems.cc

Issue 2881443002: Add EME contentType checks for mp2t (Closed)
Patch Set: Name and comment 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
« no previous file with comments | « media/base/eme_constants.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/key_systems.cc
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index 4e187a0142173c5d319d2cdefe2ef4032de18234..d210b8ada661110890fa040a37856db6584f6405 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -46,6 +46,9 @@ static const NamedCodec kMimeTypeToCodecMasks[] = {
#if BUILDFLAG(USE_PROPRIETARY_CODECS)
{"audio/mp4", EME_CODEC_MP4_AUDIO_ALL},
{"video/mp4", EME_CODEC_MP4_VIDEO_ALL},
+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
+ {"video/mp2t", EME_CODEC_MP2T_VIDEO_ALL},
+#endif // BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
};
@@ -64,8 +67,8 @@ static const NamedCodec kCodecStrings[] = {
{"ac-3", EME_CODEC_MP4_AC3}, // AC3.
{"ec-3", EME_CODEC_MP4_EAC3}, // EAC3.
#endif
- {"avc1", EME_CODEC_MP4_AVC1}, // AVC1.
- {"avc3", EME_CODEC_MP4_AVC1}, // AVC3.
+ {"avc1", EME_CODEC_MP4_AVC1}, // AVC1 for MP4 and MP2T
+ {"avc3", EME_CODEC_MP4_AVC1}, // AVC3 for MP4 and MP2T
#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
{"hev1", EME_CODEC_MP4_HEVC}, // HEV1.
{"hvc1", EME_CODEC_MP4_HEVC}, // HVC1.
« no previous file with comments | « media/base/eme_constants.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698