content/renderer/media/crypto/renderer_cdm_manager.cc - Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

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/renderer_cdm_manager.cc

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 7 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

« content/renderer/media/crypto/renderer_cdm_manager.h ('K') | « content/renderer/media/crypto/renderer_cdm_manager.h ('k') | content/renderer/pepper/content_decryptor_delegate.h » ('j') | content/renderer/pepper/content_decryptor_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4676ec634f0f26e5705e5dcd7dba37d02f2676dc..247c4a402e247609f2edfd3c3b1f3000dea5d133 100644

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

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

@@ -52,10 +52,15 @@ void RendererCdmManager::InitializeCdm(int cdm_id,

uint32_t promise_id,

ProxyMediaKeys* media_keys,

const std::string& key_system,

- const GURL& security_origin) {

+ const GURL& security_origin,

+ bool use_secure_codecs) {

DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";

+ InitializeCdmParameters parameters;

+ parameters.key_system = key_system;

+ parameters.security_origin = security_origin;

+ parameters.use_secure_codecs = use_secure_codecs;

Send(new CdmHostMsg_InitializeCdm(routing_id(), cdm_id, promise_id,

- key_system, security_origin));

+ parameters));

}

void RendererCdmManager::SetServerCertificate(