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/modules/rtp_rtcp/source/byte_io.h b/modules/rtp_rtcp/source/byte_io.h
index 955bce7..a98eb30 100644
--- a/modules/rtp_rtcp/source/byte_io.h
+++ b/modules/rtp_rtcp/source/byte_io.h
@@ -35,6 +35,7 @@
// it easy for the compiler to completely inline the reading/writing.
#include <stdint.h>
+
#include <limits>
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/byte_io_unittest.cc b/modules/rtp_rtcp/source/byte_io_unittest.cc
index 20b6636..e4dea81 100644
--- a/modules/rtp_rtcp/source/byte_io_unittest.cc
+++ b/modules/rtp_rtcp/source/byte_io_unittest.cc
@@ -8,9 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/byte_io.h"
+
#include <limits>
-#include "modules/rtp_rtcp/source/byte_io.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/contributing_sources_unittest.cc b/modules/rtp_rtcp/source/contributing_sources_unittest.cc
index acf8a90..fa8b97b 100644
--- a/modules/rtp_rtcp/source/contributing_sources_unittest.cc
+++ b/modules/rtp_rtcp/source/contributing_sources_unittest.cc
@@ -11,7 +11,6 @@
#include "modules/rtp_rtcp/source/contributing_sources.h"
#include "rtc_base/time_utils.h"
-
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/modules/rtp_rtcp/source/dtmf_queue.h b/modules/rtp_rtcp/source/dtmf_queue.h
index 28116bc..adb93aa 100644
--- a/modules/rtp_rtcp/source/dtmf_queue.h
+++ b/modules/rtp_rtcp/source/dtmf_queue.h
@@ -12,6 +12,7 @@
#define MODULES_RTP_RTCP_SOURCE_DTMF_QUEUE_H_
#include <stdint.h>
+
#include <list>
#include "rtc_base/critical_section.h"
diff --git a/modules/rtp_rtcp/source/fec_private_tables_bursty_unittest.cc b/modules/rtp_rtcp/source/fec_private_tables_bursty_unittest.cc
index fd116eb..c62f7d5 100644
--- a/modules/rtp_rtcp/source/fec_private_tables_bursty_unittest.cc
+++ b/modules/rtp_rtcp/source/fec_private_tables_bursty_unittest.cc
@@ -9,9 +9,9 @@
*/
#include "modules/rtp_rtcp/source/fec_private_tables_bursty.h"
+
#include "modules/rtp_rtcp/source/fec_private_tables_random.h"
#include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
-
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
index 3d19eda..81d0cb3 100644
--- a/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
+++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h"
+
#include <string.h>
#include <memory>
@@ -15,7 +17,6 @@
#include "api/scoped_refptr.h"
#include "modules/rtp_rtcp/source/byte_io.h"
-#include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h"
#include "modules/rtp_rtcp/source/forward_error_correction.h"
#include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
#include "rtc_base/checks.h"
diff --git a/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc b/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
index 805bc64..3d77d7b 100644
--- a/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
@@ -8,10 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/include/flexfec_receiver.h"
+
#include <algorithm>
#include <memory>
-#include "modules/rtp_rtcp/include/flexfec_receiver.h"
#include "modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h"
#include "modules/rtp_rtcp/source/fec_test_helper.h"
#include "modules/rtp_rtcp/source/forward_error_correction.h"
diff --git a/modules/rtp_rtcp/source/flexfec_sender.cc b/modules/rtp_rtcp/source/flexfec_sender.cc
index d7b8eca..038cef7 100644
--- a/modules/rtp_rtcp/source/flexfec_sender.cc
+++ b/modules/rtp_rtcp/source/flexfec_sender.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/include/flexfec_sender.h"
#include <string.h>
+
#include <list>
#include <utility>
diff --git a/modules/rtp_rtcp/source/flexfec_sender_unittest.cc b/modules/rtp_rtcp/source/flexfec_sender_unittest.cc
index c561dbb..c7291b0 100644
--- a/modules/rtp_rtcp/source/flexfec_sender_unittest.cc
+++ b/modules/rtp_rtcp/source/flexfec_sender_unittest.cc
@@ -8,10 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/include/flexfec_sender.h"
+
#include <vector>
#include "api/rtp_parameters.h"
-#include "modules/rtp_rtcp/include/flexfec_sender.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "modules/rtp_rtcp/source/fec_test_helper.h"
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
diff --git a/modules/rtp_rtcp/source/forward_error_correction.cc b/modules/rtp_rtcp/source/forward_error_correction.cc
index b7c0809..413c708 100644
--- a/modules/rtp_rtcp/source/forward_error_correction.cc
+++ b/modules/rtp_rtcp/source/forward_error_correction.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/source/forward_error_correction.h"
#include <string.h>
+
#include <algorithm>
#include <utility>
diff --git a/modules/rtp_rtcp/source/forward_error_correction.h b/modules/rtp_rtcp/source/forward_error_correction.h
index b442273..ad2eef1 100644
--- a/modules/rtp_rtcp/source/forward_error_correction.h
+++ b/modules/rtp_rtcp/source/forward_error_correction.h
@@ -13,6 +13,7 @@
#include <stddef.h>
#include <stdint.h>
+
#include <list>
#include <memory>
#include <vector>
diff --git a/modules/rtp_rtcp/source/forward_error_correction_internal.cc b/modules/rtp_rtcp/source/forward_error_correction_internal.cc
index 9b02026..2a056a6 100644
--- a/modules/rtp_rtcp/source/forward_error_correction_internal.cc
+++ b/modules/rtp_rtcp/source/forward_error_correction_internal.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
#include <string.h>
+
#include <algorithm>
#include "modules/rtp_rtcp/source/fec_private_tables_bursty.h"
diff --git a/modules/rtp_rtcp/source/packet_loss_stats.h b/modules/rtp_rtcp/source/packet_loss_stats.h
index 7c4f658..60d2029 100644
--- a/modules/rtp_rtcp/source/packet_loss_stats.h
+++ b/modules/rtp_rtcp/source/packet_loss_stats.h
@@ -12,6 +12,7 @@
#define MODULES_RTP_RTCP_SOURCE_PACKET_LOSS_STATS_H_
#include <stdint.h>
+
#include <set>
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc b/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc
index 3731250..673b223 100644
--- a/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc
+++ b/modules/rtp_rtcp/source/packet_loss_stats_unittest.cc
@@ -9,6 +9,7 @@
*/
#include "modules/rtp_rtcp/source/packet_loss_stats.h"
+
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/playout_delay_oracle.cc b/modules/rtp_rtcp/source/playout_delay_oracle.cc
index e3e13fd..f234759 100644
--- a/modules/rtp_rtcp/source/playout_delay_oracle.cc
+++ b/modules/rtp_rtcp/source/playout_delay_oracle.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <algorithm>
-
#include "modules/rtp_rtcp/source/playout_delay_oracle.h"
+#include <algorithm>
+
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
diff --git a/modules/rtp_rtcp/source/receive_statistics_impl.h b/modules/rtp_rtcp/source/receive_statistics_impl.h
index 3ab1160..d4bcc45 100644
--- a/modules/rtp_rtcp/source/receive_statistics_impl.h
+++ b/modules/rtp_rtcp/source/receive_statistics_impl.h
@@ -11,14 +11,13 @@
#ifndef MODULES_RTP_RTCP_SOURCE_RECEIVE_STATISTICS_IMPL_H_
#define MODULES_RTP_RTCP_SOURCE_RECEIVE_STATISTICS_IMPL_H_
-#include "modules/rtp_rtcp/include/receive_statistics.h"
-
#include <algorithm>
#include <map>
#include <vector>
#include "absl/types/optional.h"
#include "modules/include/module_common_types_public.h"
+#include "modules/rtp_rtcp/include/receive_statistics.h"
#include "rtc_base/critical_section.h"
#include "rtc_base/rate_statistics.h"
#include "rtc_base/thread_annotations.h"
diff --git a/modules/rtp_rtcp/source/receive_statistics_unittest.cc b/modules/rtp_rtcp/source/receive_statistics_unittest.cc
index 7840b97..f899503 100644
--- a/modules/rtp_rtcp/source/receive_statistics_unittest.cc
+++ b/modules/rtp_rtcp/source/receive_statistics_unittest.cc
@@ -8,10 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/include/receive_statistics.h"
+
#include <memory>
#include <vector>
-#include "modules/rtp_rtcp/include/receive_statistics.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "rtc_base/random.h"
#include "system_wrappers/include/clock.h"
diff --git a/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc b/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc
index 6347758..9f42f57 100644
--- a/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc
+++ b/modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc
@@ -9,6 +9,7 @@
*/
#include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
+
#include "system_wrappers/include/clock.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/modules/rtp_rtcp/source/rtcp_nack_stats_unittest.cc b/modules/rtp_rtcp/source/rtcp_nack_stats_unittest.cc
index 1c30173..60858e1 100644
--- a/modules/rtp_rtcp/source/rtcp_nack_stats_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_nack_stats_unittest.cc
@@ -9,6 +9,7 @@
*/
#include "modules/rtp_rtcp/source/rtcp_nack_stats.h"
+
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/app.cc b/modules/rtp_rtcp/source/rtcp_packet/app.cc
index eadd4d9..86cde91 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/app.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/app.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/source/rtcp_packet/app.h"
#include <string.h>
+
#include <cstdint>
#include "modules/rtp_rtcp/source/byte_io.h"
diff --git a/modules/rtp_rtcp/source/rtcp_packet/bye.cc b/modules/rtp_rtcp/source/rtcp_packet/bye.cc
index 23ac35f..6553b89 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/bye.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/bye.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/source/rtcp_packet/bye.h"
#include <string.h>
+
#include <cstdint>
#include <utility>
diff --git a/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc
index c94513f..aabae0d 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc
@@ -21,9 +21,9 @@
using ::testing::ElementsAre;
using ::testing::ElementsAreArray;
using ::testing::Invoke;
+using ::testing::make_tuple;
using ::testing::MockFunction;
using ::testing::UnorderedElementsAreArray;
-using ::testing::make_tuple;
using ::webrtc::rtcp::Nack;
constexpr uint32_t kSenderSsrc = 0x12345678;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h b/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h
index 7470d1d..bd66b8d 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h
@@ -13,6 +13,7 @@
#include <stddef.h>
#include <stdint.h>
+
#include <vector>
#include "modules/rtp_rtcp/source/rtcp_packet.h"
diff --git a/modules/rtp_rtcp/source/rtcp_packet/sdes.cc b/modules/rtp_rtcp/source/rtcp_packet/sdes.cc
index 0ef4329..b2d0ff9 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/sdes.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/sdes.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/source/rtcp_packet/sdes.h"
#include <string.h>
+
#include <utility>
#include "modules/rtp_rtcp/source/byte_io.h"
diff --git a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
index 83f28b0..3f99b03 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
@@ -22,8 +22,8 @@
namespace webrtc {
namespace {
-using ::testing::ElementsAreArray;
using rtcp::TransportFeedback;
+using ::testing::ElementsAreArray;
static const int kHeaderSize = 20;
static const int kStatusChunkSize = 2;
diff --git a/modules/rtp_rtcp/source/rtcp_packet_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
index 788028d..dccd135 100644
--- a/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
@@ -9,6 +9,7 @@
*/
#include "modules/rtp_rtcp/source/rtcp_packet.h"
+
#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
index c966470..6fa2cdf 100644
--- a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/rtcp_receiver.h"
+
#include <memory>
#include "api/array_view.h"
@@ -33,7 +35,6 @@
#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
#include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h"
#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
-#include "modules/rtp_rtcp/source/rtcp_receiver.h"
#include "modules/rtp_rtcp/source/time_util.h"
#include "rtc_base/arraysize.h"
#include "rtc_base/fake_clock.h"
diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc
index 19f1e26..af5cd27 100644
--- a/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -10,9 +10,9 @@
#include "modules/rtp_rtcp/source/rtcp_sender.h"
-#include <string.h> // memcpy
-#include <algorithm> // std::min
+#include <string.h> // memcpy
+#include <algorithm> // std::min
#include <utility>
#include "absl/memory/memory.h"
diff --git a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
index 0ddfb94..01101c0 100644
--- a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
@@ -8,13 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/rtcp_sender.h"
+
#include <memory>
#include "absl/base/macros.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "modules/rtp_rtcp/source/rtcp_packet/bye.h"
#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h"
-#include "modules/rtp_rtcp/source/rtcp_sender.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "modules/rtp_rtcp/source/rtp_rtcp_impl.h"
#include "modules/rtp_rtcp/source/time_util.h"
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.cc b/modules/rtp_rtcp/source/rtcp_transceiver.cc
index cca3205..a378b36 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver.cc
@@ -75,26 +75,21 @@
void RtcpTransceiver::SetReadyToSend(bool ready) {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
- task_queue_->PostTask([ptr, ready] {
- ptr->SetReadyToSend(ready);
- });
+ task_queue_->PostTask([ptr, ready] { ptr->SetReadyToSend(ready); });
}
void RtcpTransceiver::ReceivePacket(rtc::CopyOnWriteBuffer packet) {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
int64_t now_us = rtc::TimeMicros();
- task_queue_->PostTask([ptr, packet, now_us] {
- ptr->ReceivePacket(packet, now_us);
- });
+ task_queue_->PostTask(
+ [ptr, packet, now_us] { ptr->ReceivePacket(packet, now_us); });
}
void RtcpTransceiver::SendCompoundPacket() {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
- task_queue_->PostTask([ptr] {
- ptr->SendCompoundPacket();
- });
+ task_queue_->PostTask([ptr] { ptr->SendCompoundPacket(); });
}
void RtcpTransceiver::SetRemb(int64_t bitrate_bps,
@@ -102,9 +97,7 @@
RTC_CHECK(rtcp_transceiver_);
// TODO(danilchap): Replace with lambda with move capture when available.
struct SetRembClosure {
- void operator()() {
- ptr->SetRemb(bitrate_bps, std::move(ssrcs));
- }
+ void operator()() { ptr->SetRemb(bitrate_bps, std::move(ssrcs)); }
RtcpTransceiverImpl* ptr;
int64_t bitrate_bps;
@@ -117,9 +110,7 @@
void RtcpTransceiver::UnsetRemb() {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
- task_queue_->PostTask([ptr] {
- ptr->UnsetRemb();
- });
+ task_queue_->PostTask([ptr] { ptr->UnsetRemb(); });
}
uint32_t RtcpTransceiver::SSRC() const {
@@ -130,9 +121,7 @@
const rtcp::TransportFeedback& packet) {
RTC_CHECK(rtcp_transceiver_);
struct Closure {
- void operator()() {
- ptr->SendRawPacket(raw_packet);
- }
+ void operator()() { ptr->SendRawPacket(raw_packet); }
RtcpTransceiverImpl* ptr;
rtc::Buffer raw_packet;
};
@@ -145,9 +134,7 @@
RTC_CHECK(rtcp_transceiver_);
// TODO(danilchap): Replace with lambda with move capture when available.
struct Closure {
- void operator()() {
- ptr->SendNack(ssrc, std::move(sequence_numbers));
- }
+ void operator()() { ptr->SendNack(ssrc, std::move(sequence_numbers)); }
RtcpTransceiverImpl* ptr;
uint32_t ssrc;
@@ -167,9 +154,7 @@
RTC_CHECK(rtcp_transceiver_);
// TODO(danilchap): Replace with lambda with move capture when available.
struct Closure {
- void operator()() {
- ptr->SendFullIntraRequest(ssrcs);
- }
+ void operator()() { ptr->SendFullIntraRequest(ssrcs); }
RtcpTransceiverImpl* ptr;
std::vector<uint32_t> ssrcs;
diff --git a/modules/rtp_rtcp/source/rtp_format.h b/modules/rtp_rtcp/source/rtp_format.h
index b28e9a6..1d9c142 100644
--- a/modules/rtp_rtcp/source/rtp_format.h
+++ b/modules/rtp_rtcp/source/rtp_format.h
@@ -12,6 +12,7 @@
#define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_H_
#include <stdint.h>
+
#include <memory>
#include <vector>
diff --git a/modules/rtp_rtcp/source/rtp_format_h264.cc b/modules/rtp_rtcp/source/rtp_format_h264.cc
index 28cc2fb..f979d9f 100644
--- a/modules/rtp_rtcp/source/rtp_format_h264.cc
+++ b/modules/rtp_rtcp/source/rtp_format_h264.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/source/rtp_format_h264.h"
#include <string.h>
+
#include <cstddef>
#include <cstdint>
#include <iterator>
@@ -75,8 +76,7 @@
PayloadSizeLimits limits,
H264PacketizationMode packetization_mode,
const RTPFragmentationHeader& fragmentation)
- : limits_(limits),
- num_packets_left_(0) {
+ : limits_(limits), num_packets_left_(0) {
// Guard against uninitialized memory in packetization_mode.
RTC_CHECK(packetization_mode == H264PacketizationMode::NonInterleaved ||
packetization_mode == H264PacketizationMode::SingleNalUnit);
diff --git a/modules/rtp_rtcp/source/rtp_format_h264.h b/modules/rtp_rtcp/source/rtp_format_h264.h
index 3a51359..7102fc7 100644
--- a/modules/rtp_rtcp/source/rtp_format_h264.h
+++ b/modules/rtp_rtcp/source/rtp_format_h264.h
@@ -13,6 +13,7 @@
#include <stddef.h>
#include <stdint.h>
+
#include <deque>
#include <memory>
#include <queue>
diff --git a/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc b/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
index 484dbcb..d3ba982 100644
--- a/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/rtp_format_h264.h"
+
#include <memory>
#include <vector>
@@ -16,7 +18,6 @@
#include "modules/include/module_common_types.h"
#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
#include "modules/rtp_rtcp/source/byte_io.h"
-#include "modules/rtp_rtcp/source/rtp_format_h264.h"
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/modules/rtp_rtcp/source/rtp_format_unittest.cc b/modules/rtp_rtcp/source/rtp_format_unittest.cc
index d07c65c..53264c6 100644
--- a/modules/rtp_rtcp/source/rtp_format_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_unittest.cc
@@ -20,11 +20,11 @@
namespace webrtc {
namespace {
-using ::testing::ElementsAre;
-using ::testing::Le;
-using ::testing::Gt;
using ::testing::Each;
+using ::testing::ElementsAre;
+using ::testing::Gt;
using ::testing::IsEmpty;
+using ::testing::Le;
using ::testing::Not;
using ::testing::SizeIs;
diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic.cc b/modules/rtp_rtcp/source/rtp_format_video_generic.cc
index a45597d..3c0fe03 100644
--- a/modules/rtp_rtcp/source/rtp_format_video_generic.cc
+++ b/modules/rtp_rtcp/source/rtp_format_video_generic.cc
@@ -8,11 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/rtp_format_video_generic.h"
+
#include <assert.h>
#include <string.h>
#include "absl/types/optional.h"
-#include "modules/rtp_rtcp/source/rtp_format_video_generic.h"
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic.h b/modules/rtp_rtcp/source/rtp_format_video_generic.h
index 4e21c96..43d4bcf 100644
--- a/modules/rtp_rtcp/source/rtp_format_video_generic.h
+++ b/modules/rtp_rtcp/source/rtp_format_video_generic.h
@@ -11,6 +11,7 @@
#define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VIDEO_GENERIC_H_
#include <stdint.h>
+
#include <vector>
#include "api/array_view.h"
diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc b/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc
index d43af77..9ba0573 100644
--- a/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/rtp_format_video_generic.h"
+
#include <algorithm>
#include <limits>
#include <memory>
@@ -17,7 +19,6 @@
#include "modules/include/module_common_types.h"
#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
#include "modules/rtp_rtcp/source/byte_io.h"
-#include "modules/rtp_rtcp/source/rtp_format_video_generic.h"
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
#include "test/gmock.h"
#include "test/gtest.h"
@@ -25,11 +26,11 @@
namespace webrtc {
namespace {
+using ::testing::Contains;
using ::testing::Each;
using ::testing::ElementsAreArray;
using ::testing::Le;
using ::testing::SizeIs;
-using ::testing::Contains;
constexpr RtpPacketizer::PayloadSizeLimits kNoSizeLimits;
diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.cc b/modules/rtp_rtcp/source/rtp_format_vp8.cc
index dc56b31..bf7b969 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp8.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp8.cc
@@ -12,6 +12,7 @@
#include <stdint.h>
#include <string.h> // memcpy
+
#include <vector>
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.h b/modules/rtp_rtcp/source/rtp_format_vp8.h
index 0e0fa52..6e9cbb4 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp8.h
+++ b/modules/rtp_rtcp/source/rtp_format_vp8.h
@@ -26,6 +26,7 @@
#define MODULES_RTP_RTCP_SOURCE_RTP_FORMAT_VP8_H_
#include <stddef.h>
+
#include <cstdint>
#include <vector>
diff --git a/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
index 769b0b7..7128ae3 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc
@@ -8,9 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/rtp_format_vp8.h"
+
#include <memory>
-#include "modules/rtp_rtcp/source/rtp_format_vp8.h"
#include "modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h"
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
#include "test/gmock.h"
diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.h b/modules/rtp_rtcp/source/rtp_format_vp9.h
index 2918b06..3c4ae76 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp9.h
+++ b/modules/rtp_rtcp/source/rtp_format_vp9.h
@@ -23,6 +23,7 @@
#include <stddef.h>
#include <stdint.h>
+
#include <vector>
#include "api/array_view.h"
diff --git a/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
index 2a7cb15..77fe690 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
@@ -8,10 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/rtp_format_vp9.h"
+
#include <memory>
#include <vector>
-#include "modules/rtp_rtcp/source/rtp_format_vp9.h"
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h
index 47a2a74..9e79455 100644
--- a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h
+++ b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h
@@ -12,6 +12,7 @@
#include <stddef.h>
#include <stdint.h>
+
#include <vector>
#include "absl/types/optional.h"
diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.cc b/modules/rtp_rtcp/source/rtp_header_extensions.cc
index 834a063..d9ba258 100644
--- a/modules/rtp_rtcp/source/rtp_header_extensions.cc
+++ b/modules/rtp_rtcp/source/rtp_header_extensions.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
#include <string.h>
+
#include <cmath>
#include <limits>
diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.h b/modules/rtp_rtcp/source/rtp_header_extensions.h
index 5cf6c4f..927c9c3 100644
--- a/modules/rtp_rtcp/source/rtp_header_extensions.h
+++ b/modules/rtp_rtcp/source/rtp_header_extensions.h
@@ -12,6 +12,7 @@
#include <stddef.h>
#include <stdint.h>
+
#include <string>
#include "api/array_view.h"
@@ -163,9 +164,7 @@
static bool Parse(rtc::ArrayView<const uint8_t> data,
PlayoutDelay* playout_delay);
- static size_t ValueSize(const PlayoutDelay&) {
- return kValueSizeBytes;
- }
+ static size_t ValueSize(const PlayoutDelay&) { return kValueSizeBytes; }
static bool Write(rtc::ArrayView<uint8_t> data,
const PlayoutDelay& playout_delay);
};
@@ -180,9 +179,7 @@
static bool Parse(rtc::ArrayView<const uint8_t> data,
VideoContentType* content_type);
- static size_t ValueSize(VideoContentType) {
- return kValueSizeBytes;
- }
+ static size_t ValueSize(VideoContentType) { return kValueSizeBytes; }
static bool Write(rtc::ArrayView<uint8_t> data,
VideoContentType content_type);
};
diff --git a/modules/rtp_rtcp/source/rtp_packet_received.cc b/modules/rtp_rtcp/source/rtp_packet_received.cc
index 05f6370..56aea8e 100644
--- a/modules/rtp_rtcp/source/rtp_packet_received.cc
+++ b/modules/rtp_rtcp/source/rtp_packet_received.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include <stddef.h>
+
#include <cstdint>
#include <vector>
diff --git a/modules/rtp_rtcp/source/rtp_packet_received.h b/modules/rtp_rtcp/source/rtp_packet_received.h
index 566b116..f5d3176 100644
--- a/modules/rtp_rtcp/source/rtp_packet_received.h
+++ b/modules/rtp_rtcp/source/rtp_packet_received.h
@@ -11,6 +11,7 @@
#define MODULES_RTP_RTCP_SOURCE_RTP_PACKET_RECEIVED_H_
#include <stdint.h>
+
#include <vector>
#include "api/array_view.h"
diff --git a/modules/rtp_rtcp/source/rtp_packet_to_send.h b/modules/rtp_rtcp/source/rtp_packet_to_send.h
index 1cbe7de..b222e40 100644
--- a/modules/rtp_rtcp/source/rtp_packet_to_send.h
+++ b/modules/rtp_rtcp/source/rtp_packet_to_send.h
@@ -12,6 +12,7 @@
#include <stddef.h>
#include <stdint.h>
+
#include <vector>
#include "absl/types/optional.h"
diff --git a/modules/rtp_rtcp/source/rtp_packet_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_unittest.cc
index 8121e81..9148c67 100644
--- a/modules/rtp_rtcp/source/rtp_packet_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_packet_unittest.cc
@@ -7,12 +7,11 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
-
#include "common_video/test/utilities.h"
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
+#include "modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
#include "rtc_base/random.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index aaf1822..aa50227 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/source/rtp_rtcp_impl.h"
#include <string.h>
+
#include <algorithm>
#include <cstdint>
#include <set>
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h
index e22126c..ec62aeb 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h
@@ -13,6 +13,7 @@
#include <stddef.h>
#include <stdint.h>
+
#include <memory>
#include <set>
#include <string>
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
index 2f059c4..31f9b24 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/rtp_rtcp_impl.h"
+
#include <map>
#include <memory>
#include <set>
@@ -21,7 +23,6 @@
#include "modules/rtp_rtcp/source/rtcp_packet.h"
#include "modules/rtp_rtcp/source/rtcp_packet/nack.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "modules/rtp_rtcp/source/rtp_rtcp_impl.h"
#include "modules/rtp_rtcp/source/rtp_sender_video.h"
#include "rtc_base/rate_limiter.h"
#include "test/gmock.h"
diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.cc b/modules/rtp_rtcp/source/rtp_sender_audio.cc
index 9e5e71c..f3e742a 100644
--- a/modules/rtp_rtcp/source/rtp_sender_audio.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_audio.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/source/rtp_sender_audio.h"
#include <string.h>
+
#include <memory>
#include <utility>
diff --git a/modules/rtp_rtcp/source/rtp_sender_audio_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_audio_unittest.cc
index 2228994..dea2a38 100644
--- a/modules/rtp_rtcp/source/rtp_sender_audio_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_audio_unittest.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/rtp_sender_audio.h"
+
#include <vector>
#include "api/transport/field_trial_based_config.h"
@@ -16,7 +18,6 @@
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "modules/rtp_rtcp/source/rtp_sender.h"
-#include "modules/rtp_rtcp/source/rtp_sender_audio.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc
index 02462b4..495ffee 100644
--- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/rtp_sender.h"
+
#include <memory>
#include <vector>
@@ -29,7 +31,6 @@
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
-#include "modules/rtp_rtcp/source/rtp_sender.h"
#include "modules/rtp_rtcp/source/rtp_sender_video.h"
#include "modules/rtp_rtcp/source/rtp_utility.h"
#include "rtc_base/arraysize.h"
diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc
index 750dcf5..632088b 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_video.cc
@@ -448,8 +448,9 @@
int32_t retransmission_settings;
bool set_video_rotation;
bool set_color_space = false;
- bool set_frame_marking = video_header->codec == kVideoCodecH264 &&
- video_header->frame_marking.temporal_id != kNoTemporalIdx;
+ bool set_frame_marking =
+ video_header->codec == kVideoCodecH264 &&
+ video_header->frame_marking.temporal_id != kNoTemporalIdx;
const absl::optional<PlayoutDelay> playout_delay =
playout_delay_oracle_->PlayoutDelayToSend(video_header->playout_delay);
diff --git a/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc
index 2589ad2..f19c110 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/rtp_sender_video.h"
+
#include <string>
#include <vector>
@@ -22,7 +24,6 @@
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "modules/rtp_rtcp/source/rtp_sender.h"
-#include "modules/rtp_rtcp/source/rtp_sender_video.h"
#include "rtc_base/arraysize.h"
#include "rtc_base/rate_limiter.h"
#include "test/gmock.h"
diff --git a/modules/rtp_rtcp/source/rtp_sequence_number_map.h b/modules/rtp_rtcp/source/rtp_sequence_number_map.h
index 68fcc63..56979a3 100644
--- a/modules/rtp_rtcp/source/rtp_sequence_number_map.h
+++ b/modules/rtp_rtcp/source/rtp_sequence_number_map.h
@@ -13,7 +13,6 @@
#include <cstddef>
#include <cstdint>
-
#include <deque>
#include "absl/types/optional.h"
diff --git a/modules/rtp_rtcp/source/rtp_utility.cc b/modules/rtp_rtcp/source/rtp_utility.cc
index 6c2629c..21d3595 100644
--- a/modules/rtp_rtcp/source/rtp_utility.cc
+++ b/modules/rtp_rtcp/source/rtp_utility.cc
@@ -12,6 +12,7 @@
#include <assert.h>
#include <stddef.h>
+
#include <string>
#include "api/array_view.h"
@@ -245,8 +246,8 @@
header->extension.video_timing = {0u, 0u, 0u, 0u, 0u, 0u, false};
header->extension.has_frame_marking = false;
- header->extension.frame_marking = {false, false, false, false, false,
- kNoTemporalIdx, 0, 0};
+ header->extension.frame_marking = {false, false, false, false,
+ false, kNoTemporalIdx, 0, 0};
if (X) {
/* RTP header extension, RFC 3550.
@@ -498,7 +499,7 @@
}
case kRtpExtensionFrameMarking: {
if (!FrameMarkingExtension::Parse(rtc::MakeArrayView(ptr, len + 1),
- &header->extension.frame_marking)) {
+ &header->extension.frame_marking)) {
RTC_LOG(LS_WARNING) << "Incorrect frame marking len: " << len;
return;
}
diff --git a/modules/rtp_rtcp/source/rtp_utility.h b/modules/rtp_rtcp/source/rtp_utility.h
index b1bc352..cdda9ef 100644
--- a/modules/rtp_rtcp/source/rtp_utility.h
+++ b/modules/rtp_rtcp/source/rtp_utility.h
@@ -12,6 +12,7 @@
#define MODULES_RTP_RTCP_SOURCE_RTP_UTILITY_H_
#include <stdint.h>
+
#include <algorithm>
#include "absl/strings/string_view.h"
diff --git a/modules/rtp_rtcp/source/tmmbr_help.cc b/modules/rtp_rtcp/source/tmmbr_help.cc
index 9404ca4..569ed4d 100644
--- a/modules/rtp_rtcp/source/tmmbr_help.cc
+++ b/modules/rtp_rtcp/source/tmmbr_help.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/source/tmmbr_help.h"
#include <stddef.h>
+
#include <limits>
#include "absl/algorithm/container.h"
diff --git a/modules/rtp_rtcp/source/tmmbr_help.h b/modules/rtp_rtcp/source/tmmbr_help.h
index bf86f65..8c26b22 100644
--- a/modules/rtp_rtcp/source/tmmbr_help.h
+++ b/modules/rtp_rtcp/source/tmmbr_help.h
@@ -12,6 +12,7 @@
#define MODULES_RTP_RTCP_SOURCE_TMMBR_HELP_H_
#include <stdint.h>
+
#include <vector>
#include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h"
diff --git a/modules/rtp_rtcp/source/ulpfec_generator.cc b/modules/rtp_rtcp/source/ulpfec_generator.cc
index 56dae29..ec9088c 100644
--- a/modules/rtp_rtcp/source/ulpfec_generator.cc
+++ b/modules/rtp_rtcp/source/ulpfec_generator.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/source/ulpfec_generator.h"
#include <string.h>
+
#include <cstdint>
#include <memory>
#include <utility>
diff --git a/modules/rtp_rtcp/source/ulpfec_generator.h b/modules/rtp_rtcp/source/ulpfec_generator.h
index 74a1d80..7b18c6e 100644
--- a/modules/rtp_rtcp/source/ulpfec_generator.h
+++ b/modules/rtp_rtcp/source/ulpfec_generator.h
@@ -13,6 +13,7 @@
#include <stddef.h>
#include <stdint.h>
+
#include <list>
#include <memory>
#include <vector>
diff --git a/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc b/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc
index 10099cf..6880f79 100644
--- a/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc
+++ b/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/ulpfec_generator.h"
+
#include <list>
#include <memory>
#include <utility>
@@ -16,7 +18,6 @@
#include "modules/rtp_rtcp/source/byte_io.h"
#include "modules/rtp_rtcp/source/fec_test_helper.h"
#include "modules/rtp_rtcp/source/forward_error_correction.h"
-#include "modules/rtp_rtcp/source/ulpfec_generator.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
index 2ad1239..725f9a5 100644
--- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
+++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h"
+
#include <string.h>
#include <memory>
@@ -17,7 +19,6 @@
#include "modules/rtp_rtcp/source/byte_io.h"
#include "modules/rtp_rtcp/source/forward_error_correction.h"
#include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
-#include "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h"
#include "rtc_base/checks.h"
#include "rtc_base/random.h"
#include "test/gtest.h"
diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc b/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc
index 8bda50c..a5d6368 100644
--- a/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc
+++ b/modules/rtp_rtcp/source/ulpfec_receiver_impl.cc
@@ -11,6 +11,7 @@
#include "modules/rtp_rtcp/source/ulpfec_receiver_impl.h"
#include <string.h>
+
#include <memory>
#include <utility>
diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h
index fca80c4..51502cd 100644
--- a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h
+++ b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h
@@ -13,6 +13,7 @@
#include <stddef.h>
#include <stdint.h>
+
#include <memory>
#include <vector>
diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc b/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc
index dd33d6b..cd1798b 100644
--- a/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc
@@ -8,13 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "modules/rtp_rtcp/include/ulpfec_receiver.h"
+
#include <string.h>
#include <list>
#include <memory>
#include "modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "modules/rtp_rtcp/include/ulpfec_receiver.h"
#include "modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h"
#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
#include "modules/rtp_rtcp/source/byte_io.h"