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

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

Issue 193523002: Encrypted Media: Implement IPC based SetCdm(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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.cc
diff --git a/content/renderer/media/android/proxy_media_keys.cc b/content/renderer/media/android/proxy_media_keys.cc
index 9734e815e785ab7963e77947edfa159ec00d8c89..09c2e0bdf5fc4341ae427d100f6697096ac7dfdb 100644
--- a/content/renderer/media/android/proxy_media_keys.cc
+++ b/content/renderer/media/android/proxy_media_keys.cc
@@ -29,6 +29,7 @@ ProxyMediaKeys::ProxyMediaKeys(
session_closed_cb_(session_closed_cb),
session_error_cb_(session_error_cb) {
DCHECK(manager_);
+ DCHECK_NE(cdm_id, media::MediaKeys::kInvalidCdmId);
}
ProxyMediaKeys::~ProxyMediaKeys() {
@@ -86,6 +87,10 @@ void ProxyMediaKeys::ReleaseSession(uint32 session_id) {
manager_->ReleaseSession(cdm_id_, session_id);
}
+int ProxyMediaKeys::GetCdmId() {
+ return cdm_id_;
+}
+
void ProxyMediaKeys::OnSessionCreated(uint32 session_id,
const std::string& web_session_id) {
session_created_cb_.Run(session_id, web_session_id);

Powered by Google App Engine
This is Rietveld 408576698