Encrypted Media: Support Audio Decrypt-Only.

webkit/media/crypto/proxy_decryptor.h

 // 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.
 
 #ifndef WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 #define WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 24 matching lines @@
   ProxyDecryptor(const scoped_refptr<base::MessageLoopProxy>& message_loop,
                  media::DecryptorClient* decryptor_client,
                  WebKit::WebMediaPlayerClient* web_media_player_client,
                  WebKit::WebFrame* web_frame);
   virtual ~ProxyDecryptor();
 
   void set_decryptor_for_testing(scoped_ptr<media::Decryptor> decryptor) {
     decryptor_ = decryptor.Pass();
   }
 
-  // Callback to notify that the decryptor has been created.
-  typedef base::Callback<void(Decryptor*)> DecryptorNotificationCB;
-
-  // Requests the ProxyDecryptor to notify the decryptor creation through the
-  // |decryptor_notification_cb| provided.
-  // If |decryptor_notification_cb| is null, the ProxyDecryptor should cancel
-  // the existing request and fire it with NULL immediately.
-  void RequestDecryptorNotification(
-      const DecryptorNotificationCB& decryptor_notification_cb);
+  // Requests the ProxyDecryptor to notify the decryptor when it's ready through
+  // the |decryptor_ready_cb| provided.
+  // If |decryptor_ready_cb| is null, the ProxyDecryptor should cancel the
+  // existing request and fire it with NULL immediately.
+  void RegisterDecryptorReadyNotification(

[ddorwin, 2012/12/13 05:08:25]

I thought we were using "Set".

+      const media::DecryptorReadyCB& decryptor_ready_cb);
 
   // media::Decryptor implementation.
   virtual bool GenerateKeyRequest(const std::string& key_system,
                                   const std::string& type,
                                   const uint8* init_data,
                                   int init_data_length) OVERRIDE;
   virtual void AddKey(const std::string& key_system,
                       const uint8* key,
                       int key_length,
                       const uint8* init_data,
@@ skipping 46 matching lines @@
   media::DecryptorClient* client_;
 
   // Needed to create the PpapiDecryptor.
   WebKit::WebMediaPlayerClient* web_media_player_client_;
   WebKit::WebFrame* web_frame_;
 
   // Protects the |decryptor_|. Note that |decryptor_| itself should be thread
   // safe as per the Decryptor interface.
   base::Lock lock_;
 
-  DecryptorNotificationCB decryptor_notification_cb_;
+  media::DecryptorReadyCB decryptor_ready_cb_;
 
   // The real decryptor that does decryption for the ProxyDecryptor.
   // This pointer is protected by the |lock_|.
   scoped_ptr<media::Decryptor> decryptor_;
 
   // These two variables should be set whenever the ProxyDecryptor owes a
   // pending DecryptCB to the caller (e.g. the decoder).
   // TODO(xhwang): Here and below, it seems we have too many state variables
   // to track. Use a state enum instead!
   scoped_refptr<media::DecoderBuffer> pending_buffer_to_decrypt_;
@@ skipping 15 matching lines @@
   // the |pending_buffer_to_decrypt_| again if kNoKey is returned because a
   // new key has been added.
   bool has_new_key_added_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_