Fix webrtc HW encode deadlock scenarios.

content/renderer/media/renderer_gpu_video_accelerator_factories.cc

 // Copyright 2013 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.
 
 #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
 #include "base/bind.h"
 #include "content/child/child_thread.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/ipc/command_buffer_proxy.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 
 namespace content {
 
 RendererGpuVideoAcceleratorFactories::~RendererGpuVideoAcceleratorFactories() {}
 RendererGpuVideoAcceleratorFactories::RendererGpuVideoAcceleratorFactories(
     GpuChannelHost* gpu_channel_host,
     const scoped_refptr<base::MessageLoopProxy>& message_loop,
     WebGraphicsContext3DCommandBufferImpl* context)
     : message_loop_(message_loop),
-      main_message_loop_(base::MessageLoopProxy::current()),
       gpu_channel_host_(gpu_channel_host),
+      thread_safe_sender_(ChildThread::current()->thread_safe_sender()),
       aborted_waiter_(true, false),
-      message_loop_async_waiter_(false, false),
-      render_thread_async_waiter_(false, false) {
+      message_loop_async_waiter_(false, false) {
   // |context| is only required to support HW-accelerated decode.
   if (!context)
     return;
 
   if (message_loop_->BelongsToCurrentThread()) {
     AsyncGetContext(context);
     message_loop_async_waiter_.Reset();
     return;
   }
   // Wait for the context to be acquired.
   message_loop_->PostTask(
       FROM_HERE,
       base::Bind(&RendererGpuVideoAcceleratorFactories::AsyncGetContext,
                  // Unretained to avoid ref/deref'ing |*this|, which is not yet
                  // stored in a scoped_refptr.  Safe because the Wait() below
                  // keeps us alive until this task completes.
                  base::Unretained(this),
                  // OK to pass raw because the pointee is only deleted on the
                  // compositor thread, and only as the result of a PostTask from
                  // the render thread which can only happen after this function
                  // returns, so our PostTask will run first.
                  context));
   message_loop_async_waiter_.Wait();
 }
 
 RendererGpuVideoAcceleratorFactories::RendererGpuVideoAcceleratorFactories()
     : aborted_waiter_(true, false),
-      message_loop_async_waiter_(false, false),
-      render_thread_async_waiter_(false, false) {}
+      message_loop_async_waiter_(false, false) {}
 
 void RendererGpuVideoAcceleratorFactories::AsyncGetContext(
     WebGraphicsContext3DCommandBufferImpl* context) {
   context_ = context->AsWeakPtr();
   if (context_.get()) {
     if (context_->makeContextCurrent()) {
       // Called once per media player, but is a no-op after the first one in
       // each renderer.
       context_->insertEventMarkerEXT("GpuVDAContext3D");
     }
@@ skipping 286 matching lines @@
                     GL_UNSIGNED_BYTE,
                     read_pixels_bitmap_.pixelRef()->pixels());
   gles2->DeleteFramebuffers(1, &fb);
   gles2->DeleteTextures(1, &tmp_texture);
   DCHECK_EQ(gles2->GetError(), static_cast<GLenum>(GL_NO_ERROR));
   message_loop_async_waiter_.Signal();
 }
 
 base::SharedMemory* RendererGpuVideoAcceleratorFactories::CreateSharedMemory(
     size_t size) {
-  if (main_message_loop_->BelongsToCurrentThread()) {
-    return ChildThread::current()->AllocateSharedMemory(size);
-  }
-  main_message_loop_->PostTask(
-      FROM_HERE,
-      base::Bind(&RendererGpuVideoAcceleratorFactories::AsyncCreateSharedMemory,
-                 this,
-                 size));
-
-  base::WaitableEvent* objects[] = {&aborted_waiter_,
-                                    &render_thread_async_waiter_};
-  if (base::WaitableEvent::WaitMany(objects, arraysize(objects)) == 0)
-    return NULL;
-  return shared_memory_segment_.release();
-}
-
-void RendererGpuVideoAcceleratorFactories::AsyncCreateSharedMemory(
-    size_t size) {
-  DCHECK_EQ(base::MessageLoop::current(),
-            ChildThread::current()->message_loop());
-
-  shared_memory_segment_.reset(
-      ChildThread::current()->AllocateSharedMemory(size));
-  render_thread_async_waiter_.Signal();
+  return ChildThread::AllocateSharedMemory(size, thread_safe_sender_.get());
 }
 
 scoped_refptr<base::MessageLoopProxy>
 RendererGpuVideoAcceleratorFactories::GetMessageLoop() {
   return message_loop_;
 }
 
 void RendererGpuVideoAcceleratorFactories::Abort() { aborted_waiter_.Signal(); }
 
 bool RendererGpuVideoAcceleratorFactories::IsAborted() {
   return aborted_waiter_.IsSignaled();
 }
 
 scoped_refptr<RendererGpuVideoAcceleratorFactories>
 RendererGpuVideoAcceleratorFactories::Clone() {
   scoped_refptr<RendererGpuVideoAcceleratorFactories> factories =
       new RendererGpuVideoAcceleratorFactories();
   factories->message_loop_ = message_loop_;
-  factories->main_message_loop_ = main_message_loop_;
   factories->gpu_channel_host_ = gpu_channel_host_;
   factories->context_ = context_;
+  factories->thread_safe_sender_ = thread_safe_sender_;
   return factories;
 }
 
 void
 RendererGpuVideoAcceleratorFactories::AsyncDestroyVideoDecodeAccelerator() {
   // OK to release because Destroy() will delete the VDA instance.
   if (vda_)
     vda_.release()->Destroy();
 }
 
 void
 RendererGpuVideoAcceleratorFactories::AsyncDestroyVideoEncodeAccelerator() {
   // OK to release because Destroy() will delete the VDA instance.
   if (vea_)
     vea_.release()->Destroy();
 }
 
 }  // namespace content