content/renderer/media/crypto/encrypted_media_player_support_impl.cc - Issue 660673002: Introduce CdmFactory interface.

Unified Diff: content/renderer/media/crypto/encrypted_media_player_support_impl.cc

Issue 660673002: Introduce CdmFactory interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_result_promise

Patch Set: Created 6 years, 2 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

« content/renderer/media/cdm_session_adapter.cc ('K') | « content/renderer/media/crypto/content_decryption_module_factory.cc ('k') | content/renderer/media/crypto/proxy_decryptor.h » ('j') | content/renderer/media/crypto/proxy_decryptor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/crypto/encrypted_media_player_support_impl.cc

diff --git a/content/renderer/media/crypto/encrypted_media_player_support_impl.cc b/content/renderer/media/crypto/encrypted_media_player_support_impl.cc

index e3f70b393d18d6e316057648e99da1f20219f456..a6083fd7f4dfd16f06356b723e35c1948327baf7 100644

--- a/content/renderer/media/crypto/encrypted_media_player_support_impl.cc

+++ b/content/renderer/media/crypto/encrypted_media_player_support_impl.cc

@@ -26,6 +26,7 @@

#if defined(ENABLE_PEPPER_CDMS)

#include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h"

+#include "content/renderer/media/crypto/render_cdm_factory.h"

ddorwin 2014/10/16 17:32:52 same comment as below

#endif

using blink::WebMediaPlayer;

@@ -159,7 +160,6 @@ EncryptedMediaPlayerSupportImpl::GenerateKeyRequest(

return e;

}

WebMediaPlayer::MediaKeyException

EncryptedMediaPlayerSupportImpl::GenerateKeyRequestInternal(

blink::WebLocalFrame* frame,

@@ -174,9 +174,8 @@ EncryptedMediaPlayerSupportImpl::GenerateKeyRequestInternal(

if (!proxy_decryptor_) {

proxy_decryptor_.reset(new ProxyDecryptor(

#if defined(ENABLE_PEPPER_CDMS)

ddorwin 2014/10/16 17:32:52 What if you only wanted to support Clear Key? Shou

xhwang 2014/10/16 20:08:39 Not sure what you are asking exactly... A few poin

ddorwin 2014/10/16 20:33:20 Nevermind. I think the structure threw me off.

xhwang 2014/10/17 00:11:49 Acknowledged.

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

- // valid afterwards.

- base::Bind(&PepperCdmWrapperImpl::Create, frame),

+ scoped_ptr<media::CdmFactory>(new RenderCdmFactory(

+ base::Bind(&PepperCdmWrapperImpl::Create, frame))),

#elif defined(ENABLE_BROWSER_CDMS)

#error Browser side CDM in WMPI for prefixed EME API not supported yet.

#endif