Introduce CdmFactory interface.

content/renderer/media/crypto/encrypted_media_player_support_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/crypto/encrypted_media_player_support_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/renderer/media/crypto/key_systems.h"
 #include "content/renderer/media/webcontentdecryptionmodule_impl.h"
 #include "content/renderer/pepper/pepper_webplugin_impl.h"

[ddorwin, 2014/10/16 17:32:52]

i don't think we need this.

[xhwang, 2014/10/16 20:08:39]

Done.

 #include "media/base/bind_to_current_loop.h"
 #include "media/blink/encrypted_media_player_support.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 
 #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;
 using blink::WebMediaPlayerClient;
 using blink::WebString;
 
 namespace content {
 
 #define BIND_TO_RENDER_LOOP(function)            \
   (media::BindToCurrentLoop(base::Bind(function, AsWeakPtr())))
@@ skipping 113 matching lines @@
   std::string ascii_key_system =
       GetUnprefixedKeySystemName(ToASCIIOrEmpty(key_system));
 
   WebMediaPlayer::MediaKeyException e =
       GenerateKeyRequestInternal(frame, ascii_key_system, init_data,
                                  init_data_length);
   ReportMediaKeyExceptionToUMA("generateKeyRequest", ascii_key_system, e);
   return e;
 }
 
-
 WebMediaPlayer::MediaKeyException
 EncryptedMediaPlayerSupportImpl::GenerateKeyRequestInternal(
     blink::WebLocalFrame* frame,
     const std::string& key_system,
     const unsigned char* init_data,
     unsigned init_data_length) {
   if (!IsConcreteSupportedKeySystem(key_system))
     return WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported;
 
   // We do not support run-time switching between key systems for now.
   if (current_key_system_.empty()) {
     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?
Should we be ifdef'ing the constructor's parameters like we used to ifdef the
Create() parameters?

[xhwang, 2014/10/16 20:08:39]

Not sure what you are asking exactly... A few points here:
1, I have moved the cdm_factory to InitializeCdm() so that we don't need to keep
it.
2, Currently ClearKey is also handled by RenderCdmFactory.
3, In the future, we'll need to be able to create the ClearKey CDM without using
content/. I am not sure what's the best way to do it yet. We can create
AesDecryptor directly, or have a media::CdmFactoryImpl to create AesDecryptor.

[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
           BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupportImpl::OnKeyAdded),
           BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupportImpl::OnKeyError),
           BIND_TO_RENDER_LOOP(&EncryptedMediaPlayerSupportImpl::OnKeyMessage)));
     }
 
     GURL security_origin(frame->document().securityOrigin().toString());
     if (!proxy_decryptor_->InitializeCDM(key_system, security_origin))
@@ skipping 273 matching lines @@
 
   if (web_cdm_) {
     decryptor_ready_cb.Run(web_cdm_->GetDecryptor(), base::Bind(DoNothing));
     return;
   }
 
   decryptor_ready_cb_ = decryptor_ready_cb;
 }
 
 }  // namespace content