| Index: webkit/media/crypto/proxy_decryptor.cc
|
| diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc
|
| index d48ee85d0b7e92e9edc20f4c6fcaccbbbd435261..9d1d77da6922472ef8abfcc2d61f2276df122026 100644
|
| --- a/webkit/media/crypto/proxy_decryptor.cc
|
| +++ b/webkit/media/crypto/proxy_decryptor.cc
|
| @@ -11,6 +11,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 "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"
|
| @@ -174,6 +176,32 @@ void ProxyDecryptor::CancelDecrypt() {
|
| decryptor_->CancelDecrypt();
|
| }
|
|
|
| +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_);
|
|
|