Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(449)

Unified Diff: media/crypto/aes_decryptor.cc

Issue 10969028: Add video decoding methods in Decryptor and add DecryptingVideoDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reorder methods in the unittest Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/crypto/aes_decryptor.h ('k') | media/filters/decrypting_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_);
« no previous file with comments | « media/crypto/aes_decryptor.h ('k') | media/filters/decrypting_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698