MJPEG acceleration for video capture using VAAPI

content/common/gpu/media/gpu_jpeg_decode_accelerator.cc

Index: content/common/gpu/media/gpu_jpeg_decode_accelerator.cc
diff --git a/content/common/gpu/media/gpu_jpeg_decode_accelerator.cc b/content/common/gpu/media/gpu_jpeg_decode_accelerator.cc
new file mode 100644
index 0000000000000000000000000000000000000000..510609739443a70d65db607c86d571acc9420118
--- /dev/null
+++ b/content/common/gpu/media/gpu_jpeg_decode_accelerator.cc
@@ -0,0 +1,256 @@
+// 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 "content/common/gpu/media/gpu_jpeg_decode_accelerator.h"
+
+#include <stdint.h>
+#include <vector>

[wuchengli, 2015/04/24 05:54:25]

not used

[kcwu, 2015/04/30 19:25:41]

Done.

+
+#include "base/bind.h"
+#include "base/command_line.h"

[wuchengli, 2015/04/24 05:54:25]

not used?

[kcwu, 2015/04/30 19:25:42]

Done.

+#include "base/logging.h"
+#include "base/message_loop/message_loop_proxy.h"
+#include "base/stl_util.h"

[wuchengli, 2015/04/24 05:54:24]

not used?

[kcwu, 2015/04/30 19:25:41]

Done.

+#include "content/common/gpu/gpu_channel.h"
+#include "content/common/gpu/gpu_messages.h"
+#include "content/public/common/content_switches.h"

[wuchengli, 2015/04/24 05:54:25]

not used?

[kcwu, 2015/04/30 19:25:42]

Done.

+#include "gpu/command_buffer/common/command_buffer.h"

[wuchengli, 2015/04/24 05:54:24]

not used?

[kcwu, 2015/04/30 19:25:42]

Done.

+#include "ipc/ipc_message_macros.h"
+#include "ipc/ipc_message_utils.h"

[wuchengli, 2015/04/24 05:54:24]

is this used?

[kcwu, 2015/04/30 19:25:42]

Done.

+#include "ipc/message_filter.h"
+#include "media/base/limits.h"

[wuchengli, 2015/04/24 05:54:24]

not used?

[kcwu, 2015/04/30 19:25:42]

Done.

