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

Unified Diff: media/gpu/vaapi_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_video_encode_accelerator.cc ('k') | media/gpu/vaapi_wrapper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/vaapi_video_decode_accelerator.cc
diff --git a/media/gpu/vaapi_video_decode_accelerator.cc b/media/gpu/vaapi_video_decode_accelerator.cc
index 8f1c2bc4a9e793883bdc70c7a00ecc31542621f7..b7c8e4de67f29496ed1864fa1c5fb536480e5e57 100644
--- a/media/gpu/vaapi_video_decode_accelerator.cc
+++ b/media/gpu/vaapi_video_decode_accelerator.cc
@@ -411,8 +411,8 @@ void VaapiVideoDecodeAccelerator::OutputPicture(
// Notify the client a picture is ready to be displayed.
++num_frames_at_client_;
TRACE_COUNTER1("Video Decoder", "Textures at client", num_frames_at_client_);
- DVLOG(4) << "Notifying output picture id " << output_id << " for input "
- << input_id << " is ready";
+ DVLOG(4) << "Notifying output picture id " << output_id
+ << " for input " << input_id << " is ready";
// TODO(posciak): Use visible size from decoder here instead
// (crbug.com/402760). Passing (0, 0) results in the client using the
// visible size extracted from the container instead.
@@ -502,7 +502,7 @@ bool VaapiVideoDecodeAccelerator::GetInputBuffer_Locked() {
// already queued up. Otherwise will stop decoding.
if (input_buffers_.empty())
return false;
- // else fallthrough
+ // else fallthrough
case kDecoding:
case kIdle:
DCHECK(!input_buffers_.empty());
@@ -709,7 +709,7 @@ void VaapiVideoDecodeAccelerator::Decode(
break;
case kDecoding:
- // Decoder already running, fallthrough.
+ // Decoder already running, fallthrough.
case kResetting:
// When resetting, allow accumulating bitstream buffers, so that
// the client can queue after-seek-buffers while we are finishing with
@@ -743,11 +743,10 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
while (!output_buffers_.empty())
output_buffers_.pop();
- RETURN_AND_NOTIFY_ON_FAILURE(buffers.size() >= requested_num_pics_,
- "Got an invalid number of picture buffers. (Got "
- << buffers.size() << ", requested "
- << requested_num_pics_ << ")",
- INVALID_ARGUMENT, );
+ RETURN_AND_NOTIFY_ON_FAILURE(
+ buffers.size() >= requested_num_pics_,
+ "Got an invalid number of picture buffers. (Got " << buffers.size()
+ << ", requested " << requested_num_pics_ << ")", INVALID_ARGUMENT, );
DCHECK(requested_pic_size_ == buffers[0].size());
std::vector<VASurfaceID> va_surface_ids;
« no previous file with comments | « media/gpu/v4l2_video_encode_accelerator.cc ('k') | media/gpu/vaapi_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698