| Index: media/crypto/aes_decryptor.cc
|
| diff --git a/media/crypto/aes_decryptor.cc b/media/crypto/aes_decryptor.cc
|
| index df173339fe9a1b41e98c68dde29f4634d683b8f8..5e41ea71a0d402c728601b4b0ceabf93e526ccee 100644
|
| --- a/media/crypto/aes_decryptor.cc
|
| +++ b/media/crypto/aes_decryptor.cc
|
| @@ -14,6 +14,8 @@
|
| #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 {
|
|
|
| @@ -232,6 +234,27 @@ void AesDecryptor::Decrypt(const scoped_refptr<DecoderBuffer>& encrypted,
|
| void AesDecryptor::CancelDecrypt() {
|
| }
|
|
|
| +void AesDecryptor::InitializeVideoDecoder(const VideoDecoderConfig& config,
|
| + const DecoderInitCB& init_cb) {
|
| + // AesDecryptor does not support video decoding. Always return false here.
|
| + init_cb.Run(false);
|
| +}
|
| +
|
| +void AesDecryptor::DecryptAndDecodeVideo(
|
| + const scoped_refptr<DecoderBuffer>& encrypted,
|
| + const VideoDecodeCB& video_decode_cb) {
|
| + NOTREACHED() << "AesDecryptor does not support video decoding";
|
| + video_decode_cb.Run(kError, NULL);
|
| +}
|
| +
|
| +void AesDecryptor::CancelDecryptAndDecodeVideo() {
|
| + NOTREACHED() << "AesDecryptor does not support video decoding";
|
| +}
|
| +
|
| +void AesDecryptor::StopVideoDecoder() {
|
| + NOTREACHED() << "AesDecryptor does not support video decoding";
|
| +}
|
| +
|
| void AesDecryptor::SetKey(const std::string& key_id,
|
| scoped_ptr<DecryptionKey> decryption_key) {
|
| base::AutoLock auto_lock(key_map_lock_);
|
|
|