Remove calls to MessageLoop::current() in media.

media/gpu/vaapi_video_decode_accelerator.cc

 // 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.
 
 #include "media/gpu/vaapi_video_decode_accelerator.h"
 
 #include <string.h>
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "gpu/ipc/service/gpu_channel.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/gpu/accelerated_video_decoder.h"
 #include "media/gpu/h264_decoder.h"
 #include "media/gpu/vaapi_picture.h"
 #include "media/gpu/vp8_decoder.h"
 #include "media/gpu/vp9_decoder.h"
 #include "media/video/picture.h"
 #include "third_party/libva/va/va_dec_vp8.h"
@@ skipping 230 matching lines @@
   VaapiVideoDecodeAccelerator* vaapi_dec_;
 
   DISALLOW_COPY_AND_ASSIGN(VaapiVP9Accelerator);
 };
 
 VaapiVideoDecodeAccelerator::InputBuffer::InputBuffer() : id(0) {}
 
 VaapiVideoDecodeAccelerator::InputBuffer::~InputBuffer() {}
 
 void VaapiVideoDecodeAccelerator::NotifyError(Error error) {
-  if (message_loop_ != base::MessageLoop::current()) {
+  if (!task_runner_->BelongsToCurrentThread()) {
     DCHECK(decoder_thread_task_runner_->BelongsToCurrentThread());
-    message_loop_->PostTask(
-        FROM_HERE, base::Bind(&VaapiVideoDecodeAccelerator::NotifyError,
-                              weak_this_, error));
+    task_runner_->PostTask(FROM_HERE,
+                           base::Bind(&VaapiVideoDecodeAccelerator::NotifyError,
+                                      weak_this_, error));
     return;
   }
 
   // Post Cleanup() as a task so we don't recursively acquire lock_.
-  message_loop_->PostTask(
+  task_runner_->PostTask(
       FROM_HERE, base::Bind(&VaapiVideoDecodeAccelerator::Cleanup, weak_this_));
 
   LOG(ERROR) << "Notifying of error " << error;
   if (client_) {
     client_->NotifyError(error);
     client_ptr_factory_.reset();
   }
 }
 
 VaapiPicture* VaapiVideoDecodeAccelerator::PictureById(
     int32_t picture_buffer_id) {
   Pictures::iterator it = pictures_.find(picture_buffer_id);
   if (it == pictures_.end()) {
     LOG(ERROR) << "Picture id " << picture_buffer_id << " does not exist";
     return NULL;
   }
 
   return it->second.get();
 }
 
 VaapiVideoDecodeAccelerator::VaapiVideoDecodeAccelerator(
     const MakeGLContextCurrentCallback& make_context_current_cb,
     const BindGLImageCallback& bind_image_cb)
     : state_(kUninitialized),
       input_ready_(&lock_),
       surfaces_available_(&lock_),
-      message_loop_(base::MessageLoop::current()),
+      task_runner_(base::ThreadTaskRunnerHandle::Get()),
       decoder_thread_("VaapiDecoderThread"),
       num_frames_at_client_(0),
       num_stream_bufs_at_decoder_(0),
       finish_flush_pending_(false),
       awaiting_va_surfaces_recycle_(false),
       requested_num_pics_(0),
       make_context_current_cb_(make_context_current_cb),
       bind_image_cb_(bind_image_cb),
       weak_this_factory_(this) {
   weak_this_ = weak_this_factory_.GetWeakPtr();
   va_surface_release_cb_ = BindToCurrentLoop(
       base::Bind(&VaapiVideoDecodeAccelerator::RecycleVASurfaceID, weak_this_));
 }
 
 VaapiVideoDecodeAccelerator::~VaapiVideoDecodeAccelerator() {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
 }
 
 bool VaapiVideoDecodeAccelerator::Initialize(const Config& config,
                                              Client* client) {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
 
   if (config.is_encrypted) {
     NOTREACHED() << "Encrypted streams are not supported for this VDA";
     return false;
   }
 
   if (config.output_mode != Config::OutputMode::ALLOCATE &&
       config.output_mode != Config::OutputMode::IMPORT) {
     NOTREACHED() << "Only ALLOCATE and IMPORT OutputModes are supported";
   }
@@ skipping 49 matching lines @@
 
   state_ = kIdle;
   output_mode_ = config.output_mode;
   return true;
 }
 
 void VaapiVideoDecodeAccelerator::OutputPicture(
     const scoped_refptr<VASurface>& va_surface,
     int32_t input_id,
     VaapiPicture* picture) {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())

[chcunningham, 2016/06/21 21:29:59]

Missing semicolons

[fdoray, 2016/06/29 15:44:31]

Done.

 
   int32_t output_id = picture->picture_buffer_id();
 
   TRACE_EVENT2("Video Decoder", "VAVDA::OutputSurface", "input_id", input_id,
                "output_id", output_id);
 
   DVLOG(3) << "Outputting VASurface " << va_surface->id()
            << " into pixmap bound to picture buffer id " << output_id;
 
   RETURN_AND_NOTIFY_ON_FAILURE(picture->DownloadFromSurface(va_surface),
                                "Failed putting surface into pixmap",
                                PLATFORM_FAILURE, );
 
   // Notify the client a picture is ready to be displayed.
   ++num_frames_at_client_;
   TRACE_COUNTER1("Video Decoder", "Textures at client", num_frames_at_client_);
   DVLOG(4) << "Notifying output picture id " << output_id
            << " for input " << input_id << " is ready";
   // TODO(posciak): Use visible size from decoder here instead
   // (crbug.com/402760). Passing (0, 0) results in the client using the
   // visible size extracted from the container instead.
   if (client_)
     client_->PictureReady(
         Picture(output_id, input_id, gfx::Rect(0, 0), picture->AllowOverlay()));
 }
 
 void VaapiVideoDecodeAccelerator::TryOutputSurface() {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
 
   // Handle Destroy() arriving while pictures are queued for output.
   if (!client_)
     return;
 
   if (pending_output_cbs_.empty() || output_buffers_.empty())
     return;
 
   OutputCB output_cb = pending_output_cbs_.front();
   pending_output_cbs_.pop();
 
   VaapiPicture* picture = PictureById(output_buffers_.front());
   DCHECK(picture);
   output_buffers_.pop();
 
   output_cb.Run(picture);
 
   if (finish_flush_pending_ && pending_output_cbs_.empty())
     FinishFlush();
 }
 
 void VaapiVideoDecodeAccelerator::MapAndQueueNewInputBuffer(
     const BitstreamBuffer& bitstream_buffer) {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
   TRACE_EVENT1("Video Decoder", "MapAndQueueNewInputBuffer", "input_id",
                bitstream_buffer.id());
 
   DVLOG(4) << "Mapping new input buffer id: " << bitstream_buffer.id()
            << " size: " << (int)bitstream_buffer.size();
 
   std::unique_ptr<SharedMemoryRegion> shm(
       new SharedMemoryRegion(bitstream_buffer, true));
 
   // Skip empty buffers.
@@ skipping 66 matching lines @@
 }
 
 void VaapiVideoDecodeAccelerator::ReturnCurrInputBuffer_Locked() {
   lock_.AssertAcquired();
   DCHECK(decoder_thread_task_runner_->BelongsToCurrentThread());
   DCHECK(curr_input_buffer_.get());
 
   int32_t id = curr_input_buffer_->id;
   curr_input_buffer_.reset();
   DVLOG(4) << "End of input buffer " << id;
-  message_loop_->PostTask(
+  task_runner_->PostTask(
       FROM_HERE, base::Bind(&Client::NotifyEndOfBitstreamBuffer, client_, id));
 
   --num_stream_bufs_at_decoder_;
   TRACE_COUNTER1("Video Decoder", "Stream buffers at decoder",
                  num_stream_bufs_at_decoder_);
 }
 
 // TODO(posciak): refactor the whole class to remove sleeping in wait for
 // surfaces, and reschedule DecodeTask instead.
 bool VaapiVideoDecodeAccelerator::WaitForSurfaces_Locked() {
@@ skipping 34 matching lines @@
       // This is the main decode function of the decoder and while keeping
       // the lock for its duration would be fine, it would defeat the purpose
       // of having a separate decoder thread.
       base::AutoUnlock auto_unlock(lock_);
       res = decoder_->Decode();
     }
 
     switch (res) {
       case AcceleratedVideoDecoder::kAllocateNewSurfaces:
         DVLOG(1) << "Decoder requesting a new set of surfaces";
-        message_loop_->PostTask(
+        task_runner_->PostTask(
             FROM_HERE,
             base::Bind(&VaapiVideoDecodeAccelerator::InitiateSurfaceSetChange,
                        weak_this_, decoder_->GetRequiredNumOfPictures(),
                        decoder_->GetPicSize()));
         // We'll get rescheduled once ProvidePictureBuffers() finishes.
         return;
 
       case AcceleratedVideoDecoder::kRanOutOfStreamData:
         ReturnCurrInputBuffer_Locked();
         break;
 
       case AcceleratedVideoDecoder::kRanOutOfSurfaces:
         // No more output buffers in the decoder, try getting more or go to
         // sleep waiting for them.
         if (!WaitForSurfaces_Locked())
           return;
 
         break;
 
       case AcceleratedVideoDecoder::kDecodeError:
         RETURN_AND_NOTIFY_ON_FAILURE(false, "Error decoding stream",
                                      PLATFORM_FAILURE, );
         return;
     }
   }
 }
 
 void VaapiVideoDecodeAccelerator::InitiateSurfaceSetChange(size_t num_pics,
                                                            gfx::Size size) {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
   DCHECK(!awaiting_va_surfaces_recycle_);
 
   // At this point decoder has stopped running and has already posted onto our
   // loop any remaining output request callbacks, which executed before we got
   // here. Some of them might have been pended though, because we might not
   // have had enough TFPictures to output surfaces to. Initiate a wait cycle,
   // which will wait for client to return enough PictureBuffers to us, so that
   // we can finish all pending output callbacks, releasing associated surfaces.
   DVLOG(1) << "Initiating surface set change";
   awaiting_va_surfaces_recycle_ = true;
@@ skipping 10 matching lines @@
     case gfx::BufferFormat::BGRA_8888:
       return PIXEL_FORMAT_ARGB;
 
     default:
       LOG(FATAL) << "Add more cases as needed";
       return PIXEL_FORMAT_UNKNOWN;
   }
 }
 
 void VaapiVideoDecodeAccelerator::TryFinishSurfaceSetChange() {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
 
   if (!awaiting_va_surfaces_recycle_)
     return;
 
   if (!pending_output_cbs_.empty() ||
       pictures_.size() != available_va_surfaces_.size()) {
     // Either:
     // 1. Not all pending pending output callbacks have been executed yet.
     // Wait for the client to return enough pictures and retry later.
     // 2. The above happened and all surface release callbacks have been posted
     // as the result, but not all have executed yet. Post ourselves after them
     // to let them release surfaces.
     DVLOG(2) << "Awaiting pending output/surface release callbacks to finish";
-    message_loop_->PostTask(
+    task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&VaapiVideoDecodeAccelerator::TryFinishSurfaceSetChange,
                    weak_this_));
     return;
   }
 
   // All surfaces released, destroy them and dismiss all PictureBuffers.
   awaiting_va_surfaces_recycle_ = false;
   available_va_surfaces_.clear();
   vaapi_wrapper_->DestroySurfaces();
 
   for (Pictures::iterator iter = pictures_.begin(); iter != pictures_.end();
        ++iter) {
     DVLOG(2) << "Dismissing picture id: " << iter->first;
     if (client_)
       client_->DismissPictureBuffer(iter->first);
   }
   pictures_.clear();
 
   // And ask for a new set as requested.
   DVLOG(1) << "Requesting " << requested_num_pics_
            << " pictures of size: " << requested_pic_size_.ToString();
 
   VideoPixelFormat format =
       BufferFormatToVideoPixelFormat(kOutputPictureFormat);
