content/renderer/media/crypto/proxy_decryptor.cc - Issue 193523002: Encrypted Media: Implement IPC based SetCdm().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/crypto/proxy_decryptor.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:

Index: content/renderer/media/crypto/proxy_decryptor.cc

diff --git a/content/renderer/media/crypto/proxy_decryptor.cc b/content/renderer/media/crypto/proxy_decryptor.cc

index 10408105c07d24be75de3fd37eb5a64aa7dd49a3..a941c4d575512c987573e13c403e8536cec21b72 100644

--- a/content/renderer/media/crypto/proxy_decryptor.cc

+++ b/content/renderer/media/crypto/proxy_decryptor.cc

@@ -75,6 +75,11 @@ media::Decryptor* ProxyDecryptor::GetDecryptor() {

return media_keys_ ? media_keys_->GetDecryptor() : NULL;

}

+int ProxyDecryptor::GetCdmId() {

+ return media_keys_ ? media_keys_->GetCdmId()

+ : media::MediaKeys::kInvalidCdmId;

bool ProxyDecryptor::InitializeCDM(const std::string& key_system,

const GURL& frame_url) {

DVLOG(1) << "InitializeCDM: key_system = " << key_system;