vaapi plumbing to allow hardware video overlays

content/common/gpu/media/vaapi_picture.h

Index: content/common/gpu/media/vaapi_picture.h
diff --git a/content/common/gpu/media/vaapi_picture.h b/content/common/gpu/media/vaapi_picture.h
index 44d9db733f91097c66a0abfe237483dafc544959..92d719c22ce293e7b796b14a106369d2ecf7db30 100644
--- a/content/common/gpu/media/vaapi_picture.h
+++ b/content/common/gpu/media/vaapi_picture.h
@@ -16,6 +16,10 @@
 #include "base/threading/non_thread_safe.h"
 #include "ui/gfx/geometry/size.h"
 
+namespace gfx {
+class GLImage;
+}
+
 namespace content {
 
 class VASurface;
@@ -32,6 +36,10 @@ class VaapiPicture : public base::NonThreadSafe {
   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.
@@ -55,15 +63,18 @@ class VaapiPicture : public base::NonThreadSafe {
  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);
 };