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

Unified Diff: chrome/renderer/media/chrome_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
« no previous file with comments | « no previous file | components/cdm/renderer/DEPS » ('j') | components/cdm/renderer/android_key_systems.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/media/chrome_key_systems.cc
diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
index c15d493bb2bcf6497f5572318285c0d7b3e04999..36805971fdd8a26262e33146d7dea0f7657b0c77 100644
--- a/chrome/renderer/media/chrome_key_systems.cc
+++ b/chrome/renderer/media/chrome_key_systems.cc
@@ -13,6 +13,8 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/render_messages.h"
#include "components/cdm/renderer/widevine_key_systems.h"
+#include "content/public/common/eme_codec.h"
+#include "content/public/common/eme_init_data_type.h"
ddorwin 2014/09/13 01:20:44 Does it make sense to unify these? eme_constants.h
sandersd (OOO until July 31) 2014/09/22 23:45:52 Done.
#include "content/public/renderer/render_thread.h"
#if defined(OS_ANDROID)
@@ -78,6 +80,8 @@ static void AddExternalClearKey(
info.supported_codecs |= content::EME_CODEC_MP4_ALL;
#endif // defined(USE_PROPRIETARY_CODECS)
+ info.supported_init_data_types = content::EME_INIT_DATA_TYPE_ALL;
ddorwin 2014/09/13 01:20:44 We don't currently support keyids. How should we h
sandersd (OOO until July 31) 2014/09/22 23:45:52 Done.
+
info.pepper_type = kExternalClearKeyPepperType;
concrete_key_systems->push_back(info);
« no previous file with comments | « no previous file | components/cdm/renderer/DEPS » ('j') | components/cdm/renderer/android_key_systems.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698