+#include "media/filters/jpeg_parser.h"
+#include "ui/gfx/geometry/size.h"
+
+#if defined(OS_CHROMEOS)
+#if defined(ARCH_CPU_X86_FAMILY)
+#include "content/common/gpu/media/vaapi_jpeg_decode_accelerator.h"
+#endif  // defined(ARCH_CPU_X86_FAMILY)
+#endif
+
+namespace base {
+
+void DefaultDeleter<content::GpuJpegDecodeAccelerator>::operator()(
+    void* jpeg_decode_accelerator) const {
+  static_cast<content::GpuJpegDecodeAccelerator*>(jpeg_decode_accelerator)
+      ->Destroy();
+}
+
+}  // namespace base
+
+namespace content {
+
+class GpuJpegDecodeAccelerator::MessageFilter : public IPC::MessageFilter {
+ public:
+  MessageFilter(GpuJpegDecodeAccelerator* owner, int32 host_route_id)
+      : owner_(owner), host_route_id_(host_route_id) {}
+
+  void OnChannelError() override { sender_ = NULL; }
+
+  void OnChannelClosing() override { sender_ = NULL; }
+
+  void OnFilterAdded(IPC::Sender* sender) override { sender_ = sender; }
+
+  void OnFilterRemoved() override {
+    // This will delete |owner_| and |this|.

[wuchengli, 2015/04/24 05:54:24]

This doesn't directly delete |owner_| anymore. I think this can be removed.

[kcwu, 2015/04/30 19:25:42]

Done.

+    owner_->OnFilterRemoved();
+  }
+
+  bool OnMessageReceived(const IPC::Message& msg) override {
+    if (msg.routing_id() != host_route_id_)
+      return false;
+
+    IPC_BEGIN_MESSAGE_MAP(MessageFilter, msg)
+      IPC_MESSAGE_FORWARD(AcceleratedJpegDecoderMsg_Decode, owner_,
+                          GpuJpegDecodeAccelerator::OnDecode)
+      IPC_MESSAGE_UNHANDLED(return false;)
+    IPC_END_MESSAGE_MAP()
+    return true;
+  }
+
+  bool SendOnIOThread(IPC::Message* message) {
+    DCHECK(!message->is_sync());
+    if (!sender_) {
+      delete message;
+      return false;
+    }
+    return sender_->Send(message);
+  }
+
+ protected:
+  virtual ~MessageFilter() {}
+
+ private:
+  GpuJpegDecodeAccelerator* owner_;
+  int32 host_route_id_;
+  // The sender to which this filter was added.
+  IPC::Sender* sender_;
+};
+
+GpuJpegDecodeAccelerator::GpuJpegDecodeAccelerator(
+    GpuChannel* channel,
+    int32 host_route_id,
+    const scoped_refptr<base::MessageLoopProxy>& io_message_loop)
+    : channel_(channel),
+      host_route_id_(host_route_id),
+      filter_removed_(true, false),
+      io_message_loop_(io_message_loop) {
+  child_message_loop_ = base::MessageLoopProxy::current();
+}
+
+GpuJpegDecodeAccelerator::~GpuJpegDecodeAccelerator() {
+}
+
+bool GpuJpegDecodeAccelerator::OnMessageReceived(const IPC::Message& msg) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(GpuJpegDecodeAccelerator, msg)
+    IPC_MESSAGE_HANDLER(AcceleratedJpegDecoderMsg_Destroy, OnDestroy)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
+bool GpuJpegDecodeAccelerator::Initialize() {
+  DVLOG(3) << __func__;
+  DCHECK(child_message_loop_->BelongsToCurrentThread());
+  DCHECK(!jpeg_decode_accelerator_.get());
+
+  if (!channel_->AddRoute(host_route_id_, this)) {
+    DLOG(ERROR) << "GpuJpegDecodeAccelerator::Initialize(): "

[wuchengli, 2015/04/24 05:54:24]

AddRoute only fails when id is duplicated. If that happens, it's a bug
somewhere. So this can be changed to LOG(ERROR).

[kcwu, 2015/04/30 19:25:41]

Done.

+                   "failed to add route";
+    return false;
+  }
+
+  filter_ = new MessageFilter(this, host_route_id_);
+  channel_->AddFilter(filter_.get());
+
+// When add more platforms, GpuJpegDecodeAcceleratorAdapter::Supported need

[wuchengli, 2015/04/24 05:54:24]

s/add/adding/

[kcwu, 2015/04/30 19:25:41]

Done.

+// update as well.
+#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
+  jpeg_decode_accelerator_.reset(
+      new VaapiJpegDecodeAccelerator(io_message_loop_));
+#else
+  DVLOG(1) << "HW JPEG decode acceleration not available.";
+  return false;
+#endif
+
+  if (!jpeg_decode_accelerator_->Initialize(this)) {

[wuchengli, 2015/04/24 05:54:24]

return jpeg_decode_accelerator_->Initialize(this) directly is enough.

[kcwu, 2015/04/30 19:25:42]

Done.

+    return false;
+  }
+  return true;
+}
+
+void GpuJpegDecodeAccelerator::NotifyError(
+    int32_t buffer_id,
+    media::JpegDecodeAccelerator::Error error) {
+  DVLOG(3) << __func__;
+  Send(new AcceleratedJpegDecoderHostMsg_NotifyError(host_route_id_, buffer_id,
+                                                     error));
+}
+
+void GpuJpegDecodeAccelerator::VideoFrameReady(int32_t bitstream_buffer_id) {
+  // This is called from JDA's decode thread.
+  DVLOG(3) << __func__;
+  Send(new AcceleratedJpegDecoderHostMsg_VideoFrameReady(host_route_id_,

[wuchengli, 2015/04/24 05:54:24]

I remember now. ChannelProxy::Send requires to be called on the child thread.
That's why a filter is used in GpuVideoDecodeAccelerator to send IPC on IO
thread.

See DCHECK in line 454.
https://code.google.com/p/chromium/codesearch#chromium/src/ipc/ipc_channel_pr...

Same for Send in NotifyError if it is called on decode thread.

[kcwu, 2015/05/25 18:20:34]

Done.

+                                                         bitstream_buffer_id));
+}
+
+void DecodeFinished(scoped_ptr<base::SharedMemory> shm) {
+  // Do nothing. Because VideoFrame is backed by |shm|, the purpose of this
+  // function is to just keep reference of |shm| to make sure it live util
+  // decode finished.
+  DVLOG(3) << __func__;
+}
+
+void GpuJpegDecodeAccelerator::OnDecode(
+    const AcceleratedJpegDecoderMsg_Decode_Params& params) {
+  DVLOG(3) << __func__;
+  DCHECK(io_message_loop_->BelongsToCurrentThread());
+  DCHECK(jpeg_decode_accelerator_.get());
+
+  if (params.input_buffer_id < 0) {
+    LOG(ERROR) << "BitstreamBuffer id " << params.input_buffer_id
+               << " out of range";
+    NotifyError(params.input_buffer_id,
+                media::JpegDecodeAccelerator::INVALID_ARGUMENT);
+    return;
+  }
+
+  media::BitstreamBuffer input_buffer(params.input_buffer_id,
+                                      params.input_buffer_handle,
+                                      params.input_buffer_size);
+
+  scoped_ptr<base::SharedMemory> output_shm(
+      new base::SharedMemory(params.output_video_frame_handle, false));
+  if (!output_shm->Map(params.output_buffer_size)) {
+    LOG(ERROR) << "Could not map output shared memory for input buffer id "
+               << params.input_buffer_id;
+    NotifyError(params.input_buffer_id,
+                media::JpegDecodeAccelerator::PLATFORM_FAILURE);
+    return;
+  }
+
+  uint8* shm_memory = reinterpret_cast<uint8*>(output_shm->memory());
+  scoped_refptr<media::VideoFrame> frame =
+      media::VideoFrame::WrapExternalPackedMemory(
+          media::VideoFrame::I420,
+          params.coded_size,
+          gfx::Rect(params.coded_size),
+          params.coded_size,
+          shm_memory,
+          params.output_buffer_size,
+          params.output_video_frame_handle,
+          0,
+          base::TimeDelta(),
+          base::Bind(DecodeFinished, base::Passed(&output_shm)));
+
+  if (!frame.get()) {
+    LOG(ERROR) << "Could not create VideoFrame for input buffer id "
+               << params.input_buffer_id;
+    NotifyError(params.input_buffer_id,
+                media::JpegDecodeAccelerator::PLATFORM_FAILURE);
+    return;
+  }
+
+  jpeg_decode_accelerator_->Decode(input_buffer, frame);
+}
+
+void GpuJpegDecodeAccelerator::OnDestroy() {
+  DVLOG(3) << __func__;
+  DCHECK(child_message_loop_->BelongsToCurrentThread());
+  DCHECK(jpeg_decode_accelerator_.get());
+  Destroy();
+}
+
+void GpuJpegDecodeAccelerator::OnFilterRemoved() {
+  // We're destroying; cancel all callbacks.

[wuchengli, 2015/04/24 05:54:24]

We don't see we are cancelling any callback? Maybe just remove.

[kcwu, 2015/04/30 19:25:42]

Done.

+  filter_removed_.Signal();
+}
+
+void GpuJpegDecodeAccelerator::Destroy() {

[wuchengli, 2015/04/24 05:54:24]

Add DCHECK(child_message_loop_->BelongsToCurrentThread());.

[kcwu, 2015/04/30 19:25:42]

Done.

+  // We cannot destroy the JDA before the IO thread message filter is
+  // removed however, since we cannot service incoming messages with JDA gone.
+  // We cannot simply check for existence of JDA on IO thread though, because
+  // we don't want to synchronize the IO thread with the ChildThread.
+  // So we have to wait for the RemoveFilter callback here instead and remove
+  // the JDA after it arrives and before returning.
+  if (filter_.get()) {
+    channel_->RemoveFilter(filter_.get());
+    filter_removed_.Wait();
+  }
+
+  channel_->RemoveRoute(host_route_id_);
+  channel_->ReleaseJpegDecoder(host_route_id_);
+  jpeg_decode_accelerator_.reset();
+
+  delete this;
+}
+
+bool GpuJpegDecodeAccelerator::Send(IPC::Message* message) {
+  if (io_message_loop_->BelongsToCurrentThread())
+    return filter_->SendOnIOThread(message);
+  return channel_->Send(message);
+}
+
+}  // namespace content