commit 665174fdbb4e0540eccb27cf7412348f1b65534c
author Yves Gerey <yvesg@webrtc.org> Tue Jun 19 15:03:05 2018 +0200
committer Yves Gerey <yvesg@webrtc.org> Tue Jun 19 14:00:39 2018 +0000
tree 34a9eb770e6de54c282f62ad0b65d2cd69c917f6
parent b602123a5aae1a9f0b6b581e611acf44eb525c08

Reformat the WebRTC code base

Running clang-format with chromium's style guide.

The goal is n-fold:
 * providing consistency and readability (that's what code guidelines are for)
 * preventing noise with presubmit checks and git cl format
 * building on the previous point: making it easier to automatically fix format issues
 * you name it

Please consider using git-hyper-blame to ignore this commit.

Bug: webrtc:9340
Change-Id: I694567c4cdf8cee2860958cfe82bfaf25848bb87
Reviewed-on: https://webrtc-review.googlesource.com/81185
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23660}

modules/video_coding/generic_encoder.cc

diff --git a/modules/video_coding/generic_encoder.cc b/modules/video_coding/generic_encoder.cc
index 202cc86..7eb35e7 100644
--- a/modules/video_coding/generic_encoder.cc
+++ b/modules/video_coding/generic_encoder.cc
@@ -1,12 +1,12 @@
 /*
-*  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
-*
-*  Use of this source code is governed by a BSD-style license
-*  that can be found in the LICENSE file in the root of the source
-*  tree. An additional intellectual property rights grant can be found
-*  in the file PATENTS.  All contributing project authors may
-*  be found in the AUTHORS file in the root of the source tree.
-*/
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
 
 #include "modules/video_coding/generic_encoder.h"
 
@@ -70,8 +70,8 @@
   if (encoder_->InitEncode(settings, number_of_cores, max_payload_size) != 0) {
     RTC_LOG(LS_ERROR) << "Failed to initialize the encoder associated with "
                          "codec type: "
-                      << CodecTypeToPayloadString(settings->codecType)
-                      << " (" << settings->codecType <<")";
+                      << CodecTypeToPayloadString(settings->codecType) << " ("
+                      << settings->codecType << ")";
     return -1;
   }
   vcm_encoded_frame_callback_->Reset();
@@ -151,9 +151,9 @@
   // VideoSendStreamTest.VideoSendStreamStopSetEncoderRateToZero, set
   // internal_source to true and use FakeEncoder. And the latter will
   // happily encode this 1x1 frame and pass it on down the pipeline.
-  return encoder_->Encode(VideoFrame(I420Buffer::Create(1, 1),
-                                     kVideoRotation_0, 0),
-                          NULL, &frame_types);
+  return encoder_->Encode(
+      VideoFrame(I420Buffer::Create(1, 1), kVideoRotation_0, 0), NULL,
+      &frame_types);
   return 0;
 }