Add video decoding methods in Decryptor and add DecryptingVideoDecoder.

webkit/media/crypto/ppapi_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/ppapi_decryptor.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop.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]

These don't seem necessary.

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

Surprise! After I removed these two everything still build. 

However, VideoDecoderConfig and VideoFrame are all forward declared in header
files. Everything still build because VideoDecoderConfig and VideoFrame are
declared indirectly through "webkit/plugins/ppapi/ppapi_plugin_instance.h".

By IWYU, I think we should include them explicitly.

[ddorwin, 2012/09/26 02:34:27]

We use VideoDecodeCB and DecoderInitCB, but not VideoDecoderConfig (just a const
ref). So, we don't need definitions for everything. I'd have to look at where
those two CB's are defined, though, to see what we need to include.

+#include "media/base/video_frame.h"
 #include "webkit/media/crypto/key_systems.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 namespace webkit_media {
 
 PpapiDecryptor::PpapiDecryptor(
   media::DecryptorClient* client,
   const scoped_refptr<webkit::ppapi::PluginInstance>& plugin_instance)
     : client_(client),
       cdm_plugin_(plugin_instance),
@@ skipping 67 matching lines @@
     return;
   }
 
   if (!cdm_plugin_->Decrypt(encrypted, decrypt_cb))
     decrypt_cb.Run(kError, NULL);
 }
 
 void PpapiDecryptor::Stop() {
 }
 
+void PpapiDecryptor::InitializeVideoDecoder(
+    const media::VideoDecoderConfig& config,
+    const InitializeCB& init_cb) {
+  NOTIMPLEMENTED();

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

TODO(xhwang): Impelement.?
It seems these are intended to be whereas the AesDecryptor ones are not.

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

Added comments.

+  init_cb.Run(false);
+}
+
+void PpapiDecryptor::DecryptAndDecodeVideo(
+    const scoped_refptr<media::DecoderBuffer>& encrypted,
+    const VideoDecodeCB& video_decode_cb) {
+  NOTIMPLEMENTED();
+  video_decode_cb.Run(kError, NULL);
+}
+
+void PpapiDecryptor::ResetVideoDecoder() {
+  NOTIMPLEMENTED();
+}
+
+void PpapiDecryptor::StopVideoDecoder() {
+  NOTIMPLEMENTED();
+}
+
 void PpapiDecryptor::ReportFailureToCallPlugin(const std::string& key_system,
                                                const std::string& session_id) {
   DVLOG(1) << "Failed to call plugin.";
   client_->KeyError(key_system, session_id, kUnknownError, 0);
 }
 
 }  // namespace webkit_media