Separate MediaKeys interface from Decryptor interface.

webkit/media/crypto/proxy_decryptor.cc

 // Copyright (c) 2012 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/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 50 matching lines @@
     const media::KeyErrorCB& key_error_cb,
     const media::KeyMessageCB& key_message_cb,
     const media::NeedKeyCB& need_key_cb)
     : web_media_player_client_(web_media_player_client),
       web_frame_(web_frame),
       did_create_helper_plugin_(false),
       key_added_cb_(key_added_cb),
       key_error_cb_(key_error_cb),
       key_message_cb_(key_message_cb),
       need_key_cb_(need_key_cb),
+      decryptor_(NULL),
       weak_ptr_factory_(this) {
 }
 
 ProxyDecryptor::~ProxyDecryptor() {
   // Destroy the decryptor explicitly before destroying the plugin.
   {
     base::AutoLock auto_lock(lock_);
-    decryptor_.reset();
+    media_keys_.reset();
+    decryptor_ = NULL;
   }
 
 #if defined(ENABLE_PEPPER_CDMS)
   if (did_create_helper_plugin_)
     DestroyHelperPlugin(web_media_player_client_);
 #endif
 
   web_media_player_client_ = NULL;  // We should be done using it now.
 }
 
 // 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());
+    decryptor_ready_cb.Run(decryptor_);
     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_);
 

[ddorwin, 2013/05/24 20:39:12]

We should probably
  DCHECK((media_keys_ == NULL) == (decryptor_ == NULL));
And maybe similar checks at 128 and 134.

[xhwang, 2013/05/24 23:15:56]

This is not necessary now.

-  if (!decryptor_) {
-    decryptor_ = CreateDecryptor(key_system);
-    if (!decryptor_) {
+  if (!media_keys_) {
+    if (!CreateDecryptor(key_system)) {
       key_error_cb_.Run(
-          key_system, std::string(), media::Decryptor::kClientError, 0);
+          key_system, std::string(), media::MediaKeys::kClientError, 0);
       return false;
     }
   }
 
-  if (!decryptor_->GenerateKeyRequest(key_system, type,
-                                      init_data, init_data_length)) {
-    decryptor_.reset();
+  DCHECK(decryptor_);
+
+  if (!media_keys_->GenerateKeyRequest(key_system, type,

[ddorwin, 2013/05/24 20:39:12]

We only use media_keys_ in three places. This class would probably be cleaner if
we had decryptor_ continue to own the object and called decryptor_->media_keys()
in those three locations.

[xhwang, 2013/05/24 23:15:56]

Done.

+                                       init_data, init_data_length)) {
+    media_keys_.reset();
+    decryptor_ = NULL;
     return false;
   }
 
   if (!decryptor_ready_cb_.is_null())
-    base::ResetAndReturn(&decryptor_ready_cb_).Run(decryptor_.get());
+    base::ResetAndReturn(&decryptor_ready_cb_).Run(decryptor_);
 
   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_->AddKey(key_system, key, key_length, init_data, init_data_length,
-                     session_id);
+  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_->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<PpapiDecryptor> 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_);
   did_create_helper_plugin_ = plugin_instance != NULL;
   if (!did_create_helper_plugin_) {
     DVLOG(1) << "ProxyDecryptor: plugin instance creation failed.";
-    return scoped_ptr<media::Decryptor>();
+    return scoped_ptr<PpapiDecryptor>();
   }
 
-  return scoped_ptr<media::Decryptor>(new PpapiDecryptor(
+  return scoped_ptr<PpapiDecryptor>(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())));
 }
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
-scoped_ptr<media::Decryptor> ProxyDecryptor::CreateDecryptor(
-    const std::string& key_system) {
-  if (CanUseAesDecryptor(key_system))
-    return scoped_ptr<media::Decryptor>(new media::AesDecryptor(
+bool ProxyDecryptor::CreateDecryptor(const std::string& key_system) {
+  if (CanUseAesDecryptor(key_system)) {
+    scoped_ptr<media::AesDecryptor> aes_decryptor(new media::AesDecryptor(

[ddorwin, 2013/05/24 20:39:12]

media_keys_ =

[xhwang, 2013/05/24 23:15:56]

This change is reverted.

         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())));
+    decryptor_ = aes_decryptor.get();
+    media_keys_ = aes_decryptor.Pass();
+    return true;
+  }
 
 #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>();
+  scoped_ptr<PpapiDecryptor> ppapi_decryptor = CreatePpapiDecryptor(key_system);

[ddorwin, 2013/05/24 20:39:12]

same

[xhwang, 2013/05/24 23:15:56]

This change is reverted.

+  if (ppapi_decryptor) {
+    decryptor_ = ppapi_decryptor.get();
+    media_keys_ = ppapi_decryptor.Pass();
+    return true;
+  }
 #endif  // defined(ENABLE_PEPPER_CDMS)
+
+  return false;
 }
 
 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,
-                              media::Decryptor::KeyError error_code,
+                              media::MediaKeys::KeyError error_code,
                               int system_code) {
   key_error_cb_.Run(key_system, session_id, error_code, system_code);
 }
 
 void ProxyDecryptor::KeyMessage(const std::string& key_system,
                                 const std::string& session_id,
                                 const std::string& message,
                                 const std::string& default_url) {
   key_message_cb_.Run(key_system, session_id, message, default_url);
 }
 
 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