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

Unified Diff: media/gpu/v4l2_video_encode_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_video_decode_accelerator.cc ('k') | media/gpu/vaapi_video_decode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/v4l2_video_encode_accelerator.cc
diff --git a/media/gpu/v4l2_video_encode_accelerator.cc b/media/gpu/v4l2_video_encode_accelerator.cc
index 8c3afa41f4108a7b2cfe0bc250e2c80112aca610..1138beb9437e4f44dd6fbbd5761079046bb29f9d 100644
--- a/media/gpu/v4l2_video_encode_accelerator.cc
+++ b/media/gpu/v4l2_video_encode_accelerator.cc
@@ -132,8 +132,7 @@ bool V4L2VideoEncodeAccelerator::Initialize(
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;
}
@@ -514,12 +513,15 @@ void V4L2VideoEncodeAccelerator::ServiceDeviceTask() {
FROM_HERE, base::Bind(&V4L2VideoEncodeAccelerator::DevicePollTask,
base::Unretained(this), poll_device));
- DVLOG(2) << __func__ << ": buffer counts: ENC[" << encoder_input_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()
- << "] => OUT[" << encoder_output_queue_.size() << "]";
+ DVLOG(2) << __func__ << ": buffer counts: ENC["
+ << encoder_input_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() << "] => OUT["
+ << encoder_output_queue_.size() << "]";
}
void V4L2VideoEncodeAccelerator::Enqueue() {
@@ -658,8 +660,8 @@ void V4L2VideoEncodeAccelerator::Dequeue() {
}
DVLOG(3) << "Dequeue(): returning "
- "bitstream_buffer_id="
- << output_record.buffer_ref->id << ", size=" << output_size
+ << "bitstream_buffer_id=" << output_record.buffer_ref->id
+ << ", size=" << output_size
<< ", key_frame=" << key_frame;
child_task_runner_->PostTask(
FROM_HERE,
@@ -1197,9 +1199,11 @@ bool V4L2VideoEncodeAccelerator::CreateOutputBuffers() {
buffer.m.planes = planes;
buffer.length = arraysize(planes);
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) << "CreateOutputBuffers(): mmap() failed";
return false;
« no previous file with comments | « media/gpu/v4l2_video_decode_accelerator.cc ('k') | media/gpu/vaapi_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698