content/browser/media/cdm/browser_cdm_manager.cc - Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer

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/browser/media/cdm/browser_cdm_manager.cc

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755

Patch Set: Better handling of player_tracker_.NotifyNewKey() Created 5 years, 3 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/browser/media/android/media_drm_credential_manager.h ('K') | « content/browser/media/cdm/browser_cdm_manager.h ('k') | media/base/android/browser_cdm_factory_android.h » ('j') | media/base/android/browser_cdm_factory_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/cdm/browser_cdm_manager.cc

diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc

index eefceba28b97d1a73cd31834fb3b34d231a554ae..84412848d522653c5ea094d05c612f4cec71408d 100644

--- a/content/browser/media/cdm/browser_cdm_manager.cc

+++ b/content/browser/media/cdm/browser_cdm_manager.cc

@@ -31,6 +31,7 @@

namespace content {

using media::BrowserCdm;

+using media::BrowserCdmPtr;

using media::MediaKeys;

namespace {

@@ -541,7 +542,7 @@ void BrowserCdmManager::AddCdm(int render_frame_id,

scoped_ptr<SimplePromise> promise(new SimplePromise(

weak_ptr_factory_.GetWeakPtr(), render_frame_id, cdm_id, promise_id));

- scoped_ptr<BrowserCdm> cdm(media::CreateBrowserCdm(

+ BrowserCdmPtr cdm(media::CreateBrowserCdm(

key_system, use_hw_secure_codecs,

BROWSER_CDM_MANAGER_CB(OnSessionMessage),

BROWSER_CDM_MANAGER_CB(OnSessionClosed),