Update Decryptor interface to support audio decoding.

media/crypto/aes_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 "media/crypto/aes_decryptor.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "crypto/encryptor.h"
 #include "crypto/symmetric_key.h"
+#include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/decryptor_client.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 
 namespace media {
 
 uint32 AesDecryptor::next_session_id_ = 1;
 
@@ skipping 167 matching lines @@
   }
 
   SetKey(key_id_string, decryption_key.Pass());
   client_->KeyAdded(key_system, session_id);
 }
 
 void AesDecryptor::CancelKeyRequest(const std::string& key_system,
                                     const std::string& session_id) {
 }
 
-void AesDecryptor::Decrypt(const scoped_refptr<DecoderBuffer>& encrypted,
+void AesDecryptor::Decrypt(StreamType stream_type,
+                           const scoped_refptr<DecoderBuffer>& encrypted,
                            const DecryptCB& decrypt_cb) {
   CHECK(encrypted->GetDecryptConfig());
   const std::string& key_id = encrypted->GetDecryptConfig()->key_id();
 
   DecryptionKey* key = GetKey(key_id);
   if (!key) {
     DVLOG(1) << "Could not find a matching key for the given key ID.";
     decrypt_cb.Run(kNoKey, NULL);
     return;
   }
@@ skipping 12 matching lines @@
       decrypt_cb.Run(kError, NULL);
       return;
     }
   }
 
   decrypted->SetTimestamp(encrypted->GetTimestamp());
   decrypted->SetDuration(encrypted->GetDuration());
   decrypt_cb.Run(kSuccess, decrypted);
 }
 
-void AesDecryptor::CancelDecrypt() {
+void AesDecryptor::CancelDecrypt(StreamType stream_type) {
+  // Decrypt() calls the DecryptCB synchronously so there's nothing to cancel.
+}
+
+void AesDecryptor::InitializeAudioDecoder(scoped_ptr<AudioDecoderConfig> config,
+                                          const DecoderInitCB& init_cb,
+                                          const KeyAddedCB& key_added_cb) {
+  // AesDecryptor does not support audio decoding.
+  init_cb.Run(false);
 }
 
 void AesDecryptor::InitializeVideoDecoder(scoped_ptr<VideoDecoderConfig> config,
                                           const DecoderInitCB& init_cb,
                                           const KeyAddedCB& key_added_cb) {
   // AesDecryptor does not support video decoding.
   init_cb.Run(false);
 }
 
+void AesDecryptor::DecryptAndDecodeAudio(
+    const scoped_refptr<DecoderBuffer>& encrypted,
+    const AudioDecodeCB& audio_decode_cb) {
+  NOTREACHED() << "AesDecryptor does not support audio decoding";
+}
+
 void AesDecryptor::DecryptAndDecodeVideo(
     const scoped_refptr<DecoderBuffer>& encrypted,
     const VideoDecodeCB& video_decode_cb) {
   NOTREACHED() << "AesDecryptor does not support video decoding";
 }
 
-void AesDecryptor::CancelDecryptAndDecodeVideo() {
-  NOTREACHED() << "AesDecryptor does not support video decoding";
+void AesDecryptor::ResetDecoder(StreamType stream_type) {
+  NOTREACHED() << "AesDecryptor does not support audio/video decoding";
 }
 
-void AesDecryptor::StopVideoDecoder() {
-  NOTREACHED() << "AesDecryptor does not support video decoding";
+void AesDecryptor::DeinitializeDecoder(StreamType stream_type) {
+  NOTREACHED() << "AesDecryptor does not support audio/video decoding";
 }
 
 void AesDecryptor::SetKey(const std::string& key_id,
                           scoped_ptr<DecryptionKey> decryption_key) {
   base::AutoLock auto_lock(key_map_lock_);
   KeyMap::iterator found = key_map_.find(key_id);
   if (found != key_map_.end()) {
     delete found->second;
     key_map_.erase(found);
   }
@@ skipping 19 matching lines @@
 bool AesDecryptor::DecryptionKey::Init() {
   CHECK(!secret_.empty());
   decryption_key_.reset(crypto::SymmetricKey::Import(
       crypto::SymmetricKey::AES, secret_));
   if (!decryption_key_.get())
     return false;
   return true;
 }
 
 }  // namespace media