content/renderer/media/webmediaplayer_impl.cc - Issue 318753010: Introduce the ENABLE_BROWSER_CDMS macro.

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

Issue 318753010: Introduce the ENABLE_BROWSER_CDMS macro. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Ready for review. Please diff against PS1 for easy life. Created 6 years, 6 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/webmediaplayer_impl.cc

diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc

index 9cf57d06659dbbc1fb9acef422ad27e6056c7454..f32e497edab74ce4b436e960242f264dbacfa644 100644

--- a/content/renderer/media/webmediaplayer_impl.cc

+++ b/content/renderer/media/webmediaplayer_impl.cc

@@ -788,6 +788,10 @@ WebMediaPlayerImpl::GenerateKeyRequestInternal(const std::string& key_system,

// Create() must be called synchronously as |frame_| may not be

// valid afterwards.

base::Bind(&PepperCdmWrapperImpl::Create, frame_),

+#elif defined(ENABLE_BROWSER_CDMS)

+ // TODO(xhwang): Fix this if we have a platform that uses prefixed EME

ddorwin 2014/06/05 17:59:48 Does this actually get compiled on such platforms

xhwang 2014/06/09 20:57:20 Not yet. Added #error.

+ // API in WMPI and uses a browser side CDM.

+ NULL,

#endif

BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyAdded),

BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnKeyError),