VaapiVideoAccelerator: make Vaapi accelerator work with ozone

content/common/gpu/media/rendering_helper.h

 // Copyright (c) 2012 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_RENDERING_HELPER_H_
 #define CONTENT_COMMON_GPU_MEDIA_RENDERING_HELPER_H_
 
 #include <map>
 #include <queue>
 #include <vector>
@@ skipping 45 matching lines @@
   // initialized.
   int warm_up_iterations;
 
   // The desired size of each window. We play each stream in its own window
   // on the screen.
   std::vector<gfx::Size> window_sizes;
 
   // The members below are only used for the thumbnail mode where all frames
   // are rendered in sequence onto one FBO for comparison/verification purposes.
 
+  // Whether any rendering will actually happen.
+  bool suppress_rendering;

[Owen Lin, 2014/11/03 06:59:06]

Remove this ? Rebase conflict ?

[llandwerlin-old, 2014/11/03 09:30:10]

As you suggested in a different comment, I will use the frame_duration_ instead
of this flag.

   // Whether the frames are rendered as scaled thumbnails within a
   // larger FBO that is in turn rendered to the window.
   bool render_as_thumbnails;
   // The size of the FBO containing all visible thumbnails.
   gfx::Size thumbnails_page_size;
   // The size of each thumbnail within the FBO.
   gfx::Size thumbnail_size;
 };
 
 // Creates and draws textures used by the video decoder.
@@ skipping 32 matching lines @@
   // Flushes the pending frames. Notify the rendering_helper there won't be
   // more video frames.
   void Flush(size_t window_id);
 
   // Delete |texture_id|.
   void DeleteTexture(uint32 texture_id);
 
   // Get the platform specific handle to the OpenGL display.
   void* GetGLDisplay();
 
+  // Get the GL context.
+  scoped_refptr<gfx::GLContext> GetGLContext();
+
   // Get the platform specific handle to the OpenGL context.
-  void* GetGLContext();
+  void* GetGLContextHandle();
 
   // Get rendered thumbnails as RGB.
   // Sets alpha_solid to true if the alpha channel is entirely 0xff.
   void GetThumbnailsAsRGB(std::vector<unsigned char>* rgb,
                           bool* alpha_solid,
                           base::WaitableEvent* done);
 
  private:
   struct RenderedVideo {
     // The rect on the screen where the video will be rendered.
@@ skipping 33 matching lines @@
 
   // Render |texture_id| to the current view port of the screen using target
   // |texture_target|.
   void RenderTexture(uint32 texture_target, uint32 texture_id);
 
   base::MessageLoop* message_loop_;
 
   scoped_refptr<gfx::GLContext> gl_context_;
   scoped_refptr<gfx::GLSurface> gl_surface_;
 
+#if defined(USE_OZONE)
+  class StubOzoneDelegate;
+  scoped_ptr<StubOzoneDelegate> platform_window_delegate_;
+#endif
+
   gfx::AcceleratedWidget window_;
 
   gfx::Size screen_size_;
 
   std::vector<RenderedVideo> videos_;
 
   bool render_as_thumbnails_;
   int frame_count_;
   GLuint thumbnails_fbo_id_;
   GLuint thumbnails_texture_id_;
   gfx::Size thumbnails_fbo_size_;
   gfx::Size thumbnail_size_;
   GLuint program_;
   base::TimeDelta frame_duration_;
   base::TimeTicks scheduled_render_time_;
   base::CancelableClosure render_task_;
   base::TimeTicks vsync_timebase_;
   base::TimeDelta vsync_interval_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderingHelper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_RENDERING_HELPER_H_