Add video decoding methods in Decryptor and add DecryptingVideoDecoder.

webkit/media/crypto/proxy_decryptor.cc

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..3118e373d76acc1f1e33fca5dfc62acbaf0f7565 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"

[ddorwin, 2012/09/21 00:36:08]

same

[xhwang, 2012/09/25 23:52:32]

same

+#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,28 @@ void ProxyDecryptor::Stop() {
   }
 }
 
+void ProxyDecryptor::InitializeVideoDecoder(
+    const media::VideoDecoderConfig& config,
+    const InitializeCB& init_cb) {
+  NOTIMPLEMENTED();

[ddorwin, 2012/09/21 00:36:08]

Will be implemented or not?

[xhwang, 2012/09/25 23:52:32]

Done.

+  init_cb.Run(false);
+}
+
+void ProxyDecryptor::DecryptAndDecodeVideo(
+    const scoped_refptr<media::DecoderBuffer>& encrypted,
+    const VideoDecodeCB& video_decode_cb) {
+  NOTIMPLEMENTED();
+  video_decode_cb.Run(kError, NULL);
+}
+
+void ProxyDecryptor::ResetVideoDecoder() {
+  NOTIMPLEMENTED();
+}
+
+void ProxyDecryptor::StopVideoDecoder() {
+  NOTIMPLEMENTED();
+}
+
 scoped_ptr<media::Decryptor> ProxyDecryptor::CreatePpapiDecryptor(
     const std::string& key_system) {
   DCHECK(client_);