diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 21:28:28 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 21:28:28 +0000 |
| commit | dd4393148b9bded2cfbc54c2c91f7da5c6450ce0 (patch) | |
| tree | 2db730e0a17dd701b97cf13946fac9588cb3a982 /ppapi/cpp | |
| parent | e1fffb8ef5c80c1f1f6a3e363ef2eca24244a781 (diff) | |
| download | chromium_src-dd4393148b9bded2cfbc54c2c91f7da5c6450ce0.zip chromium_src-dd4393148b9bded2cfbc54c2c91f7da5c6450ce0.tar.gz chromium_src-dd4393148b9bded2cfbc54c2c91f7da5c6450ce0.tar.bz2 | |
Convert video capture/decoder stuff to IDL.
I revved the PPP_VideoDecoder interface since IDL wants to pass PP_Picture_Dev
by pointer instead of by value. This also renames the VIDEO_CAPTURE interface
string/define to VIDEOCAPTURE for consistency (what IDL wants to do).
Review URL: http://codereview.chromium.org/8144008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp')
| -rw-r--r-- | ppapi/cpp/dev/video_capture_dev.cc | 2 | ||||
| -rw-r--r-- | ppapi/cpp/dev/video_decoder_client_dev.cc | 8 | ||||
| -rw-r--r-- | ppapi/cpp/dev/video_decoder_client_dev.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ppapi/cpp/dev/video_capture_dev.cc b/ppapi/cpp/dev/video_capture_dev.cc index 41e36b9..cd2a4b8 100644 --- a/ppapi/cpp/dev/video_capture_dev.cc +++ b/ppapi/cpp/dev/video_capture_dev.cc @@ -15,7 +15,7 @@ namespace pp { namespace { template <> const char* interface_name<PPB_VideoCapture_Dev>() { - return PPB_VIDEO_CAPTURE_DEV_INTERFACE; + return PPB_VIDEOCAPTURE_DEV_INTERFACE; } } // namespace diff --git a/ppapi/cpp/dev/video_decoder_client_dev.cc b/ppapi/cpp/dev/video_decoder_client_dev.cc index d70cff5..6186745 100644 --- a/ppapi/cpp/dev/video_decoder_client_dev.cc +++ b/ppapi/cpp/dev/video_decoder_client_dev.cc @@ -20,13 +20,13 @@ const char kPPPVideoDecoderInterface[] = PPP_VIDEODECODER_DEV_INTERFACE; void ProvidePictureBuffers(PP_Instance instance, PP_Resource decoder, uint32_t req_num_of_bufs, - struct PP_Size dimensions) { + const PP_Size* dimensions) { void* object = pp::Instance::GetPerInstanceObject( instance, kPPPVideoDecoderInterface); if (!object) return; static_cast<VideoDecoderClient_Dev*>(object)->ProvidePictureBuffers( - decoder, req_num_of_bufs, dimensions); + decoder, req_num_of_bufs, *dimensions); } void DismissPictureBuffer(PP_Instance instance, @@ -42,12 +42,12 @@ void DismissPictureBuffer(PP_Instance instance, void PictureReady(PP_Instance instance, PP_Resource decoder, - PP_Picture_Dev picture) { + const PP_Picture_Dev* picture) { void* object = pp::Instance::GetPerInstanceObject( instance, kPPPVideoDecoderInterface); if (!object) return; - static_cast<VideoDecoderClient_Dev*>(object)->PictureReady(decoder, picture); + static_cast<VideoDecoderClient_Dev*>(object)->PictureReady(decoder, *picture); } void EndOfStream(PP_Instance instance, diff --git a/ppapi/cpp/dev/video_decoder_client_dev.h b/ppapi/cpp/dev/video_decoder_client_dev.h index 5249fed..5510b4c 100644 --- a/ppapi/cpp/dev/video_decoder_client_dev.h +++ b/ppapi/cpp/dev/video_decoder_client_dev.h @@ -25,7 +25,7 @@ class VideoDecoderClient_Dev { // Callback to provide buffers for the decoded output pictures. virtual void ProvidePictureBuffers(PP_Resource decoder, uint32_t req_num_of_bufs, - struct PP_Size dimensions) = 0; + const PP_Size& dimensions) = 0; // Callback for decoder to deliver unneeded picture buffers back to the // plugin. |