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

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

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.h
diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.h b/content/renderer/media/webcontentdecryptionmodule_impl.h
index 6ec3a95e30a8d21e029f45e8b990b6804610adb1..ef3bb75545aabee7fe31a979dc63090c745a6add 100644
--- a/content/renderer/media/webcontentdecryptionmodule_impl.h
+++ b/content/renderer/media/webcontentdecryptionmodule_impl.h
@@ -36,16 +36,31 @@ class WebContentDecryptionModuleImpl
// after WebContentDecryptionModule is freed. http://crbug.com/330324
media::Decryptor* GetDecryptor();
+#if defined(OS_ANDROID)
+ // Returns the CDM ID associated with this object. May be kInvalidCdmId if no
+ // CDM ID is associated.
+ int GetCdmId();
+#endif // defined(OS_ANDROID)
+
// blink::WebContentDecryptionModule implementation.
virtual blink::WebContentDecryptionModuleSession* createSession(
blink::WebContentDecryptionModuleSession::Client* client);
private:
// Takes reference to |adapter|.
+#if defined(OS_ANDROID)
+ WebContentDecryptionModuleImpl(scoped_refptr<CdmSessionAdapter> adapter,
+ int cdm_id);
+#else
WebContentDecryptionModuleImpl(scoped_refptr<CdmSessionAdapter> adapter);
+#endif
scoped_refptr<CdmSessionAdapter> adapter_;
+#if defined(OS_ANDROID)
+ int cdm_id_;
+#endif // defined(OS_ANDROID)
+
DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleImpl);
};

Powered by Google App Engine
This is Rietveld 408576698