Index: ppapi/proxy/video_decoder_resource.h |
diff --git a/ppapi/proxy/video_decoder_resource.h b/ppapi/proxy/video_decoder_resource.h |
index 2e4ea6d5875d793f6ad938eff831b155faa71083..7aefcbda52185b8fbe1515b0a26aa08f0c6ea9cd 100644 |
--- a/ppapi/proxy/video_decoder_resource.h |
+++ b/ppapi/proxy/video_decoder_resource.h |
@@ -18,6 +18,8 @@ |
#include "ppapi/shared_impl/scoped_pp_resource.h" |
#include "ppapi/thunk/ppb_video_decoder_api.h" |
+struct PP_Rect; |
+ |
namespace gpu { |
struct Mailbox; |
namespace gles2 { |
@@ -56,6 +58,9 @@ class PPAPI_PROXY_EXPORT VideoDecoderResource |
uint32_t size, |
const void* buffer, |
scoped_refptr<TrackedCallback> callback) override; |
+ virtual int32_t GetPicture0_1( |
+ PP_VideoPicture_0_1* picture, |
+ scoped_refptr<TrackedCallback> callback) override; |
virtual int32_t GetPicture(PP_VideoPicture* picture, |
scoped_refptr<TrackedCallback> callback) override; |
virtual void RecyclePicture(const PP_VideoPicture* picture) override; |
@@ -96,19 +101,16 @@ class PPAPI_PROXY_EXPORT VideoDecoderResource |
// Struct to hold a picture received from the decoder. |
struct Picture { |
- Picture(int32_t decode_id, uint32_t texture_id); |
+ Picture(int32_t decode_id, |
+ uint32_t texture_id, |
+ const PP_Rect& visible_rect); |
~Picture(); |
int32_t decode_id; |
uint32_t texture_id; |
+ PP_Rect visible_rect; |
}; |
- int32_t InitializeInternal(PP_Resource graphics_context, |
- PP_VideoProfile profile, |
- PP_Bool allow_software_fallback, |
- scoped_refptr<TrackedCallback> callback, |
- bool testing); |
- |
// Unsolicited reply message handlers. |
void OnPluginMsgRequestTextures(const ResourceMessageReplyParams& params, |
uint32_t num_textures, |
@@ -117,7 +119,8 @@ class PPAPI_PROXY_EXPORT VideoDecoderResource |
const std::vector<gpu::Mailbox>& mailboxes); |
void OnPluginMsgPictureReady(const ResourceMessageReplyParams& params, |
int32_t decode_id, |
- uint32_t texture_id); |
+ uint32_t texture_id, |
+ const PP_Rect& visible_rect); |
void OnPluginMsgDismissPicture(const ResourceMessageReplyParams& params, |
uint32_t texture_id); |
void OnPluginMsgNotifyError(const ResourceMessageReplyParams& params, |
@@ -132,7 +135,7 @@ class PPAPI_PROXY_EXPORT VideoDecoderResource |
void RunCallbackWithError(scoped_refptr<TrackedCallback>* callback); |
void DeleteGLTexture(uint32_t texture_id); |
- void WriteNextPicture(PP_VideoPicture* picture); |
+ void WriteNextPicture(); |
// ScopedVector to own the shared memory buffers. |
ScopedVector<ShmBuffer> shm_buffers_; |
@@ -169,6 +172,7 @@ class PPAPI_PROXY_EXPORT VideoDecoderResource |
// State for pending get_picture_callback_. |
PP_VideoPicture* get_picture_; |
+ PP_VideoPicture_0_1* get_picture_0_1_; |
ScopedPPResource graphics3d_; |
gpu::gles2::GLES2Implementation* gles2_impl_; |