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

Unified Diff: content/renderer/media/android/proxy_media_keys.h

Issue 193523002: Encrypted Media: Implement IPC based SetCdm(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only 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/android/proxy_media_keys.h
diff --git a/content/renderer/media/android/proxy_media_keys.h b/content/renderer/media/android/proxy_media_keys.h
index dd0f99e9f91b4ff51cc5d443ac43076e4433d837..74ae52e60e0e8f552107d8d83693e92420ef89da 100644
--- a/content/renderer/media/android/proxy_media_keys.h
+++ b/content/renderer/media/android/proxy_media_keys.h
@@ -21,7 +21,6 @@ class RendererMediaPlayerManager;
class ProxyMediaKeys : public media::MediaKeys {
public:
ProxyMediaKeys(RendererMediaPlayerManager* proxy,
- int cdm_id,
const media::SessionCreatedCB& session_created_cb,
const media::SessionMessageCB& session_message_cb,
const media::SessionReadyCB& session_ready_cb,
@@ -54,7 +53,13 @@ class ProxyMediaKeys : public media::MediaKeys {
media::MediaKeys::KeyError error_code,
uint32 system_code);
+ int GetCdmId() const;
+
private:
+ // CDM ID should be unique per renderer process.
+ // TODO(xhwang): Use uint32 to prevent undefined overflow behavior.
+ static int next_cdm_id_;
+
RendererMediaPlayerManager* manager_;
int cdm_id_;
media::SessionCreatedCB session_created_cb_;

Powered by Google App Engine
This is Rietveld 408576698