Pepper: Expose visible_rect to PPB_VideoDecoder.GetPicture.

ppapi/proxy/video_decoder_resource.h

 // Copyright (c) 2014 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.
 
 #ifndef PPAPI_PROXY_VIDEO_DECODER_RESOURCE_H_
 #define PPAPI_PROXY_VIDEO_DECODER_RESOURCE_H_
 
 #include <queue>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "ppapi/proxy/connection.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/resource.h"
 #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 {
 class GLES2Implementation;
 }
 }
 
 namespace ppapi {
 
 class PPB_Graphics3D_Shared;
@@ skipping 18 matching lines @@
       PP_Bool allow_software_fallback,
       scoped_refptr<TrackedCallback> callback) override;
   virtual int32_t Initialize(PP_Resource graphics_context,
                              PP_VideoProfile profile,
                              PP_HardwareAcceleration acceleration,
                              scoped_refptr<TrackedCallback> callback) override;
   virtual int32_t Decode(uint32_t decode_id,
                          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;
   virtual int32_t Flush(scoped_refptr<TrackedCallback> callback) override;
   virtual int32_t Reset(scoped_refptr<TrackedCallback> callback) override;
 
   // PluginResource implementation.
   virtual void OnReplyReceived(const ResourceMessageReplyParams& params,
                                const IPC::Message& msg) override;
 
@@ skipping 20 matching lines @@
   struct Texture {
     Texture(uint32_t texture_target, const PP_Size& size);
     ~Texture();
 
     const uint32_t texture_target;
     const PP_Size size;
   };
 
   // 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,
                                   const PP_Size& size,
                                   uint32_t texture_target,
                                   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,
                               int32_t error);
 
   // Reply message handlers for operations that are done in the host.
   void OnPluginMsgInitializeComplete(const ResourceMessageReplyParams& params);
   void OnPluginMsgDecodeComplete(const ResourceMessageReplyParams& params,
                                  uint32_t shm_id);
   void OnPluginMsgFlushComplete(const ResourceMessageReplyParams& params);
   void OnPluginMsgResetComplete(const ResourceMessageReplyParams& params);
 
   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_;
 
   // List of available shared memory buffers.
   typedef std::vector<ShmBuffer*> ShmBufferList;
   ShmBufferList available_shm_buffers_;
 
   // Map of GL texture id to texture info.
   typedef base::hash_map<uint32_t, Texture> TextureMap;
@@ skipping 16 matching lines @@
   // haven't received a picture from a Decode call after this many successive
   // calls to Decode, then we will never receive a picture from the call.
   // Note that this isn't guaranteed by H264 or other codecs. In practice, this
   // number is less than 16. Make it much larger just to be safe.
   // NOTE: because we count decodes mod 2^31, this value must be a power of 2.
   static const int kMaximumPictureDelay = 128;
   uint32_t decode_ids_[kMaximumPictureDelay];
 
   // 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_;
 
   bool initialized_;
   bool testing_;
   int32_t decoder_last_error_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoDecoderResource);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_VIDEO_DECODER_RESOURCE_H_