vaapi plumbing to allow hardware video overlays

content/common/gpu/media/vaapi_video_decode_accelerator.h

Index: content/common/gpu/media/vaapi_video_decode_accelerator.h
diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.h b/content/common/gpu/media/vaapi_video_decode_accelerator.h
index 206999a1db4a3af3ea91bfb74818ef0b1f95f356..f30641a8d748d7080218ec0822bfae2472262ab4 100644
--- a/content/common/gpu/media/vaapi_video_decode_accelerator.h
+++ b/content/common/gpu/media/vaapi_video_decode_accelerator.h
@@ -28,6 +28,12 @@
 #include "media/video/picture.h"
 #include "media/video/video_decode_accelerator.h"
 
+namespace gpu {
+namespace gles2 {
+class TextureManager;
+}
+}
+
 namespace content {
 
 class VaapiPicture;
@@ -44,7 +50,8 @@ class CONTENT_EXPORT VaapiVideoDecodeAccelerator
     : public media::VideoDecodeAccelerator {
  public:
   VaapiVideoDecodeAccelerator(
-      const base::Callback<bool(void)>& make_context_current);
+      const base::Callback<bool(void)>& make_context_current,
+      gpu::gles2::TextureManager* texture_manager);
   virtual ~VaapiVideoDecodeAccelerator();
 
   // media::VideoDecodeAccelerator implementation.
@@ -264,6 +271,8 @@ private:
   size_t requested_num_pics_;
   gfx::Size requested_pic_size_;
 
+  gpu::gles2::TextureManager* texture_manager_;

[alexst (slow to review), 2015/01/19 19:02:17]

Is it safe to cache this here from a lifetime perspective?

[achaulk, 2015/01/19 19:05:49]

It should be. This object is owned by the GpuVideoDecodeAccelerator which in
turn has its lifetime bounded by GpuCommandBufferStub, so when the command
buffer is destroyed this object should also be torn down

+
   // The WeakPtrFactory for |weak_this_|.
   base::WeakPtrFactory<VaapiVideoDecodeAccelerator> weak_this_factory_;