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

Unified Diff: webkit/media/crypto/proxy_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 | « webkit/media/crypto/proxy_decryptor.h ('k') | webkit/media/filter_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/crypto/proxy_decryptor.cc
diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc
index d48ee85d0b7e92e9edc20f4c6fcaccbbbd435261..9d1d77da6922472ef8abfcc2d61f2276df122026 100644
--- a/webkit/media/crypto/proxy_decryptor.cc
+++ b/webkit/media/crypto/proxy_decryptor.cc
@@ -11,6 +11,8 @@
#include "base/message_loop_proxy.h"
#include "media/base/decoder_buffer.h"
#include "media/base/decryptor_client.h"
+#include "media/base/video_decoder_config.h"
+#include "media/base/video_frame.h"
#include "media/crypto/aes_decryptor.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
@@ -174,6 +176,32 @@ void ProxyDecryptor::CancelDecrypt() {
decryptor_->CancelDecrypt();
}
+void ProxyDecryptor::InitializeVideoDecoder(
+ const media::VideoDecoderConfig& config,
+ const DecoderInitCB& init_cb) {
+ // TODO(xhwang): Implement this!
+ NOTIMPLEMENTED();
+ init_cb.Run(false);
+}
+
+void ProxyDecryptor::DecryptAndDecodeVideo(
+ const scoped_refptr<media::DecoderBuffer>& encrypted,
+ const VideoDecodeCB& video_decode_cb) {
+ // TODO(xhwang): Implement this!
+ NOTIMPLEMENTED();
+ video_decode_cb.Run(kError, NULL);
+}
+
+void ProxyDecryptor::CancelDecryptAndDecodeVideo() {
+ // TODO(xhwang): Implement this!
+ NOTIMPLEMENTED();
+}
+
+void ProxyDecryptor::StopVideoDecoder() {
+ // TODO(xhwang): Implement this!
+ NOTIMPLEMENTED();
+}
+
scoped_ptr<media::Decryptor> ProxyDecryptor::CreatePpapiDecryptor(
const std::string& key_system) {
DCHECK(client_);
« no previous file with comments | « webkit/media/crypto/proxy_decryptor.h ('k') | webkit/media/filter_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698