content/renderer/media/android/webmediaplayer_android.cc - Issue 1132323004: Pass video overlay renderer preference to ProxyDecryptor.

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

Issue 1132323004: Pass video overlay renderer preference to ProxyDecryptor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

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

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

index 16f17f4702d92e0cc265c8d8a1cb2bf8fe9d7350..a84941ef38ba411279f441d84f4a22f4bc2d13fc 100644

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

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

@@ -1542,8 +1542,10 @@ WebMediaPlayerAndroid::GenerateKeyRequestInternal(

if (!proxy_decryptor_) {

DCHECK(current_key_system_.empty());

proxy_decryptor_.reset(new media::ProxyDecryptor(

- media_permission_, base::Bind(&WebMediaPlayerAndroid::OnKeyAdded,

- weak_factory_.GetWeakPtr()),

+ media_permission_,

+ player_manager_->ShouldUseVideoOverlayForEmbeddedEncryptedVideo(),

+ base::Bind(&WebMediaPlayerAndroid::OnKeyAdded,

+ weak_factory_.GetWeakPtr()),

base::Bind(&WebMediaPlayerAndroid::OnKeyError,

weak_factory_.GetWeakPtr()),

base::Bind(&WebMediaPlayerAndroid::OnKeyMessage,

« no previous file with comments | « no previous file | media/blink/encrypted_media_player_support.cc » ('j') | no next file with comments »