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

Unified Diff: content/renderer/media/webcontentdecryptionmodule_impl.cc

Issue 193523002: Encrypted Media: Implement IPC based SetCdm(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 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: content/renderer/media/webcontentdecryptionmodule_impl.cc
diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.cc b/content/renderer/media/webcontentdecryptionmodule_impl.cc
index a9b201fbc13278ef319526c73ae64eb7f7edff4f..206a7cc7017c5736392acd239afebc3fcafb2aab 100644
--- a/content/renderer/media/webcontentdecryptionmodule_impl.cc
+++ b/content/renderer/media/webcontentdecryptionmodule_impl.cc
@@ -44,6 +44,7 @@ WebContentDecryptionModuleImpl* WebContentDecryptionModuleImpl::Create(
}
scoped_refptr<CdmSessionAdapter> adapter(new CdmSessionAdapter());
+
if (!adapter->Initialize(
#if defined(ENABLE_PEPPER_CDMS)
base::Bind(&PepperCdmWrapperImpl::Create, frame),
@@ -57,8 +58,7 @@ WebContentDecryptionModuleImpl* WebContentDecryptionModuleImpl::Create(
WebContentDecryptionModuleImpl::WebContentDecryptionModuleImpl(
scoped_refptr<CdmSessionAdapter> adapter)
- : adapter_(adapter) {
-}
+ : adapter_(adapter) {}
WebContentDecryptionModuleImpl::~WebContentDecryptionModuleImpl() {
}
@@ -74,4 +74,10 @@ media::Decryptor* WebContentDecryptionModuleImpl::GetDecryptor() {
return adapter_->GetDecryptor();
}
+#if defined(OS_ANDROID)
+int WebContentDecryptionModuleImpl::GetCdmId() const {
+ return adapter_->GetCdmId();
+}
+#endif // defined(OS_ANDROID)
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698