Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Unified Diff: media/blink/encrypted_media_player_support.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
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | media/cdm/proxy_decryptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/encrypted_media_player_support.cc
diff --git a/media/blink/encrypted_media_player_support.cc b/media/blink/encrypted_media_player_support.cc
index 3a0ddd80cfb1b61c6b79c935cc5297737041050e..e83efd9a527cc845b67f14cf51370dee3f71afd4 100644
--- a/media/blink/encrypted_media_player_support.cc
+++ b/media/blink/encrypted_media_player_support.cc
@@ -154,11 +154,15 @@ EncryptedMediaPlayerSupport::GenerateKeyRequestInternal(
if (!PrefixedIsSupportedConcreteKeySystem(key_system))
return WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported;
+ // |use_hw_secure_codecs| is only supported on Android, and Android (WMPA)
+ // does not use EncryptedMediaPlayerSupport.
+ bool use_hw_secure_codecs = false;
+
if (!proxy_decryptor_) {
DCHECK(current_key_system_.empty());
DCHECK(!cdm_context_ready_cb_.is_null());
proxy_decryptor_.reset(new ProxyDecryptor(
- media_permission_,
+ media_permission_, use_hw_secure_codecs,
BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupport::OnKeyAdded),
BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupport::OnKeyError),
BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupport::OnKeyMessage)));
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | media/cdm/proxy_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698