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

Unified Diff: media/gpu/v4l2_video_decode_accelerator.cc

Issue 1973753003: media/gpu: restore some of the reformatting done during migration to media/gpu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « media/gpu/v4l2_slice_video_decode_accelerator.cc ('k') | media/gpu/v4l2_video_encode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/v4l2_video_decode_accelerator.cc
diff --git a/media/gpu/v4l2_video_decode_accelerator.cc b/media/gpu/v4l2_video_decode_accelerator.cc
index 77d9f293faad863a9b859eb78836ef2919110547..e046d17c2fe417443bcc31e39891b67e2b67c6ab 100644
--- a/media/gpu/v4l2_video_decode_accelerator.cc
+++ b/media/gpu/v4l2_video_decode_accelerator.cc
@@ -258,8 +258,7 @@ bool V4L2VideoDecodeAccelerator::Initialize(const Config& config,
IOCTL_OR_ERROR_RETURN_FALSE(VIDIOC_QUERYCAP, &caps);
if ((caps.capabilities & kCapsRequired) != kCapsRequired) {
LOG(ERROR) << "Initialize(): ioctl() failed: VIDIOC_QUERYCAP"
- ", caps check failed: 0x"
- << std::hex << caps.capabilities;
+ << ", caps check failed: 0x" << std::hex << caps.capabilities;
return false;
}
@@ -326,8 +325,8 @@ void V4L2VideoDecodeAccelerator::AssignPictureBuffers(
if (buffers.size() < req_buffer_count) {
LOG(ERROR) << "AssignPictureBuffers(): Failed to provide requested picture"
- " buffers. (Got "
- << buffers.size() << ", requested " << req_buffer_count << ")";
+ << " buffers. (Got " << buffers.size()
+ << ", requested " << req_buffer_count << ")";
NOTIFY_ERROR(INVALID_ARGUMENT);
return;
}
@@ -1011,13 +1010,16 @@ void V4L2VideoDecodeAccelerator::ServiceDeviceTask(bool event_pending) {
base::Unretained(this), poll_device));
DVLOG(1) << "ServiceDeviceTask(): buffer counts: DEC["
- << decoder_input_queue_.size() << "->" << input_ready_queue_.size()
- << "] => DEVICE[" << free_input_buffers_.size() << "+"
- << input_buffer_queued_count_ << "/" << input_buffer_map_.size()
- << "->" << free_output_buffers_.size() << "+"
- << output_buffer_queued_count_ << "/" << output_buffer_map_.size()
- << "] => PROCESSOR[" << image_processor_bitstream_buffer_ids_.size()
- << "] => CLIENT[" << decoder_frames_at_client_ << "]";
+ << decoder_input_queue_.size() << "->"
+ << input_ready_queue_.size() << "] => DEVICE["
+ << free_input_buffers_.size() << "+"
+ << input_buffer_queued_count_ << "/"
+ << input_buffer_map_.size() << "->"
+ << free_output_buffers_.size() << "+"
+ << output_buffer_queued_count_ << "/"
+ << output_buffer_map_.size() << "] => PROCESSOR["
+ << image_processor_bitstream_buffer_ids_.size() << "] => CLIENT["
+ << decoder_frames_at_client_ << "]";
ScheduleDecodeBufferTaskIfNeeded();
if (resolution_change_pending)
@@ -1869,9 +1871,11 @@ bool V4L2VideoDecodeAccelerator::CreateInputBuffers() {
buffer.m.planes = planes;
buffer.length = 1;
IOCTL_OR_ERROR_RETURN_FALSE(VIDIOC_QUERYBUF, &buffer);
- void* address =
- device_->Mmap(NULL, buffer.m.planes[0].length, PROT_READ | PROT_WRITE,
- MAP_SHARED, buffer.m.planes[0].m.mem_offset);
+ void* address = device_->Mmap(NULL,
+ buffer.m.planes[0].length,
+ PROT_READ | PROT_WRITE,
+ MAP_SHARED,
+ buffer.m.planes[0].m.mem_offset);
if (address == MAP_FAILED) {
PLOG(ERROR) << "CreateInputBuffers(): mmap() failed";
return false;
« no previous file with comments | « media/gpu/v4l2_slice_video_decode_accelerator.cc ('k') | media/gpu/v4l2_video_encode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698