media/blink/cdm_session_adapter.cc - Issue 814143004: Encrypted Media: Add DefaultCdmFactory.

Unified Diff: media/blink/cdm_session_adapter.cc

Issue 814143004: Encrypted Media: Add DefaultCdmFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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: media/blink/cdm_session_adapter.cc

diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc

index 43ce395ac29c6db6d8804dd485ff1a52cb3afb2b..c82575f513bbe4d0e4deb7ecde04d1cb995bcefd 100644

--- a/media/blink/cdm_session_adapter.cc

+++ b/media/blink/cdm_session_adapter.cc

@@ -13,7 +13,6 @@

#include "media/base/key_systems.h"

#include "media/base/media_keys.h"

#include "media/blink/webcontentdecryptionmodulesession_impl.h"

-#include "media/cdm/aes_decryptor.h"

#include "url/gurl.h"

namespace media {

@@ -34,12 +33,7 @@ bool CdmSessionAdapter::Initialize(CdmFactory* cdm_factory,

base::WeakPtr<CdmSessionAdapter> weak_this = weak_ptr_factory_.GetWeakPtr();

- if (CanUseAesDecryptor(key_system)) {

- media_keys_.reset(new AesDecryptor(

- base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this),

- base::Bind(&CdmSessionAdapter::OnSessionClosed, weak_this),

- base::Bind(&CdmSessionAdapter::OnSessionKeysChange, weak_this)));

- } else if (cdm_factory) {

+ if (cdm_factory) {

ddorwin 2014/12/19 18:16:56 If we have a default, can this ever be null?

xhwang 2014/12/19 19:18:30 Good point. Done.

media_keys_ = cdm_factory->Create(

ddorwin 2014/12/19 18:16:56 Clear Key isn't added to the existing factories. H

gunsch 2014/12/19 19:06:19 I think AesDecryptor is still created in RenderCdm

xhwang 2014/12/19 19:18:28 See gunsch's reply. We still create AesDecryptor i

xhwang 2014/12/19 19:18:30 Thanks for the link!

key_system, security_origin,

base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this),