Add video decoding methods in Decryptor and add DecryptingVideoDecoder.

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/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;
 
 enum ClearBytesBufferSel {
   kSrcContainsClearBytes,
   kDstContainsClearBytes
 };
 
@@ skipping 198 matching lines @@
   }
 
   decrypted->SetTimestamp(encrypted->GetTimestamp());
   decrypted->SetDuration(encrypted->GetDuration());
   decrypt_cb.Run(kSuccess, decrypted);
 }
 
 void AesDecryptor::Stop() {
 }
 
+void AesDecryptor::InitializeVideoDecoder(const VideoDecoderConfig& config,
+                                          const InitializeCB& init_cb) {
+  init_cb.Run(false);

[ddorwin, 2012/09/21 00:36:08]

Why not NOTREACHED();?
If this is used to determine whether this decryptor supports D&D, that might be
worth a comment.

[xhwang, 2012/09/25 23:52:32]

Done.

+}
+
+void AesDecryptor::DecryptAndDecodeVideo(
+    const scoped_refptr<DecoderBuffer>& encrypted,
+    const VideoDecodeCB& video_decode_cb) {
+  NOTREACHED();
+  video_decode_cb.Run(kError, NULL);
+}
+
+void AesDecryptor::ResetVideoDecoder() {
+  NOTREACHED();
+}
+
+void AesDecryptor::StopVideoDecoder() {
+  NOTREACHED();
+}
+
 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);
   }
   key_map_[key_id] = decryption_key.release();
 }
@@ skipping 17 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