media/gpu: restore some of the reformatting done during migration to media/gpu.

media/gpu/vaapi_video_decode_accelerator.cc

 // Copyright (c) 2012 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 "media/gpu/vaapi_video_decode_accelerator.h"
 
 #include <string.h>
 
 #include <memory>
 
@@ skipping 16 matching lines @@
 #include "third_party/libva/va/va_dec_vp8.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_image.h"
 
 namespace media {
 
 namespace {
 // UMA errors that the VaapiVideoDecodeAccelerator class reports.
 enum VAVDADecoderFailure {
   VAAPI_ERROR = 0,
+  // UMA requires that max passed to UMA_HISTOGRAM_ENUMERATION must be greater
+  // than 1.

[Mark Dittmer, 2016/05/12 14:13:51]

Ditto.

[Pawel Osciak, 2016/05/13 06:07:22]

Acknowledged.

   VAVDA_DECODER_FAILURES_MAX,
 };
 }
 
 static void ReportToUMA(VAVDADecoderFailure failure) {
   UMA_HISTOGRAM_ENUMERATION("Media.VAVDA.DecoderFailure", failure,
                             VAVDA_DECODER_FAILURES_MAX + 1);

[Mark Dittmer, 2016/05/12 14:13:51]

Ditto.

[Pawel Osciak, 2016/05/13 06:07:22]

Acknowledged.

 }
 
 #define RETURN_AND_NOTIFY_ON_FAILURE(result, log, error_code, ret) \
   do {                                                             \
     if (!(result)) {                                               \
       LOG(ERROR) << log;                                           \
       NotifyError(error_code);                                     \
       return ret;                                                  \
     }                                                              \
   } while (0)
@@ skipping 350 matching lines @@
   DVLOG(3) << "Outputting VASurface " << va_surface->id()
            << " into pixmap bound to picture buffer id " << output_id;
 
   RETURN_AND_NOTIFY_ON_FAILURE(picture->DownloadFromSurface(va_surface),
                                "Failed putting surface into pixmap",
                                PLATFORM_FAILURE, );
 
   // 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.
   if (client_)
     client_->PictureReady(media::Picture(output_id, input_id, gfx::Rect(0, 0),
                                          picture->AllowOverlay()));
 }
 
 void VaapiVideoDecodeAccelerator::TryOutputSurface() {
   DCHECK_EQ(message_loop_, base::MessageLoop::current());
@@ skipping 69 matching lines @@
   }
 
   // We could have got woken up in a different state or never got to sleep
   // due to current state; check for that.
   switch (state_) {
     case kFlushing:
       // Here we are only interested in finishing up decoding buffers that are
       // 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());
 
       curr_input_buffer_ = input_buffers_.front();
       input_buffers_.pop();
 
       DVLOG(4) << "New current bitstream buffer, id: " << curr_input_buffer_->id
                << " size: " << curr_input_buffer_->shm->size();
 
@@ skipping 186 matching lines @@
   base::AutoLock auto_lock(lock_);
   switch (state_) {
     case kIdle:
       state_ = kDecoding;
       decoder_thread_task_runner_->PostTask(
           FROM_HERE, base::Bind(&VaapiVideoDecodeAccelerator::DecodeTask,
                                 base::Unretained(this)));
       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
       // the before-seek one.
       break;
 
     default:
       RETURN_AND_NOTIFY_ON_FAILURE(
           false, "Decode request from client in invalid state: " << state_,
           PLATFORM_FAILURE, );
@@ skipping 13 matching lines @@
 void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
     const std::vector<media::PictureBuffer>& buffers) {
   DCHECK_EQ(message_loop_, base::MessageLoop::current());
 
   base::AutoLock auto_lock(lock_);
   DCHECK(pictures_.empty());
 
   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;
   RETURN_AND_NOTIFY_ON_FAILURE(
       vaapi_wrapper_->CreateSurfaces(VA_RT_FORMAT_YUV420, requested_pic_size_,
                                      buffers.size(), &va_surface_ids),
       "Failed creating VA Surfaces", PLATFORM_FAILURE, );
   DCHECK_EQ(va_surface_ids.size(), buffers.size());
 
   for (size_t i = 0; i < buffers.size(); ++i) {
@@ skipping 1006 matching lines @@
   return vaapi_pic->dec_surface();
 }
 
 // static
 media::VideoDecodeAccelerator::SupportedProfiles
 VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
   return VaapiWrapper::GetSupportedDecodeProfiles();
 }
 
 }  // namespace media