Add Mojo interfaces for GpuJpegDecodeAccelerator and GpuJpegDecodeAcceleratorHost

media/gpu/ipc/client/gpu_jpeg_decode_accelerator_host.cc

 // Copyright 2015 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_jpeg_decode_accelerator_host.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/shared_memory_handle.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/waitable_event.h"
 #include "build/build_config.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "media/gpu/ipc/common/media_messages.h"
 
 namespace media {
 
 // Class to receive AcceleratedJpegDecoderHostMsg_DecodeAck IPC message on IO
 // thread. This does very similar what MessageFilter usually does. It is not
 // MessageFilter because GpuChannelHost doesn't support AddFilter.
-class GpuJpegDecodeAcceleratorHost::Receiver : public IPC::Listener,
-                                               public base::NonThreadSafe {
+class GpuJpegDecodeAcceleratorHost::Receiver : public IPC::Listener {
  public:
   Receiver(Client* client,
            const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner)
       : client_(client),
         io_task_runner_(io_task_runner),
         weak_factory_for_io_(
             base::MakeUnique<base::WeakPtrFactory<Receiver>>(this)),
         weak_ptr_for_io_(weak_factory_for_io_->GetWeakPtr()) {
-    DCHECK(CalledOnValidThread());
+    DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   }
 
   ~Receiver() override {
-    DCHECK(CalledOnValidThread());
+    DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
     // If |io_task_runner_| no longer accepts tasks, |weak_factory_for_io_|
     // will leak. This is acceptable, because that should only happen on
     // Browser shutdown.
     io_task_runner_->DeleteSoon(FROM_HERE, weak_factory_for_io_.release());
   }
 
   void InvalidateWeakPtrOnIOThread(base::WaitableEvent* event) {
     DCHECK(io_task_runner_->BelongsToCurrentThread());
     weak_factory_for_io_->InvalidateWeakPtrs();
     event->Signal();
@@ skipping 41 matching lines @@
 
   Client* client_;
 
   // GPU IO task runner.
   scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
 
   // Weak pointers will be invalidated on IO thread.
   std::unique_ptr<base::WeakPtrFactory<Receiver>> weak_factory_for_io_;
   base::WeakPtr<Receiver> weak_ptr_for_io_;
 
+  THREAD_CHECKER(thread_checker_);
   DISALLOW_COPY_AND_ASSIGN(Receiver);
 };
 
 GpuJpegDecodeAcceleratorHost::GpuJpegDecodeAcceleratorHost(
     scoped_refptr<gpu::GpuChannelHost> channel,
     int32_t route_id,
     const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner)
     : channel_(std::move(channel)),
       decoder_route_id_(route_id),
       io_task_runner_(io_task_runner) {
   DCHECK(channel_);
   DCHECK_NE(decoder_route_id_, MSG_ROUTING_NONE);
 }
 
 GpuJpegDecodeAcceleratorHost::~GpuJpegDecodeAcceleratorHost() {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   Send(new AcceleratedJpegDecoderMsg_Destroy(decoder_route_id_));
 
   if (receiver_) {
     channel_->RemoveRoute(decoder_route_id_);
 
     // Invalidate weak ptr of |receiver_|. After that, no more messages will be
     // routed to |receiver_| on IO thread.
     base::WaitableEvent event(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                               base::WaitableEvent::InitialState::NOT_SIGNALED);
     // Use of Unretained() is safe, because if the task executes, we block
     // until it is finished by waiting on |event| below.
     bool task_expected_to_run = io_task_runner_->PostTask(
         FROM_HERE, base::Bind(&Receiver::InvalidateWeakPtrOnIOThread,
                               base::Unretained(receiver_.get()),
                               base::Unretained(&event)));
     // If the current call is happening during the browser shutdown, the
     // |io_task_runner_| may no longer be accepting tasks.
     if (task_expected_to_run)
       event.Wait();
   }
 }
 
 bool GpuJpegDecodeAcceleratorHost::Initialize(
     JpegDecodeAccelerator::Client* client) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
   bool succeeded = false;
   // This cannot be on IO thread because the msg is synchronous.
   Send(new GpuChannelMsg_CreateJpegDecoder(decoder_route_id_, &succeeded));
 
   if (!succeeded) {
     DLOG(ERROR) << "Send(GpuChannelMsg_CreateJpegDecoder()) failed";
     return false;
   }
 
   receiver_.reset(new Receiver(client, io_task_runner_));
 
   return true;
 }
 
 void GpuJpegDecodeAcceleratorHost::Decode(
     const BitstreamBuffer& bitstream_buffer,
     const scoped_refptr<VideoFrame>& video_frame) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
   DCHECK(
       base::SharedMemory::IsHandleValid(video_frame->shared_memory_handle()));
 
   AcceleratedJpegDecoderMsg_Decode_Params decode_params;
   decode_params.input_buffer = bitstream_buffer;
   base::SharedMemoryHandle input_handle =
       channel_->ShareToGpuProcess(bitstream_buffer.handle());
   if (!base::SharedMemory::IsHandleValid(input_handle)) {
     DLOG(ERROR) << "Failed to duplicate handle of BitstreamBuffer";
@@ skipping 22 matching lines @@
   decode_params.output_buffer_size =
       base::checked_cast<uint32_t>(output_buffer_size);
   Send(new AcceleratedJpegDecoderMsg_Decode(decoder_route_id_, decode_params));
 }
 
 bool GpuJpegDecodeAcceleratorHost::IsSupported() {
   return channel_->gpu_info().jpeg_decode_accelerator_supported;
 }
 
 void GpuJpegDecodeAcceleratorHost::Send(IPC::Message* message) {
-  DCHECK(CalledOnValidThread());
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
   if (!channel_->Send(message)) {
     DLOG(ERROR) << "Send(" << message->type() << ") failed";
   }
 }
 
 base::WeakPtr<IPC::Listener> GpuJpegDecodeAcceleratorHost::GetReceiver() {
   return receiver_->AsWeakPtrForIO();
 }
 
+void GpuJpegDecodeAcceleratorHost::OnDecodeAck(int32_t bitstream_buffer_id,
+                                               mojom::Error error) {}
+
 }  // namespace media