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

Unified Diff: webkit/media/crypto/ppapi_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/ppapi_decryptor.h ('k') | webkit/media/crypto/proxy_decryptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/crypto/ppapi_decryptor.cc
diff --git a/webkit/media/crypto/ppapi_decryptor.cc b/webkit/media/crypto/ppapi_decryptor.cc
index 38b9ed4341a7986605a44d56e53ea12164ba42c1..185a050fb8d426319759cbd60c73f615adf22936 100644
--- a/webkit/media/crypto/ppapi_decryptor.cc
+++ b/webkit/media/crypto/ppapi_decryptor.cc
@@ -13,6 +13,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 "webkit/media/crypto/key_systems.h"
#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
@@ -100,6 +102,32 @@ void PpapiDecryptor::Decrypt(
void PpapiDecryptor::CancelDecrypt() {
}
+void PpapiDecryptor::InitializeVideoDecoder(
+ const media::VideoDecoderConfig& config,
+ const DecoderInitCB& init_cb) {
+ // TODO(xhwang): Implement this!
+ NOTIMPLEMENTED();
+ init_cb.Run(false);
+}
+
+void PpapiDecryptor::DecryptAndDecodeVideo(
+ const scoped_refptr<media::DecoderBuffer>& encrypted,
+ const VideoDecodeCB& video_decode_cb) {
+ // TODO(xhwang): Implement this!
+ NOTIMPLEMENTED();
+ video_decode_cb.Run(kError, NULL);
+}
+
+void PpapiDecryptor::CancelDecryptAndDecodeVideo() {
+ // TODO(xhwang): Implement this!
+ NOTIMPLEMENTED();
+}
+
+void PpapiDecryptor::StopVideoDecoder() {
+ // TODO(xhwang): Implement this!
+ NOTIMPLEMENTED();
+}
+
void PpapiDecryptor::ReportFailureToCallPlugin(const std::string& key_system,
const std::string& session_id) {
DVLOG(1) << "Failed to call plugin.";
« no previous file with comments | « webkit/media/crypto/ppapi_decryptor.h ('k') | webkit/media/crypto/proxy_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698