Update Decryptor interface to support audio decoding.

media/crypto/aes_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 MEDIA_CRYPTO_AES_DECRYPTOR_H_
 #define MEDIA_CRYPTO_AES_DECRYPTOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 27 matching lines @@
                                   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,
                       int init_data_length,
                       const std::string& session_id) OVERRIDE;
   virtual void CancelKeyRequest(const std::string& key_system,
                                 const std::string& session_id) OVERRIDE;
-  // Decrypts |encrypted| buffer. |encrypted| should not be NULL. Returns a
-  // DecoderBuffer with the decrypted data if the decryption succeeded through
-  // |decrypt_cb|.
-  virtual void Decrypt(const scoped_refptr<DecoderBuffer>& encrypted,
+  virtual void Decrypt(StreamType stream_type,
+                       const scoped_refptr<DecoderBuffer>& encrypted,
                        const DecryptCB& decrypt_cb) OVERRIDE;
-  virtual void CancelDecrypt() OVERRIDE;
+  virtual void CancelDecrypt(StreamType stream_type) OVERRIDE;
+  virtual void InitializeAudioDecoder(scoped_ptr<AudioDecoderConfig> config,
+                                      const DecoderInitCB& init_cb,
+                                      const KeyAddedCB& key_added_cb) OVERRIDE;
   virtual void InitializeVideoDecoder(scoped_ptr<VideoDecoderConfig> config,
                                       const DecoderInitCB& init_cb,
                                       const KeyAddedCB& key_added_cb) OVERRIDE;
+  virtual void DecryptAndDecodeAudio(
+      const scoped_refptr<DecoderBuffer>& encrypted,
+      const AudioDecodeCB& audio_decode_cb) OVERRIDE;
   virtual void DecryptAndDecodeVideo(
       const scoped_refptr<DecoderBuffer>& encrypted,
       const VideoDecodeCB& video_decode_cb) OVERRIDE;
-  virtual void CancelDecryptAndDecodeVideo() OVERRIDE;
-  virtual void StopVideoDecoder() OVERRIDE;
+  virtual void ResetDecoder(StreamType stream_type) OVERRIDE;
+  virtual void DeinitializeDecoder(StreamType stream_type) OVERRIDE;
 
  private:
   // TODO(fgalligan): Remove this and change KeyMap to use crypto::SymmetricKey
   // as there are no decryptors that are performing an integrity check.
   // Helper class that manages the decryption key.
   class DecryptionKey {
    public:
     explicit DecryptionKey(const std::string& secret);
     ~DecryptionKey();
 
@@ skipping 35 matching lines @@
   static uint32 next_session_id_;
 
   DecryptorClient* const client_;
 
   DISALLOW_COPY_AND_ASSIGN(AesDecryptor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CRYPTO_AES_DECRYPTOR_H_