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

Unified Diff: components/cdm/renderer/widevine_key_systems.cc

Issue 557723003: Implement Chromium side of MediaKeys.isTypeSupported(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add DEP from components/cdm/renderer to content/public/common. Created 6 years, 3 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: components/cdm/renderer/widevine_key_systems.cc
diff --git a/components/cdm/renderer/widevine_key_systems.cc b/components/cdm/renderer/widevine_key_systems.cc
index 2a41322112eac5fac5e2dd64a7c46eff29705304..69178669937a1c1c761cf2a73c4b5e36d9ab9574 100644
--- a/components/cdm/renderer/widevine_key_systems.cc
+++ b/components/cdm/renderer/widevine_key_systems.cc
@@ -8,6 +8,9 @@
#include <vector>
#include "base/logging.h"
+// TODO(sandersd): Violates DEPS.
ddorwin 2014/09/13 01:20:44 Didn't you fix this?
sandersd (OOO until July 31) 2014/09/22 23:45:52 Done.
+#include "content/public/common/eme_codec.h"
+#include "content/public/common/eme_init_data_type.h"
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
@@ -49,6 +52,9 @@ void AddWidevineWithCodecs(WidevineCdmType widevine_cdm_type,
// initDataType.
info.supported_codecs = supported_codecs;
+ info.supported_init_data_types = (content::EME_INIT_DATA_TYPE_CENC |
ddorwin 2014/09/13 01:20:44 Note that the general logic will filter out unsupp
sandersd (OOO until July 31) 2014/09/22 23:45:52 Done.
+ content::EME_INIT_DATA_TYPE_WEBM);
+
#if defined(ENABLE_PEPPER_CDMS)
info.pepper_type = kWidevineCdmPluginMimeType;
#endif // defined(ENABLE_PEPPER_CDMS)

Powered by Google App Engine
This is Rietveld 408576698