MJPEG acceleration for video capture using VAAPI

content/common/gpu/gpu_channel.cc

Index: content/common/gpu/gpu_channel.cc
diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc
index c12c762c6004f725973182513535274cc6ac2cc7..007a3e5cd0ca02bb13a1716d0d47d7d045277bd5 100644
--- a/content/common/gpu/gpu_channel.cc
+++ b/content/common/gpu/gpu_channel.cc
@@ -13,6 +13,7 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/macros.h"

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

not used?

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

For ignore_result()

 #include "base/message_loop/message_loop_proxy.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
@@ -21,6 +22,7 @@
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "content/common/gpu/gpu_messages.h"
+#include "content/common/gpu/media/gpu_jpeg_decode_accelerator.h"

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

gpu_channel.h already has this

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

Done.

 #include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "gpu/command_buffer/common/value_state.h"
@@ -672,6 +674,7 @@ bool GpuChannel::OnControlMessageReceived(const IPC::Message& msg) {
                         OnCreateOffscreenCommandBuffer)
     IPC_MESSAGE_HANDLER(GpuChannelMsg_DestroyCommandBuffer,
                         OnDestroyCommandBuffer)
+    IPC_MESSAGE_HANDLER(GpuMsg_CreateJpegDecoder, OnCreateJpegDecoder)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled) << msg.type();
@@ -793,6 +796,22 @@ void GpuChannel::OnDestroyCommandBuffer(int32 route_id) {
   }
 }
 
+void GpuChannel::OnCreateJpegDecoder(int32 route_id, bool* succeeded) {
+  scoped_ptr<content::GpuJpegDecodeAccelerator> decoder(
+      new GpuJpegDecodeAccelerator(this, route_id, io_message_loop_));
+
+  *succeeded = decoder->Initialize();
+  DCHECK(jpeg_decoder_map_.get(route_id) == nullptr);
+  jpeg_decoder_map_.set(route_id, decoder.Pass());
+}
+
+void GpuChannel::ReleaseJpegDecoder(int32 route_id) {
+  scoped_ptr<content::GpuJpegDecodeAccelerator> decoder =
+    jpeg_decoder_map_.take_and_erase(route_id);
+  DCHECK(decoder);
+  ignore_result(decoder.release());

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

not needed?

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

GpuChannel::ReleaseJpegDecoder is called from GpuJpegDecodeAccelerator::Destroy,
where decoder will delete itself.

This function just release the pointer and don't delete it.
If without this line, decoder will be deleted here.

+}
+
 void GpuChannel::MessageProcessed() {
   messages_processed_++;
   if (preempting_flag_.get()) {