vaapi plumbing to allow hardware video overlays

content/common/gpu/media/vaapi_picture.h

 // Copyright 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.
 //
 // This file contains an interface of output pictures for the Vaapi
 // video decoder. This is implemented by different window system
 // (X11/Ozone) and used by VaapiVideoDecodeAccelerator to produce
 // output pictures.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_PICTURE_H_
 #define CONTENT_COMMON_GPU_MEDIA_VAAPI_PICTURE_H_
 
 #include "base/callback.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
 #include "ui/gfx/geometry/size.h"
 
+namespace gfx {
+class GLImage;
+}
+
 namespace content {
 
 class VASurface;
 class VaapiWrapper;
 
 // Picture is native pixmap abstraction (X11/Ozone).
 class VaapiPicture : public base::NonThreadSafe {
  public:
   virtual ~VaapiPicture() {}
 
   // Try to allocate the underlying resources for the picture.
   virtual bool Initialize() = 0;
 
   int32 picture_buffer_id() const { return picture_buffer_id_; }
   uint32 texture_id() const { return texture_id_; }
   const gfx::Size& size() const { return size_; }
+  bool allow_overlay() const { return allow_overlay_; }
+
+  // Returns the |GLImage|, if any, to bind to the texture.
+  virtual scoped_refptr<gfx::GLImage> GetImageToBind() = 0;
 
   // Downloads the |va_surface| into the picture, potentially scaling
   // it if needed.
   virtual bool DownloadFromSurface(
       const scoped_refptr<VASurface>& va_surface) = 0;
 
   // Create a VaapiPicture of |size| to be associated with
   // |picture_buffer_id| and bound to |texture_id|.
   // |make_context_current| is provided for the GL operations.
   static linked_ptr<VaapiPicture> CreatePicture(
       VaapiWrapper* vaapi_wrapper,
       const base::Callback<bool(void)> make_context_current,
       int32 picture_buffer_id,
       uint32 texture_id,
       const gfx::Size& size);
 
   // Get the texture target used to bind EGLImages (either
   // GL_TEXTURE_2D on X11 or GL_TEXTURE_EXTERNAL_OES on DRM).
   static uint32 GetGLTextureTarget();
 
  protected:
   VaapiPicture(int32 picture_buffer_id,
                uint32 texture_id,
-               const gfx::Size& size)
+               const gfx::Size& size,
+               bool allow_overlay)

[Pawel Osciak, 2015/01/24 00:58:54]

Could we please get rid of this in favor of a virtual method returning false and
overriden to true in DrmPicture as discussed previously?

[achaulk, 2015/01/27 18:36:48]

Done.

       : picture_buffer_id_(picture_buffer_id),
         texture_id_(texture_id),
-        size_(size) {}
+        size_(size),
+        allow_overlay_(allow_overlay) {}
 
  private:
   int32 picture_buffer_id_;
   uint32 texture_id_;
   gfx::Size size_;
+  bool allow_overlay_;
 
   DISALLOW_COPY_AND_ASSIGN(VaapiPicture);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_PICTURE_H_