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

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: resolve comments and fix stop-during-pending-init. 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
Index: webkit/media/crypto/proxy_decryptor.cc
diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc
index ce01925ac5960e66d7ce4b0a3aee45d99ca371aa..69210b14dacaa04f3f393ddf40fd241e8c0fee79 100644
--- a/webkit/media/crypto/proxy_decryptor.cc
+++ b/webkit/media/crypto/proxy_decryptor.cc
@@ -12,6 +12,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"
@@ -185,6 +187,32 @@ void ProxyDecryptor::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_);

Powered by Google App Engine
This is Rietveld 408576698