Encrypted Media: Support Audio Decrypt-Only.

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/location.h"
 #include "base/logging.h"
@@ skipping 62 matching lines @@
       is_waiting_for_decryptor_(false),
       is_canceling_decrypt_(false),
       has_new_key_added_(false) {
 }
 
 ProxyDecryptor::~ProxyDecryptor() {
 }
 
 // TODO(xhwang): Support multiple decryptor notification request (e.g. from
 // video and audio decoders).
-void ProxyDecryptor::RequestDecryptorNotification(
-     const DecryptorNotificationCB& decryptor_notification_cb) {
+void ProxyDecryptor::RegisterDecryptorReadyNotification(
+     const media::DecryptorReadyCB& decryptor_ready_cb) {
   base::AutoLock auto_lock(lock_);
 
   // Cancels the previous decryptor request.
-  if (decryptor_notification_cb.is_null()) {
-    if (!decryptor_notification_cb_.is_null())
-      base::ResetAndReturn(&decryptor_notification_cb_).Run(NULL);
+  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_notification_cb_.is_null());
+  DCHECK(decryptor_ready_cb_.is_null());
   if (decryptor_) {
-    decryptor_notification_cb.Run(decryptor_.get());
+    decryptor_ready_cb.Run(decryptor_.get());
     return;
   }
-  decryptor_notification_cb_ = decryptor_notification_cb;
+  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_) {
       client_->KeyError(key_system, "", media::Decryptor::kUnknownError, 0);
       return false;
     }
   }
 
   if (!decryptor_->GenerateKeyRequest(key_system, type,
                                       init_data, init_data_length)) {
     decryptor_.reset();
     return false;
   }
 
-  if (!decryptor_notification_cb_.is_null())
-    base::ResetAndReturn(&decryptor_notification_cb_).Run(decryptor_.get());
+  if (!decryptor_ready_cb_.is_null())
+    base::ResetAndReturn(&decryptor_ready_cb_).Run(decryptor_.get());
 
   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) {
@@ skipping 217 matching lines @@
     return;
   }
 
   // TODO(xhwang): The same NeedKey may be fired multiple times here and also
   // in Decrypt(). While the spec says only one NeedKey should be fired. Leave
   // them as is since the spec about this may change.
   FireNeedKey(client_, pending_buffer_to_decrypt_);
 }
 
 }  // namespace webkit_media