Adds locks for CommandBufferProxyImpl invalidation

media/gpu/ipc/client/gpu_video_encode_accelerator_host.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 "media/gpu/ipc/client/gpu_video_encode_accelerator_host.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
+#include "media/base/bind_to_current_loop.h"
 #include "media/base/video_frame.h"
 #include "media/gpu/gpu_video_accelerator_util.h"
 #include "media/gpu/ipc/common/media_messages.h"
 #include "media/video/video_encode_accelerator.h"
 
 namespace media {
 
 GpuVideoEncodeAcceleratorHost::GpuVideoEncodeAcceleratorHost(
     gpu::CommandBufferProxyImpl* impl)
     : channel_(impl->channel()),
       encoder_route_id_(MSG_ROUTING_NONE),
       client_(nullptr),
       impl_(impl),
       next_frame_id_(0),
       weak_this_factory_(this) {
   DCHECK(channel_);
   DCHECK(impl_);
   impl_->AddDeletionObserver(this);
+  channel_error_cb_ = media::BindToCurrentLoop(

[danakj, 2017/01/13 18:27:50]

same

[emircan, 2017/01/13 19:08:14]

Done.

+      base::Bind(&GpuVideoEncodeAcceleratorHost::OnChannelError,
+                 weak_this_factory_.GetWeakPtr()));
 }
 
 GpuVideoEncodeAcceleratorHost::~GpuVideoEncodeAcceleratorHost() {
   DCHECK(CalledOnValidThread());
   if (channel_ && encoder_route_id_ != MSG_ROUTING_NONE)
     channel_->RemoveRoute(encoder_route_id_);
+
+  base::AutoLock lock(impl_lock_);
   if (impl_)
     impl_->RemoveDeletionObserver(this);
 }
 
 bool GpuVideoEncodeAcceleratorHost::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(GpuVideoEncodeAcceleratorHost, message)
     IPC_MESSAGE_HANDLER(AcceleratedVideoEncoderHostMsg_RequireBitstreamBuffers,
                         OnRequireBitstreamBuffers)
@@ skipping 31 matching lines @@
 }
 
 bool GpuVideoEncodeAcceleratorHost::Initialize(
     VideoPixelFormat input_format,
     const gfx::Size& input_visible_size,
     VideoCodecProfile output_profile,
     uint32_t initial_bitrate,
     Client* client) {
   DCHECK(CalledOnValidThread());
   client_ = client;
+
+  base::AutoLock lock(impl_lock_);
   if (!impl_) {
     DLOG(ERROR) << "impl_ destroyed";
     return false;
   }
 
   int32_t route_id = channel_->GenerateRouteID();
   channel_->AddRoute(route_id, weak_this_factory_.GetWeakPtr());
 
   CreateVideoEncoderParams params;
   params.input_format = input_format;
@@ skipping 71 matching lines @@
 
 void GpuVideoEncodeAcceleratorHost::Destroy() {
   DCHECK(CalledOnValidThread());
   if (channel_)
     Send(new AcceleratedVideoEncoderMsg_Destroy(encoder_route_id_));
   client_ = nullptr;
   delete this;
 }
 
 void GpuVideoEncodeAcceleratorHost::OnWillDeleteImpl() {
-  DCHECK(CalledOnValidThread());
+  base::AutoLock lock(impl_lock_);
   impl_ = nullptr;
 
   // The gpu::CommandBufferProxyImpl is going away; error out this VEA.
-  OnChannelError();
+  channel_error_cb_.Run();
 }
 
 void GpuVideoEncodeAcceleratorHost::EncodeSharedMemoryFrame(
     const scoped_refptr<VideoFrame>& frame,
     bool force_keyframe) {
   if (!base::SharedMemory::IsHandleValid(frame->shared_memory_handle())) {
     PostNotifyError(FROM_HERE, kPlatformFailureError,
                     "EncodeSharedMemory(): cannot encode frame with invalid "
                     "shared memory handle");
     return;
@@ skipping 97 matching lines @@
   weak_this_factory_.InvalidateWeakPtrs();
 
   // Client::NotifyError() may Destroy() |this|, so calling it needs to be the
   // last thing done on this stack!
   VideoEncodeAccelerator::Client* client = nullptr;
   std::swap(client_, client);
   client->NotifyError(error);
 }
 
 }  // namespace media