Format almost everything.
This CL was generated by running
git ls-files | grep -P "(\.h|\.cc)$" | grep -v 'sdk/' | grep -v 'rtc_base/ssl_' | \
grep -v 'fake_rtc_certificate_generator.h' | grep -v 'modules/audio_device/win/' | \
grep -v 'system_wrappers/source/clock.cc' | grep -v 'rtc_base/trace_event.h' | \
grep -v 'modules/audio_coding/codecs/ilbc/' | grep -v 'screen_capturer_mac.h' | \
grep -v 'spl_inl_mips.h' | grep -v 'data_size_unittest.cc' | grep -v 'timestamp_unittest.cc' \
| xargs clang-format -i ; git cl format
Most of these changes are clang-format grouping and reordering includes
differently.
Bug: webrtc:9340
Change-Id: Ic83ddbc169bfacd21883e381b5181c3dd4fe8a63
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144051
Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28505}
diff --git a/test/frame_generator.cc b/test/frame_generator.cc
index 84da4f7..7a9e9a0 100644
--- a/test/frame_generator.cc
+++ b/test/frame_generator.cc
@@ -10,6 +10,7 @@
#include "test/frame_generator.h"
#include <string.h>
+
#include <cstdint>
#include <cstdio>
#include <memory>
@@ -233,8 +234,7 @@
size_t prev_file_index = file_index_;
last_read_buffer_ =
test::ReadI420Buffer(static_cast<int>(width_),
- static_cast<int>(height_),
- files_[file_index_]);
+ static_cast<int>(height_), files_[file_index_]);
++frame_index_;
if (!last_read_buffer_) {
// No more frames to read in this file, rewind and move to next file.
@@ -244,8 +244,7 @@
file_index_ = (file_index_ + 1) % files_.size();
last_read_buffer_ =
test::ReadI420Buffer(static_cast<int>(width_),
- static_cast<int>(height_),
- files_[file_index_]);
+ static_cast<int>(height_), files_[file_index_]);
RTC_CHECK(last_read_buffer_);
}
return frame_index_ != prev_frame_index || file_index_ != prev_file_index;
@@ -301,7 +300,7 @@
void GenerateNewFrame() {
// The squares should have a varying order of magnitude in order
// to simulate variation in the slides' complexity.
- const int kSquareNum = 1 << (4 + (random_generator_.Rand(0, 3) * 2));
+ const int kSquareNum = 1 << (4 + (random_generator_.Rand(0, 3) * 2));
buffer_ = I420Buffer::Create(width_, height_);
memset(buffer_->MutableDataY(), 127, height_ * buffer_->StrideY());
@@ -525,9 +524,11 @@
}
std::unique_ptr<FrameGenerator> FrameGenerator::CreateSlideGenerator(
- int width, int height, int frame_repeat_count) {
- return std::unique_ptr<FrameGenerator>(new SlideGenerator(
- width, height, frame_repeat_count));
+ int width,
+ int height,
+ int frame_repeat_count) {
+ return std::unique_ptr<FrameGenerator>(
+ new SlideGenerator(width, height, frame_repeat_count));
}
std::unique_ptr<FrameGenerator> FrameGenerator::CreateFromYuvFile(
