Clean up video frame sizes, types in Video Decode API

content/common/gpu/media/omx_video_decode_accelerator.h

 // Copyright (c) 2011 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 CONTENT_COMMON_GPU_MEDIA_OMX_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_OMX_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <dlfcn.h>
 #include <map>
 #include <queue>
@@ skipping 26 matching lines @@
 // that references can be added from any thread (practically used only by the
 // OMX thread).
 class OmxVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
  public:
   // Does not take ownership of |client| which must outlive |*this|.
   OmxVideoDecodeAccelerator(media::VideoDecodeAccelerator::Client* client);
 
   // media::VideoDecodeAccelerator implementation.
   bool Initialize(const std::vector<uint32>& config) OVERRIDE;
   void Decode(const media::BitstreamBuffer& bitstream_buffer) OVERRIDE;
-  virtual void AssignGLESBuffers(
-      const std::vector<media::GLESBuffer>& buffers) OVERRIDE;
+  virtual void AssignPictureBuffers(
+      const std::vector<media::PictureBuffer>& buffers) OVERRIDE;
   void ReusePictureBuffer(int32 picture_buffer_id) OVERRIDE;
   void Flush() OVERRIDE;
   void Reset() OVERRIDE;
   void Destroy() OVERRIDE;
 
   void SetEglState(EGLDisplay egl_display, EGLContext egl_context);
 
  private:
   virtual ~OmxVideoDecodeAccelerator();
 
   // Because OMX state-transitions are described solely by the "state reached"
   // (3.1.2.9.1, table 3-7 of the spec), we track what transition was requested
   // using this enum.  Note that it is an error to request a transition while
   // |*this| is in any state other than NO_TRANSITION.
   enum CurrentStateChange {
     NO_TRANSITION,  // Not in the middle of a transition.
     INITIALIZING,
     FLUSHING,
     RESETTING,
     DESTROYING,
     ERRORING,  // Trumps all other transitions; no recovery is possible.
   };
 
   // Helper struct for keeping track of the relationship between an OMX output
-  // buffer and the GLESBuffer it points to.
+  // buffer and the PictureBuffer it points to.
   struct OutputPicture {
-    OutputPicture(media::GLESBuffer g_b, OMX_BUFFERHEADERTYPE* o_b_h,
+    OutputPicture(media::PictureBuffer p_b, OMX_BUFFERHEADERTYPE* o_b_h,
                   EGLImageKHR e_i)
-        : gles_buffer(g_b), omx_buffer_header(o_b_h),  egl_image(e_i) {}
-    media::GLESBuffer gles_buffer;
+        : picture_buffer(p_b), omx_buffer_header(o_b_h),  egl_image(e_i) {}
+    media::PictureBuffer picture_buffer;
     OMX_BUFFERHEADERTYPE* omx_buffer_header;
     EGLImageKHR egl_image;
   };
   typedef std::map<int32, OutputPicture> OutputPictureById;
 
   // Verify that |config| is compatible with this class and hardware.
   bool VerifyConfigs(const std::vector<uint32>& configs);
 
   MessageLoop* message_loop_;
   OMX_HANDLETYPE component_handle_;
@@ skipping 113 matching lines @@
                                     OMX_PTR event_data);
   static OMX_ERRORTYPE EmptyBufferCallback(OMX_HANDLETYPE component,
                                            OMX_PTR priv_data,
                                            OMX_BUFFERHEADERTYPE* buffer);
   static OMX_ERRORTYPE FillBufferCallback(OMX_HANDLETYPE component,
                                           OMX_PTR priv_data,
                                           OMX_BUFFERHEADERTYPE* buffer);
 };
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_OMX_VIDEO_DECODE_ACCELERATOR_H_