content/renderer/media/android/webmediaplayer_android.h - Issue 594713002: Pass initial CDM to CreateMediaPlayer()

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/android/webmediaplayer_android.h

Issue 594713002: Pass initial CDM to CreateMediaPlayer() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixes for android + mojo Created 6 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:

Index: content/renderer/media/android/webmediaplayer_android.h

diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h

index 8ed1ad6c21c325027500d94a27db9e1f3b6c9e2a..1a2797708f4f5806813b31c1788afffbfd95f2c4 100644

--- a/content/renderer/media/android/webmediaplayer_android.h

+++ b/content/renderer/media/android/webmediaplayer_android.h

@@ -87,6 +87,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,

base::WeakPtr<media::WebMediaPlayerDelegate> delegate,

RendererMediaPlayerManager* player_manager,

RendererCdmManager* cdm_manager,

+ blink::WebContentDecryptionModule* initial_cdm,

scoped_refptr<StreamTextureFactory> factory,

const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,

media::MediaLog* media_log);

@@ -247,8 +248,6 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,

virtual void setContentDecryptionModule(

blink::WebContentDecryptionModule* cdm,

blink::WebContentDecryptionModuleResult result);

- virtual void setContentDecryptionModuleSync(

- blink::WebContentDecryptionModule* cdm);

void OnKeyAdded(const std::string& session_id);

void OnKeyError(const std::string& session_id,

« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »