Index: webkit/media/crypto/proxy_decryptor.cc |
diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc |
index bdbabbf21fe8095577573c9c672870ae281110f3..6509e84bbd44d3e4e8a27c8cfb6db50a54a2b184 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" |
ddorwin
2012/09/26 02:34:27
What is used from this?
|
#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::Stop() { |
} |
} |
+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_); |