Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Unified Diff: content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc

Issue 1124423008: MJPEG acceleration for video capture using VAAPI, the GPU and IPC part (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mjpeg-1-media
Patch Set: gpu_jpeg_decode_accelerator.cc filter to dispatch decode task Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc
diff --git a/content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc b/content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc
new file mode 100644
index 0000000000000000000000000000000000000000..67348ae0e84ca4442665e0fc08beb67919f755e4
--- /dev/null
+++ b/content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc
@@ -0,0 +1,251 @@
+// 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/vaapi_jpeg_decode_accelerator.h"
+
+#include "base/bind.h"
+#include "base/logging.h"
+#include "base/thread_task_runner_handle.h"
+#include "base/trace_event/trace_event.h"
+#include "content/common/gpu/gpu_channel.h"
+#include "content/common/gpu/media/vaapi_picture.h"
+#include "media/base/video_frame.h"
+#include "media/filters/jpeg_parser.h"
+
+static void ReportVaapiError() {
+ // TODO(kcwu) report error to UMA
+}
+
+namespace content {
+
+VaapiJpegDecodeAccelerator::DecodeRequest::DecodeRequest(
+ const media::BitstreamBuffer& bitstream_buffer,
+ scoped_refptr<media::VideoFrame> video_frame)
+ : bitstream_buffer(bitstream_buffer), video_frame(video_frame) {
+}
+
+VaapiJpegDecodeAccelerator::DecodeRequest::~DecodeRequest() {
+}
+
+void VaapiJpegDecodeAccelerator::NotifyError(int32_t bitstream_buffer_id,
+ Error error) {
+ DCHECK_EQ(task_runner_, base::ThreadTaskRunnerHandle::Get());
+ DLOG(ERROR) << "Notifying of error " << error;
+ DCHECK(client_);
+ client_->NotifyError(bitstream_buffer_id, error);
+}
+
+void VaapiJpegDecodeAccelerator::NotifyErrorFromDecoderThread(
+ int32_t bitstream_buffer_id,
+ Error error) {
+ DCHECK(decoder_task_runner_->BelongsToCurrentThread());
+ task_runner_->PostTask(FROM_HERE,
+ base::Bind(&VaapiJpegDecodeAccelerator::NotifyError,
+ weak_this_, bitstream_buffer_id, error));
+}
+
+VaapiJpegDecodeAccelerator::VaapiJpegDecodeAccelerator(
+ const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner)
+ : initialized_(false),
+ task_runner_(base::ThreadTaskRunnerHandle::Get()),
+ io_task_runner_(io_task_runner),
+ decoder_thread_("VaapiJpegDecoderThread"),
+ va_surface_(VA_INVALID_SURFACE),
+ weak_this_factory_(this) {
+ weak_this_ = weak_this_factory_.GetWeakPtr();
+}
+
+VaapiJpegDecodeAccelerator::~VaapiJpegDecodeAccelerator() {
+ DCHECK_EQ(task_runner_, base::ThreadTaskRunnerHandle::Get());
+ Cleanup();
+}
+
+bool VaapiJpegDecodeAccelerator::Initialize(Client* client) {
+ DCHECK_EQ(task_runner_, base::ThreadTaskRunnerHandle::Get());
+
+ client_ = client;
+
+ base::AutoLock auto_lock(lock_);
+ DCHECK(!initialized_);
+
+ vaapi_wrapper_ =
+ VaapiWrapper::Create(VaapiWrapper::kDecode, VAProfileJPEGBaseline,
+ base::Bind(&ReportVaapiError));
+
+ if (!vaapi_wrapper_.get()) {
+ DLOG(ERROR) << "Failed initializing VAAPI";
+ return false;
+ }
+
+ if (!decoder_thread_.Start()) {
+ DLOG(ERROR) << "Failed to start decoding thread.";
+ return false;
+ }
+ decoder_task_runner_ = decoder_thread_.task_runner();
+
+ initialized_ = true;
+ return true;
+}
+
+bool VaapiJpegDecodeAccelerator::OutputPicture(
+ VASurfaceID va_surface_id,
+ int32_t input_buffer_id,
+ const scoped_refptr<media::VideoFrame>& video_frame) {
+ DCHECK(decoder_task_runner_->BelongsToCurrentThread());
+
+ TRACE_EVENT1("jpeg", "VaapiJpegDecodeAccelerator::OutputPicture",
+ "input_buffer_id", input_buffer_id);
+
+ DVLOG(3) << "Outputting VASurface " << va_surface_id
+ << " into video_frame associated with input buffer id "
+ << input_buffer_id;
+
+ VAImage image;
+ VAImageFormat format;
+ const uint32_t kI420Fourcc = VA_FOURCC('I', '4', '2', '0');
+ memset(&image, 0, sizeof(image));
+ memset(&format, 0, sizeof(format));
+ format.fourcc = kI420Fourcc;
+ format.byte_order = VA_LSB_FIRST;
+ format.bits_per_pixel = 12; // 12 for I420
+
+ void* mem = nullptr;
+ gfx::Size coded_size = video_frame->coded_size();
+ if (!vaapi_wrapper_->GetVaImage(va_surface_id, &format, coded_size, &image,
+ &mem)) {
+ DLOG(ERROR) << "Cannot get VAImage";
+ return false;
+ }
+
+ uint8* frame_mem = video_frame->data(media::VideoFrame::kYPlane);
+ size_t frame_buffer_size =
+ media::VideoFrame::AllocationSize(media::VideoFrame::I420, coded_size);
+ memcpy(frame_mem, mem, frame_buffer_size);
+
+ vaapi_wrapper_->ReturnVaImage(&image);
+
+ task_runner_->PostTask(
+ FROM_HERE,
+ base::Bind(&media::JpegDecodeAccelerator::Client::VideoFrameReady,
+ base::Unretained(client_), input_buffer_id));
+
+ return true;
+}
+
+void VaapiJpegDecodeAccelerator::DecodeTask() {
+ DVLOG(3) << __func__;
+ DCHECK(decoder_task_runner_->BelongsToCurrentThread());
+ TRACE_EVENT0("jpeg", "DecodeTask");
+ linked_ptr<DecodeRequest> request;
+ {
+ base::AutoLock auto_lock(lock_);
+ if (!initialized_)
+ return;
+
+ DCHECK(!decode_requests_.empty());
+ request = decode_requests_.front();
+ decode_requests_.pop();
+ }
+
+ DVLOG(4) << "Mapping new input buffer id: " << request->bitstream_buffer.id()
+ << " size: " << (int)request->bitstream_buffer.size();
+
+ scoped_ptr<base::SharedMemory> shm(
+ new base::SharedMemory(request->bitstream_buffer.handle(), true));
+ if (!shm->Map(request->bitstream_buffer.size())) {
+ LOG(ERROR) << "Failed to map input buffer";
+ NotifyErrorFromDecoderThread(request->bitstream_buffer.id(),
+ UNREADABLE_INPUT);
+ return;
+ }
+
+ media::JpegParseResult parse_result;
+
+ if (!media::ParseJpegPicture(reinterpret_cast<const uint8_t*>(shm->memory()),
+ request->bitstream_buffer.size(),
+ &parse_result)) {
+ DLOG(ERROR) << "ParseJpegPicture failed";
+ NotifyErrorFromDecoderThread(
+ request->bitstream_buffer.id(),
+ media::JpegDecodeAccelerator::PARSE_JPEG_FAILED);
+ return;
+ }
+
+ // Reuse VASurface if size doesn't change.
+ gfx::Size coded_size(parse_result.frame_header.coded_width,
+ parse_result.frame_header.coded_height);
+ if (coded_size != coded_size_ || va_surface_ == VA_INVALID_SURFACE) {
+ vaapi_wrapper_->DestroySurfaces();
+ std::vector<VASurfaceID> va_surfaces;
+ if (!vaapi_wrapper_->CreateSurfaces(coded_size, 1, &va_surfaces)) {
+ LOG(ERROR) << "Create VA surface failed";
+ NotifyErrorFromDecoderThread(
+ request->bitstream_buffer.id(),
+ media::JpegDecodeAccelerator::PLATFORM_FAILURE);
+ return;
+ }
+ va_surface_ = va_surfaces[0];
+ coded_size_ = coded_size;
+ }
+
+ if (!VaapiJpegDecoder::Decode(vaapi_wrapper_.get(), parse_result,
+ va_surface_)) {
+ LOG(ERROR) << "Decode JPEG failed";
+ NotifyErrorFromDecoderThread(
+ request->bitstream_buffer.id(),
+ media::JpegDecodeAccelerator::PLATFORM_FAILURE);
+ return;
+ }
+
+ if (!OutputPicture(va_surface_, request->bitstream_buffer.id(),
+ request->video_frame)) {
+ LOG(ERROR) << "Output picture failed";
+ NotifyErrorFromDecoderThread(
+ request->bitstream_buffer.id(),
+ media::JpegDecodeAccelerator::PLATFORM_FAILURE);
+ return;
+ }
+}
+
+void VaapiJpegDecodeAccelerator::Decode(
+ const media::BitstreamBuffer& bitstream_buffer,
+ const scoped_refptr<media::VideoFrame>& video_frame) {
+ DVLOG(3) << __func__;
+ DCHECK(io_task_runner_->BelongsToCurrentThread());
+ TRACE_EVENT1("jpeg", "Decode", "input_id", bitstream_buffer.id());
+
+ base::AutoLock auto_lock(lock_);
+ if (!initialized_)
+ return;
+
+ // Set up a new decode request and queue it for later.
+ linked_ptr<DecodeRequest> input_buffer(
+ new DecodeRequest(bitstream_buffer, video_frame));
+ decode_requests_.push(input_buffer);
+
+ decoder_task_runner_->PostTask(
+ FROM_HERE, base::Bind(&VaapiJpegDecodeAccelerator::DecodeTask,
+ base::Unretained(this)));
+}
+
+void VaapiJpegDecodeAccelerator::Cleanup() {
+ DCHECK_EQ(task_runner_, base::ThreadTaskRunnerHandle::Get());
+
+ base::AutoLock auto_lock(lock_);
+ if (!initialized_)
+ return;
+
+ DVLOG(1) << "Destroying VaapiJpegDecodeAccelerator";
+
+ weak_this_factory_.InvalidateWeakPtrs();
+
+ {
+ base::AutoUnlock auto_unlock(lock_);
+ decoder_thread_.Stop();
+ }
+
+ initialized_ = false;
+}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698