-  message_loop_->PostTask(
+  task_runner_->PostTask(
       FROM_HERE, base::Bind(&Client::ProvidePictureBuffers, client_,
                             requested_num_pics_, format, 1, requested_pic_size_,
                             VaapiPicture::GetGLTextureTarget()));
 }
 
 void VaapiVideoDecodeAccelerator::Decode(
     const BitstreamBuffer& bitstream_buffer) {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
 
   TRACE_EVENT1("Video Decoder", "VAVDA::Decode", "Buffer id",
                bitstream_buffer.id());
 
   if (bitstream_buffer.id() < 0) {
     if (base::SharedMemory::IsHandleValid(bitstream_buffer.handle()))
       base::SharedMemory::CloseHandle(bitstream_buffer.handle());
     LOG(ERROR) << "Invalid bitstream_buffer, id: " << bitstream_buffer.id();
     NotifyError(INVALID_ARGUMENT);
     return;
@@ skipping 22 matching lines @@
     default:
       RETURN_AND_NOTIFY_ON_FAILURE(
           false, "Decode request from client in invalid state: " << state_,
           PLATFORM_FAILURE, );
       break;
   }
 }
 
 void VaapiVideoDecodeAccelerator::RecycleVASurfaceID(
     VASurfaceID va_surface_id) {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
   base::AutoLock auto_lock(lock_);
 
   available_va_surfaces_.push_back(va_surface_id);
   surfaces_available_.Signal();
 }
 
 void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
     const std::vector<PictureBuffer>& buffers) {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
 
   base::AutoLock auto_lock(lock_);
   DCHECK(pictures_.empty());
 
   while (!output_buffers_.empty())
     output_buffers_.pop();
 
   RETURN_AND_NOTIFY_ON_FAILURE(
       buffers.size() >= requested_num_pics_,
       "Got an invalid number of picture buffers. (Got " << buffers.size()
@@ skipping 47 matching lines @@
   for (const auto& fd : handle.native_pixmap_handle.fds) {
     // Close the fd by wrapping it in a ScopedFD and letting
     // it fall out of scope.
     base::ScopedFD scoped_fd(fd.fd);
   }
 }
 
 void VaapiVideoDecodeAccelerator::ImportBufferForPicture(
     int32_t picture_buffer_id,
     const gfx::GpuMemoryBufferHandle& gpu_memory_buffer_handle) {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
   DVLOG(2) << "Importing picture id: " << picture_buffer_id;
 
   if (output_mode_ != Config::OutputMode::IMPORT) {
     CloseGpuMemoryBufferHandle(gpu_memory_buffer_handle);
     LOG(ERROR) << "Cannot import in non-import mode";
     NotifyError(INVALID_ARGUMENT);
     return;
   }
 
   if (gpu_memory_buffer_handle.native_pixmap_handle.fds.size() != 1) {
@@ skipping 19 matching lines @@
     NotifyError(PLATFORM_FAILURE);
     return;
   }
 
   ReusePictureBuffer(picture_buffer_id);
 }
 #endif
 
 void VaapiVideoDecodeAccelerator::ReusePictureBuffer(
     int32_t picture_buffer_id) {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
   TRACE_EVENT1("Video Decoder", "VAVDA::ReusePictureBuffer", "Picture id",
                picture_buffer_id);
 
   --num_frames_at_client_;
   TRACE_COUNTER1("Video Decoder", "Textures at client", num_frames_at_client_);
 
   output_buffers_.push(picture_buffer_id);
   TryOutputSurface();
 }
 
 void VaapiVideoDecodeAccelerator::FlushTask() {
   DCHECK(decoder_thread_task_runner_->BelongsToCurrentThread());
   DVLOG(1) << "Flush task";
 
   // First flush all the pictures that haven't been outputted, notifying the
   // client to output them.
   bool res = decoder_->Flush();
   RETURN_AND_NOTIFY_ON_FAILURE(res, "Failed flushing the decoder.",
                                PLATFORM_FAILURE, );
 
   // Put the decoder in idle state, ready to resume.
   decoder_->Reset();
 
-  message_loop_->PostTask(
+  task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&VaapiVideoDecodeAccelerator::FinishFlush, weak_this_));
 }
 
 void VaapiVideoDecodeAccelerator::Flush() {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
   DVLOG(1) << "Got flush request";
 
   base::AutoLock auto_lock(lock_);
   state_ = kFlushing;
   // Queue a flush task after all existing decoding tasks to clean up.
   decoder_thread_task_runner_->PostTask(
       FROM_HERE, base::Bind(&VaapiVideoDecodeAccelerator::FlushTask,
                             base::Unretained(this)));
 
   input_ready_.Signal();
   surfaces_available_.Signal();
 }
 
 void VaapiVideoDecodeAccelerator::FinishFlush() {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
 
   finish_flush_pending_ = false;
 
   base::AutoLock auto_lock(lock_);
   if (state_ != kFlushing) {
     DCHECK_EQ(state_, kDestroying);
     return;  // We could've gotten destroyed already.
   }
 
   // Still waiting for textures from client to finish outputting all pending
   // frames. Try again later.
   if (!pending_output_cbs_.empty()) {
     finish_flush_pending_ = true;
     return;
   }
 
   state_ = kIdle;
 
-  message_loop_->PostTask(FROM_HERE,
-                          base::Bind(&Client::NotifyFlushDone, client_));
+  task_runner_->PostTask(FROM_HERE,
+                         base::Bind(&Client::NotifyFlushDone, client_));
 
   DVLOG(1) << "Flush finished";
 }
 
 void VaapiVideoDecodeAccelerator::ResetTask() {
   DCHECK(decoder_thread_task_runner_->BelongsToCurrentThread());
   DVLOG(1) << "ResetTask";
 
   // All the decoding tasks from before the reset request from client are done
   // by now, as this task was scheduled after them and client is expected not
   // to call Decode() after Reset() and before NotifyResetDone.
   decoder_->Reset();
 
   base::AutoLock auto_lock(lock_);
 
   // Return current input buffer, if present.
   if (curr_input_buffer_.get())
     ReturnCurrInputBuffer_Locked();
 
   // And let client know that we are done with reset.
-  message_loop_->PostTask(
+  task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&VaapiVideoDecodeAccelerator::FinishReset, weak_this_));
 }
 
 void VaapiVideoDecodeAccelerator::Reset() {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
   DVLOG(1) << "Got reset request";
 
   // This will make any new decode tasks exit early.
   base::AutoLock auto_lock(lock_);
   state_ = kResetting;
   finish_flush_pending_ = false;
 
   // Drop all remaining input buffers, if present.
   while (!input_buffers_.empty()) {
-    message_loop_->PostTask(
+    task_runner_->PostTask(
         FROM_HERE, base::Bind(&Client::NotifyEndOfBitstreamBuffer, client_,
                               input_buffers_.front()->id));
     input_buffers_.pop();
   }
 
   decoder_thread_task_runner_->PostTask(
       FROM_HERE, base::Bind(&VaapiVideoDecodeAccelerator::ResetTask,
                             base::Unretained(this)));
 
   input_ready_.Signal();
   surfaces_available_.Signal();
 }
 
 void VaapiVideoDecodeAccelerator::FinishReset() {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
   DVLOG(1) << "FinishReset";
   base::AutoLock auto_lock(lock_);
 
   if (state_ != kResetting) {
     DCHECK(state_ == kDestroying || state_ == kUninitialized) << state_;
     return;  // We could've gotten destroyed already.
   }
 
   // Drop pending outputs.
   while (!pending_output_cbs_.empty())
     pending_output_cbs_.pop();
 
   if (awaiting_va_surfaces_recycle_) {
     // Decoder requested a new surface set while we were waiting for it to
     // finish the last DecodeTask, running at the time of Reset().
     // Let the surface set change finish first before resetting.
-    message_loop_->PostTask(
+    task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&VaapiVideoDecodeAccelerator::FinishReset, weak_this_));
     return;
   }
 
   num_stream_bufs_at_decoder_ = 0;
   state_ = kIdle;
 
-  message_loop_->PostTask(FROM_HERE,
-                          base::Bind(&Client::NotifyResetDone, client_));
+  task_runner_->PostTask(FROM_HERE,
+                         base::Bind(&Client::NotifyResetDone, client_));
 
   // The client might have given us new buffers via Decode() while we were
   // resetting and might be waiting for our move, and not call Decode() anymore
   // until we return something. Post a DecodeTask() so that we won't
   // sleep forever waiting for Decode() in that case. Having two of them
   // in the pipe is harmless, the additional one will return as soon as it sees
   // that we are back in kDecoding state.
   if (!input_buffers_.empty()) {
     state_ = kDecoding;
     decoder_thread_task_runner_->PostTask(
         FROM_HERE, base::Bind(&VaapiVideoDecodeAccelerator::DecodeTask,
                               base::Unretained(this)));
   }
 
   DVLOG(1) << "Reset finished";
 }
 
 void VaapiVideoDecodeAccelerator::Cleanup() {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
 
   base::AutoLock auto_lock(lock_);
   if (state_ == kUninitialized || state_ == kDestroying)
     return;
 
   DVLOG(1) << "Destroying VAVDA";
   state_ = kDestroying;
 
   client_ptr_factory_.reset();
   weak_this_factory_.InvalidateWeakPtrs();
 
   // Signal all potential waiters on the decoder_thread_, let them early-exit,
   // as we've just moved to the kDestroying state, and wait for all tasks
   // to finish.
   input_ready_.Signal();
   surfaces_available_.Signal();
   {
     base::AutoUnlock auto_unlock(lock_);
     decoder_thread_.Stop();
   }
 
   state_ = kUninitialized;
 }
 
 void VaapiVideoDecodeAccelerator::Destroy() {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(task_runner_->BelongsToCurrentThread())
   Cleanup();
   delete this;
 }
 
 bool VaapiVideoDecodeAccelerator::TryToSetupDecodeOnSeparateThread(
     const base::WeakPtr<Client>& decode_client,
     const scoped_refptr<base::SingleThreadTaskRunner>& decode_task_runner) {
   return false;
 }
 
 bool VaapiVideoDecodeAccelerator::DecodeSurface(
     const scoped_refptr<VaapiDecodeSurface>& dec_surface) {
   if (!vaapi_wrapper_->ExecuteAndDestroyPendingBuffers(
           dec_surface->va_surface()->id())) {
     DVLOG(1) << "Failed decoding picture";
     return false;
   }
 
   return true;
 }
 
 void VaapiVideoDecodeAccelerator::SurfaceReady(
     const scoped_refptr<VaapiDecodeSurface>& dec_surface) {
-  if (message_loop_ != base::MessageLoop::current()) {
-    message_loop_->PostTask(
+  if (!task_runner_->BelongsToCurrentThread()) {
+    task_runner_->PostTask(
         FROM_HERE, base::Bind(&VaapiVideoDecodeAccelerator::SurfaceReady,
                               weak_this_, dec_surface));
     return;
   }
 
   DCHECK(!awaiting_va_surfaces_recycle_);
 
   {
     base::AutoLock auto_lock(lock_);
     // Drop any requests to output if we are resetting or being destroyed.
@@ skipping 741 matching lines @@
   return vaapi_pic->dec_surface();
 }
 
 // static
 VideoDecodeAccelerator::SupportedProfiles
 VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
   return VaapiWrapper::GetSupportedDecodeProfiles();
 }
 
 }  // namespace media