IWYU test/ and use C++ headers
using
find test -name "*.h" -o -name "*.cc" | xargs tools_webrtc/iwyu/apply_include_cleaner.py
followed by
git cl format
and
tools_webrtc/gn_check_autofix.py -C out/Default
followed by running clang-tidy with
tools/clang/scripts/build_clang_tools_extra.py \
--fetch out/Default clang-tidy clang-apply-replacements
ninja -C out/Default
gn gen out/Default --export-compile-commands
cd out/Default
tools/clang/third_party/llvm/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -p . \
-clang-tidy-binary out/Default/tools/clang/third_party/llvm/build/bin/clang-tidy \
-clang-apply-replacements-binary \
out/Default/tools/clang/third_party/llvm/build/bin/clang-apply-replacements \
-checks='-*,modernize-deprecated-headers' \
-fix
to move from C style standard headers to C++ style variants followed
another round of IWYU (which brought back stdio.h), format and gn_check_autofix.
This was followed by a manual pass removing C style headers from C++ headers when the corresponding C++-style header was in included in the .cc file. IWYU after thought brought some instances of stdio.h back *again*.
Bug: webrtc:42226242
Change-Id: I3ec5ee4bd3d4f81e25f5dfca3764bb85c2cad99b
No-Iwyu: false positive of jpeg include
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/396321
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@meta.com>
Cr-Commit-Position: refs/heads/main@{#44937}
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 9f10a3f..dc2fcb7 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -55,6 +55,7 @@
"../api:scoped_refptr",
"../api:sequence_checker",
"../api/environment",
+ "../api/units:time_delta",
"../api/video:encoded_image",
"../api/video:video_frame",
"../api/video:video_frame_i010",
@@ -71,6 +72,7 @@
"../rtc_base:checks",
"../rtc_base:criticalsection",
"../rtc_base:logging",
+ "../rtc_base:macromagic",
"../rtc_base:random",
"../rtc_base:rtc_event",
"../rtc_base/synchronization:mutex",
@@ -122,6 +124,7 @@
"../api/video:video_rtp_headers",
"../media:video_adapter",
"../media:video_broadcaster",
+ "../rtc_base:macromagic",
"../rtc_base/synchronization:mutex",
]
}
@@ -212,17 +215,24 @@
":test_video_capturer",
"../api:array_view",
"../api:create_frame_generator",
+ "../api:fec_controller_api",
"../api:frame_generator_api",
+ "../api:make_ref_counted",
"../api:scoped_refptr",
"../api/environment",
"../api/task_queue",
+ "../api/units:data_rate",
+ "../api/video:encoded_image",
+ "../api/video:render_resolution",
"../api/video:video_frame",
+ "../api/video:video_frame_type",
"../api/video:video_rtp_headers",
"../api/video_codecs:video_codecs_api",
"../common_video",
"../rtc_base:checks",
"../rtc_base:criticalsection",
"../rtc_base:logging",
+ "../rtc_base:macromagic",
"../rtc_base:refcount",
"../rtc_base:timeutils",
"../rtc_base/synchronization:mutex",
@@ -262,6 +272,7 @@
"../api:libjingle_peerconnection_api",
"../api:media_stream_interface",
"../api:scoped_refptr",
+ "../api/video:video_frame",
"../modules/video_capture:video_capture_module",
"../rtc_base:logging",
"../rtc_base:threading",
@@ -282,6 +293,8 @@
deps = [
":test_video_capturer",
":video_test_common",
+ "../api/video:video_frame",
+ "../common_video",
"//third_party/abseil-cpp/absl/memory",
]
if (is_mac || is_ios) {
@@ -382,6 +395,7 @@
"../rtc_base:checks",
"../rtc_base:criticalsection",
"../rtc_base:logging",
+ "../rtc_base:macromagic",
"../rtc_base:rtc_numerics",
"../rtc_base:stringutils",
"../rtc_base/synchronization:mutex",
@@ -501,6 +515,7 @@
":video_frame_writer",
"../api/test/video:video_frame_writer",
"../api/units:time_delta",
+ "../api/units:timestamp",
"../api/video:video_frame",
"../rtc_base:checks",
"../system_wrappers",
@@ -569,6 +584,7 @@
"../rtc_base:rtc_event",
"../rtc_base:stringutils",
"../rtc_base/system:file_wrapper",
+ "//third_party/abseil-cpp/absl/strings:string_view",
]
}
@@ -691,9 +707,12 @@
":fixed_fps_video_frame_writer_adapter",
":test_support",
":video_frame_writer",
+ "../api:time_controller",
+ "../api/test/video:video_frame_writer",
"../api/units:time_delta",
"../api/units:timestamp",
"../api/video:video_frame",
+ "../rtc_base:macromagic",
"../rtc_base/synchronization:mutex",
"time_controller",
]
@@ -737,11 +756,14 @@
"../api:mock_video_encoder",
"../api:rtc_error",
"../api:rtc_error_matchers",
+ "../api:rtp_headers",
+ "../api:rtp_parameters",
"../api:scoped_refptr",
"../api:simulcast_test_fixture_api",
"../api:time_controller",
"../api/environment",
"../api/environment:environment_factory",
+ "../api/numerics",
"../api/task_queue",
"../api/task_queue:task_queue_test",
"../api/test/video:function_video_factory",
@@ -752,6 +774,8 @@
"../api/units:time_delta",
"../api/units:timestamp",
"../api/video:encoded_image",
+ "../api/video:resolution",
+ "../api/video:video_bitrate_allocation",
"../api/video:video_frame",
"../api/video:video_frame_type",
"../api/video_codecs:builtin_video_decoder_factory",
@@ -770,7 +794,9 @@
"../modules/video_coding:webrtc_vp8",
"../modules/video_coding:webrtc_vp9",
"../modules/video_coding/svc:scalability_mode_util",
+ "../rtc_base:checks",
"../rtc_base:criticalsection",
+ "../rtc_base:macromagic",
"../rtc_base:rtc_base_tests_utils",
"../rtc_base:rtc_event",
"../rtc_base:threading",
@@ -1019,9 +1045,12 @@
"../api:sequence_checker",
"../api/environment",
"../api/task_queue",
+ "../api/units:time_delta",
"../api/video:encoded_image",
"../api/video:video_bitrate_allocation",
+ "../api/video:video_codec_constants",
"../api/video:video_frame",
+ "../api/video:video_frame_type",
"../api/video:video_rtp_headers",
"../api/video_codecs:video_codecs_api",
"../api/video_codecs:vp8_temporal_layers_factory",
@@ -1058,7 +1087,10 @@
"encoder_settings.h",
]
deps = [
+ "../api:field_trials_view",
+ "../api:make_ref_counted",
"../api:scoped_refptr",
+ "../api/video:video_frame",
"../api/video_codecs:video_codecs_api",
"../call:rtp_interfaces",
"../call:video_receive_stream_api",
@@ -1083,6 +1115,9 @@
]
deps = [
"../api/task_queue",
+ "../api/units:time_delta",
+ "../rtc_base:socket",
+ "../rtc_base:socket_server",
"../rtc_base:threading",
"../rtc_base:timeutils",
"//third_party/abseil-cpp/absl/functional:any_invocable",
@@ -1211,6 +1246,10 @@
"../api/audio_codecs:audio_codecs_api",
"../api/audio_codecs:builtin_audio_decoder_factory",
"../api/environment",
+ "../api/units:data_rate",
+ "../api/units:time_delta",
+ "../rtc_base:buffer",
+ "../rtc_base:checks",
]
}
@@ -1237,6 +1276,7 @@
":fileutils",
":test_support",
"../modules/audio_device:test_audio_device_module",
+ "../rtc_base:buffer",
]
}
@@ -1285,13 +1325,16 @@
"..//test/network:simulated_network",
"../api:array_view",
"../api:create_frame_generator",
+ "../api:fec_controller_api",
"../api:frame_generator_api",
+ "../api:network_state_predictor_api",
"../api:rtp_headers",
"../api:rtp_parameters",
"../api:scoped_refptr",
"../api:simulated_network_api",
"../api:transport_api",
"../api/audio:audio_device",
+ "../api/audio:audio_processing",
"../api/audio:builtin_audio_processing_builder",
"../api/audio_codecs:audio_codecs_api",
"../api/audio_codecs:builtin_audio_decoder_factory",
@@ -1303,7 +1346,9 @@
"../api/test/video:function_video_factory",
"../api/transport:bitrate_settings",
"../api/transport:field_trial_based_config",
+ "../api/transport:network_control",
"../api/units:time_delta",
+ "../api/units:timestamp",
"../api/video:builtin_video_bitrate_allocator_factory",
"../api/video:video_bitrate_allocator_factory",
"../api/video:video_frame",
@@ -1312,6 +1357,7 @@
"../call",
"../call:call_interfaces",
"../call:fake_network",
+ "../call:rtp_interfaces",
"../call:simulated_packet_receiver",
"../call:video_receive_stream_api",
"../call:video_send_stream_api",
@@ -1410,10 +1456,12 @@
deps = [
":test_support",
"../api:rtp_packet_info",
+ "../api/units:timestamp",
"../api/video:encoded_frame",
"../api/video:encoded_image",
"../api/video:video_frame_type",
"../api/video:video_rtp_headers",
+ "../rtc_base:checks",
]
}
diff --git a/test/android/native_test_util.cc b/test/android/native_test_util.cc
index 529ffbe..31cb564 100644
--- a/test/android/native_test_util.cc
+++ b/test/android/native_test_util.cc
@@ -16,8 +16,8 @@
#include "test/android/native_test_util.h"
#include <android/log.h>
-#include <stdio.h>
+#include <cstdio>
#include <optional>
#include <string>
diff --git a/test/call_config_utils.h b/test/call_config_utils.h
index 97cfdc3..72ba671 100644
--- a/test/call_config_utils.h
+++ b/test/call_config_utils.h
@@ -11,6 +11,7 @@
#ifndef TEST_CALL_CONFIG_UTILS_H_
#define TEST_CALL_CONFIG_UTILS_H_
+#include "api/call/transport.h"
#include "call/video_receive_stream.h"
#include "rtc_base/strings/json.h"
diff --git a/test/call_config_utils_unittest.cc b/test/call_config_utils_unittest.cc
index 46ebf18..8c9598e 100644
--- a/test/call_config_utils_unittest.cc
+++ b/test/call_config_utils_unittest.cc
@@ -10,6 +10,7 @@
#include "test/call_config_utils.h"
+#include "api/rtp_headers.h"
#include "call/video_receive_stream.h"
#include "test/gtest.h"
diff --git a/test/call_test.cc b/test/call_test.cc
index 4d55cde..685ba45 100644
--- a/test/call_test.cc
+++ b/test/call_test.cc
@@ -65,7 +65,6 @@
#include "test/gtest.h"
#include "test/network/simulated_network.h"
#include "test/rtp_rtcp_observer.h"
-#include "test/testsupport/file_utils.h"
#include "test/video_test_constants.h"
#include "video/config/video_encoder_config.h"
diff --git a/test/call_test.h b/test/call_test.h
index 37c27c8..1a2fdbd 100644
--- a/test/call_test.h
+++ b/test/call_test.h
@@ -10,6 +10,8 @@
#ifndef TEST_CALL_TEST_H_
#define TEST_CALL_TEST_H_
+#include <cstddef>
+#include <cstdint>
#include <map>
#include <memory>
#include <optional>
@@ -18,27 +20,46 @@
#include "api/array_view.h"
#include "api/audio/audio_device.h"
+#include "api/audio/audio_processing.h"
+#include "api/audio_codecs/audio_decoder_factory.h"
+#include "api/audio_codecs/audio_encoder_factory.h"
+#include "api/call/transport.h"
#include "api/environment/environment.h"
+#include "api/fec_controller.h"
+#include "api/media_types.h"
+#include "api/network_state_predictor.h"
#include "api/rtc_event_log/rtc_event_log.h"
+#include "api/rtp_parameters.h"
+#include "api/scoped_refptr.h"
#include "api/task_queue/task_queue_base.h"
-#include "api/task_queue/task_queue_factory.h"
#include "api/test/simulated_network.h"
#include "api/test/video/function_video_decoder_factory.h"
#include "api/test/video/function_video_encoder_factory.h"
+#include "api/transport/bitrate_settings.h"
+#include "api/transport/network_control.h"
#include "api/units/time_delta.h"
#include "api/video/video_bitrate_allocator_factory.h"
+#include "api/video/video_rotation.h"
+#include "api/video_codecs/video_decoder_factory.h"
+#include "call/audio_receive_stream.h"
+#include "call/audio_send_stream.h"
#include "call/call.h"
+#include "call/call_config.h"
+#include "call/flexfec_receive_stream.h"
+#include "call/rtp_packet_sink_interface.h"
+#include "call/video_receive_stream.h"
+#include "call/video_send_stream.h"
#include "modules/audio_device/include/test_audio_device.h"
-#include "test/encoder_settings.h"
-#include "test/fake_decoder.h"
+#include "modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "system_wrappers/include/clock.h"
#include "test/fake_videorenderer.h"
-#include "test/fake_vp8_encoder.h"
#include "test/frame_generator_capturer.h"
+#include "test/gtest.h"
#include "test/rtp_rtcp_observer.h"
#include "test/run_loop.h"
#include "test/scoped_key_value_config.h"
#include "test/test_video_capturer.h"
-#include "test/video_test_constants.h"
+#include "video/config/video_encoder_config.h"
namespace webrtc {
namespace test {
diff --git a/test/configurable_frame_size_encoder.cc b/test/configurable_frame_size_encoder.cc
index 51274f4..3bd3b5b 100644
--- a/test/configurable_frame_size_encoder.cc
+++ b/test/configurable_frame_size_encoder.cc
@@ -10,16 +10,21 @@
#include "test/configurable_frame_size_encoder.h"
-#include <string.h>
-
#include <cstdint>
-#include <type_traits>
+#include <cstring>
+#include <functional>
#include <utility>
+#include <vector>
+#include "api/fec_controller_override.h"
#include "api/video/encoded_image.h"
+#include "api/video/video_codec_type.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_frame_type.h"
+#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_encoder.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/include/video_error_codes.h"
-#include "rtc_base/checks.h"
namespace webrtc {
namespace test {
diff --git a/test/configurable_frame_size_encoder.h b/test/configurable_frame_size_encoder.h
index 1fa032a..bc90efb 100644
--- a/test/configurable_frame_size_encoder.h
+++ b/test/configurable_frame_size_encoder.h
@@ -15,15 +15,15 @@
#include <stdint.h>
#include <functional>
-#include <memory>
#include <optional>
#include <vector>
-#include "api/video/video_bitrate_allocation.h"
+#include "api/fec_controller_override.h"
+#include "api/video/video_codec_type.h"
#include "api/video/video_frame.h"
+#include "api/video/video_frame_type.h"
#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_encoder.h"
-#include "modules/video_coding/include/video_codec_interface.h"
namespace webrtc {
namespace test {
diff --git a/test/create_frame_generator_capturer.cc b/test/create_frame_generator_capturer.cc
index 0eb2e69..7268ca8 100644
--- a/test/create_frame_generator_capturer.cc
+++ b/test/create_frame_generator_capturer.cc
@@ -22,6 +22,7 @@
#include "api/units/time_delta.h"
#include "rtc_base/checks.h"
#include "system_wrappers/include/clock.h"
+#include "test/frame_generator_capturer.h"
#include "test/testsupport/file_utils.h"
namespace webrtc {
diff --git a/test/direct_transport_unittest.cc b/test/direct_transport_unittest.cc
index ab00971..4fbc11c 100644
--- a/test/direct_transport_unittest.cc
+++ b/test/direct_transport_unittest.cc
@@ -9,8 +9,10 @@
*/
#include "test/direct_transport.h"
-#include <string.h>
+#include <cstdint>
+#include <cstring>
+#include "api/media_types.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/test/drifting_clock.cc b/test/drifting_clock.cc
index 47c8e56..fc47623 100644
--- a/test/drifting_clock.cc
+++ b/test/drifting_clock.cc
@@ -10,7 +10,13 @@
#include "test/drifting_clock.h"
+#include <cstdint>
+
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
#include "rtc_base/checks.h"
+#include "system_wrappers/include/clock.h"
+#include "system_wrappers/include/ntp_time.h"
namespace webrtc {
namespace test {
diff --git a/test/drifting_clock.h b/test/drifting_clock.h
index 4a2500b..0b71a9c 100644
--- a/test/drifting_clock.h
+++ b/test/drifting_clock.h
@@ -10,8 +10,8 @@
#ifndef TEST_DRIFTING_CLOCK_H_
#define TEST_DRIFTING_CLOCK_H_
-#include <stdint.h>
-
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
#include "system_wrappers/include/clock.h"
#include "system_wrappers/include/ntp_time.h"
diff --git a/test/encoder_settings.cc b/test/encoder_settings.cc
index d8c9348..5e154c8 100644
--- a/test/encoder_settings.cc
+++ b/test/encoder_settings.cc
@@ -10,11 +10,20 @@
#include "test/encoder_settings.h"
#include <algorithm>
+#include <cstddef>
+#include <string>
+#include <vector>
+#include "api/field_trials_view.h"
+#include "api/make_ref_counted.h"
#include "api/scoped_refptr.h"
+#include "api/video/video_codec_type.h"
#include "api/video_codecs/sdp_video_format.h"
#include "call/rtp_config.h"
+#include "call/video_receive_stream.h"
+#include "call/video_send_stream.h"
#include "rtc_base/checks.h"
+#include "video/config/video_encoder_config.h"
namespace webrtc {
namespace test {
diff --git a/test/encoder_settings.h b/test/encoder_settings.h
index aa3954a..d920ceb 100644
--- a/test/encoder_settings.h
+++ b/test/encoder_settings.h
@@ -10,11 +10,12 @@
#ifndef TEST_ENCODER_SETTINGS_H_
#define TEST_ENCODER_SETTINGS_H_
-#include <stddef.h>
-
+#include <cstddef>
#include <string>
#include <vector>
+#include "api/field_trials_view.h"
+#include "api/video/video_codec_type.h"
#include "call/video_receive_stream.h"
#include "call/video_send_stream.h"
#include "video/config/video_encoder_config.h"
diff --git a/test/fake_decoder.cc b/test/fake_decoder.cc
index d077ae7..e2362a0 100644
--- a/test/fake_decoder.cc
+++ b/test/fake_decoder.cc
@@ -10,19 +10,20 @@
#include "test/fake_decoder.h"
-#include <string.h>
-
+#include <cstdint>
+#include <cstring>
#include <memory>
#include "api/scoped_refptr.h"
#include "api/task_queue/task_queue_factory.h"
+#include "api/units/time_delta.h"
+#include "api/video/encoded_image.h"
#include "api/video/i420_buffer.h"
#include "api/video/video_frame.h"
-#include "api/video/video_frame_buffer.h"
#include "api/video/video_rotation.h"
+#include "api/video_codecs/video_decoder.h"
#include "modules/video_coding/include/video_error_codes.h"
#include "rtc_base/checks.h"
-#include "rtc_base/time_utils.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_decoder.h b/test/fake_decoder.h
index 8487e36..e8f9462 100644
--- a/test/fake_decoder.h
+++ b/test/fake_decoder.h
@@ -11,15 +11,13 @@
#ifndef TEST_FAKE_DECODER_H_
#define TEST_FAKE_DECODER_H_
-#include <stdint.h>
-
+#include <cstdint>
#include <memory>
#include "api/task_queue/task_queue_base.h"
#include "api/task_queue/task_queue_factory.h"
#include "api/video/encoded_image.h"
#include "api/video_codecs/video_decoder.h"
-#include "modules/video_coding/include/video_codec_interface.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_encoded_frame.cc b/test/fake_encoded_frame.cc
index 7a74bf9..021abc0 100644
--- a/test/fake_encoded_frame.cc
+++ b/test/fake_encoded_frame.cc
@@ -10,9 +10,19 @@
#include "test/fake_encoded_frame.h"
+#include <cstddef>
+#include <cstdint>
#include <memory>
+#include <vector>
+#include "api/rtp_packet_infos.h"
+#include "api/units/timestamp.h"
+#include "api/video/encoded_frame.h"
+#include "api/video/encoded_image.h"
#include "api/video/video_frame_type.h"
+#include "api/video/video_rotation.h"
+#include "api/video/video_timing.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_encoded_frame.h b/test/fake_encoded_frame.h
index cfac3d9..484bd31 100644
--- a/test/fake_encoded_frame.h
+++ b/test/fake_encoded_frame.h
@@ -11,12 +11,17 @@
#ifndef TEST_FAKE_ENCODED_FRAME_H_
#define TEST_FAKE_ENCODED_FRAME_H_
+#include <cstddef>
+#include <cstdint>
#include <memory>
+#include <optional>
#include <vector>
#include "api/rtp_packet_infos.h"
+#include "api/units/timestamp.h"
#include "api/video/encoded_frame.h"
#include "api/video/video_rotation.h"
+#include "api/video/video_timing.h"
#include "test/gmock.h"
namespace webrtc {
diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc
index e069b4b..51ca50e 100644
--- a/test/fake_encoder.cc
+++ b/test/fake_encoder.cc
@@ -10,20 +10,36 @@
#include "test/fake_encoder.h"
-#include <string.h>
-
#include <algorithm>
+#include <array>
#include <cstdint>
+#include <cstring>
#include <memory>
+#include <optional>
#include <string>
+#include <vector>
+#include "absl/strings/string_view.h"
#include "api/environment/environment.h"
+#include "api/fec_controller_override.h"
+#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
+#include "api/task_queue/task_queue_base.h"
#include "api/task_queue/task_queue_factory.h"
-#include "api/video/video_content_type.h"
+#include "api/video/encoded_image.h"
+#include "api/video/video_bitrate_allocation.h"
+#include "api/video/video_codec_constants.h"
+#include "api/video/video_codec_type.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_frame_type.h"
+#include "api/video_codecs/simulcast_stream.h"
+#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_encoder.h"
#include "modules/video_coding/codecs/h264/include/h264_globals.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/include/video_error_codes.h"
#include "rtc_base/checks.h"
+#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/thread.h"
namespace webrtc {
diff --git a/test/fake_encoder.h b/test/fake_encoder.h
index e77f8aa..4e8b796 100644
--- a/test/fake_encoder.h
+++ b/test/fake_encoder.h
@@ -11,26 +11,30 @@
#ifndef TEST_FAKE_ENCODER_H_
#define TEST_FAKE_ENCODER_H_
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <memory>
#include <optional>
+#include <string>
#include <vector>
#include "absl/strings/string_view.h"
#include "api/environment/environment.h"
#include "api/fec_controller_override.h"
+#include "api/scoped_refptr.h"
#include "api/sequence_checker.h"
+#include "api/task_queue/task_queue_base.h"
#include "api/video/encoded_image.h"
#include "api/video/video_bitrate_allocation.h"
+#include "api/video/video_codec_constants.h"
#include "api/video/video_frame.h"
+#include "api/video/video_frame_type.h"
+#include "api/video_codecs/simulcast_stream.h"
#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_encoder.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/thread_annotations.h"
-#include "system_wrappers/include/clock.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_texture_frame.cc b/test/fake_texture_frame.cc
index 95e84c7..1f27b4f 100644
--- a/test/fake_texture_frame.cc
+++ b/test/fake_texture_frame.cc
@@ -10,7 +10,14 @@
#include "test/fake_texture_frame.h"
+#include <cstdint>
+
+#include "api/make_ref_counted.h"
+#include "api/scoped_refptr.h"
#include "api/video/i420_buffer.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_frame_buffer.h"
+#include "api/video/video_rotation.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_texture_frame.h b/test/fake_texture_frame.h
index b032965..c0fc36c 100644
--- a/test/fake_texture_frame.h
+++ b/test/fake_texture_frame.h
@@ -10,10 +10,12 @@
#ifndef TEST_FAKE_TEXTURE_FRAME_H_
#define TEST_FAKE_TEXTURE_FRAME_H_
-#include "api/video/i420_buffer.h"
+#include <cstdint>
+
+#include "api/scoped_refptr.h"
#include "api/video/video_frame.h"
-#include "common_video/include/video_frame_buffer.h"
-#include "rtc_base/checks.h"
+#include "api/video/video_frame_buffer.h"
+#include "api/video/video_rotation.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_vp8_decoder.cc b/test/fake_vp8_decoder.cc
index 9471d11..8e953fe 100644
--- a/test/fake_vp8_decoder.cc
+++ b/test/fake_vp8_decoder.cc
@@ -10,17 +10,17 @@
#include "test/fake_vp8_decoder.h"
-#include <stddef.h>
-
+#include <cstddef>
+#include <cstdint>
#include <optional>
#include "api/scoped_refptr.h"
+#include "api/video/encoded_image.h"
#include "api/video/i420_buffer.h"
#include "api/video/video_frame.h"
-#include "api/video/video_frame_buffer.h"
#include "api/video/video_rotation.h"
+#include "api/video_codecs/video_decoder.h"
#include "modules/video_coding/include/video_error_codes.h"
-#include "rtc_base/time_utils.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_vp8_decoder.h b/test/fake_vp8_decoder.h
index 5bfe3a4..0ce9b4b 100644
--- a/test/fake_vp8_decoder.h
+++ b/test/fake_vp8_decoder.h
@@ -11,11 +11,10 @@
#ifndef TEST_FAKE_VP8_DECODER_H_
#define TEST_FAKE_VP8_DECODER_H_
-#include <stdint.h>
+#include <cstdint>
#include "api/video/encoded_image.h"
#include "api/video_codecs/video_decoder.h"
-#include "modules/video_coding/include/video_codec_interface.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_vp8_encoder.cc b/test/fake_vp8_encoder.cc
index 597d01e..f3e95cc 100644
--- a/test/fake_vp8_encoder.cc
+++ b/test/fake_vp8_encoder.cc
@@ -10,16 +10,24 @@
#include "test/fake_vp8_encoder.h"
-#include <algorithm>
+#include <cstddef>
+#include <cstdint>
#include <optional>
+#include "api/environment/environment.h"
+#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
+#include "api/video/encoded_image.h"
+#include "api/video/video_codec_type.h"
+#include "api/video/video_frame_type.h"
+#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_encoder.h"
-#include "api/video_codecs/vp8_temporal_layers.h"
#include "api/video_codecs/vp8_temporal_layers_factory.h"
#include "modules/video_coding/codecs/interface/common_constants.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/include/video_error_codes.h"
-#include "modules/video_coding/utility/simulcast_utility.h"
+#include "rtc_base/synchronization/mutex.h"
+#include "test/fake_encoder.h"
namespace {
diff --git a/test/fake_vp8_encoder.h b/test/fake_vp8_encoder.h
index 53288a1..9147dfa 100644
--- a/test/fake_vp8_encoder.h
+++ b/test/fake_vp8_encoder.h
@@ -11,19 +11,19 @@
#ifndef TEST_FAKE_VP8_ENCODER_H_
#define TEST_FAKE_VP8_ENCODER_H_
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <memory>
#include "api/environment/environment.h"
#include "api/fec_controller_override.h"
+#include "api/scoped_refptr.h"
#include "api/sequence_checker.h"
#include "api/video/encoded_image.h"
+#include "api/video/video_frame_type.h"
#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_encoder.h"
#include "api/video_codecs/vp8_frame_buffer_controller.h"
-#include "api/video_codecs/vp8_temporal_layers.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "rtc_base/thread_annotations.h"
#include "system_wrappers/include/clock.h"
diff --git a/test/fake_vp8_encoder_unittest.cc b/test/fake_vp8_encoder_unittest.cc
index 0898243..d54fbc5 100644
--- a/test/fake_vp8_encoder_unittest.cc
+++ b/test/fake_vp8_encoder_unittest.cc
@@ -13,12 +13,16 @@
#include <memory>
#include <utility>
+#include "api/environment/environment.h"
#include "api/test/create_simulcast_test_fixture.h"
#include "api/test/simulcast_test_fixture.h"
#include "api/test/video/function_video_decoder_factory.h"
#include "api/test/video/function_video_encoder_factory.h"
-#include "modules/video_coding/utility/simulcast_test_fixture_impl.h"
+#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_decoder_factory.h"
+#include "api/video_codecs/video_encoder_factory.h"
#include "test/fake_vp8_decoder.h"
+#include "test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/test/frame_forwarder.cc b/test/frame_forwarder.cc
index 944fbf4..c723089 100644
--- a/test/frame_forwarder.cc
+++ b/test/frame_forwarder.cc
@@ -9,7 +9,11 @@
*/
#include "test/frame_forwarder.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_sink_interface.h"
+#include "api/video/video_source_interface.h"
#include "rtc_base/checks.h"
+#include "rtc_base/synchronization/mutex.h"
namespace webrtc {
namespace test {
diff --git a/test/frame_forwarder.h b/test/frame_forwarder.h
index 59b36a4..b27267b 100644
--- a/test/frame_forwarder.h
+++ b/test/frame_forwarder.h
@@ -11,8 +11,10 @@
#define TEST_FRAME_FORWARDER_H_
#include "api/video/video_frame.h"
+#include "api/video/video_sink_interface.h"
#include "api/video/video_source_interface.h"
#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
namespace webrtc {
namespace test {
diff --git a/test/frame_generator.cc b/test/frame_generator.cc
index aab3991..15faf25 100644
--- a/test/frame_generator.cc
+++ b/test/frame_generator.cc
@@ -9,18 +9,25 @@
*/
#include "test/frame_generator.h"
-#include <string.h>
-
+#include <algorithm>
#include <cstdint>
#include <cstdio>
+#include <cstring>
+#include <limits>
#include <memory>
+#include <optional>
+#include <vector>
+#include "api/scoped_refptr.h"
+#include "api/test/frame_generator_interface.h"
#include "api/video/i010_buffer.h"
#include "api/video/nv12_buffer.h"
-#include "api/video/video_rotation.h"
+#include "api/video/video_frame_buffer.h"
#include "common_video/include/video_frame_buffer.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "rtc_base/checks.h"
+#include "rtc_base/synchronization/mutex.h"
+#include "system_wrappers/include/clock.h"
#include "test/frame_utils.h"
namespace webrtc {
diff --git a/test/frame_generator.h b/test/frame_generator.h
index 089caaa..e2bb768 100644
--- a/test/frame_generator.h
+++ b/test/frame_generator.h
@@ -10,20 +10,22 @@
#ifndef TEST_FRAME_GENERATOR_H_
#define TEST_FRAME_GENERATOR_H_
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
#include <memory>
-#include <string>
+#include <optional>
#include <vector>
#include "api/scoped_refptr.h"
#include "api/test/frame_generator_interface.h"
#include "api/video/i420_buffer.h"
#include "api/video/nv12_buffer.h"
-#include "api/video/video_frame.h"
#include "api/video/video_frame_buffer.h"
-#include "api/video/video_source_interface.h"
#include "rtc_base/logging.h"
#include "rtc_base/random.h"
#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
#include "system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/test/frame_generator_capturer_unittest.cc b/test/frame_generator_capturer_unittest.cc
index 94b9d70..8f60cd7 100644
--- a/test/frame_generator_capturer_unittest.cc
+++ b/test/frame_generator_capturer_unittest.cc
@@ -10,6 +10,11 @@
#include "test/frame_generator_capturer.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_sink_interface.h"
+#include "api/video/video_source_interface.h"
#include "test/create_frame_generator_capturer.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/test/frame_generator_unittest.cc b/test/frame_generator_unittest.cc
index 8de5241..dcd546d 100644
--- a/test/frame_generator_unittest.cc
+++ b/test/frame_generator_unittest.cc
@@ -8,19 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "test/frame_generator.h"
-
#include <stdio.h>
-#include <string.h>
#include <cstdint>
+#include <cstdio>
+#include <cstring>
#include <memory>
#include <string>
+#include <vector>
#include "api/scoped_refptr.h"
#include "api/test/create_frame_generator.h"
#include "api/test/frame_generator_interface.h"
#include "api/video/video_frame_buffer.h"
+#include "rtc_base/checks.h"
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
diff --git a/test/frame_utils.cc b/test/frame_utils.cc
index 1a45c04..2ea921f 100644
--- a/test/frame_utils.cc
+++ b/test/frame_utils.cc
@@ -10,12 +10,15 @@
#include "test/frame_utils.h"
-#include <stdio.h>
-#include <string.h>
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
+#include "api/scoped_refptr.h"
#include "api/video/i420_buffer.h"
#include "api/video/nv12_buffer.h"
#include "api/video/video_frame.h"
+#include "api/video/video_frame_buffer.h"
namespace webrtc {
namespace test {
diff --git a/test/frame_utils.h b/test/frame_utils.h
index c537fc6..71430c0 100644
--- a/test/frame_utils.h
+++ b/test/frame_utils.h
@@ -10,7 +10,8 @@
#ifndef TEST_FRAME_UTILS_H_
#define TEST_FRAME_UTILS_H_
-#include <stdint.h>
+#include <cstdint>
+#include <cstdio>
#include "api/scoped_refptr.h"
#include "api/video/nv12_buffer.h"
diff --git a/test/function_audio_decoder_factory.h b/test/function_audio_decoder_factory.h
index c314249..6d1141b 100644
--- a/test/function_audio_decoder_factory.h
+++ b/test/function_audio_decoder_factory.h
@@ -13,10 +13,12 @@
#include <functional>
#include <memory>
+#include <optional>
#include <utility>
#include <vector>
-#include "absl/memory/memory.h"
+#include "api/audio_codecs/audio_codec_pair_id.h"
+#include "api/audio_codecs/audio_decoder.h"
#include "api/audio_codecs/audio_decoder_factory.h"
#include "api/audio_codecs/audio_format.h"
#include "api/environment/environment.h"
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 69f0f5d..e2b3709 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -38,6 +38,7 @@
deps = [
"../../api:array_view",
"../../modules/rtp_rtcp:rtp_rtcp_format",
+ "../../rtc_base:checks",
]
visibility = [ ":*" ] # Only targets in this file can depend on this.
}
diff --git a/test/fuzzers/audio_encoder_fuzzer.h b/test/fuzzers/audio_encoder_fuzzer.h
index 69ef08f..de0609d 100644
--- a/test/fuzzers/audio_encoder_fuzzer.h
+++ b/test/fuzzers/audio_encoder_fuzzer.h
@@ -11,6 +11,7 @@
#ifndef TEST_FUZZERS_AUDIO_ENCODER_FUZZER_H_
#define TEST_FUZZERS_AUDIO_ENCODER_FUZZER_H_
+#include <cstdint>
#include <memory>
#include "api/array_view.h"
diff --git a/test/fuzzers/audio_processing_fuzzer_helper.h b/test/fuzzers/audio_processing_fuzzer_helper.h
index 9437a4a..fc216f2 100644
--- a/test/fuzzers/audio_processing_fuzzer_helper.h
+++ b/test/fuzzers/audio_processing_fuzzer_helper.h
@@ -11,9 +11,9 @@
#ifndef TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_HELPER_H_
#define TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_HELPER_H_
-#include <memory>
#include "api/audio/audio_processing.h"
+#include "api/scoped_refptr.h"
#include "test/fuzzers/fuzz_data_helper.h"
namespace webrtc {
diff --git a/test/fuzzers/fuzz_data_helper.h b/test/fuzzers/fuzz_data_helper.h
index 42617f1..c93f6b7 100644
--- a/test/fuzzers/fuzz_data_helper.h
+++ b/test/fuzzers/fuzz_data_helper.h
@@ -11,10 +11,15 @@
#ifndef TEST_FUZZERS_FUZZ_DATA_HELPER_H_
#define TEST_FUZZERS_FUZZ_DATA_HELPER_H_
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
#include <limits>
+#include <type_traits>
#include "api/array_view.h"
#include "modules/rtp_rtcp/source/byte_io.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace test {
diff --git a/test/fuzzers/utils/BUILD.gn b/test/fuzzers/utils/BUILD.gn
index d090183..3082b84 100644
--- a/test/fuzzers/utils/BUILD.gn
+++ b/test/fuzzers/utils/BUILD.gn
@@ -15,12 +15,15 @@
"rtp_replayer.h",
]
deps = [
+ "../../../api:transport_api",
"../../../api/environment:environment_factory",
"../../../api/test/video:function_video_factory",
"../../../api/units:timestamp",
+ "../../../api/video:video_frame",
"../../../api/video_codecs:video_codecs_api",
"../../../call",
"../../../call:call_interfaces",
+ "../../../call:video_receive_stream_api",
"../../../common_video",
"../../../media:rtc_internal_video_codecs",
"../../../modules/rtp_rtcp:rtp_rtcp_format",
diff --git a/test/fuzzers/utils/rtp_replayer.cc b/test/fuzzers/utils/rtp_replayer.cc
index 081d31b..d6d3b4a 100644
--- a/test/fuzzers/utils/rtp_replayer.cc
+++ b/test/fuzzers/utils/rtp_replayer.cc
@@ -18,6 +18,7 @@
#include "absl/memory/memory.h"
#include "api/environment/environment_factory.h"
#include "api/units/timestamp.h"
+#include "media/engine/internal_decoder_factory.h"
#include "modules/rtp_rtcp/source/rtp_packet.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "rtc_base/strings/json.h"
diff --git a/test/fuzzers/utils/rtp_replayer.h b/test/fuzzers/utils/rtp_replayer.h
index c6fa74f..6646245 100644
--- a/test/fuzzers/utils/rtp_replayer.h
+++ b/test/fuzzers/utils/rtp_replayer.h
@@ -11,22 +11,21 @@
#ifndef TEST_FUZZERS_UTILS_RTP_REPLAYER_H_
#define TEST_FUZZERS_UTILS_RTP_REPLAYER_H_
-#include <stdio.h>
-
-#include <map>
+#include <cstddef>
+#include <cstdint>
#include <memory>
#include <string>
#include <vector>
-#include "api/test/video/function_video_decoder_factory.h"
-#include "api/video_codecs/video_decoder.h"
+#include "api/call/transport.h"
+#include "api/video/video_sink_interface.h"
+#include "api/video_codecs/video_decoder_factory.h"
#include "call/call.h"
-#include "media/engine/internal_decoder_factory.h"
+#include "call/video_receive_stream.h"
+#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
#include "rtc_base/fake_clock.h"
-#include "rtc_base/time_utils.h"
#include "test/null_transport.h"
#include "test/rtp_file_reader.h"
-#include "test/test_video_capturer.h"
#include "test/video_renderer.h"
namespace webrtc {
diff --git a/test/jitter/BUILD.gn b/test/jitter/BUILD.gn
index c14c94c..08d298b 100644
--- a/test/jitter/BUILD.gn
+++ b/test/jitter/BUILD.gn
@@ -36,7 +36,10 @@
deps = [
":delay_variation_calculator",
"../../api/test/metrics:global_metrics_logger_and_exporter",
+ "../../api/test/metrics:metric",
+ "../../api/test/metrics:metrics_logger",
"../../api/units:data_size",
+ "../../api/units:timestamp",
"../../api/video:video_frame_type",
"../../rtc_base:logging",
"//third_party/abseil-cpp/absl/strings:string_view",
@@ -54,8 +57,11 @@
":delay_variation_calculator",
":logging_delay_variation_calculator",
"../../api/numerics",
+ "../../api/test/metrics:metric",
"../../api/test/metrics:metrics_logger",
+ "../../api/units:data_size",
"../../api/units:timestamp",
+ "../../api/video:video_frame_type",
"../../system_wrappers",
"../../test:test_support",
]
diff --git a/test/jitter/delay_variation_calculator.cc b/test/jitter/delay_variation_calculator.cc
index 2d409f8..9098ef6 100644
--- a/test/jitter/delay_variation_calculator.cc
+++ b/test/jitter/delay_variation_calculator.cc
@@ -10,13 +10,16 @@
#include "test/jitter/delay_variation_calculator.h"
+#include <cstdint>
#include <optional>
#include <string>
+#include "api/numerics/samples_stats_counter.h"
+#include "api/units/data_size.h"
#include "api/units/frequency.h"
#include "api/units/time_delta.h"
#include "api/units/timestamp.h"
-#include "rtc_base/logging.h"
+#include "api/video/video_frame_type.h"
namespace webrtc {
namespace test {
diff --git a/test/jitter/delay_variation_calculator.h b/test/jitter/delay_variation_calculator.h
index 6b06afe..dcf10a2 100644
--- a/test/jitter/delay_variation_calculator.h
+++ b/test/jitter/delay_variation_calculator.h
@@ -11,14 +11,12 @@
#ifndef TEST_JITTER_DELAY_VARIATION_CALCULATOR_H_
#define TEST_JITTER_DELAY_VARIATION_CALCULATOR_H_
-#include <stdint.h>
-
+#include <cstdint>
#include <map>
#include <optional>
#include <string>
#include "api/numerics/samples_stats_counter.h"
-#include "api/test/metrics/metrics_logger.h"
#include "api/units/data_size.h"
#include "api/units/timestamp.h"
#include "api/video/video_frame_type.h"
diff --git a/test/jitter/delay_variation_calculator_unittest.cc b/test/jitter/delay_variation_calculator_unittest.cc
index 41db376..e3ca861 100644
--- a/test/jitter/delay_variation_calculator_unittest.cc
+++ b/test/jitter/delay_variation_calculator_unittest.cc
@@ -10,8 +10,12 @@
#include "test/jitter/delay_variation_calculator.h"
+#include <string>
+
#include "api/numerics/samples_stats_counter.h"
+#include "api/units/data_size.h"
#include "api/units/timestamp.h"
+#include "api/video/video_frame_type.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/test/jitter/logging_delay_variation_calculator.cc b/test/jitter/logging_delay_variation_calculator.cc
index dc08a17..854b555 100644
--- a/test/jitter/logging_delay_variation_calculator.cc
+++ b/test/jitter/logging_delay_variation_calculator.cc
@@ -10,8 +10,14 @@
#include "test/jitter/logging_delay_variation_calculator.h"
-#include "api/test/metrics/global_metrics_logger_and_exporter.h"
-#include "rtc_base/logging.h"
+#include <cstdint>
+#include <optional>
+
+#include "api/test/metrics/metric.h"
+#include "api/units/data_size.h"
+#include "api/units/timestamp.h"
+#include "api/video/video_frame_type.h"
+#include "test/jitter/delay_variation_calculator.h"
namespace webrtc {
namespace test {
diff --git a/test/jitter/logging_delay_variation_calculator.h b/test/jitter/logging_delay_variation_calculator.h
index a3a67af..7438026 100644
--- a/test/jitter/logging_delay_variation_calculator.h
+++ b/test/jitter/logging_delay_variation_calculator.h
@@ -11,11 +11,16 @@
#ifndef TEST_JITTER_LOGGING_DELAY_VARIATION_CALCULATOR_H_
#define TEST_JITTER_LOGGING_DELAY_VARIATION_CALCULATOR_H_
+#include <cstdint>
+#include <optional>
#include <string>
#include "absl/strings/string_view.h"
#include "api/test/metrics/global_metrics_logger_and_exporter.h"
+#include "api/test/metrics/metrics_logger.h"
#include "api/units/data_size.h"
+#include "api/units/timestamp.h"
+#include "api/video/video_frame_type.h"
#include "test/jitter/delay_variation_calculator.h"
namespace webrtc {
diff --git a/test/jitter/logging_delay_variation_calculator_unittest.cc b/test/jitter/logging_delay_variation_calculator_unittest.cc
index d28a235..de1f682 100644
--- a/test/jitter/logging_delay_variation_calculator_unittest.cc
+++ b/test/jitter/logging_delay_variation_calculator_unittest.cc
@@ -11,11 +11,15 @@
#include "test/jitter/logging_delay_variation_calculator.h"
#include <algorithm>
+#include <iterator>
#include <map>
#include <string>
+#include <utility>
#include <vector>
+#include "api/test/metrics/metric.h"
#include "api/test/metrics/metrics_logger.h"
+#include "api/units/data_size.h"
#include "api/units/timestamp.h"
#include "system_wrappers/include/clock.h"
#include "test/gtest.h"
diff --git a/test/layer_filtering_transport.cc b/test/layer_filtering_transport.cc
index bc68d3a..109ef8b 100644
--- a/test/layer_filtering_transport.cc
+++ b/test/layer_filtering_transport.cc
@@ -10,13 +10,20 @@
#include "test/layer_filtering_transport.h"
-#include <string.h>
-
#include <algorithm>
+#include <cstdint>
+#include <map>
#include <memory>
#include <utility>
-#include "api/rtp_headers.h"
+#include "api/array_view.h"
+#include "api/call/transport.h"
+#include "api/media_types.h"
+#include "api/rtp_parameters.h"
+#include "api/task_queue/task_queue_base.h"
+#include "api/video/video_codec_type.h"
+#include "call/call.h"
+#include "call/simulated_packet_receiver.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "modules/rtp_rtcp/source/create_video_rtp_depacketizer.h"
#include "modules/rtp_rtcp/source/rtp_video_header.h"
@@ -25,6 +32,7 @@
#include "modules/video_coding/codecs/vp8/include/vp8_globals.h"
#include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
#include "rtc_base/checks.h"
+#include "test/direct_transport.h"
namespace webrtc {
namespace test {
diff --git a/test/layer_filtering_transport.h b/test/layer_filtering_transport.h
index e0a23a20..24c3c1d 100644
--- a/test/layer_filtering_transport.h
+++ b/test/layer_filtering_transport.h
@@ -10,14 +10,15 @@
#ifndef TEST_LAYER_FILTERING_TRANSPORT_H_
#define TEST_LAYER_FILTERING_TRANSPORT_H_
-#include <stddef.h>
-#include <stdint.h>
-
+#include <cstdint>
#include <map>
#include <memory>
+#include "api/array_view.h"
#include "api/call/transport.h"
#include "api/media_types.h"
+#include "api/rtp_parameters.h"
+#include "api/task_queue/task_queue_base.h"
#include "call/call.h"
#include "call/simulated_packet_receiver.h"
#include "modules/rtp_rtcp/source/video_rtp_depacketizer.h"
diff --git a/test/linux/glx_renderer.cc b/test/linux/glx_renderer.cc
index 8e66b92..12659de 100644
--- a/test/linux/glx_renderer.cc
+++ b/test/linux/glx_renderer.cc
@@ -10,10 +10,18 @@
#include "test/linux/glx_renderer.h"
+#include <GL/glx.h>
+#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <stdlib.h>
+#include <cstdlib>
+
+#include "api/video/video_frame.h"
+#include "rtc_base/checks.h"
+#include "test/gl/gl_renderer.h"
+
namespace webrtc {
namespace test {
diff --git a/test/linux/video_renderer_linux.cc b/test/linux/video_renderer_linux.cc
index 3d07bd0..43281d3 100644
--- a/test/linux/video_renderer_linux.cc
+++ b/test/linux/video_renderer_linux.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stddef.h>
+#include <cstddef>
#include "test/linux/glx_renderer.h"
#include "test/video_renderer.h"
diff --git a/test/logging/file_log_writer.cc b/test/logging/file_log_writer.cc
index 9189e163..f953147 100644
--- a/test/logging/file_log_writer.cc
+++ b/test/logging/file_log_writer.cc
@@ -9,11 +9,15 @@
*/
#include "test/logging/file_log_writer.h"
+#include <cerrno>
+#include <cstddef>
+#include <cstdio>
#include <memory>
+#include <string>
#include "absl/strings/string_view.h"
+#include "api/rtc_event_log_output.h"
#include "rtc_base/checks.h"
-#include "rtc_base/logging.h"
#include "test/testsupport/file_utils.h"
namespace webrtc {
diff --git a/test/logging/file_log_writer.h b/test/logging/file_log_writer.h
index c49b96c..6cbc253 100644
--- a/test/logging/file_log_writer.h
+++ b/test/logging/file_log_writer.h
@@ -16,6 +16,7 @@
#include <vector>
#include "absl/strings/string_view.h"
+#include "api/rtc_event_log_output.h"
#include "test/logging/log_writer.h"
namespace webrtc {
diff --git a/test/logging/log_writer.cc b/test/logging/log_writer.cc
index d9b8c1e..79a35d4 100644
--- a/test/logging/log_writer.cc
+++ b/test/logging/log_writer.cc
@@ -9,7 +9,11 @@
*/
#include "test/logging/log_writer.h"
+#include <memory>
+#include <string>
+
#include "absl/strings/string_view.h"
+#include "api/rtc_event_log_output.h"
namespace webrtc {
diff --git a/test/logging/log_writer.h b/test/logging/log_writer.h
index 335dab3..c26925e 100644
--- a/test/logging/log_writer.h
+++ b/test/logging/log_writer.h
@@ -10,15 +10,14 @@
#ifndef TEST_LOGGING_LOG_WRITER_H_
#define TEST_LOGGING_LOG_WRITER_H_
-#include <stdarg.h>
-
+#include <cstdarg>
+#include <cstdio>
#include <memory>
#include <string>
-#include <utility>
#include "absl/strings/string_view.h"
#include "api/rtc_event_log_output.h"
-#include "rtc_base/strings/string_builder.h"
+#include "rtc_base/checks.h"
namespace webrtc {
template <class... Args>
diff --git a/test/logging/memory_log_writer.cc b/test/logging/memory_log_writer.cc
index eae9223..e121e5d 100644
--- a/test/logging/memory_log_writer.cc
+++ b/test/logging/memory_log_writer.cc
@@ -9,11 +9,14 @@
*/
#include "test/logging/memory_log_writer.h"
+#include <map>
#include <memory>
+#include <string>
+#include <utility>
#include "absl/strings/string_view.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/logging.h"
+#include "api/rtc_event_log_output.h"
+#include "test/logging/log_writer.h"
namespace webrtc {
namespace {
diff --git a/test/logging/memory_log_writer.h b/test/logging/memory_log_writer.h
index e795b2f..3918923 100644
--- a/test/logging/memory_log_writer.h
+++ b/test/logging/memory_log_writer.h
@@ -13,7 +13,6 @@
#include <map>
#include <memory>
#include <string>
-#include <vector>
#include "test/logging/log_writer.h"
diff --git a/test/mac_capturer.h b/test/mac_capturer.h
index 8e53cd5..edf5e8f 100644
--- a/test/mac_capturer.h
+++ b/test/mac_capturer.h
@@ -11,14 +11,10 @@
#define TEST_MAC_CAPTURER_H_
#include <cstddef>
-#include <memory>
-#include <vector>
-#include "api/media_stream_interface.h"
-#include "api/scoped_refptr.h"
-#include "modules/video_capture/video_capture.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_sink_interface.h"
#include "rtc_base/logging.h"
-#include "rtc_base/thread.h"
#include "test/test_video_capturer.h"
namespace webrtc {
diff --git a/test/mappable_native_buffer.cc b/test/mappable_native_buffer.cc
index 8a23809..4a8f6ca 100644
--- a/test/mappable_native_buffer.cc
+++ b/test/mappable_native_buffer.cc
@@ -10,13 +10,21 @@
#include "test/mappable_native_buffer.h"
+#include <cstdint>
+#include <utility>
+#include <vector>
+
#include "absl/algorithm/container.h"
+#include "api/array_view.h"
+#include "api/make_ref_counted.h"
+#include "api/scoped_refptr.h"
#include "api/video/i420_buffer.h"
#include "api/video/nv12_buffer.h"
#include "api/video/video_frame.h"
+#include "api/video/video_frame_buffer.h"
#include "api/video/video_rotation.h"
-#include "common_video/include/video_frame_buffer.h"
#include "rtc_base/checks.h"
+#include "rtc_base/synchronization/mutex.h"
namespace webrtc {
namespace test {
diff --git a/test/mappable_native_buffer.h b/test/mappable_native_buffer.h
index c2b4cec..ddbc657 100644
--- a/test/mappable_native_buffer.h
+++ b/test/mappable_native_buffer.h
@@ -11,14 +11,16 @@
#ifndef TEST_MAPPABLE_NATIVE_BUFFER_H_
#define TEST_MAPPABLE_NATIVE_BUFFER_H_
-#include <utility>
+#include <cstdint>
#include <vector>
#include "api/array_view.h"
+#include "api/scoped_refptr.h"
#include "api/video/video_frame.h"
-#include "common_video/include/video_frame_buffer.h"
+#include "api/video/video_frame_buffer.h"
#include "rtc_base/ref_counted_object.h"
#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
namespace webrtc {
namespace test {
diff --git a/test/mock_audio_decoder.h b/test/mock_audio_decoder.h
index 8f44bf8..abc3246 100644
--- a/test/mock_audio_decoder.h
+++ b/test/mock_audio_decoder.h
@@ -11,6 +11,9 @@
#ifndef TEST_MOCK_AUDIO_DECODER_H_
#define TEST_MOCK_AUDIO_DECODER_H_
+#include <cstddef>
+#include <cstdint>
+
#include "api/audio_codecs/audio_decoder.h"
#include "test/gmock.h"
diff --git a/test/mock_audio_decoder_factory.h b/test/mock_audio_decoder_factory.h
index d14a7dc..f5d6790 100644
--- a/test/mock_audio_decoder_factory.h
+++ b/test/mock_audio_decoder_factory.h
@@ -12,10 +12,13 @@
#define TEST_MOCK_AUDIO_DECODER_FACTORY_H_
#include <memory>
+#include <optional>
#include <vector>
+#include "api/audio_codecs/audio_codec_pair_id.h"
+#include "api/audio_codecs/audio_decoder.h"
#include "api/audio_codecs/audio_decoder_factory.h"
-#include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/audio_codecs/audio_format.h"
#include "api/environment/environment.h"
#include "api/make_ref_counted.h"
#include "api/scoped_refptr.h"
diff --git a/test/mock_audio_encoder.cc b/test/mock_audio_encoder.cc
index 74f6a29..817bcc4 100644
--- a/test/mock_audio_encoder.cc
+++ b/test/mock_audio_encoder.cc
@@ -10,6 +10,14 @@
#include "test/mock_audio_encoder.h"
+#include <cstddef>
+#include <cstdint>
+
+#include "api/array_view.h"
+#include "api/audio_codecs/audio_encoder.h"
+#include "rtc_base/buffer.h"
+#include "rtc_base/checks.h"
+
namespace webrtc {
MockAudioEncoder::MockAudioEncoder() = default;
diff --git a/test/mock_audio_encoder.h b/test/mock_audio_encoder.h
index df00896..f643c67 100644
--- a/test/mock_audio_encoder.h
+++ b/test/mock_audio_encoder.h
@@ -11,10 +11,17 @@
#ifndef TEST_MOCK_AUDIO_ENCODER_H_
#define TEST_MOCK_AUDIO_ENCODER_H_
+#include <cstddef>
+#include <cstdint>
+#include <optional>
#include <string>
+#include <utility>
#include "api/array_view.h"
#include "api/audio_codecs/audio_encoder.h"
+#include "api/units/data_rate.h"
+#include "api/units/time_delta.h"
+#include "rtc_base/buffer.h"
#include "test/gmock.h"
namespace webrtc {
diff --git a/test/mock_audio_encoder_factory.h b/test/mock_audio_encoder_factory.h
index 0d3c96a..d978f51 100644
--- a/test/mock_audio_encoder_factory.h
+++ b/test/mock_audio_encoder_factory.h
@@ -12,9 +12,12 @@
#define TEST_MOCK_AUDIO_ENCODER_FACTORY_H_
#include <memory>
+#include <optional>
#include <vector>
+#include "api/audio_codecs/audio_encoder.h"
#include "api/audio_codecs/audio_encoder_factory.h"
+#include "api/audio_codecs/audio_format.h"
#include "api/environment/environment.h"
#include "api/make_ref_counted.h"
#include "api/scoped_refptr.h"
diff --git a/test/network/cross_traffic.cc b/test/network/cross_traffic.cc
index d35a830..3d8d577 100644
--- a/test/network/cross_traffic.cc
+++ b/test/network/cross_traffic.cc
@@ -10,8 +10,6 @@
#include "test/network/cross_traffic.h"
-#include <math.h>
-
#include <algorithm>
#include <cmath>
#include <cstddef>
diff --git a/test/network/fake_network_socket_server.cc b/test/network/fake_network_socket_server.cc
index 26e8911..910da61 100644
--- a/test/network/fake_network_socket_server.cc
+++ b/test/network/fake_network_socket_server.cc
@@ -31,6 +31,7 @@
#include "rtc_base/event.h"
#include "rtc_base/ip_address.h"
#include "rtc_base/logging.h"
+#include "rtc_base/net_helpers.h"
#include "rtc_base/socket.h"
#include "rtc_base/socket_address.h"
#include "rtc_base/synchronization/mutex.h"
diff --git a/test/network/network_emulation.cc b/test/network/network_emulation.cc
index 3dfe3d0..c46b36f 100644
--- a/test/network/network_emulation.cc
+++ b/test/network/network_emulation.cc
@@ -10,10 +10,9 @@
#include "test/network/network_emulation.h"
-#include <stdint.h>
-
#include <algorithm>
#include <cstddef>
+#include <cstdint>
#include <functional>
#include <limits>
#include <map>
diff --git a/test/null_platform_renderer.cc b/test/null_platform_renderer.cc
index 7ea604ea..db76840 100644
--- a/test/null_platform_renderer.cc
+++ b/test/null_platform_renderer.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <cstddef>
+
#include "test/video_renderer.h"
namespace webrtc {
diff --git a/test/pc/e2e/analyzer/video/analyzing_video_sink_test.cc b/test/pc/e2e/analyzer/video/analyzing_video_sink_test.cc
index e683393..7555ee4 100644
--- a/test/pc/e2e/analyzer/video/analyzing_video_sink_test.cc
+++ b/test/pc/e2e/analyzer/video/analyzing_video_sink_test.cc
@@ -9,9 +9,8 @@
*/
#include "test/pc/e2e/analyzer/video/analyzing_video_sink.h"
-#include <stdio.h>
-
#include <cstdint>
+#include <cstdio>
#include <memory>
#include <optional>
#include <string>
diff --git a/test/pc/e2e/analyzer/video/video_dumping.cc b/test/pc/e2e/analyzer/video/video_dumping.cc
index d1434e0..1a8bf23 100644
--- a/test/pc/e2e/analyzer/video/video_dumping.cc
+++ b/test/pc/e2e/analyzer/video/video_dumping.cc
@@ -9,8 +9,7 @@
*/
#include "test/pc/e2e/analyzer/video/video_dumping.h"
-#include <stdio.h>
-
+#include <cstdio>
#include <memory>
#include <string>
#include <utility>
diff --git a/test/pc/e2e/analyzer/video/video_dumping_test.cc b/test/pc/e2e/analyzer/video/video_dumping_test.cc
index 4e46b05..06933e8 100644
--- a/test/pc/e2e/analyzer/video/video_dumping_test.cc
+++ b/test/pc/e2e/analyzer/video/video_dumping_test.cc
@@ -12,6 +12,7 @@
#include <stdio.h>
#include <cstdint>
+#include <cstdio>
#include <cstring>
#include <memory>
#include <string>
diff --git a/test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.cc b/test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.cc
index 2af685e..b311c2a 100644
--- a/test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.cc
+++ b/test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.cc
@@ -10,8 +10,6 @@
#include "test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.h"
-#include <stdio.h>
-
#include <cstdint>
#include <memory>
#include <string>
diff --git a/test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.h b/test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.h
index c5aa503..99b2580 100644
--- a/test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.h
+++ b/test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.h
@@ -11,8 +11,6 @@
#ifndef TEST_PC_E2E_ANALYZER_VIDEO_VIDEO_QUALITY_ANALYZER_INJECTION_HELPER_H_
#define TEST_PC_E2E_ANALYZER_VIDEO_VIDEO_QUALITY_ANALYZER_INJECTION_HELPER_H_
-#include <stdio.h>
-
#include <memory>
#include <string>
#include <vector>
diff --git a/test/pc/e2e/peer_params_preprocessor.cc b/test/pc/e2e/peer_params_preprocessor.cc
index 615a179..5cfbab3 100644
--- a/test/pc/e2e/peer_params_preprocessor.cc
+++ b/test/pc/e2e/peer_params_preprocessor.cc
@@ -10,8 +10,7 @@
#include "test/pc/e2e/peer_params_preprocessor.h"
-#include <stddef.h>
-
+#include <cstddef>
#include <memory>
#include <optional>
#include <set>
diff --git a/test/platform_video_capturer.cc b/test/platform_video_capturer.cc
index fb3392a..4bc91832 100644
--- a/test/platform_video_capturer.cc
+++ b/test/platform_video_capturer.cc
@@ -9,7 +9,11 @@
*/
#include "test/platform_video_capturer.h"
+#include <cstddef>
+#include <memory>
+
#include "absl/memory/memory.h"
+#include "test/test_video_capturer.h"
#if defined(WEBRTC_MAC)
#include "test/mac_capturer.h"
#else
diff --git a/test/platform_video_capturer.h b/test/platform_video_capturer.h
index 241ba87..2c5ba84 100644
--- a/test/platform_video_capturer.h
+++ b/test/platform_video_capturer.h
@@ -10,6 +10,7 @@
#ifndef TEST_PLATFORM_VIDEO_CAPTURER_H_
#define TEST_PLATFORM_VIDEO_CAPTURER_H_
+#include <cstddef>
#include <memory>
#include "test/test_video_capturer.h"
diff --git a/test/rtcp_packet_parser.cc b/test/rtcp_packet_parser.cc
index f0a7465..eb74ad9 100644
--- a/test/rtcp_packet_parser.cc
+++ b/test/rtcp_packet_parser.cc
@@ -10,8 +10,25 @@
#include "test/rtcp_packet_parser.h"
+#include <cstdint>
+
+#include "api/array_view.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/app.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_packet/extended_reports.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/fir.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/nack.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/pli.h"
#include "modules/rtp_rtcp/source/rtcp_packet/psfb.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
#include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/sdes.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/tmmbn.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
diff --git a/test/rtp_file_reader.cc b/test/rtp_file_reader.cc
index d1718f6..e7f5845 100644
--- a/test/rtp_file_reader.cc
+++ b/test/rtp_file_reader.cc
@@ -10,15 +10,21 @@
#include "test/rtp_file_reader.h"
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
#include <map>
+#include <memory>
+#include <set>
#include <string>
#include <vector>
#include "absl/strings/string_view.h"
+#include "api/array_view.h"
#include "modules/rtp_rtcp/source/rtp_util.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/system/arch.h"
#include "rtc_base/time_utils.h"
namespace {
diff --git a/test/rtp_file_reader.h b/test/rtp_file_reader.h
index 4af704d..c7224af 100644
--- a/test/rtp_file_reader.h
+++ b/test/rtp_file_reader.h
@@ -10,9 +10,9 @@
#ifndef TEST_RTP_FILE_READER_H_
#define TEST_RTP_FILE_READER_H_
+#include <cstddef>
#include <cstdint>
#include <set>
-#include <string>
#include "absl/strings/string_view.h"
diff --git a/test/rtp_file_reader_unittest.cc b/test/rtp_file_reader_unittest.cc
index eb15d87..7236f6c 100644
--- a/test/rtp_file_reader_unittest.cc
+++ b/test/rtp_file_reader_unittest.cc
@@ -10,8 +10,10 @@
#include "test/rtp_file_reader.h"
+#include <cstdint>
#include <map>
#include <memory>
+#include <string>
#include "api/array_view.h"
#include "modules/rtp_rtcp/source/rtp_util.h"
diff --git a/test/rtp_file_writer.cc b/test/rtp_file_writer.cc
index 118d8cd..e11a3ac 100644
--- a/test/rtp_file_writer.cc
+++ b/test/rtp_file_writer.cc
@@ -10,13 +10,13 @@
#include "test/rtp_file_writer.h"
-#include <stdint.h>
-#include <stdio.h>
-
+#include <cstdint>
+#include <cstdio>
#include <optional>
#include <string>
#include "rtc_base/checks.h"
+#include "test/rtp_file_reader.h"
namespace webrtc {
namespace test {
diff --git a/test/rtp_file_writer_unittest.cc b/test/rtp_file_writer_unittest.cc
index 5d51e46..e21dd43 100644
--- a/test/rtp_file_writer_unittest.cc
+++ b/test/rtp_file_writer_unittest.cc
@@ -10,10 +10,10 @@
#include "test/rtp_file_writer.h"
-#include <stdint.h>
-#include <string.h>
-
+#include <cstdint>
+#include <cstring>
#include <memory>
+#include <string>
#include "test/gtest.h"
#include "test/rtp_file_reader.h"
diff --git a/test/run_loop.cc b/test/run_loop.cc
index 7bcde87..b3e0c4a 100644
--- a/test/run_loop.cc
+++ b/test/run_loop.cc
@@ -9,6 +9,11 @@
*/
#include "test/run_loop.h"
+#include "api/task_queue/task_queue_base.h"
+#include "api/units/time_delta.h"
+#include "rtc_base/socket.h"
+#include "rtc_base/socket_server.h"
+#include "rtc_base/thread.h"
#include "rtc_base/time_utils.h"
namespace webrtc {
diff --git a/test/run_loop.h b/test/run_loop.h
index 17638f6..29b77af 100644
--- a/test/run_loop.h
+++ b/test/run_loop.h
@@ -14,6 +14,9 @@
#include "absl/functional/any_invocable.h"
#include "api/task_queue/task_queue_base.h"
+#include "api/units/time_delta.h"
+#include "rtc_base/socket.h"
+#include "rtc_base/socket_server.h"
#include "rtc_base/thread.h"
namespace webrtc {
diff --git a/test/scoped_key_value_config.cc b/test/scoped_key_value_config.cc
index 6f1230d..3e04977 100644
--- a/test/scoped_key_value_config.cc
+++ b/test/scoped_key_value_config.cc
@@ -10,6 +10,12 @@
#include "test/scoped_key_value_config.h"
+#include <functional>
+#include <map>
+#include <memory>
+#include <string>
+
+#include "absl/strings/string_view.h"
#include "rtc_base/checks.h"
#include "system_wrappers/include/field_trial.h"
#include "test/field_trial.h"
diff --git a/test/test_main.cc b/test/test_main.cc
index d811fd0..9dcc57c 100644
--- a/test/test_main.cc
+++ b/test/test_main.cc
@@ -8,8 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <algorithm>
+#include <cstddef>
#include <memory>
-#include <regex>
#include <string>
#include <vector>
diff --git a/test/test_main_lib.cc b/test/test_main_lib.cc
index 5348d1c..c665cc7 100644
--- a/test/test_main_lib.cc
+++ b/test/test_main_lib.cc
@@ -10,6 +10,8 @@
#include "test/test_main_lib.h"
+#include <stdlib.h>
+
#include <cstddef>
#include <cstdlib>
#include <fstream>
diff --git a/test/test_video_capturer.cc b/test/test_video_capturer.cc
index 42d8c3d..e63f604 100644
--- a/test/test_video_capturer.cc
+++ b/test/test_video_capturer.cc
@@ -10,12 +10,17 @@
#include "test/test_video_capturer.h"
-#include <algorithm>
+#include <optional>
+#include <utility>
#include "api/scoped_refptr.h"
#include "api/video/i420_buffer.h"
+#include "api/video/video_frame.h"
#include "api/video/video_frame_buffer.h"
#include "api/video/video_rotation.h"
+#include "api/video/video_sink_interface.h"
+#include "api/video/video_source_interface.h"
+#include "rtc_base/synchronization/mutex.h"
namespace webrtc {
namespace test {
diff --git a/test/test_video_capturer.h b/test/test_video_capturer.h
index 41ffdb7..66f0c8b 100644
--- a/test/test_video_capturer.h
+++ b/test/test_video_capturer.h
@@ -10,15 +10,17 @@
#ifndef TEST_TEST_VIDEO_CAPTURER_H_
#define TEST_TEST_VIDEO_CAPTURER_H_
-#include <stddef.h>
-
#include <memory>
+#include <optional>
+#include <utility>
#include "api/video/video_frame.h"
+#include "api/video/video_sink_interface.h"
#include "api/video/video_source_interface.h"
#include "media/base/video_adapter.h"
#include "media/base/video_broadcaster.h"
#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/copy_to_file_audio_capturer.cc b/test/testsupport/copy_to_file_audio_capturer.cc
index df93f26..afb7175 100644
--- a/test/testsupport/copy_to_file_audio_capturer.cc
+++ b/test/testsupport/copy_to_file_audio_capturer.cc
@@ -10,9 +10,15 @@
#include "test/testsupport/copy_to_file_audio_capturer.h"
+#include <cstdint>
#include <memory>
+#include <string>
#include <utility>
+#include "common_audio/wav_file.h"
+#include "modules/audio_device/include/test_audio_device.h"
+#include "rtc_base/buffer.h"
+
namespace webrtc {
namespace test {
diff --git a/test/testsupport/copy_to_file_audio_capturer.h b/test/testsupport/copy_to_file_audio_capturer.h
index 2f7859f..2ecd914 100644
--- a/test/testsupport/copy_to_file_audio_capturer.h
+++ b/test/testsupport/copy_to_file_audio_capturer.h
@@ -11,11 +11,10 @@
#ifndef TEST_TESTSUPPORT_COPY_TO_FILE_AUDIO_CAPTURER_H_
#define TEST_TESTSUPPORT_COPY_TO_FILE_AUDIO_CAPTURER_H_
+#include <cstdint>
#include <memory>
-#include <optional>
#include <string>
-#include "api/array_view.h"
#include "common_audio/wav_file.h"
#include "modules/audio_device/include/test_audio_device.h"
#include "rtc_base/buffer.h"
diff --git a/test/testsupport/copy_to_file_audio_capturer_unittest.cc b/test/testsupport/copy_to_file_audio_capturer_unittest.cc
index 023b61d..236ecd3 100644
--- a/test/testsupport/copy_to_file_audio_capturer_unittest.cc
+++ b/test/testsupport/copy_to_file_audio_capturer_unittest.cc
@@ -10,10 +10,15 @@
#include "test/testsupport/copy_to_file_audio_capturer.h"
+#include <stdio.h>
+
+#include <cstdint>
#include <memory>
+#include <string>
#include <utility>
#include "modules/audio_device/include/test_audio_device.h"
+#include "rtc_base/buffer.h"
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
diff --git a/test/testsupport/file_utils.cc b/test/testsupport/file_utils.cc
index 27bb59c..491dcde 100644
--- a/test/testsupport/file_utils.cc
+++ b/test/testsupport/file_utils.cc
@@ -10,6 +10,8 @@
#include "test/testsupport/file_utils.h"
+#include <stdlib.h>
+
#include <cstdio>
#include <cstdlib>
#include <optional>
@@ -21,7 +23,6 @@
#include "absl/strings/string_view.h"
#include "rtc_base/checks.h"
#include "rtc_base/crypto_random.h"
-#include "rtc_base/string_utils.h"
#include "rtc_base/strings/string_builder.h"
#include "test/testsupport/file_utils_override.h"
@@ -30,6 +31,8 @@
#endif
#if defined(WEBRTC_WIN)
+#include <Shlwapi.h>
+#include <WinDef.h>
#include <direct.h>
#include <tchar.h>
#include <windows.h>
@@ -37,8 +40,7 @@
#include <algorithm>
#include <locale>
-#include "Shlwapi.h"
-#include "WinDef.h"
+#include "rtc_base/string_utils.h"
#include "rtc_base/win32.h"
#define GET_CURRENT_DIR _getcwd
diff --git a/test/testsupport/file_utils_override.cc b/test/testsupport/file_utils_override.cc
index e3b2299..f90d722 100644
--- a/test/testsupport/file_utils_override.cc
+++ b/test/testsupport/file_utils_override.cc
@@ -12,6 +12,7 @@
#include <stdio.h>
+#include <cstdio>
#include <iterator>
#include <optional>
#include <string>
@@ -21,6 +22,8 @@
#include "rtc_base/strings/string_builder.h"
#if defined(WEBRTC_WIN)
+#include <Shlwapi.h>
+#include <WinDef.h>
#include <direct.h>
#include <tchar.h>
#include <windows.h>
@@ -28,8 +31,6 @@
#include <algorithm>
#include <locale>
-#include "Shlwapi.h"
-#include "WinDef.h"
#include "rtc_base/string_utils.h"
#include "rtc_base/win32.h"
diff --git a/test/testsupport/file_utils_unittest.cc b/test/testsupport/file_utils_unittest.cc
index 4cea088..bbf0445 100644
--- a/test/testsupport/file_utils_unittest.cc
+++ b/test/testsupport/file_utils_unittest.cc
@@ -13,6 +13,7 @@
#include <stdio.h>
#include <algorithm>
+#include <cstdio>
#include <fstream>
#include <optional>
#include <string>
diff --git a/test/testsupport/fixed_fps_video_frame_writer_adapter.cc b/test/testsupport/fixed_fps_video_frame_writer_adapter.cc
index 4b90d21..84bb85e 100644
--- a/test/testsupport/fixed_fps_video_frame_writer_adapter.cc
+++ b/test/testsupport/fixed_fps_video_frame_writer_adapter.cc
@@ -10,14 +10,16 @@
#include "test/testsupport/fixed_fps_video_frame_writer_adapter.h"
-#include <cmath>
+#include <memory>
#include <optional>
#include <utility>
+#include "api/test/video/video_frame_writer.h"
#include "api/units/time_delta.h"
-#include "api/video/video_sink_interface.h"
+#include "api/units/timestamp.h"
+#include "api/video/video_frame.h"
#include "rtc_base/checks.h"
-#include "test/testsupport/video_frame_writer.h"
+#include "system_wrappers/include/clock.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/fixed_fps_video_frame_writer_adapter.h b/test/testsupport/fixed_fps_video_frame_writer_adapter.h
index 6d966bf..00909a4 100644
--- a/test/testsupport/fixed_fps_video_frame_writer_adapter.h
+++ b/test/testsupport/fixed_fps_video_frame_writer_adapter.h
@@ -15,9 +15,10 @@
#include <optional>
#include "api/test/video/video_frame_writer.h"
-#include "api/video/video_sink_interface.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
+#include "api/video/video_frame.h"
#include "system_wrappers/include/clock.h"
-#include "test/testsupport/video_frame_writer.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/fixed_fps_video_frame_writer_adapter_test.cc b/test/testsupport/fixed_fps_video_frame_writer_adapter_test.cc
index 473e63d..faf40e8 100644
--- a/test/testsupport/fixed_fps_video_frame_writer_adapter_test.cc
+++ b/test/testsupport/fixed_fps_video_frame_writer_adapter_test.cc
@@ -10,18 +10,21 @@
#include "test/testsupport/fixed_fps_video_frame_writer_adapter.h"
+#include <cstdint>
#include <memory>
#include <utility>
#include <vector>
+#include "api/test/time_controller.h"
+#include "api/test/video/video_frame_writer.h"
#include "api/units/time_delta.h"
#include "api/units/timestamp.h"
#include "api/video/i420_buffer.h"
#include "api/video/video_frame.h"
#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
#include "test/gmock.h"
#include "test/gtest.h"
-#include "test/testsupport/video_frame_writer.h"
#include "test/time_controller/simulated_time_controller.h"
namespace webrtc {
diff --git a/test/testsupport/frame_reader.h b/test/testsupport/frame_reader.h
index c18ea7f..c2b913d 100644
--- a/test/testsupport/frame_reader.h
+++ b/test/testsupport/frame_reader.h
@@ -11,8 +11,7 @@
#ifndef TEST_TESTSUPPORT_FRAME_READER_H_
#define TEST_TESTSUPPORT_FRAME_READER_H_
-#include <stdio.h>
-
+#include <cstdio>
#include <memory>
#include <optional>
#include <string>
diff --git a/test/testsupport/frame_writer.h b/test/testsupport/frame_writer.h
index 5f85d8b..3959a5d 100644
--- a/test/testsupport/frame_writer.h
+++ b/test/testsupport/frame_writer.h
@@ -11,8 +11,9 @@
#ifndef TEST_TESTSUPPORT_FRAME_WRITER_H_
#define TEST_TESTSUPPORT_FRAME_WRITER_H_
-#include <stdio.h>
-
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
#include <string>
#include "api/video/video_frame.h"
diff --git a/test/testsupport/ivf_video_frame_generator.cc b/test/testsupport/ivf_video_frame_generator.cc
index a50779d..704a277 100644
--- a/test/testsupport/ivf_video_frame_generator.cc
+++ b/test/testsupport/ivf_video_frame_generator.cc
@@ -10,19 +10,31 @@
#include "test/testsupport/ivf_video_frame_generator.h"
+#include <cstddef>
+#include <cstdint>
#include <limits>
+#include <memory>
+#include <optional>
+#include "absl/strings/string_view.h"
#include "api/environment/environment.h"
+#include "api/scoped_refptr.h"
+#include "api/test/frame_generator_interface.h"
+#include "api/units/time_delta.h"
#include "api/video/encoded_image.h"
#include "api/video/i420_buffer.h"
-#include "api/video_codecs/video_codec.h"
-#include "media/base/media_constants.h"
+#include "api/video/video_codec_type.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_frame_buffer.h"
+#include "api/video_codecs/video_decoder.h"
#include "modules/video_coding/codecs/av1/dav1d_decoder.h"
#include "modules/video_coding/codecs/h264/include/h264.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "modules/video_coding/codecs/vp9/include/vp9.h"
#include "modules/video_coding/include/video_error_codes.h"
+#include "modules/video_coding/utility/ivf_file_reader.h"
#include "rtc_base/checks.h"
+#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/system/file_wrapper.h"
namespace webrtc {
diff --git a/test/testsupport/ivf_video_frame_generator.h b/test/testsupport/ivf_video_frame_generator.h
index cb0b97f..237e76b 100644
--- a/test/testsupport/ivf_video_frame_generator.h
+++ b/test/testsupport/ivf_video_frame_generator.h
@@ -11,20 +11,20 @@
#ifndef TEST_TESTSUPPORT_IVF_VIDEO_FRAME_GENERATOR_H_
#define TEST_TESTSUPPORT_IVF_VIDEO_FRAME_GENERATOR_H_
+#include <cstddef>
+#include <cstdint>
#include <memory>
#include <optional>
-#include <string>
#include "absl/strings/string_view.h"
#include "api/environment/environment.h"
-#include "api/sequence_checker.h"
#include "api/test/frame_generator_interface.h"
-#include "api/video/video_codec_type.h"
#include "api/video/video_frame.h"
#include "api/video_codecs/video_decoder.h"
#include "modules/video_coding/utility/ivf_file_reader.h"
#include "rtc_base/event.h"
#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/ivf_video_frame_generator_unittest.cc b/test/testsupport/ivf_video_frame_generator_unittest.cc
index a2c3fea..f104e36 100644
--- a/test/testsupport/ivf_video_frame_generator_unittest.cc
+++ b/test/testsupport/ivf_video_frame_generator_unittest.cc
@@ -10,27 +10,36 @@
#include "test/testsupport/ivf_video_frame_generator.h"
+#include <cstddef>
+#include <cstdint>
#include <memory>
#include <optional>
+#include <string>
#include <vector>
#include "api/environment/environment.h"
#include "api/environment/environment_factory.h"
+#include "api/scoped_refptr.h"
#include "api/test/create_frame_generator.h"
+#include "api/test/frame_generator_interface.h"
#include "api/units/time_delta.h"
#include "api/video/encoded_image.h"
+#include "api/video/video_bitrate_allocation.h"
#include "api/video/video_codec_type.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_frame_buffer.h"
#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_encoder.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "media/base/codec.h"
-#include "media/base/media_constants.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "modules/video_coding/codecs/vp9/include/vp9.h"
#include "modules/video_coding/include/video_error_codes.h"
#include "modules/video_coding/utility/ivf_file_writer.h"
+#include "rtc_base/checks.h"
#include "rtc_base/event.h"
+#include "rtc_base/system/file_wrapper.h"
+#include "rtc_base/thread_annotations.h"
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
#include "test/video_codec_settings.h"
diff --git a/test/testsupport/jpeg_frame_writer.cc b/test/testsupport/jpeg_frame_writer.cc
index 8bf1ee4..3b6e417 100644
--- a/test/testsupport/jpeg_frame_writer.cc
+++ b/test/testsupport/jpeg_frame_writer.cc
@@ -8,10 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdio.h>
+#include <cstdint>
+#include <cstdio>
+#include <memory>
+#include <string>
+#include "api/video/video_frame.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "test/testsupport/frame_writer.h"
diff --git a/test/testsupport/jpeg_frame_writer_ios.cc b/test/testsupport/jpeg_frame_writer_ios.cc
index e72fea1..150ab8b 100644
--- a/test/testsupport/jpeg_frame_writer_ios.cc
+++ b/test/testsupport/jpeg_frame_writer_ios.cc
@@ -8,7 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "rtc_base/checks.h"
+#include <string>
+
+#include "api/video/video_frame.h"
#include "rtc_base/logging.h"
#include "test/testsupport/frame_writer.h"
diff --git a/test/testsupport/mock/mock_frame_reader.h b/test/testsupport/mock/mock_frame_reader.h
index 1be387b..9015008 100644
--- a/test/testsupport/mock/mock_frame_reader.h
+++ b/test/testsupport/mock/mock_frame_reader.h
@@ -11,7 +11,9 @@
#ifndef TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_
#define TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_
+#include "api/scoped_refptr.h"
#include "api/video/i420_buffer.h"
+#include "api/video/resolution.h"
#include "test/gmock.h"
#include "test/testsupport/frame_reader.h"
diff --git a/test/testsupport/perf_test.cc b/test/testsupport/perf_test.cc
index 4c5e0f4..5bf873b 100644
--- a/test/testsupport/perf_test.cc
+++ b/test/testsupport/perf_test.cc
@@ -10,21 +10,25 @@
#include "test/testsupport/perf_test.h"
-#include <stdio.h>
-
#include <algorithm>
-#include <fstream>
+#include <cmath>
+#include <cstdio>
+#include <ostream>
#include <set>
#include <sstream>
+#include <string>
#include <vector>
#include "absl/strings/string_view.h"
+#include "api/array_view.h"
#include "api/numerics/samples_stats_counter.h"
#include "rtc_base/checks.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
#include "test/testsupport/file_utils.h"
#include "test/testsupport/perf_test_histogram_writer.h"
+#include "test/testsupport/perf_test_result_writer.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/perf_test.h b/test/testsupport/perf_test.h
index 0f48b68..f151340 100644
--- a/test/testsupport/perf_test.h
+++ b/test/testsupport/perf_test.h
@@ -11,7 +11,7 @@
#ifndef TEST_TESTSUPPORT_PERF_TEST_H_
#define TEST_TESTSUPPORT_PERF_TEST_H_
-#include <sstream>
+#include <cstdio>
#include <string>
#include <vector>
diff --git a/test/testsupport/perf_test_histogram_writer.cc b/test/testsupport/perf_test_histogram_writer.cc
index de771b9..b93a9a4 100644
--- a/test/testsupport/perf_test_histogram_writer.cc
+++ b/test/testsupport/perf_test_histogram_writer.cc
@@ -10,16 +10,21 @@
#include "test/testsupport/perf_test_histogram_writer.h"
-#include <stdlib.h>
-
+#include <cstdlib>
#include <map>
#include <memory>
+#include <string>
+#include <utility>
#include "absl/strings/string_view.h"
-#include "api/numerics/samples_stats_counter.h"
+#include "api/array_view.h"
+#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
+#include "test/testsupport/perf_test.h"
+#include "test/testsupport/perf_test_result_writer.h"
#include "third_party/catapult/tracing/tracing/value/diagnostics/reserved_infos.h"
#include "third_party/catapult/tracing/tracing/value/histogram.h"
diff --git a/test/testsupport/perf_test_histogram_writer_no_protobuf.cc b/test/testsupport/perf_test_histogram_writer_no_protobuf.cc
index 6bc810b..956cbe1 100644
--- a/test/testsupport/perf_test_histogram_writer_no_protobuf.cc
+++ b/test/testsupport/perf_test_histogram_writer_no_protobuf.cc
@@ -8,7 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "rtc_base/checks.h"
#include "test/testsupport/perf_test_histogram_writer.h"
+#include "test/testsupport/perf_test_result_writer.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/perf_test_histogram_writer_unittest.cc b/test/testsupport/perf_test_histogram_writer_unittest.cc
index 83025a7..1d04557 100644
--- a/test/testsupport/perf_test_histogram_writer_unittest.cc
+++ b/test/testsupport/perf_test_histogram_writer_unittest.cc
@@ -11,9 +11,11 @@
#include "test/testsupport/perf_test_histogram_writer.h"
#include <memory>
-#include <string>
+#include <vector>
#include "test/gtest.h"
+#include "test/testsupport/perf_test.h"
+#include "test/testsupport/perf_test_result_writer.h"
#include "third_party/catapult/tracing/tracing/value/histogram.h"
namespace webrtc {
diff --git a/test/testsupport/perf_test_result_writer.h b/test/testsupport/perf_test_result_writer.h
index 5ec31de..a4c52e9 100644
--- a/test/testsupport/perf_test_result_writer.h
+++ b/test/testsupport/perf_test_result_writer.h
@@ -11,11 +11,10 @@
#ifndef TEST_TESTSUPPORT_PERF_TEST_RESULT_WRITER_H_
#define TEST_TESTSUPPORT_PERF_TEST_RESULT_WRITER_H_
-#include <stdio.h>
-
#include <string>
#include "absl/strings/string_view.h"
+#include "api/array_view.h"
#include "test/testsupport/perf_test.h"
namespace webrtc {
diff --git a/test/testsupport/perf_test_unittest.cc b/test/testsupport/perf_test_unittest.cc
index 509882d..fad4916 100644
--- a/test/testsupport/perf_test_unittest.cc
+++ b/test/testsupport/perf_test_unittest.cc
@@ -10,10 +10,10 @@
#include "test/testsupport/perf_test.h"
-#include <algorithm>
#include <limits>
#include <string>
+#include "api/numerics/samples_stats_counter.h"
#include "test/gmock.h"
#include "test/gtest.h"
#include "test/testsupport/rtc_expect_death.h"
diff --git a/test/testsupport/resources_dir_flag.cc b/test/testsupport/resources_dir_flag.cc
index 87a449a..876da1a 100644
--- a/test/testsupport/resources_dir_flag.cc
+++ b/test/testsupport/resources_dir_flag.cc
@@ -10,6 +10,8 @@
#include "test/testsupport/resources_dir_flag.h"
+#include <string>
+
#include "absl/flags/flag.h"
ABSL_FLAG(std::string,
diff --git a/test/testsupport/test_artifacts.cc b/test/testsupport/test_artifacts.cc
index b0ab046..c700ddc 100644
--- a/test/testsupport/test_artifacts.cc
+++ b/test/testsupport/test_artifacts.cc
@@ -10,10 +10,11 @@
#include "test/testsupport/test_artifacts.h"
-#include <string.h>
+#include <cstdint>
+#include <cstring>
+#include <string>
#include "absl/flags/flag.h"
-#include "absl/flags/parse.h"
#include "rtc_base/logging.h"
#include "rtc_base/system/file_wrapper.h"
#include "test/testsupport/file_utils.h"
diff --git a/test/testsupport/test_artifacts_unittest.cc b/test/testsupport/test_artifacts_unittest.cc
index fb57761..fb5d8a4 100644
--- a/test/testsupport/test_artifacts_unittest.cc
+++ b/test/testsupport/test_artifacts_unittest.cc
@@ -10,8 +10,8 @@
#include "test/testsupport/test_artifacts.h"
-#include <string.h>
-
+#include <cstdint>
+#include <cstring>
#include <string>
#include "absl/flags/declare.h"
diff --git a/test/testsupport/video_frame_writer.h b/test/testsupport/video_frame_writer.h
index 1cc4e56..bc5525e 100644
--- a/test/testsupport/video_frame_writer.h
+++ b/test/testsupport/video_frame_writer.h
@@ -16,7 +16,6 @@
#include "api/test/video/video_frame_writer.h"
#include "api/video/video_frame.h"
-#include "rtc_base/buffer.h"
#include "test/testsupport/frame_writer.h"
namespace webrtc {
diff --git a/test/testsupport/video_frame_writer_unittest.cc b/test/testsupport/video_frame_writer_unittest.cc
index de8c618..2c32409 100644
--- a/test/testsupport/video_frame_writer_unittest.cc
+++ b/test/testsupport/video_frame_writer_unittest.cc
@@ -10,16 +10,20 @@
#include "test/testsupport/video_frame_writer.h"
-#include <stdint.h>
#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
#include <memory>
#include <string>
#include "absl/strings/string_view.h"
+#include "api/scoped_refptr.h"
#include "api/test/video/video_frame_writer.h"
#include "api/video/i420_buffer.h"
+#include "api/video/resolution.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_frame_buffer.h"
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
#include "test/testsupport/frame_reader.h"
diff --git a/test/testsupport/y4m_frame_generator.cc b/test/testsupport/y4m_frame_generator.cc
index f7b0eb0..462c9a8 100644
--- a/test/testsupport/y4m_frame_generator.cc
+++ b/test/testsupport/y4m_frame_generator.cc
@@ -10,14 +10,15 @@
#include "test/testsupport/y4m_frame_generator.h"
-#include <stdio.h>
-#include <string.h>
-
+#include <cstdio>
+#include <cstring>
#include <string>
#include "absl/strings/string_view.h"
#include "api/scoped_refptr.h"
+#include "api/test/frame_generator_interface.h"
#include "api/video/i420_buffer.h"
+#include "api/video/video_frame.h"
#include "rtc_base/checks.h"
#include "test/testsupport/frame_reader.h"
diff --git a/test/testsupport/y4m_frame_generator.h b/test/testsupport/y4m_frame_generator.h
index dfffb4a..774e775 100644
--- a/test/testsupport/y4m_frame_generator.h
+++ b/test/testsupport/y4m_frame_generator.h
@@ -18,7 +18,6 @@
#include "absl/strings/string_view.h"
#include "api/test/frame_generator_interface.h"
-#include "rtc_base/checks.h"
#include "test/testsupport/frame_reader.h"
namespace webrtc {
diff --git a/test/testsupport/y4m_frame_generator_test.cc b/test/testsupport/y4m_frame_generator_test.cc
index 24d10c8..aa03273 100644
--- a/test/testsupport/y4m_frame_generator_test.cc
+++ b/test/testsupport/y4m_frame_generator_test.cc
@@ -10,13 +10,15 @@
#include "test/testsupport/y4m_frame_generator.h"
-#include <cstdint>
+#include <stdio.h>
+
#include <cstdio>
#include <cstring>
#include <string>
#include <vector>
#include "absl/strings/string_view.h"
+#include "api/test/frame_generator_interface.h"
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
diff --git a/test/testsupport/y4m_frame_reader.cc b/test/testsupport/y4m_frame_reader.cc
index 6d9649d..8ce8494 100644
--- a/test/testsupport/y4m_frame_reader.cc
+++ b/test/testsupport/y4m_frame_reader.cc
@@ -8,17 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdio.h>
-
#include <charconv>
+#include <cstdio>
+#include <cstring>
+#include <memory>
#include <string>
+#include <vector>
-#include "api/scoped_refptr.h"
-#include "api/video/i420_buffer.h"
+#include "absl/strings/string_view.h"
+#include "api/video/resolution.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "rtc_base/logging.h"
+#include "rtc_base/checks.h"
#include "rtc_base/string_encode.h"
-#include "rtc_base/strings/string_builder.h"
#include "test/testsupport/file_utils.h"
#include "test/testsupport/frame_reader.h"
diff --git a/test/testsupport/y4m_frame_reader_unittest.cc b/test/testsupport/y4m_frame_reader_unittest.cc
index 406c69e..70be442 100644
--- a/test/testsupport/y4m_frame_reader_unittest.cc
+++ b/test/testsupport/y4m_frame_reader_unittest.cc
@@ -8,15 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdint.h>
#include <stdio.h>
+#include <cstdio>
#include <memory>
#include <string>
+#include <tuple>
+#include <vector>
#include "absl/strings/string_view.h"
#include "api/scoped_refptr.h"
-#include "api/video/i420_buffer.h"
+#include "api/video/resolution.h"
#include "api/video/video_frame_buffer.h"
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
diff --git a/test/testsupport/y4m_frame_writer.cc b/test/testsupport/y4m_frame_writer.cc
index 1bb4543..7309f99 100644
--- a/test/testsupport/y4m_frame_writer.cc
+++ b/test/testsupport/y4m_frame_writer.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdio.h>
-
+#include <cstdint>
+#include <cstdio>
#include <string>
#include "rtc_base/logging.h"
diff --git a/test/testsupport/y4m_frame_writer_unittest.cc b/test/testsupport/y4m_frame_writer_unittest.cc
index ebb34f5..f2acc00 100644
--- a/test/testsupport/y4m_frame_writer_unittest.cc
+++ b/test/testsupport/y4m_frame_writer_unittest.cc
@@ -8,10 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdint.h>
#include <stdio.h>
-#include <string.h>
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
#include <memory>
#include <string>
diff --git a/test/testsupport/yuv_frame_reader.cc b/test/testsupport/yuv_frame_reader.cc
index 4a72735..b338329 100644
--- a/test/testsupport/yuv_frame_reader.cc
+++ b/test/testsupport/yuv_frame_reader.cc
@@ -8,14 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdio.h>
-
+#include <algorithm>
+#include <cstdio>
+#include <memory>
#include <string>
#include "api/scoped_refptr.h"
#include "api/video/i420_buffer.h"
+#include "api/video/resolution.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "rtc_base/logging.h"
+#include "rtc_base/checks.h"
#include "test/frame_utils.h"
#include "test/testsupport/file_utils.h"
#include "test/testsupport/frame_reader.h"
diff --git a/test/testsupport/yuv_frame_reader_unittest.cc b/test/testsupport/yuv_frame_reader_unittest.cc
index 9d633d7..28f6fd0 100644
--- a/test/testsupport/yuv_frame_reader_unittest.cc
+++ b/test/testsupport/yuv_frame_reader_unittest.cc
@@ -8,14 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdint.h>
#include <stdio.h>
+#include <cstdint>
+#include <cstdio>
#include <memory>
#include <string>
+#include <tuple>
+#include <vector>
#include "api/scoped_refptr.h"
-#include "api/video/i420_buffer.h"
+#include "api/video/resolution.h"
#include "api/video/video_frame_buffer.h"
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
diff --git a/test/testsupport/yuv_frame_writer.cc b/test/testsupport/yuv_frame_writer.cc
index e5e0a6b..1cef6d6 100644
--- a/test/testsupport/yuv_frame_writer.cc
+++ b/test/testsupport/yuv_frame_writer.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdio.h>
-
+#include <cstdint>
+#include <cstdio>
#include <string>
#include "rtc_base/checks.h"
diff --git a/test/testsupport/yuv_frame_writer_unittest.cc b/test/testsupport/yuv_frame_writer_unittest.cc
index 22a048b..63c3cd1 100644
--- a/test/testsupport/yuv_frame_writer_unittest.cc
+++ b/test/testsupport/yuv_frame_writer_unittest.cc
@@ -8,10 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdint.h>
#include <stdio.h>
-#include <string.h>
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
#include <memory>
#include <string>
diff --git a/test/time_controller/BUILD.gn b/test/time_controller/BUILD.gn
index 3255594..0cf531f 100644
--- a/test/time_controller/BUILD.gn
+++ b/test/time_controller/BUILD.gn
@@ -23,6 +23,8 @@
deps = [
"../../api:field_trials_view",
+ "../../api:function_view",
+ "../../api:location",
"../../api:sequence_checker",
"../../api:time_controller",
"../../api/task_queue",
@@ -30,10 +32,12 @@
"../../api/units:time_delta",
"../../api/units:timestamp",
"../../rtc_base:checks",
+ "../../rtc_base:macromagic",
"../../rtc_base:null_socket_server",
"../../rtc_base:platform_thread_types",
"../../rtc_base:rtc_base_tests_utils",
"../../rtc_base:rtc_event",
+ "../../rtc_base:socket",
"../../rtc_base:socket_server",
"../../rtc_base:threading",
"../../rtc_base:timeutils",
@@ -58,6 +62,8 @@
"../../api:time_controller",
"../../api/task_queue",
"../../api/units:time_delta",
+ "../../api/units:timestamp",
+ "../../rtc_base:checks",
"../../rtc_base:macromagic",
"../../rtc_base:rtc_event",
"../../rtc_base:task_queue_for_test",
diff --git a/test/time_controller/real_time_controller.cc b/test/time_controller/real_time_controller.cc
index 5a27d25..ac33ee7 100644
--- a/test/time_controller/real_time_controller.cc
+++ b/test/time_controller/real_time_controller.cc
@@ -9,9 +9,18 @@
*/
#include "test/time_controller/real_time_controller.h"
+#include <memory>
+#include <string>
+#include <utility>
+
#include "api/field_trials_view.h"
#include "api/task_queue/default_task_queue_factory.h"
+#include "api/task_queue/task_queue_factory.h"
+#include "api/units/time_delta.h"
#include "rtc_base/null_socket_server.h"
+#include "rtc_base/socket_server.h"
+#include "rtc_base/thread.h"
+#include "system_wrappers/include/clock.h"
namespace webrtc {
namespace {
diff --git a/test/time_controller/real_time_controller.h b/test/time_controller/real_time_controller.h
index 99eb72e..73650677 100644
--- a/test/time_controller/real_time_controller.h
+++ b/test/time_controller/real_time_controller.h
@@ -10,13 +10,15 @@
#ifndef TEST_TIME_CONTROLLER_REAL_TIME_CONTROLLER_H_
#define TEST_TIME_CONTROLLER_REAL_TIME_CONTROLLER_H_
-#include <functional>
#include <memory>
+#include <string>
#include "api/field_trials_view.h"
#include "api/task_queue/task_queue_factory.h"
#include "api/test/time_controller.h"
#include "api/units/time_delta.h"
+#include "rtc_base/socket_server.h"
+#include "rtc_base/thread.h"
#include "system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/test/time_controller/simulated_task_queue.cc b/test/time_controller/simulated_task_queue.cc
index 3d786df..44065fc 100644
--- a/test/time_controller/simulated_task_queue.cc
+++ b/test/time_controller/simulated_task_queue.cc
@@ -10,7 +10,18 @@
#include "test/time_controller/simulated_task_queue.h"
#include <algorithm>
+#include <deque>
+#include <map>
#include <utility>
+#include <vector>
+
+#include "absl/functional/any_invocable.h"
+#include "absl/strings/string_view.h"
+#include "api/location.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
+#include "rtc_base/synchronization/mutex.h"
+#include "test/time_controller/simulated_time_controller.h"
namespace webrtc {
diff --git a/test/time_controller/simulated_task_queue.h b/test/time_controller/simulated_task_queue.h
index 6ca4632..5f3d174 100644
--- a/test/time_controller/simulated_task_queue.h
+++ b/test/time_controller/simulated_task_queue.h
@@ -12,12 +12,16 @@
#include <deque>
#include <map>
-#include <memory>
#include <vector>
#include "absl/functional/any_invocable.h"
+#include "absl/strings/string_view.h"
+#include "api/location.h"
+#include "api/task_queue/task_queue_base.h"
#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
#include "test/time_controller/simulated_time_controller.h"
namespace webrtc {
diff --git a/test/time_controller/simulated_thread.cc b/test/time_controller/simulated_thread.cc
index d8ff5d9..16e7d69 100644
--- a/test/time_controller/simulated_thread.cc
+++ b/test/time_controller/simulated_thread.cc
@@ -10,8 +10,24 @@
#include "test/time_controller/simulated_thread.h"
#include <algorithm>
+#include <memory>
#include <utility>
+#include "absl/functional/any_invocable.h"
+#include "absl/strings/string_view.h"
+#include "api/function_view.h"
+#include "api/location.h"
+#include "api/task_queue/task_queue_base.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/socket.h"
+#include "rtc_base/socket_server.h"
+#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/time_utils.h"
+#include "test/time_controller/simulated_time_controller.h"
+
namespace webrtc {
namespace {
diff --git a/test/time_controller/simulated_thread.h b/test/time_controller/simulated_thread.h
index 2c370a0..51fe661 100644
--- a/test/time_controller/simulated_thread.h
+++ b/test/time_controller/simulated_thread.h
@@ -12,7 +12,17 @@
#include <memory>
+#include "absl/functional/any_invocable.h"
+#include "absl/strings/string_view.h"
+#include "api/function_view.h"
+#include "api/location.h"
+#include "api/task_queue/task_queue_base.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
+#include "rtc_base/socket_server.h"
#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/thread_annotations.h"
#include "test/time_controller/simulated_time_controller.h"
namespace webrtc {
diff --git a/test/time_controller/simulated_time_controller.h b/test/time_controller/simulated_time_controller.h
index a458b97..b934941 100644
--- a/test/time_controller/simulated_time_controller.h
+++ b/test/time_controller/simulated_time_controller.h
@@ -12,18 +12,27 @@
#include <list>
#include <memory>
+#include <string>
#include <unordered_set>
-#include <utility>
#include <vector>
+#include "absl/functional/any_invocable.h"
#include "absl/strings/string_view.h"
-#include "api/sequence_checker.h"
+#include "api/location.h"
+#include "api/task_queue/task_queue_base.h"
+#include "api/task_queue/task_queue_factory.h"
#include "api/test/time_controller.h"
+#include "api/units/time_delta.h"
#include "api/units/timestamp.h"
+#include "rtc_base/checks.h"
#include "rtc_base/fake_clock.h"
#include "rtc_base/platform_thread_types.h"
+#include "rtc_base/socket_server.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/synchronization/yield_policy.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/thread_annotations.h"
+#include "system_wrappers/include/clock.h"
namespace webrtc {
namespace sim_time_impl {
diff --git a/test/time_controller/simulated_time_controller_unittest.cc b/test/time_controller/simulated_time_controller_unittest.cc
index 10d741b..c68a81d 100644
--- a/test/time_controller/simulated_time_controller_unittest.cc
+++ b/test/time_controller/simulated_time_controller_unittest.cc
@@ -12,9 +12,12 @@
#include <atomic>
#include <memory>
+#include <utility>
#include "api/task_queue/task_queue_base.h"
+#include "api/task_queue/task_queue_factory.h"
#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
#include "rtc_base/event.h"
#include "rtc_base/task_queue_for_test.h"
#include "rtc_base/task_utils/repeating_task.h"
diff --git a/test/time_controller/time_controller_conformance_test.cc b/test/time_controller/time_controller_conformance_test.cc
index 2654041..19f4216 100644
--- a/test/time_controller/time_controller_conformance_test.cc
+++ b/test/time_controller/time_controller_conformance_test.cc
@@ -9,10 +9,14 @@
*/
#include <memory>
+#include <string>
#include <vector>
+#include "api/task_queue/task_queue_factory.h"
#include "api/test/time_controller.h"
#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
+#include "rtc_base/checks.h"
#include "rtc_base/event.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/thread.h"
diff --git a/test/vcm_capturer.cc b/test/vcm_capturer.cc
index bc022c1..b793313 100644
--- a/test/vcm_capturer.cc
+++ b/test/vcm_capturer.cc
@@ -10,13 +10,17 @@
#include "test/vcm_capturer.h"
-#include <stdint.h>
-
+#include <cstddef>
+#include <cstdint>
#include <memory>
+#include "api/video/video_frame.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "modules/video_capture/video_capture.h"
#include "modules/video_capture/video_capture_factory.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
+#include "test/test_video_capturer.h"
namespace webrtc {
namespace test {
diff --git a/test/vcm_capturer.h b/test/vcm_capturer.h
index 433cb48..722f2c8 100644
--- a/test/vcm_capturer.h
+++ b/test/vcm_capturer.h
@@ -10,11 +10,13 @@
#ifndef TEST_VCM_CAPTURER_H_
#define TEST_VCM_CAPTURER_H_
-#include <memory>
-#include <vector>
+#include <cstddef>
#include "api/scoped_refptr.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_sink_interface.h"
#include "modules/video_capture/video_capture.h"
+#include "modules/video_capture/video_capture_defines.h"
#include "rtc_base/logging.h"
#include "test/test_video_capturer.h"
diff --git a/test/video_codec_settings.h b/test/video_codec_settings.h
index 5ef4ed3..4d8ae7e 100644
--- a/test/video_codec_settings.h
+++ b/test/video_codec_settings.h
@@ -10,6 +10,10 @@
#ifndef TEST_VIDEO_CODEC_SETTINGS_H_
#define TEST_VIDEO_CODEC_SETTINGS_H_
+#include <cstdint>
+
+#include "api/video/video_codec_type.h"
+#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_encoder.h"
namespace webrtc {
diff --git a/test/video_codec_tester.h b/test/video_codec_tester.h
index fcec47e..e62ab06 100644
--- a/test/video_codec_tester.h
+++ b/test/video_codec_tester.h
@@ -11,6 +11,7 @@
#ifndef TEST_VIDEO_CODEC_TESTER_H_
#define TEST_VIDEO_CODEC_TESTER_H_
+#include <cstdint>
#include <limits>
#include <map>
#include <memory>
@@ -18,15 +19,20 @@
#include <string>
#include <vector>
+#include "absl/strings/string_view.h"
#include "api/environment/environment.h"
#include "api/numerics/samples_stats_counter.h"
-#include "api/test/metrics/metric.h"
#include "api/test/metrics/metrics_logger.h"
#include "api/units/data_rate.h"
#include "api/units/data_size.h"
#include "api/units/frequency.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
#include "api/video/encoded_image.h"
#include "api/video/resolution.h"
+#include "api/video_codecs/scalability_mode.h"
+#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_decoder_factory.h"
#include "api/video_codecs/video_encoder_factory.h"
diff --git a/test/video_decoder_proxy_factory.h b/test/video_decoder_proxy_factory.h
index 2a22f66..72f5691 100644
--- a/test/video_decoder_proxy_factory.h
+++ b/test/video_decoder_proxy_factory.h
@@ -11,11 +11,16 @@
#ifndef TEST_VIDEO_DECODER_PROXY_FACTORY_H_
#define TEST_VIDEO_DECODER_PROXY_FACTORY_H_
+#include <cstdint>
#include <memory>
#include <vector>
+#include "api/environment/environment.h"
+#include "api/video/encoded_image.h"
+#include "api/video_codecs/sdp_video_format.h"
#include "api/video_codecs/video_decoder.h"
#include "api/video_codecs/video_decoder_factory.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace test {
diff --git a/test/video_encoder_nullable_proxy_factory.h b/test/video_encoder_nullable_proxy_factory.h
index d27afb4..001d006 100644
--- a/test/video_encoder_nullable_proxy_factory.h
+++ b/test/video_encoder_nullable_proxy_factory.h
@@ -12,9 +12,9 @@
#define TEST_VIDEO_ENCODER_NULLABLE_PROXY_FACTORY_H_
#include <memory>
-#include <vector>
#include "api/environment/environment.h"
+#include "api/video_codecs/sdp_video_format.h"
#include "api/video_codecs/video_encoder.h"
#include "api/video_codecs/video_encoder_factory.h"
#include "test/video_encoder_proxy_factory.h"
diff --git a/test/video_encoder_proxy_factory.h b/test/video_encoder_proxy_factory.h
index 5560fb8..a2e8dca 100644
--- a/test/video_encoder_proxy_factory.h
+++ b/test/video_encoder_proxy_factory.h
@@ -11,12 +11,23 @@
#ifndef TEST_VIDEO_ENCODER_PROXY_FACTORY_H_
#define TEST_VIDEO_ENCODER_PROXY_FACTORY_H_
+#include <algorithm>
+#include <cstdint>
#include <memory>
+#include <optional>
#include <vector>
#include "api/environment/environment.h"
+#include "api/fec_controller_override.h"
+#include "api/units/data_rate.h"
+#include "api/video/render_resolution.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_frame_type.h"
+#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_encoder.h"
#include "api/video_codecs/video_encoder_factory.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace test {
diff --git a/test/video_renderer.cc b/test/video_renderer.cc
index 75ab72a..abd76fd 100644
--- a/test/video_renderer.cc
+++ b/test/video_renderer.cc
@@ -9,6 +9,8 @@
*/
#include "test/video_renderer.h"
+#include <cstddef>
+
// TODO(pbos): Android renderer
namespace webrtc {
diff --git a/test/video_test_constants.h b/test/video_test_constants.h
index b908398..f3bf34f 100644
--- a/test/video_test_constants.h
+++ b/test/video_test_constants.h
@@ -10,6 +10,7 @@
#ifndef TEST_VIDEO_TEST_CONSTANTS_H_
#define TEST_VIDEO_TEST_CONSTANTS_H_
+#include <cstddef>
#include <cstdint>
#include "api/units/time_delta.h"
