media/blink/webmediaplayer_impl.cc - Issue 1102363005: Initialize the CDM asynchronously

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: media/blink/webmediaplayer_impl.cc

Issue 1102363005: Initialize the CDM asynchronously (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase + Android compile changes 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:

Index: media/blink/webmediaplayer_impl.cc

diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc

index bf938c256d505711f245c7bcb9cad629206a2470..201ab1701908483c5db5f53e9c33861b8d1f0a8f 100644

--- a/media/blink/webmediaplayer_impl.cc

+++ b/media/blink/webmediaplayer_impl.cc

@@ -699,7 +699,9 @@ void WebMediaPlayerImpl::OnWaitingForDecryptionKey() {

void WebMediaPlayerImpl::SetCdm(const CdmAttachedCB& cdm_attached_cb,

CdmContext* cdm_context) {

- pipeline_.SetCdm(cdm_context, cdm_attached_cb);

+ // If CDM initialization succeeded, tell the pipeline about it.

+ if (cdm_context)

+ pipeline_.SetCdm(cdm_context, cdm_attached_cb);

}

void WebMediaPlayerImpl::OnCdmAttached(

« no previous file with comments | « media/base/cdm_factory.h ('k') | media/cdm/ppapi/cdm_adapter.h » ('j') | no next file with comments »