media/base/browser_cdm_factory.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: media/base/browser_cdm_factory.cc

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

Patch Set: Pass MediaCrypto as global ref pointer with MediaCryptoReady callback 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

Index: media/base/browser_cdm_factory.cc

diff --git a/media/base/browser_cdm_factory.cc b/media/base/browser_cdm_factory.cc

index 88445d890b754d5b2fb261a5b89977e97c1d6715..2a8b1fbc403bdbd1c948cfc980684bb8310db3d7 100644

--- a/media/base/browser_cdm_factory.cc

+++ b/media/base/browser_cdm_factory.cc

@@ -21,7 +21,7 @@ void SetBrowserCdmFactory(BrowserCdmFactory* factory) {

g_cdm_factory = factory;

}

-scoped_ptr<BrowserCdm> CreateBrowserCdm(

+BrowserCdmPtr CreateBrowserCdm(

const std::string& key_system,

bool use_hw_secure_codecs,

const SessionMessageCB& session_message_cb,

« media/base/android/media_drm_bridge.cc ('K') | « media/base/browser_cdm_factory.h ('k') | media/cdm/player_tracker_impl.cc » ('j') | no next file with comments »