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

Unified Diff: media/base/key_systems.cc

Issue 1624703002: Implement support for vp9 in ISO-BMFF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/key_systems.cc
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index 914661f580e653f88c960cb30c08b5efd16426fb..16902fd6eae9c613422c5febd031eb7570ca12ce 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -17,6 +17,7 @@
#include "media/base/key_system_info.h"
#include "media/base/media_client.h"
#include "media/cdm/key_system_names.h"
+#include "media/media_features.h"
#include "third_party/widevine/cdm/widevine_cdm_common.h"
namespace media {
@@ -53,6 +54,9 @@ static const NamedCodec kCodecStrings[] = {
{"vp9", EME_CODEC_WEBM_VP9}, // VP9.
{"vp9.0", EME_CODEC_WEBM_VP9}, // VP9.
#if defined(USE_PROPRIETARY_CODECS)
+#if BUILDFLAG(ENABLE_MP4_VP9_DEMUXING)
+ {"vp09", EME_CODEC_MP4_VP9}, // VP9 in MP4.
+#endif
{"mp4a", EME_CODEC_MP4_AAC}, // AAC.
{"avc1", EME_CODEC_MP4_AVC1}, // AVC1.
{"avc3", EME_CODEC_MP4_AVC1} // AVC3.

Powered by Google App Engine
This is Rietveld 408576698