Add video decoding methods in Decryptor and add DecryptingVideoDecoder.

webkit/media/crypto/proxy_decryptor.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/crypto/proxy_decryptor.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #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"
 #include "webkit/media/crypto/key_systems.h"
 #include "webkit/media/crypto/ppapi_decryptor.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
 // TODO(xhwang): Put this include after "ppapi_plugin_instance.h" for definition
 // of "uint8_t", which WebMediaPlayer.h uses without including a header for it.
 // See: https://bugs.webkit.org/show_bug.cgi?id=92031
@@ skipping 153 matching lines @@
     std::swap(pending_decrypt_closures_, closures_to_run);
   }
 
   for (std::vector<base::Closure>::iterator iter = closures_to_run.begin();
        iter != closures_to_run.end();
        ++iter) {
     iter->Run();
   }
 }
 
+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_);
   DCHECK(web_media_player_client_);
   DCHECK(web_frame_);
 
   std::string plugin_type = GetPluginType(key_system);
   DCHECK(!plugin_type.empty());
   const scoped_refptr<webkit::ppapi::PluginInstance>& plugin_instance =
     CreatePluginInstance(plugin_type, web_media_player_client_, web_frame_);
@@ skipping 71 matching lines @@
         &ProxyDecryptor::DecryptOnMessageLoop, base::Unretained(this),
         message_loop_proxy, encrypted, decrypt_cb));
   }
   // TODO(xhwang): The same NeedKey may be fired multiple times here and also
   // in Decrypt(). While the spec says only one NeedKey should be fired. Leave
   // them as is since the spec about this may change.
   FireNeedKey(client_, encrypted);
 }
 
 }  // namespace webkit_media