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

Unified Diff: media/base/key_systems.cc

Issue 2809013002: EME contentType checks DolbyVision (Closed)
Patch Set: Typo 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 | « 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 41f83b58d89b38e106dda1fe84c3a82e20a0a96d..708750ac82b6f41ea9b6bdac8c88e9b8831f4dd9 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -45,7 +45,7 @@ static const NamedCodec kMimeTypeToCodecMasks[] = {
{"video/webm", EME_CODEC_WEBM_VIDEO_ALL},
#if BUILDFLAG(USE_PROPRIETARY_CODECS)
{"audio/mp4", EME_CODEC_MP4_AUDIO_ALL},
- {"video/mp4", EME_CODEC_MP4_VIDEO_ALL}
+ {"video/mp4", EME_CODEC_MP4_VIDEO_ALL},
#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
};
@@ -66,6 +66,14 @@ static const NamedCodec kCodecStrings[] = {
{"hev1", EME_CODEC_MP4_HEVC}, // HEV1.
{"hvc1", EME_CODEC_MP4_HEVC}, // HVC1.
#endif
+#if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
+ {"dva1", EME_CODEC_MP4_DV_AVC}, // DolbyVision AVC
+ {"dvav", EME_CODEC_MP4_DV_AVC}, // DolbyVision AVC
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
+ {"dvh1", EME_CODEC_MP4_DV_HEVC}, // DolbyVision HEVC
+ {"dvhe", EME_CODEC_MP4_DV_HEVC}, // DolbyVision HEVC
+#endif
+#endif
#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
};
« 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