diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-28 21:28:46 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-28 21:28:46 +0000 |
| commit | d213ab5841654a50dfb9f90a271a451fef3457cf (patch) | |
| tree | 424ab5edbfbd66c4f662ccc769d8ba0f6802293a /chrome/renderer/pepper_plugin_delegate_impl.cc | |
| parent | 1bf58e1635c6225aba534e7b0c1fb5cac0b0b3ec (diff) | |
| download | chromium_src-d213ab5841654a50dfb9f90a271a451fef3457cf.zip chromium_src-d213ab5841654a50dfb9f90a271a451fef3457cf.tar.gz chromium_src-d213ab5841654a50dfb9f90a271a451fef3457cf.tar.bz2 | |
Pull latest Pepper to get moved audio, video, and char set interfaces, now
called "dev." This also marks un-flaky the image data test which I think I
fixed.
BUG=51344
TEST=covered by unit tests
Review URL: http://codereview.chromium.org/3243007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/pepper_plugin_delegate_impl.cc')
| -rw-r--r-- | chrome/renderer/pepper_plugin_delegate_impl.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/chrome/renderer/pepper_plugin_delegate_impl.cc index e56e873..8ccaed4 100644 --- a/chrome/renderer/pepper_plugin_delegate_impl.cc +++ b/chrome/renderer/pepper_plugin_delegate_impl.cc @@ -14,6 +14,7 @@ #include "chrome/renderer/command_buffer_proxy.h" #include "chrome/renderer/render_view.h" #include "chrome/renderer/webplugin_delegate_proxy.h" +#include "third_party/ppapi/c/dev/pp_video_dev.h" #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserCompletion.h" #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserParams.h" #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h" @@ -394,7 +395,7 @@ class PlatformVideoDecoderImpl memset(&flush_callback_, 0, sizeof(flush_callback_)); } - virtual bool Init(const PP_VideoDecoderConfig& decoder_config) { + virtual bool Init(const PP_VideoDecoderConfig_Dev& decoder_config) { decoder_config_ = decoder_config; input_buffer_size_ = 1024 << 4; @@ -409,7 +410,7 @@ class PlatformVideoDecoderImpl return true; } - virtual bool Decode(PP_VideoCompressedDataBuffer& input_buffer) { + virtual bool Decode(PP_VideoCompressedDataBuffer_Dev& input_buffer) { // TODO(wjia): Implement me! NOTIMPLEMENTED(); @@ -436,7 +437,7 @@ class PlatformVideoDecoderImpl } virtual bool ReturnUncompressedDataBuffer( - PP_VideoUncompressedDataBuffer& buffer) { + PP_VideoUncompressedDataBuffer_Dev& buffer) { // TODO(wjia): Implement me! NOTIMPLEMENTED(); @@ -461,8 +462,8 @@ class PlatformVideoDecoderImpl size_t input_buffer_size_; int next_dib_id_; scoped_ptr<TransportDIB> dib_; - PP_VideoDecoderConfig decoder_config_; - std::queue<PP_VideoCompressedDataBuffer*> input_buffers_; + PP_VideoDecoderConfig_Dev decoder_config_; + std::queue<PP_VideoCompressedDataBuffer_Dev*> input_buffers_; PP_CompletionCallback flush_callback_; DISALLOW_COPY_AND_ASSIGN(PlatformVideoDecoderImpl); @@ -570,7 +571,7 @@ pepper::PluginDelegate::PlatformContext3D* pepper::PluginDelegate::PlatformVideoDecoder* PepperPluginDelegateImpl::CreateVideoDecoder( - const PP_VideoDecoderConfig& decoder_config) { + const PP_VideoDecoderConfig_Dev& decoder_config) { scoped_ptr<PlatformVideoDecoderImpl> decoder(new PlatformVideoDecoderImpl()); if (!decoder->Init(decoder_config)) |