EME: ProxyDecryptor creates MediaKeys instead of Decryptor.

webkit/renderer/media/crypto/proxy_decryptor.cc

 // Copyright 2013 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 "webkit/renderer/media/crypto/proxy_decryptor.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "media/crypto/aes_decryptor.h"
@@ skipping 52 matching lines @@
       key_error_cb_(key_error_cb),
       key_message_cb_(key_message_cb),
       need_key_cb_(need_key_cb),
       weak_ptr_factory_(this) {
 }
 
 ProxyDecryptor::~ProxyDecryptor() {
   // Destroy the decryptor explicitly before destroying the plugin.
   {
     base::AutoLock auto_lock(lock_);
-    decryptor_.reset();
+    media_keys_.reset();
   }
 }
 
 // TODO(xhwang): Support multiple decryptor notification request (e.g. from
 // video and audio decoders). The current implementation is okay for the current
 // media pipeline since we initialize audio and video decoders in sequence.
 // But ProxyDecryptor should not depend on media pipeline's implementation
 // detail.
 void ProxyDecryptor::SetDecryptorReadyCB(
      const media::DecryptorReadyCB& decryptor_ready_cb) {
   base::AutoLock auto_lock(lock_);
 
   // Cancels the previous decryptor request.
   if (decryptor_ready_cb.is_null()) {
     if (!decryptor_ready_cb_.is_null())
       base::ResetAndReturn(&decryptor_ready_cb_).Run(NULL);
     return;
   }
 
   // Normal decryptor request.
   DCHECK(decryptor_ready_cb_.is_null());
-  if (decryptor_) {
-    decryptor_ready_cb.Run(decryptor_.get());
+  if (media_keys_) {
+    decryptor_ready_cb.Run(media_keys_->GetDecryptor());
     return;
   }
   decryptor_ready_cb_ = decryptor_ready_cb;
 }
 
 bool ProxyDecryptor::GenerateKeyRequest(const std::string& key_system,
                                         const std::string& type,
                                         const uint8* init_data,
                                         int init_data_length) {
   // We do not support run-time switching of decryptors. GenerateKeyRequest()
   // only creates a new decryptor when |decryptor_| is not initialized.
   DVLOG(1) << "GenerateKeyRequest: key_system = " << key_system;
 
   base::AutoLock auto_lock(lock_);
 
-  if (!decryptor_) {
-    decryptor_ = CreateDecryptor(key_system);
-    if (!decryptor_) {
+  if (!media_keys_) {
+    media_keys_ = CreateMediaKeys(key_system);
+    if (!media_keys_) {
       key_error_cb_.Run(
           key_system, std::string(), media::MediaKeys::kClientError, 0);
       return false;
     }
   }
 
-  if (!decryptor_->GetMediaKeys()->GenerateKeyRequest(
+  if (!media_keys_->GenerateKeyRequest(
       key_system, type, init_data, init_data_length)) {
-    decryptor_.reset();
+    media_keys_.reset();
     return false;
   }
 
   if (!decryptor_ready_cb_.is_null())
-    base::ResetAndReturn(&decryptor_ready_cb_).Run(decryptor_.get());
+    base::ResetAndReturn(&decryptor_ready_cb_).Run(media_keys_->GetDecryptor());
 
   return true;
 }
 
 void ProxyDecryptor::AddKey(const std::string& key_system,
                             const uint8* key,
                             int key_length,
                             const uint8* init_data,
                             int init_data_length,
                             const std::string& session_id) {
   DVLOG(1) << "AddKey()";
 
   // WebMediaPlayerImpl ensures GenerateKeyRequest() has been called.
-  decryptor_->GetMediaKeys()->AddKey(
+  media_keys_->AddKey(
       key_system, key, key_length, init_data, init_data_length, session_id);
 }
 
 void ProxyDecryptor::CancelKeyRequest(const std::string& key_system,
                                       const std::string& session_id) {
   DVLOG(1) << "CancelKeyRequest()";
 
   // WebMediaPlayerImpl ensures GenerateKeyRequest() has been called.
-  decryptor_->GetMediaKeys()->CancelKeyRequest(key_system, session_id);
+  media_keys_->CancelKeyRequest(key_system, session_id);
 }
 
 #if defined(ENABLE_PEPPER_CDMS)
-scoped_ptr<media::Decryptor> ProxyDecryptor::CreatePpapiDecryptor(
+scoped_ptr<media::MediaKeys> ProxyDecryptor::CreatePpapiDecryptor(
     const std::string& key_system) {
   DCHECK(web_media_player_client_);
   DCHECK(web_frame_);
 
   std::string plugin_type = GetPepperType(key_system);
   DCHECK(!plugin_type.empty());
   const scoped_refptr<webkit::ppapi::PluginInstance>& plugin_instance =
       CreateHelperPlugin(plugin_type, web_media_player_client_, web_frame_);
   if (!plugin_instance.get()) {
     DVLOG(1) << "ProxyDecryptor: plugin instance creation failed.";
-    return scoped_ptr<media::Decryptor>();
+    return scoped_ptr<media::MediaKeys>();
   }
 
   // The new object will call destroy_plugin_cb to destroy Helper Plugin.
-  return scoped_ptr<media::Decryptor>(new PpapiDecryptor(
+  return scoped_ptr<media::MediaKeys>(new PpapiDecryptor(
       plugin_instance,
       base::Bind(&ProxyDecryptor::KeyAdded, weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&ProxyDecryptor::KeyError, weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&ProxyDecryptor::KeyMessage, weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&ProxyDecryptor::NeedKey, weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&ProxyDecryptor::DestroyHelperPlugin,
                  weak_ptr_factory_.GetWeakPtr())));
 }
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
-scoped_ptr<media::Decryptor> ProxyDecryptor::CreateDecryptor(
+scoped_ptr<media::MediaKeys> ProxyDecryptor::CreateMediaKeys(
     const std::string& key_system) {
   if (CanUseAesDecryptor(key_system))
-    return scoped_ptr<media::Decryptor>(new media::AesDecryptor(
+    return scoped_ptr<media::MediaKeys>(new media::AesDecryptor(
         base::Bind(&ProxyDecryptor::KeyAdded, weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&ProxyDecryptor::KeyError, weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&ProxyDecryptor::KeyMessage, weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&ProxyDecryptor::NeedKey, weak_ptr_factory_.GetWeakPtr())));
 
 #if defined(ENABLE_PEPPER_CDMS)
   // We only support AesDecryptor and PpapiDecryptor. So if we cannot
   // use the AesDecryptor, then we'll try to create a PpapiDecryptor for given
   // |key_system|.
   return CreatePpapiDecryptor(key_system);
 #else
-  return scoped_ptr<media::Decryptor>();
+  return scoped_ptr<media::MediaKeys>();
 #endif  // defined(ENABLE_PEPPER_CDMS)
 }
 
 void ProxyDecryptor::KeyAdded(const std::string& key_system,
                               const std::string& session_id) {
   key_added_cb_.Run(key_system, session_id);
 }
 
 void ProxyDecryptor::KeyError(const std::string& key_system,
                               const std::string& session_id,
@@ skipping 12 matching lines @@
 void ProxyDecryptor::NeedKey(const std::string& key_system,
                              const std::string& session_id,
                              const std::string& type,
                              scoped_ptr<uint8[]> init_data,
                              int init_data_size) {
   need_key_cb_.Run(key_system, session_id, type,
                    init_data.Pass(), init_data_size);
 }
 
 }  // namespace webkit_media