Remove threading from RendererGpuVideoAcceleratorFactories

content/renderer/media/renderer_gpu_video_accelerator_factories.h

 // Copyright 2013 The Chromium Authors. All rights reserved.

[Ami GONE FROM CHROMIUM, 2013/10/17 22:22:17]

I fail to understand the "proof" in the CL description.  Would you mind
rewriting it?

[sheu, 2013/10/21 05:17:35]

Heh, sure.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
 #define CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ skipping 15 matching lines @@
 class GpuChannelHost;
 class WebGraphicsContext3DCommandBufferImpl;
 
 // Glue code to expose functionality needed by media::GpuVideoAccelerator to
 // RenderViewImpl.  This class is entirely an implementation detail of
 // RenderViewImpl and only has its own header to allow extraction of its
 // implementation from render_view_impl.cc which is already far too large.
 //
 // The public methods of the class can be called from any thread, and are
 // internally trampolined to the appropriate thread.  GPU/GL-related calls go to
 // the constructor-argument loop (the media thread).

[Ami GONE FROM CHROMIUM, 2013/10/17 22:22:17]

Paragraph is a lie.

[sheu, 2013/10/21 05:17:35]

It is now.  FWIW: this CL is based off the previous partial de-threading of the
RGVAF.  The comments are updated in the next version.

 class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories
     : public media::GpuVideoAcceleratorFactories {
  public:
   // Takes a ref on |gpu_channel_host| and tests |context| for loss before each
   // use.
   RendererGpuVideoAcceleratorFactories(
       GpuChannelHost* gpu_channel_host,
       const scoped_refptr<base::MessageLoopProxy>& message_loop,
       const scoped_refptr<ContextProviderCommandBuffer>& context_provider);
 
@@ skipping 12 matching lines @@
                                 std::vector<uint32>* texture_ids,
                                 std::vector<gpu::Mailbox>* texture_mailboxes,
                                 uint32 texture_target) OVERRIDE;
   virtual void DeleteTexture(uint32 texture_id) OVERRIDE;
   virtual void WaitSyncPoint(uint32 sync_point) OVERRIDE;
   virtual void ReadPixels(uint32 texture_id,
                           const gfx::Size& size,
                           const SkBitmap& pixels) OVERRIDE;
   virtual base::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE;
   virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoop() OVERRIDE;
-  virtual void Abort() OVERRIDE;
-  virtual bool IsAborted() OVERRIDE;
-  scoped_refptr<RendererGpuVideoAcceleratorFactories> Clone();
 
  protected:
   friend class base::RefCountedThreadSafe<RendererGpuVideoAcceleratorFactories>;
   virtual ~RendererGpuVideoAcceleratorFactories();
 
  private:
-  RendererGpuVideoAcceleratorFactories();
-
   // Helper to get a pointer to the WebGraphicsContext3DCommandBufferImpl,
   // if it has not been lost yet.
   WebGraphicsContext3DCommandBufferImpl* GetContext3d();
 
   // Helper for the constructor to acquire the ContentGLContext on
   // |message_loop_|.
   void AsyncBindContext();
 
-  // Async versions of the public methods, run on |message_loop_|.
-  // They use output parameters instead of return values and each takes
-  // a WaitableEvent* param to signal completion (except for DeleteTexture,
-  // which is fire-and-forget).
-  // AsyncCreateVideoDecodeAccelerator returns its output in the |vda_| member.
-  void AsyncCreateVideoDecodeAccelerator(
-      media::VideoCodecProfile profile,
-      media::VideoDecodeAccelerator::Client* client);
-  void AsyncReadPixels(uint32 texture_id, const gfx::Size& size);
-  void AsyncDestroyVideoDecodeAccelerator();
+  // Async versions of ReadPixels, run on |message_loop_|.  It uses output
+  // parameters instead of return values and takes a base::WaitableEvent* param
+  // to signal completion.
+  void AsyncReadPixels(uint32 texture_id,
+                       const gfx::Size& size,
+                       const SkBitmap& pixels,
+                       base::WaitableEvent* waiter);
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   scoped_refptr<GpuChannelHost> gpu_channel_host_;
   scoped_refptr<ContextProviderCommandBuffer> context_provider_;
 
   // For sending requests to allocate shared memory in the Browser process.
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
 
-  // This event is signaled if we have been asked to Abort().
-  base::WaitableEvent aborted_waiter_;
-
-  // This event is signaled by asynchronous tasks posted to |message_loop_| to
-  // indicate their completion.
-  // e.g. AsyncCreateVideoDecodeAccelerator()/AsyncCreateTextures() etc.
-  base::WaitableEvent message_loop_async_waiter_;
-
-  // The vda returned by the CreateVideoDecodeAccelerator function.
-  scoped_ptr<media::VideoDecodeAccelerator> vda_;
-
-  // Bitmap returned by ReadPixels().
-  SkBitmap read_pixels_bitmap_;
-
   // Textures returned by the CreateTexture() function.
   std::vector<uint32> created_textures_;
   std::vector<gpu::Mailbox> created_texture_mailboxes_;

[Ami GONE FROM CHROMIUM, 2013/10/17 22:22:17]

Garbage

[sheu, 2013/10/21 05:17:35]

Removed with rebase.

 
   DISALLOW_COPY_AND_ASSIGN(RendererGpuVideoAcceleratorFactories);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_