MJPEG acceleration for video capture using VAAPI

content/browser/renderer_host/media/video_capture_device_client.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 "content/browser/renderer_host/media/video_capture_device_client.h"
 
 #include "base/bind.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/compositor/image_transport_factory.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
+#include "content/browser/renderer_host/gpu_jpeg_decoder.h"
 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h"
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/public/browser/browser_thread.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "media/base/bind_to_current_loop.h"
@@ skipping 89 matching lines @@
         pool_(pool),
         buffer_handle_(pool_->GetBufferHandle(buffer_id).Pass()) {
     DCHECK(pool_.get());
   }
   int id() const override { return id_; }
   size_t size() const override { return buffer_handle_->size(); }
   void* data() override { return buffer_handle_->data(); }
   ClientBuffer AsClientBuffer() override {
     return buffer_handle_->AsClientBuffer();
   }
+  base::SharedMemoryHandle AsPlatformHandle() override {
+    return buffer_handle_->AsPlatformHandle();
+  }
 
  private:
   ~AutoReleaseBuffer() override { pool_->RelinquishProducerReservation(id_); }
 
   const int id_;
   const scoped_refptr<VideoCaptureBufferPool> pool_;
   const scoped_ptr<VideoCaptureBufferPool::BufferHandle> buffer_handle_;
 };
 
 // Internal ref-counted class wrapping an incoming GpuMemoryBuffer into a
@@ skipping 57 matching lines @@
 
 VideoCaptureDeviceClient::VideoCaptureDeviceClient(
     const base::WeakPtr<VideoCaptureController>& controller,
     const scoped_refptr<VideoCaptureBufferPool>& buffer_pool,
     const scoped_refptr<base::SingleThreadTaskRunner>& capture_task_runner)
     : controller_(controller),
       buffer_pool_(buffer_pool),
       capture_task_runner_(capture_task_runner),
       last_captured_pixel_format_(media::PIXEL_FORMAT_UNKNOWN) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (GpuJpegDecoder::Supported()) {
+    external_jpeg_decoder_.reset(new GpuJpegDecoder(
+        this,
+        base::Bind(
+            &VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread,
+            controller_)));
+  }
 }
 
-VideoCaptureDeviceClient::~VideoCaptureDeviceClient() {}
+VideoCaptureDeviceClient::~VideoCaptureDeviceClient() {
+}
 
 void VideoCaptureDeviceClient::OnIncomingCapturedData(
     const uint8* data,
     int length,
     const VideoCaptureFormat& frame_format,
     int rotation,
     const base::TimeTicks& timestamp) {
   TRACE_EVENT0("video", "VideoCaptureDeviceClient::OnIncomingCapturedData");
 
   if (last_captured_pixel_format_ != frame_format.pixel_format) {
     OnLog("Pixel format: " + media::VideoCaptureFormat::PixelFormatToString(
                                  frame_format.pixel_format));
     last_captured_pixel_format_ = frame_format.pixel_format;
+
+    if (frame_format.pixel_format == media::PIXEL_FORMAT_MJPEG &&
+        external_jpeg_decoder_)

[mcasas, 2015/05/07 00:59:03]

With this condition, we would be calling 
external_jpeg_decoder_->Initialize() on every 
incoming MJPEG frame, is that what we want?

[wuchengli, 2015/05/07 06:23:14]

Not every incoming frame. Only when format changes.

I also asked Kuang-che to clear |external_jpeg_decoder_| when initialization
fails. So it won't try to initialize again next time the format changes.

[kcwu, 2015/05/08 14:42:42]

This only happens when pixel_format becomes from non-MJPEG to MJPEG. Not every
frame.

[kcwu, 2015/05/08 14:42:42]

Acknowledged.

+      ignore_result(external_jpeg_decoder_->Initialize());

[wuchengli, 2015/05/04 14:14:41]

Why not set |external_jpeg_decoder_| to NULL if Initialize fails? GpuJpegDecoder
won't need |initialized_|.

[wuchengli, 2015/05/06 07:59:18]

As discussed, if Initialize fails, there will be no any callback. So it's safe
to clear |external_jpeg_decoder_| here.

[kcwu, 2015/05/08 14:42:42]

Done.

[kcwu, 2015/05/08 14:42:42]

Done.

   }
 
   if (!frame_format.IsValid())
     return;
 
+  if (frame_format.pixel_format == media::PIXEL_FORMAT_MJPEG &&
+      external_jpeg_decoder_) {

[mcasas, 2015/05/07 00:59:03]

nit: Merge all conditions in lines l.237-238.

[kcwu, 2015/05/08 14:42:42]

Acknowledged.
This is changed to no fallback.

+    if (external_jpeg_decoder_->DecodeCapturedData(data, length, frame_format,
+                                                   rotation, timestamp))
+      return;
+  }
+
   // |chopped_{width,height} and |new_unrotated_{width,height}| are the lowest
   // bit decomposition of {width, height}, grabbing the odd and even parts.
   const int chopped_width = frame_format.frame_size.width() & 1;
   const int chopped_height = frame_format.frame_size.height() & 1;
   const int new_unrotated_width = frame_format.frame_size.width() & ~1;
   const int new_unrotated_height = frame_format.frame_size.height() & ~1;
 
   int destination_width = new_unrotated_width;
   int destination_height = new_unrotated_height;
   if (rotation == 90 || rotation == 270) {
@@ skipping 433 matching lines @@
 void VideoCaptureDeviceClient::TextureWrapHelper::OnError(
     const std::string& message) {
   DCHECK(capture_task_runner_->BelongsToCurrentThread());
   DLOG(ERROR) << message;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&VideoCaptureController::DoErrorOnIOThread, controller_));
 }
 
 }  // namespace content