[Cleanup] Add missing #include. Remove useless ones. IWYU part 2.
This is a follow-up to
https://webrtc-review.googlesource.com/c/src/+/106280.
This time the whole code base is covered.
Some files may have not been fixed though, whenever the IWYU tool
was breaking the build.
Bug: webrtc:8311
Change-Id: I2c31f552a87e887d33931d46e87b6208b1e483ef
Reviewed-on: https://webrtc-review.googlesource.com/c/111965
Commit-Queue: Yves Gerey <yvesg@google.com>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25830}diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index ac359bc..988cbb8 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -15,9 +15,11 @@
"encoded_frame.h",
]
deps = [
+ ":codec_globals_headers",
":video_codec_interface",
"../../:webrtc_common",
"../../api/video:encoded_image",
+ "../../api/video:video_frame",
"../../api/video:video_frame_i420",
"../../modules:module_api",
"../../modules:module_api_public",
@@ -28,6 +30,7 @@
"../../rtc_base/experiments:rtt_mult_experiment",
"../../system_wrappers:system_wrappers",
"//third_party/abseil-cpp/absl/types:optional",
+ "//third_party/abseil-cpp/absl/types:variant",
]
if (!build_with_chromium && is_clang) {
@@ -70,15 +73,26 @@
]
deps = [
"..:module_api",
+ "../../:webrtc_common",
+ "../../api:libjingle_peerconnection_api",
"../rtp_rtcp:rtp_rtcp_format",
+ "../rtp_rtcp:rtp_video_header",
+ "//third_party/abseil-cpp/absl/types:optional",
]
}
rtc_static_library("video_coding") {
visibility = [ "*" ]
deps = [
+ "..:module_fec_api",
+ "../../api:libjingle_peerconnection_api",
+ "../../api/video:encoded_image",
+ "../../api/video:video_bitrate_allocation",
+ "../../api/video:video_bitrate_allocator_factory",
"../../system_wrappers:field_trial",
"../../system_wrappers:metrics",
+ "../rtp_rtcp:rtp_video_header",
+ "//third_party/abseil-cpp/absl/memory",
]
sources = [
@@ -201,6 +215,7 @@
"../../api/video:video_frame",
"../../api/video_codecs:video_codecs_api",
"../../common_video:common_video",
+ "//third_party/abseil-cpp/absl/types:optional",
]
}
@@ -264,6 +279,7 @@
"..:module_api",
"../..:webrtc_common",
"../../api/video:encoded_image",
+ "../../api/video:video_bitrate_allocation",
"../../api/video:video_bitrate_allocator",
"../../api/video_codecs:video_codecs_api",
"../../common_video",
@@ -298,6 +314,7 @@
deps = [
":video_codec_interface",
":video_coding_utility",
+ "../../:webrtc_common",
"../../api/video:video_frame",
"../../api/video:video_frame_i420",
"../../api/video_codecs:video_codecs_api",
@@ -309,6 +326,7 @@
"../../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
+ "//third_party/abseil-cpp/absl/types:optional",
"//third_party/libyuv",
]
@@ -386,6 +404,7 @@
"../../api/video:video_frame_i420",
"../../api/video_codecs:video_codecs_api",
"../../common_video:common_video",
+ "../../rtc_base:checks",
"../../rtc_base:rtc_base",
"../../system_wrappers",
"../rtp_rtcp:rtp_rtcp_format",
@@ -420,6 +439,7 @@
"../..:webrtc_common",
"../../api/video:encoded_image",
"../../api/video:video_frame",
+ "../../api/video:video_frame_i420",
"../../api/video_codecs:create_vp8_temporal_layers",
"../../api/video_codecs:video_codecs_api",
"../../common_video",
@@ -489,8 +509,10 @@
}
deps = [
+ ":codec_globals_headers",
":video_codec_interface",
"../..:webrtc_common",
+ "../../api/video:video_bitrate_allocation",
"../../api/video:video_bitrate_allocator",
"../../api/video_codecs:video_codecs_api",
"../../common_video",
@@ -634,14 +656,19 @@
}
deps = [
+ ":codec_globals_headers",
":video_codec_interface",
":video_coding",
":video_coding_utility",
":webrtc_vp9_helpers",
+ "..:module_api",
"../..:webrtc_common",
"../../api:videocodec_test_fixture_api",
"../../api/video:builtin_video_bitrate_allocator_factory",
+ "../../api/video:encoded_image",
+ "../../api/video:video_bitrate_allocation",
"../../api/video:video_bitrate_allocator",
+ "../../api/video:video_bitrate_allocator_factory",
"../../api/video:video_frame",
"../../api/video:video_frame_i420",
"../../api/video_codecs:video_codecs_api",
@@ -655,6 +682,8 @@
"../../test:video_test_common",
"../../test:video_test_support",
"../rtp_rtcp:rtp_rtcp_format",
+ "//third_party/abseil-cpp/absl/memory",
+ "//third_party/abseil-cpp/absl/types:optional",
"//third_party/libyuv",
]
}
@@ -703,13 +732,16 @@
"codecs/test/videocodec_test_stats_impl.h",
]
deps = [
+ ":codec_globals_headers",
":video_codec_interface",
":video_codecs_test_framework",
":video_coding_utility",
":webrtc_vp9_helpers",
"../..:webrtc_common",
+ "../../api:array_view",
"../../api:videocodec_test_fixture_api",
"../../api/test/video:function_video_factory",
+ "../../api/video:video_bitrate_allocation",
"../../api/video_codecs:video_codecs_api",
"../../call:video_stream_api",
"../../common_video",
@@ -730,6 +762,7 @@
"../../test:video_test_support",
"../rtp_rtcp:rtp_rtcp_format",
"//third_party/abseil-cpp/absl/memory",
+ "//third_party/abseil-cpp/absl/types:optional",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
@@ -756,6 +789,7 @@
deps = [
":mock_headers",
+ ":video_codec_interface",
":video_codecs_test_framework",
":video_coding_utility",
":videocodec_test_impl",
@@ -771,6 +805,7 @@
"../../api:mock_video_encoder",
"../../api:videocodec_test_fixture_api",
"../../api/test/video:function_video_factory",
+ "../../api/video:encoded_image",
"../../api/video:video_frame",
"../../api/video:video_frame_i420",
"../../api/video_codecs:rtc_software_fallback_wrappers",
@@ -885,14 +920,18 @@
":webrtc_vp9",
":webrtc_vp9_helpers",
"..:module_api",
+ "..:module_fec_api",
"../..:webrtc_common",
+ "../../api:array_view",
"../../api:create_simulcast_test_fixture_api",
+ "../../api:fec_controller_api",
"../../api:mock_video_decoder",
"../../api:mock_video_encoder",
"../../api:simulcast_test_fixture_api",
"../../api:videocodec_test_fixture_api",
"../../api/test/video:function_video_factory",
"../../api/video:builtin_video_bitrate_allocator_factory",
+ "../../api/video:video_bitrate_allocation",
"../../api/video:video_bitrate_allocator",
"../../api/video:video_bitrate_allocator_factory",
"../../api/video:video_frame",
@@ -919,8 +958,10 @@
"../../test:video_test_common",
"../../test:video_test_support",
"../rtp_rtcp:rtp_rtcp_format",
+ "../rtp_rtcp:rtp_video_header",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
+ "//third_party/abseil-cpp/absl/types:variant",
]
if (rtc_build_libvpx) {
deps += [ rtc_libvpx_dir ]
diff --git a/modules/video_coding/codec_timer.cc b/modules/video_coding/codec_timer.cc
index 725f025..0d4099b 100644
--- a/modules/video_coding/codec_timer.cc
+++ b/modules/video_coding/codec_timer.cc
@@ -10,6 +10,8 @@
#include "modules/video_coding/codec_timer.h"
+#include <cstdint>
+
namespace webrtc {
namespace {
diff --git a/modules/video_coding/codecs/h264/h264.cc b/modules/video_coding/codecs/h264/h264.cc
index aff9f7d..6d84b66 100644
--- a/modules/video_coding/codecs/h264/h264.cc
+++ b/modules/video_coding/codecs/h264/h264.cc
@@ -11,15 +11,19 @@
#include "modules/video_coding/codecs/h264/include/h264.h"
+#include <string>
+
+#include "absl/types/optional.h"
#include "api/video_codecs/sdp_video_format.h"
+#include "common_types.h" // NOLINT(build/include)
#include "media/base/h264_profile_level_id.h"
+#include "media/base/mediaconstants.h"
#if defined(WEBRTC_USE_H264)
#include "modules/video_coding/codecs/h264/h264_decoder_impl.h"
#include "modules/video_coding/codecs/h264/h264_encoder_impl.h"
#endif
-#include "absl/memory/memory.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
diff --git a/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc b/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
index 82c14b7..ea92bd9 100644
--- a/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
+++ b/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
@@ -8,10 +8,25 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <stdint.h>
+#include <memory>
+
+#include "absl/types/optional.h"
#include "api/video/color_space.h"
+#include "api/video/encoded_image.h"
+#include "api/video/video_frame.h"
+#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_decoder.h"
+#include "api/video_codecs/video_encoder.h"
+#include "common_types.h" // NOLINT(build/include)
#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "media/base/codec.h"
+#include "media/base/mediaconstants.h"
#include "modules/video_coding/codecs/h264/include/h264.h"
#include "modules/video_coding/codecs/test/video_codec_unittest.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "modules/video_coding/include/video_error_codes.h"
+#include "test/gtest.h"
#include "test/video_codec_settings.h"
namespace webrtc {
diff --git a/modules/video_coding/codecs/interface/common_constants.h b/modules/video_coding/codecs/interface/common_constants.h
index 2fdcb90..a8fc629 100644
--- a/modules/video_coding/codecs/interface/common_constants.h
+++ b/modules/video_coding/codecs/interface/common_constants.h
@@ -14,6 +14,8 @@
#ifndef MODULES_VIDEO_CODING_CODECS_INTERFACE_COMMON_CONSTANTS_H_
#define MODULES_VIDEO_CODING_CODECS_INTERFACE_COMMON_CONSTANTS_H_
+#include <stdint.h>
+
namespace webrtc {
const int16_t kNoPictureId = -1;
diff --git a/modules/video_coding/codecs/multiplex/augmented_video_frame_buffer.cc b/modules/video_coding/codecs/multiplex/augmented_video_frame_buffer.cc
index b61a4a6..49d1c04 100644
--- a/modules/video_coding/codecs/multiplex/augmented_video_frame_buffer.cc
+++ b/modules/video_coding/codecs/multiplex/augmented_video_frame_buffer.cc
@@ -9,6 +9,10 @@
*/
#include "modules/video_coding/codecs/multiplex/include/augmented_video_frame_buffer.h"
+
+#include <stdint.h>
+#include <utility>
+
#include "api/video/video_frame_buffer.h"
namespace webrtc {
diff --git a/modules/video_coding/codecs/multiplex/include/augmented_video_frame_buffer.h b/modules/video_coding/codecs/multiplex/include/augmented_video_frame_buffer.h
index 96496ed..72c8fb8 100644
--- a/modules/video_coding/codecs/multiplex/include/augmented_video_frame_buffer.h
+++ b/modules/video_coding/codecs/multiplex/include/augmented_video_frame_buffer.h
@@ -11,9 +11,11 @@
#ifndef MODULES_VIDEO_CODING_CODECS_MULTIPLEX_INCLUDE_AUGMENTED_VIDEO_FRAME_BUFFER_H_
#define MODULES_VIDEO_CODING_CODECS_MULTIPLEX_INCLUDE_AUGMENTED_VIDEO_FRAME_BUFFER_H_
+#include <cstdint>
#include <memory>
#include "api/video/video_frame_buffer.h"
+#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
class AugmentedVideoFrameBuffer : public VideoFrameBuffer {
diff --git a/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc b/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc
index dec60d9..04103b9 100644
--- a/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc
+++ b/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc
@@ -14,6 +14,7 @@
#include <utility>
#include "modules/rtp_rtcp/source/byte_io.h"
+#include "rtc_base/checks.h"
namespace webrtc {
int PackHeader(uint8_t* buffer, MultiplexImageHeader header) {
diff --git a/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h b/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h
index 0d2f9fa..9d9be26 100644
--- a/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h
+++ b/modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h
@@ -11,6 +11,7 @@
#ifndef MODULES_VIDEO_CODING_CODECS_MULTIPLEX_MULTIPLEX_ENCODED_IMAGE_PACKER_H_
#define MODULES_VIDEO_CODING_CODECS_MULTIPLEX_MULTIPLEX_ENCODED_IMAGE_PACKER_H_
+#include <cstdint>
#include <memory>
#include <vector>
diff --git a/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc b/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc
index c479d8a..8ced0a9 100644
--- a/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc
+++ b/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc
@@ -8,10 +8,25 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <stddef.h>
+#include <cstdint>
+#include <memory>
+#include <utility>
+#include <vector>
+
#include "absl/memory/memory.h"
+#include "absl/types/optional.h"
#include "api/test/mock_video_decoder_factory.h"
#include "api/test/mock_video_encoder_factory.h"
+#include "api/video/encoded_image.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_frame_buffer.h"
+#include "api/video/video_rotation.h"
#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_decoder.h"
+#include "api/video_codecs/video_encoder.h"
+#include "common_types.h" // NOLINT(build/include)
#include "common_video/include/video_frame_buffer.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "media/base/mediaconstants.h"
@@ -21,7 +36,13 @@
#include "modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h"
#include "modules/video_coding/codecs/test/video_codec_unittest.h"
#include "modules/video_coding/codecs/vp9/include/vp9.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "modules/video_coding/include/video_error_codes.h"
#include "rtc_base/keep_ref_until_done.h"
+#include "rtc_base/refcountedobject.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
#include "test/video_codec_settings.h"
using testing::_;
diff --git a/modules/video_coding/codecs/test/video_codec_unittest.cc b/modules/video_coding/codecs/test/video_codec_unittest.cc
index 12ffdd0..de0fea4 100644
--- a/modules/video_coding/codecs/test/video_codec_unittest.cc
+++ b/modules/video_coding/codecs/test/video_codec_unittest.cc
@@ -8,9 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "modules/video_coding/codecs/test/video_codec_unittest.h"
+#include <utility>
+#include "common_types.h" // NOLINT(build/include)
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "modules/video_coding/codecs/test/video_codec_unittest.h"
#include "modules/video_coding/include/video_error_codes.h"
#include "test/video_codec_settings.h"
diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc
index d01a842..3e8c373 100644
--- a/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc
@@ -8,7 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <stddef.h>
+
#include "api/test/videocodec_test_fixture.h"
+#include "api/video_codecs/video_codec.h"
+#include "common_types.h" // NOLINT(build/include)
#include "test/gmock.h"
#include "test/gtest.h"
#include "test/video_codec_settings.h"
diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
index 847e847..e6b2f7b 100644
--- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
@@ -10,30 +10,43 @@
#include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h"
+#include <stdint.h>
+#include <stdio.h>
#include <algorithm>
#include <cmath>
#include <memory>
+#include <string>
#include <utility>
#include "absl/memory/memory.h"
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "api/video/video_bitrate_allocation.h"
#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_decoder.h"
+#include "api/video_codecs/video_encoder_config.h"
#include "common_types.h" // NOLINT(build/include)
+#include "common_video/h264/h264_common.h"
#include "media/base/h264_profile_level_id.h"
#include "media/base/mediaconstants.h"
#include "media/engine/internaldecoderfactory.h"
#include "media/engine/internalencoderfactory.h"
#include "media/engine/simulcast.h"
+#include "modules/video_coding/codecs/h264/include/h264_globals.h"
#include "modules/video_coding/codecs/vp9/svc_config.h"
-#include "modules/video_coding/include/video_codec_interface.h"
+#include "modules/video_coding/utility/ivf_file_writer.h"
#include "rtc_base/checks.h"
#include "rtc_base/cpu_time.h"
#include "rtc_base/event.h"
#include "rtc_base/file.h"
#include "rtc_base/strings/string_builder.h"
+#include "rtc_base/timeutils.h"
#include "system_wrappers/include/cpu_info.h"
#include "system_wrappers/include/sleep.h"
#include "test/gtest.h"
#include "test/testsupport/fileutils.h"
+#include "test/testsupport/frame_writer.h"
#include "test/video_codec_settings.h"
namespace webrtc {
diff --git a/modules/video_coding/codecs/test/videocodec_test_stats_impl.h b/modules/video_coding/codecs/test/videocodec_test_stats_impl.h
index 9cc5e33..905db5c 100644
--- a/modules/video_coding/codecs/test/videocodec_test_stats_impl.h
+++ b/modules/video_coding/codecs/test/videocodec_test_stats_impl.h
@@ -11,12 +11,11 @@
#ifndef MODULES_VIDEO_CODING_CODECS_TEST_VIDEOCODEC_TEST_STATS_IMPL_H_
#define MODULES_VIDEO_CODING_CODECS_TEST_VIDEOCODEC_TEST_STATS_IMPL_H_
+#include <stddef.h>
#include <map>
-#include <string>
#include <vector>
#include "api/test/videocodec_test_stats.h" // NOLINT(build/include)
-#include "common_types.h" // NOLINT(build/include)
namespace webrtc {
namespace test {
diff --git a/modules/video_coding/codecs/test/videoprocessor.cc b/modules/video_coding/codecs/test/videoprocessor.cc
index 6958266..5510876 100644
--- a/modules/video_coding/codecs/test/videoprocessor.cc
+++ b/modules/video_coding/codecs/test/videoprocessor.cc
@@ -10,21 +10,27 @@
#include "modules/video_coding/codecs/test/videoprocessor.h"
+#include <string.h>
#include <algorithm>
+#include <cstddef>
#include <limits>
#include <utility>
+#include "absl/memory/memory.h"
#include "api/video/builtin_video_bitrate_allocator_factory.h"
#include "api/video/i420_buffer.h"
+#include "api/video/video_bitrate_allocator_factory.h"
+#include "api/video/video_frame_buffer.h"
+#include "api/video/video_rotation.h"
+#include "api/video_codecs/video_codec.h"
#include "common_types.h" // NOLINT(build/include)
#include "common_video/h264/h264_common.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "modules/video_coding/include/video_codec_initializer.h"
+#include "modules/video_coding/codecs/interface/common_constants.h"
#include "modules/video_coding/include/video_error_codes.h"
-#include "modules/video_coding/utility/default_video_bitrate_allocator.h"
-#include "modules/video_coding/utility/simulcast_rate_allocator.h"
#include "rtc_base/checks.h"
+#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/timeutils.h"
#include "test/gtest.h"
#include "third_party/libyuv/include/libyuv/compare.h"
diff --git a/modules/video_coding/codecs/test/videoprocessor.h b/modules/video_coding/codecs/test/videoprocessor.h
index 9f1fa13..1a1bdb3 100644
--- a/modules/video_coding/codecs/test/videoprocessor.h
+++ b/modules/video_coding/codecs/test/videoprocessor.h
@@ -11,21 +11,32 @@
#ifndef MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_
#define MODULES_VIDEO_CODING_CODECS_TEST_VIDEOPROCESSOR_H_
+#include <stddef.h>
+#include <stdint.h>
#include <map>
#include <memory>
-#include <string>
#include <vector>
+#include "absl/types/optional.h"
#include "api/test/videocodec_test_fixture.h"
#include "api/test/videocodec_test_stats.h"
+#include "api/video/encoded_image.h"
+#include "api/video/video_bitrate_allocation.h"
#include "api/video/video_bitrate_allocator.h"
#include "api/video/video_frame.h"
+#include "api/video_codecs/video_decoder.h"
+#include "api/video_codecs/video_encoder.h"
+#include "common_types.h" // NOLINT(build/include)
+#include "modules/include/module_common_types.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/utility/ivf_file_writer.h"
#include "rtc_base/buffer.h"
+#include "rtc_base/checks.h"
#include "rtc_base/constructormagic.h"
#include "rtc_base/sequenced_task_checker.h"
#include "rtc_base/task_queue.h"
+#include "rtc_base/thread_annotations.h"
+#include "rtc_base/thread_checker.h"
#include "test/testsupport/frame_reader.h"
#include "test/testsupport/frame_writer.h"
diff --git a/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/modules/video_coding/codecs/test/videoprocessor_unittest.cc
index 3d41ad9..f83240f 100644
--- a/modules/video_coding/codecs/test/videoprocessor_unittest.cc
+++ b/modules/video_coding/codecs/test/videoprocessor_unittest.cc
@@ -15,12 +15,10 @@
#include "api/test/mock_video_encoder.h"
#include "api/test/videocodec_test_fixture.h"
#include "api/video/i420_buffer.h"
-#include "common_types.h" // NOLINT(build/include)
#include "media/base/mediaconstants.h"
#include "modules/video_coding/codecs/test/videocodec_test_stats_impl.h"
#include "modules/video_coding/codecs/test/videoprocessor.h"
-#include "modules/video_coding/include/video_coding.h"
-#include "rtc_base/event.h"
+#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/task_queue_for_test.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/modules/video_coding/codecs/vp8/default_temporal_layers.h b/modules/video_coding/codecs/vp8/default_temporal_layers.h
index fff62a5..16d84f2 100644
--- a/modules/video_coding/codecs/vp8/default_temporal_layers.h
+++ b/modules/video_coding/codecs/vp8/default_temporal_layers.h
@@ -12,6 +12,8 @@
#ifndef MODULES_VIDEO_CODING_CODECS_VP8_DEFAULT_TEMPORAL_LAYERS_H_
#define MODULES_VIDEO_CODING_CODECS_VP8_DEFAULT_TEMPORAL_LAYERS_H_
+#include <stddef.h>
+#include <stdint.h>
#include <limits>
#include <map>
#include <memory>
@@ -19,9 +21,9 @@
#include <vector>
#include "absl/types/optional.h"
-
#include "api/video_codecs/vp8_temporal_layers.h"
#include "modules/video_coding/codecs/vp8/include/temporal_layers_checker.h"
+#include "modules/video_coding/include/video_codec_interface.h"
namespace webrtc {
diff --git a/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc b/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
index 5ee6520..a7bcbe6 100644
--- a/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
+++ b/modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc
@@ -9,11 +9,18 @@
*/
#include "modules/video_coding/codecs/vp8/default_temporal_layers.h"
+
+#include <cstdint>
+
+#include "api/video/video_bitrate_allocation.h"
+#include "api/video_codecs/video_codec.h"
+#include "common_types.h" // NOLINT(build/include)
#include "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/utility/simulcast_rate_allocator.h"
#include "test/field_trial.h"
#include "test/gtest.h"
+#include "vpx/vp8cx.h"
namespace webrtc {
namespace test {
diff --git a/modules/video_coding/codecs/vp8/libvpx_interface.h b/modules/video_coding/codecs/vp8/libvpx_interface.h
index af8b836..1eebeec 100644
--- a/modules/video_coding/codecs/vp8/libvpx_interface.h
+++ b/modules/video_coding/codecs/vp8/libvpx_interface.h
@@ -11,10 +11,13 @@
#ifndef MODULES_VIDEO_CODING_CODECS_VP8_LIBVPX_INTERFACE_H_
#define MODULES_VIDEO_CODING_CODECS_VP8_LIBVPX_INTERFACE_H_
+#include <stdint.h>
#include <memory>
#include "vpx/vp8cx.h"
+#include "vpx/vpx_codec.h"
#include "vpx/vpx_encoder.h"
+#include "vpx/vpx_image.h"
namespace webrtc {
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
index 48838e9..0c27a67 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
@@ -8,18 +8,31 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <stdio.h>
+#include <string.h>
#include <algorithm>
#include <string>
#include "absl/memory/memory.h"
+#include "absl/types/optional.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 "common_types.h" // NOLINT(build/include)
+#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h"
+#include "modules/video_coding/include/video_error_codes.h"
#include "rtc_base/checks.h"
#include "rtc_base/numerics/exp_filter.h"
+#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/timeutils.h"
#include "system_wrappers/include/field_trial.h"
#include "system_wrappers/include/metrics.h"
#include "third_party/libyuv/include/libyuv/convert.h"
-#include "third_party/libyuv/include/libyuv/scale.h"
+#include "vpx/vp8.h"
+#include "vpx/vp8dx.h"
+#include "vpx/vpx_decoder.h"
namespace webrtc {
namespace {
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
index be5242c..e019f47 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
@@ -8,24 +8,33 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <assert.h>
+#include <string.h>
#include <algorithm>
+#include <cstdint>
#include <string>
#include <utility>
#include <vector>
#include "absl/memory/memory.h"
+#include "api/video/video_content_type.h"
+#include "api/video/video_frame_buffer.h"
+#include "api/video/video_timing.h"
#include "api/video_codecs/create_vp8_temporal_layers.h"
#include "api/video_codecs/vp8_temporal_layers.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "modules/video_coding/codecs/interface/common_constants.h"
+#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h"
+#include "modules/video_coding/include/video_error_codes.h"
#include "modules/video_coding/utility/simulcast_rate_allocator.h"
#include "modules/video_coding/utility/simulcast_utility.h"
#include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/trace_event.h"
#include "system_wrappers/include/field_trial.h"
-#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/scale.h"
+#include "vpx/vp8cx.h"
namespace webrtc {
namespace {
diff --git a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
index 474e4f8..e0bb464 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
+++ b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
@@ -8,16 +8,22 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <stdlib.h>
+#include <string.h>
+#include <cstdint>
#include <memory>
#include <vector>
+#include "modules/video_coding/codecs/interface/common_constants.h"
#include "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h"
#include "modules/video_coding/codecs/vp8/screenshare_layers.h"
#include "modules/video_coding/include/video_codec_interface.h"
+#include "rtc_base/checks.h"
#include "system_wrappers/include/clock.h"
#include "system_wrappers/include/metrics.h"
#include "test/gmock.h"
#include "test/gtest.h"
+#include "vpx/vp8cx.h"
using ::testing::_;
using ::testing::ElementsAre;
diff --git a/modules/video_coding/codecs/vp9/include/vp9_globals.h b/modules/video_coding/codecs/vp9/include/vp9_globals.h
index aa532a6..895e2de 100644
--- a/modules/video_coding/codecs/vp9/include/vp9_globals.h
+++ b/modules/video_coding/codecs/vp9/include/vp9_globals.h
@@ -15,6 +15,7 @@
#define MODULES_VIDEO_CODING_CODECS_VP9_INCLUDE_VP9_GLOBALS_H_
#include <assert.h>
+#include <stdint.h>
#include "modules/video_coding/codecs/interface/common_constants.h"
diff --git a/modules/video_coding/codecs/vp9/svc_config.cc b/modules/video_coding/codecs/vp9/svc_config.cc
index 3e92280..0e76b09 100644
--- a/modules/video_coding/codecs/vp9/svc_config.cc
+++ b/modules/video_coding/codecs/vp9/svc_config.cc
@@ -14,8 +14,9 @@
#include <cmath>
#include <vector>
+#include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
#include "modules/video_coding/codecs/vp9/svc_rate_allocator.h"
-#include "modules/video_coding/include/video_codec_interface.h"
+#include "rtc_base/checks.h"
namespace webrtc {
diff --git a/modules/video_coding/codecs/vp9/svc_config.h b/modules/video_coding/codecs/vp9/svc_config.h
index f671ced..d24d295 100644
--- a/modules/video_coding/codecs/vp9/svc_config.h
+++ b/modules/video_coding/codecs/vp9/svc_config.h
@@ -10,6 +10,7 @@
#ifndef MODULES_VIDEO_CODING_CODECS_VP9_SVC_CONFIG_H_
#define MODULES_VIDEO_CODING_CODECS_VP9_SVC_CONFIG_H_
+#include <stddef.h>
#include <vector>
#include "common_types.h" // NOLINT(build/include)
diff --git a/modules/video_coding/codecs/vp9/svc_config_unittest.cc b/modules/video_coding/codecs/vp9/svc_config_unittest.cc
index b997767..05802eb 100644
--- a/modules/video_coding/codecs/vp9/svc_config_unittest.cc
+++ b/modules/video_coding/codecs/vp9/svc_config_unittest.cc
@@ -9,7 +9,6 @@
*/
#include <cstddef>
-#include <cstdint>
#include <vector>
#include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
diff --git a/modules/video_coding/codecs/vp9/svc_rate_allocator.cc b/modules/video_coding/codecs/vp9/svc_rate_allocator.cc
index 9b846ad..cf74e08 100644
--- a/modules/video_coding/codecs/vp9/svc_rate_allocator.cc
+++ b/modules/video_coding/codecs/vp9/svc_rate_allocator.cc
@@ -12,8 +12,10 @@
#include <algorithm>
#include <cmath>
+#include <cstddef>
#include <numeric>
+#include "common_types.h" // NOLINT(build/include)
#include "rtc_base/checks.h"
namespace webrtc {
diff --git a/modules/video_coding/codecs/vp9/svc_rate_allocator.h b/modules/video_coding/codecs/vp9/svc_rate_allocator.h
index 10e22ed..8aa60ff 100644
--- a/modules/video_coding/codecs/vp9/svc_rate_allocator.h
+++ b/modules/video_coding/codecs/vp9/svc_rate_allocator.h
@@ -11,10 +11,11 @@
#ifndef MODULES_VIDEO_CODING_CODECS_VP9_SVC_RATE_ALLOCATOR_H_
#define MODULES_VIDEO_CODING_CODECS_VP9_SVC_RATE_ALLOCATOR_H_
+#include <stddef.h>
#include <stdint.h>
-
#include <vector>
+#include "api/video/video_bitrate_allocation.h"
#include "api/video/video_bitrate_allocator.h"
#include "api/video_codecs/video_codec.h"
diff --git a/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc b/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc
index eec2b9d..e430123 100644
--- a/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc
+++ b/modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc
@@ -10,8 +10,10 @@
#include <algorithm>
+#include "common_types.h" // NOLINT(build/include)
#include "modules/video_coding/codecs/vp9/svc_config.h"
#include "modules/video_coding/codecs/vp9/svc_rate_allocator.h"
+#include "rtc_base/checks.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/decoding_state_unittest.cc b/modules/video_coding/decoding_state_unittest.cc
index 82c6f12..e4dd8b3 100644
--- a/modules/video_coding/decoding_state_unittest.cc
+++ b/modules/video_coding/decoding_state_unittest.cc
@@ -8,13 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <string.h>
-
-#include "modules/include/module_common_types.h"
#include "modules/video_coding/decoding_state.h"
+#include "common_types.h" // NOLINT(build/include)
+#include "modules/rtp_rtcp/source/rtp_video_header.h"
+#include "modules/video_coding/codecs/interface/common_constants.h"
+#include "modules/video_coding/codecs/vp8/include/vp8_globals.h"
+#include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
#include "modules/video_coding/frame_buffer.h"
-#include "modules/video_coding/jitter_buffer_common.h"
+#include "modules/video_coding/include/video_coding.h"
#include "modules/video_coding/packet.h"
+#include "modules/video_coding/session_info.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/encoded_frame.cc b/modules/video_coding/encoded_frame.cc
index 8124b6b..b46f759 100644
--- a/modules/video_coding/encoded_frame.cc
+++ b/modules/video_coding/encoded_frame.cc
@@ -10,6 +10,14 @@
#include "modules/video_coding/encoded_frame.h"
+#include <string.h>
+
+#include "absl/types/variant.h"
+#include "api/video/video_timing.h"
+#include "modules/video_coding/codecs/interface/common_constants.h"
+#include "modules/video_coding/codecs/vp8/include/vp8_globals.h"
+#include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
+
namespace webrtc {
VCMEncodedFrame::VCMEncodedFrame()
diff --git a/modules/video_coding/encoder_database.cc b/modules/video_coding/encoder_database.cc
index 5a89590..0497e3a 100644
--- a/modules/video_coding/encoder_database.cc
+++ b/modules/video_coding/encoder_database.cc
@@ -10,6 +10,9 @@
#include "modules/video_coding/encoder_database.h"
+#include <string.h>
+
+#include "common_types.h" // NOLINT(build/include)
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
diff --git a/modules/video_coding/encoder_database.h b/modules/video_coding/encoder_database.h
index a9db4e1..09baff0 100644
--- a/modules/video_coding/encoder_database.h
+++ b/modules/video_coding/encoder_database.h
@@ -11,8 +11,11 @@
#ifndef MODULES_VIDEO_CODING_ENCODER_DATABASE_H_
#define MODULES_VIDEO_CODING_ENCODER_DATABASE_H_
+#include <stddef.h>
#include <memory>
+#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_encoder.h"
#include "modules/video_coding/generic_encoder.h"
namespace webrtc {
diff --git a/modules/video_coding/fec_controller_default.cc b/modules/video_coding/fec_controller_default.cc
index 841ed74..3bceecc 100644
--- a/modules/video_coding/fec_controller_default.cc
+++ b/modules/video_coding/fec_controller_default.cc
@@ -8,8 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <stdlib.h>
#include <algorithm>
+#include <string>
+#include "modules/include/module_fec_types.h"
#include "modules/video_coding/fec_controller_default.h" // NOLINT
#include "rtc_base/logging.h"
#include "system_wrappers/include/field_trial.h"
diff --git a/modules/video_coding/fec_controller_default.h b/modules/video_coding/fec_controller_default.h
index 9d79a61..9943777 100644
--- a/modules/video_coding/fec_controller_default.h
+++ b/modules/video_coding/fec_controller_default.h
@@ -11,12 +11,17 @@
#ifndef MODULES_VIDEO_CODING_FEC_CONTROLLER_DEFAULT_H_
#define MODULES_VIDEO_CODING_FEC_CONTROLLER_DEFAULT_H_
+#include <stddef.h>
+#include <stdint.h>
#include <memory>
#include <vector>
+
#include "api/fec_controller.h"
-#include "modules/include/module_common_types.h"
+#include "common_types.h" // NOLINT(build/include)
#include "modules/video_coding/media_opt_util.h"
+#include "rtc_base/constructormagic.h"
#include "rtc_base/criticalsection.h"
+#include "rtc_base/thread_annotations.h"
#include "system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/modules/video_coding/fec_controller_unittest.cc b/modules/video_coding/fec_controller_unittest.cc
index 51ae158..5a9ec4b 100644
--- a/modules/video_coding/fec_controller_unittest.cc
+++ b/modules/video_coding/fec_controller_unittest.cc
@@ -8,6 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <stdint.h>
+#include <vector>
+
+#include "api/fec_controller.h"
+#include "modules/include/module_fec_types.h"
#include "modules/video_coding/fec_controller_default.h"
#include "system_wrappers/include/clock.h"
#include "test/gtest.h"
diff --git a/modules/video_coding/frame_buffer.cc b/modules/video_coding/frame_buffer.cc
index 9c2819e..b623dd6 100644
--- a/modules/video_coding/frame_buffer.cc
+++ b/modules/video_coding/frame_buffer.cc
@@ -13,6 +13,10 @@
#include <assert.h>
#include <string.h>
+#include "api/video/encoded_image.h"
+#include "api/video/video_timing.h"
+#include "modules/rtp_rtcp/source/rtp_video_header.h"
+#include "modules/video_coding/include/video_codec_interface.h"
#include "modules/video_coding/packet.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
diff --git a/modules/video_coding/frame_buffer.h b/modules/video_coding/frame_buffer.h
index 0b8c220..32c459a 100644
--- a/modules/video_coding/frame_buffer.h
+++ b/modules/video_coding/frame_buffer.h
@@ -11,12 +11,17 @@
#ifndef MODULES_VIDEO_CODING_FRAME_BUFFER_H_
#define MODULES_VIDEO_CODING_FRAME_BUFFER_H_
+#include <stddef.h>
+#include <stdint.h>
#include <vector>
-#include "modules/include/module_common_types.h"
+#include "common_types.h" // NOLINT(build/include)
+#include "modules/video_coding/codecs/h264/include/h264_globals.h"
+#include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
#include "modules/video_coding/encoded_frame.h"
#include "modules/video_coding/include/video_coding.h"
#include "modules/video_coding/jitter_buffer_common.h"
+#include "modules/video_coding/packet.h"
#include "modules/video_coding/session_info.h"
namespace webrtc {
diff --git a/modules/video_coding/frame_buffer2.cc b/modules/video_coding/frame_buffer2.cc
index 04fba84..0385460 100644
--- a/modules/video_coding/frame_buffer2.cc
+++ b/modules/video_coding/frame_buffer2.cc
@@ -11,15 +11,22 @@
#include "modules/video_coding/frame_buffer2.h"
#include <algorithm>
-#include <cstring>
+#include <cstdlib>
+#include <iterator>
#include <queue>
+#include <utility>
#include <vector>
+#include "api/video/encoded_image.h"
+#include "api/video/video_timing.h"
+#include "common_types.h" // NOLINT(build/include)
#include "modules/video_coding/include/video_coding_defines.h"
#include "modules/video_coding/jitter_estimator.h"
#include "modules/video_coding/timing.h"
#include "rtc_base/checks.h"
+#include "rtc_base/experiments/rtt_mult_experiment.h"
#include "rtc_base/logging.h"
+#include "rtc_base/numerics/sequence_number_util.h"
#include "rtc_base/trace_event.h"
#include "system_wrappers/include/clock.h"
#include "system_wrappers/include/field_trial.h"
diff --git a/modules/video_coding/frame_object.cc b/modules/video_coding/frame_object.cc
index f0c7449..5ccf0b7 100644
--- a/modules/video_coding/frame_object.cc
+++ b/modules/video_coding/frame_object.cc
@@ -10,9 +10,14 @@
#include "modules/video_coding/frame_object.h"
-#include "common_video/h264/h264_common.h"
+#include <string.h>
+
+#include "api/video/encoded_image.h"
+#include "api/video/video_timing.h"
+#include "modules/video_coding/packet.h"
#include "modules/video_coding/packet_buffer.h"
#include "rtc_base/checks.h"
+#include "rtc_base/criticalsection.h"
namespace webrtc {
namespace video_coding {
diff --git a/modules/video_coding/generic_decoder.cc b/modules/video_coding/generic_decoder.cc
index 92e53da..2dd9b26 100644
--- a/modules/video_coding/generic_decoder.cc
+++ b/modules/video_coding/generic_decoder.cc
@@ -10,10 +10,11 @@
#include "modules/video_coding/generic_decoder.h"
+#include <stddef.h>
#include <algorithm>
-#include "modules/video_coding/include/video_coding.h"
-#include "modules/video_coding/internal_defines.h"
+#include "api/video/video_timing.h"
+#include "modules/video_coding/include/video_error_codes.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/timeutils.h"
diff --git a/modules/video_coding/generic_encoder.cc b/modules/video_coding/generic_encoder.cc
index d5cc0a8..24a4678 100644
--- a/modules/video_coding/generic_encoder.cc
+++ b/modules/video_coding/generic_encoder.cc
@@ -10,19 +10,24 @@
#include "modules/video_coding/generic_encoder.h"
+#include <cstddef>
+#include <cstdint>
#include <vector>
#include "absl/types/optional.h"
#include "api/video/i420_buffer.h"
+#include "api/video/video_content_type.h"
+#include "api/video/video_frame_buffer.h"
+#include "api/video/video_rotation.h"
+#include "api/video/video_timing.h"
#include "modules/include/module_common_types_public.h"
-#include "modules/video_coding/encoded_frame.h"
+#include "modules/video_coding/include/video_coding_defines.h"
#include "modules/video_coding/media_optimization.h"
#include "rtc_base/checks.h"
#include "rtc_base/experiments/alr_experiment.h"
#include "rtc_base/logging.h"
#include "rtc_base/timeutils.h"
#include "rtc_base/trace_event.h"
-#include "system_wrappers/include/field_trial.h"
namespace webrtc {
diff --git a/modules/video_coding/generic_encoder_unittest.cc b/modules/video_coding/generic_encoder_unittest.cc
index 2be6856..4d5df5b 100644
--- a/modules/video_coding/generic_encoder_unittest.cc
+++ b/modules/video_coding/generic_encoder_unittest.cc
@@ -8,12 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <cstddef>
#include <vector>
-#include "modules/video_coding/encoded_frame.h"
+#include "api/video/video_timing.h"
#include "modules/video_coding/generic_encoder.h"
#include "modules/video_coding/include/video_coding_defines.h"
#include "rtc_base/fakeclock.h"
+#include "rtc_base/timeutils.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/h264_sprop_parameter_sets.cc b/modules/video_coding/h264_sprop_parameter_sets.cc
index e858545..9ee0e66 100644
--- a/modules/video_coding/h264_sprop_parameter_sets.cc
+++ b/modules/video_coding/h264_sprop_parameter_sets.cc
@@ -10,6 +10,8 @@
#include "modules/video_coding/h264_sprop_parameter_sets.h"
+#include <stddef.h>
+#include <stdint.h>
#include <string>
#include <vector>
diff --git a/modules/video_coding/h264_sprop_parameter_sets.h b/modules/video_coding/h264_sprop_parameter_sets.h
index 62f5ed1..28172d4 100644
--- a/modules/video_coding/h264_sprop_parameter_sets.h
+++ b/modules/video_coding/h264_sprop_parameter_sets.h
@@ -11,6 +11,7 @@
#ifndef MODULES_VIDEO_CODING_H264_SPROP_PARAMETER_SETS_H_
#define MODULES_VIDEO_CODING_H264_SPROP_PARAMETER_SETS_H_
+#include <cstdint>
#include <string>
#include <vector>
diff --git a/modules/video_coding/h264_sprop_parameter_sets_unittest.cc b/modules/video_coding/h264_sprop_parameter_sets_unittest.cc
index 3c367c6..6cd7590 100644
--- a/modules/video_coding/h264_sprop_parameter_sets_unittest.cc
+++ b/modules/video_coding/h264_sprop_parameter_sets_unittest.cc
@@ -10,8 +10,6 @@
#include "modules/video_coding/h264_sprop_parameter_sets.h"
-#include <stdint.h>
-
#include <vector>
#include "test/gtest.h"
diff --git a/modules/video_coding/h264_sps_pps_tracker_unittest.cc b/modules/video_coding/h264_sps_pps_tracker_unittest.cc
index dad8294..da60cc5 100644
--- a/modules/video_coding/h264_sps_pps_tracker_unittest.cc
+++ b/modules/video_coding/h264_sps_pps_tracker_unittest.cc
@@ -10,9 +10,14 @@
#include "modules/video_coding/h264_sps_pps_tracker.h"
+#include <string.h>
#include <vector>
+#include "absl/types/variant.h"
+#include "common_types.h" // NOLINT(build/include)
#include "common_video/h264/h264_common.h"
+#include "modules/rtp_rtcp/source/rtp_video_header.h"
+#include "modules/video_coding/codecs/h264/include/h264_globals.h"
#include "modules/video_coding/packet.h"
#include "test/gtest.h"
diff --git a/modules/video_coding/histogram.cc b/modules/video_coding/histogram.cc
index e87b0c0..4e90b19 100644
--- a/modules/video_coding/histogram.cc
+++ b/modules/video_coding/histogram.cc
@@ -12,7 +12,7 @@
#include <algorithm>
-#include "rtc_base/numerics/sequence_number_util.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace video_coding {
diff --git a/modules/video_coding/include/video_coding_defines.h b/modules/video_coding/include/video_coding_defines.h
index 7bbc98f..242edee 100644
--- a/modules/video_coding/include/video_coding_defines.h
+++ b/modules/video_coding/include/video_coding_defines.h
@@ -11,11 +11,14 @@
#ifndef MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_
#define MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_
-#include <string>
-#include <vector>
+#include <stddef.h>
+#include <stdint.h>
+#include "absl/types/optional.h"
+#include "api/video/video_content_type.h"
#include "api/video/video_frame.h"
-#include "modules/include/module_common_types.h"
+#include "api/video/video_timing.h"
+#include "common_types.h" // NOLINT(build/include)
namespace webrtc {
diff --git a/modules/video_coding/jitter_estimator.cc b/modules/video_coding/jitter_estimator.cc
index 0d0fac7..00d75da 100644
--- a/modules/video_coding/jitter_estimator.cc
+++ b/modules/video_coding/jitter_estimator.cc
@@ -12,17 +12,16 @@
#include <assert.h>
#include <math.h>
-#include <stdlib.h>
#include <string.h>
#include <algorithm>
-#include <string>
+#include <cstdint>
#include "absl/types/optional.h"
#include "modules/video_coding/internal_defines.h"
#include "modules/video_coding/rtt_filter.h"
#include "rtc_base/experiments/jitter_upper_bound_experiment.h"
+#include "rtc_base/numerics/safe_conversions.h"
#include "system_wrappers/include/clock.h"
-#include "system_wrappers/include/field_trial.h"
namespace webrtc {
namespace {
diff --git a/modules/video_coding/jitter_estimator_tests.cc b/modules/video_coding/jitter_estimator_tests.cc
index 45262ef..730f0ac 100644
--- a/modules/video_coding/jitter_estimator_tests.cc
+++ b/modules/video_coding/jitter_estimator_tests.cc
@@ -7,11 +7,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "modules/video_coding/jitter_estimator.h"
+#include <stdint.h>
+#include <memory>
+#include <vector>
+#include "absl/memory/memory.h"
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "modules/video_coding/jitter_estimator.h"
#include "rtc_base/experiments/jitter_upper_bound_experiment.h"
-#include "rtc_base/logging.h"
#include "rtc_base/numerics/histogram_percentile_counter.h"
+#include "rtc_base/strings/string_builder.h"
#include "rtc_base/timeutils.h"
#include "system_wrappers/include/clock.h"
#include "test/field_trial.h"
diff --git a/modules/video_coding/media_opt_util.cc b/modules/video_coding/media_opt_util.cc
index 436cb0f..a46417b 100644
--- a/modules/video_coding/media_opt_util.cc
+++ b/modules/video_coding/media_opt_util.cc
@@ -10,18 +10,14 @@
#include "modules/video_coding/media_opt_util.h"
-#include <float.h>
-#include <limits.h>
+#include <assert.h>
#include <math.h>
-
#include <algorithm>
-#include <limits>
-#include "modules/include/module_common_types.h"
#include "modules/video_coding/fec_rate_table.h"
-#include "modules/video_coding/include/video_coding_defines.h"
-#include "modules/video_coding/nack_fec_tables.h"
+#include "modules/video_coding/internal_defines.h"
#include "modules/video_coding/utility/simulcast_rate_allocator.h"
+#include "rtc_base/checks.h"
#include "rtc_base/numerics/safe_conversions.h"
namespace webrtc {
diff --git a/modules/video_coding/media_optimization.cc b/modules/video_coding/media_optimization.cc
index 2c1e50e..f74e5eb 100644
--- a/modules/video_coding/media_optimization.cc
+++ b/modules/video_coding/media_optimization.cc
@@ -10,6 +10,8 @@
#include "modules/video_coding/media_optimization.h"
+#include <string.h>
+#include <algorithm>
#include <limits>
#include "modules/video_coding/utility/frame_dropper.h"
diff --git a/modules/video_coding/nack_module.h b/modules/video_coding/nack_module.h
index f86dd16..ace5648 100644
--- a/modules/video_coding/nack_module.h
+++ b/modules/video_coding/nack_module.h
@@ -11,6 +11,7 @@
#ifndef MODULES_VIDEO_CODING_NACK_MODULE_H_
#define MODULES_VIDEO_CODING_NACK_MODULE_H_
+#include <stdint.h>
#include <map>
#include <set>
#include <vector>
diff --git a/modules/video_coding/nack_module_unittest.cc b/modules/video_coding/nack_module_unittest.cc
index 8efb8ac..0fd3d32 100644
--- a/modules/video_coding/nack_module_unittest.cc
+++ b/modules/video_coding/nack_module_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <cstdint>
#include <cstring>
#include <memory>
-#include "modules/video_coding/include/video_coding_defines.h"
#include "modules/video_coding/nack_module.h"
#include "system_wrappers/include/clock.h"
#include "test/field_trial.h"
diff --git a/modules/video_coding/packet.cc b/modules/video_coding/packet.cc
index deb19cf..0ec6317 100644
--- a/modules/video_coding/packet.cc
+++ b/modules/video_coding/packet.cc
@@ -10,6 +10,7 @@
#include "modules/video_coding/packet.h"
+#include "api/rtp_headers.h"
#include "modules/include/module_common_types.h"
namespace webrtc {
diff --git a/modules/video_coding/packet.h b/modules/video_coding/packet.h
index bddf857..bc833bb 100644
--- a/modules/video_coding/packet.h
+++ b/modules/video_coding/packet.h
@@ -11,8 +11,14 @@
#ifndef MODULES_VIDEO_CODING_PACKET_H_
#define MODULES_VIDEO_CODING_PACKET_H_
+#include <stddef.h>
+#include <stdint.h>
+
+#include "absl/types/optional.h"
+#include "common_types.h" // NOLINT(build/include)
#include "modules/include/module_common_types.h"
#include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h"
+#include "modules/rtp_rtcp/source/rtp_video_header.h"
namespace webrtc {
diff --git a/modules/video_coding/packet_buffer.cc b/modules/video_coding/packet_buffer.cc
index 552de4d..0a2b8bf 100644
--- a/modules/video_coding/packet_buffer.cc
+++ b/modules/video_coding/packet_buffer.cc
@@ -10,15 +10,22 @@
#include "modules/video_coding/packet_buffer.h"
+#include <string.h>
#include <algorithm>
-#include <limits>
+#include <cstdint>
#include <utility>
+#include "absl/types/variant.h"
+#include "api/video/encoded_frame.h"
+#include "common_types.h" // NOLINT(build/include)
#include "common_video/h264/h264_common.h"
+#include "modules/rtp_rtcp/source/rtp_video_header.h"
+#include "modules/video_coding/codecs/h264/include/h264_globals.h"
#include "modules/video_coding/frame_object.h"
#include "rtc_base/atomicops.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
+#include "rtc_base/numerics/mod_ops.h"
#include "system_wrappers/include/clock.h"
#include "system_wrappers/include/field_trial.h"
diff --git a/modules/video_coding/receiver.cc b/modules/video_coding/receiver.cc
index 5bf2725..0d6478f 100644
--- a/modules/video_coding/receiver.cc
+++ b/modules/video_coding/receiver.cc
@@ -11,14 +11,17 @@
#include "modules/video_coding/receiver.h"
#include <assert.h>
-
+#include <cstdint>
#include <cstdlib>
#include <utility>
#include <vector>
+#include "absl/memory/memory.h"
+#include "api/video/encoded_image.h"
+#include "common_types.h" // NOLINT(build/include)
#include "modules/video_coding/encoded_frame.h"
#include "modules/video_coding/internal_defines.h"
-#include "modules/video_coding/media_opt_util.h"
+#include "modules/video_coding/jitter_buffer_common.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/trace_event.h"
diff --git a/modules/video_coding/receiver_unittest.cc b/modules/video_coding/receiver_unittest.cc
index ba35f69..ca50dfa 100644
--- a/modules/video_coding/receiver_unittest.cc
+++ b/modules/video_coding/receiver_unittest.cc
@@ -8,13 +8,14 @@
*/
#include <string.h>
-
-#include <list>
+#include <cstdint>
#include <memory>
#include <queue>
#include <vector>
+#include "common_types.h" // NOLINT(build/include)
#include "modules/video_coding/encoded_frame.h"
+#include "modules/video_coding/jitter_buffer_common.h"
#include "modules/video_coding/packet.h"
#include "modules/video_coding/receiver.h"
#include "modules/video_coding/test/stream_generator.h"
diff --git a/modules/video_coding/session_info.cc b/modules/video_coding/session_info.cc
index 0887109..c37aaf7 100644
--- a/modules/video_coding/session_info.cc
+++ b/modules/video_coding/session_info.cc
@@ -9,6 +9,17 @@
*/
#include "modules/video_coding/session_info.h"
+
+#include <assert.h>
+#include <string.h>
+#include <vector>
+
+#include "absl/types/variant.h"
+#include "modules/include/module_common_types.h"
+#include "modules/include/module_common_types_public.h"
+#include "modules/rtp_rtcp/source/rtp_video_header.h"
+#include "modules/video_coding/codecs/interface/common_constants.h"
+#include "modules/video_coding/codecs/vp8/include/vp8_globals.h"
#include "modules/video_coding/jitter_buffer_common.h"
#include "modules/video_coding/packet.h"
#include "rtc_base/logging.h"
diff --git a/modules/video_coding/session_info.h b/modules/video_coding/session_info.h
index 8d577fe..172d092 100644
--- a/modules/video_coding/session_info.h
+++ b/modules/video_coding/session_info.h
@@ -11,10 +11,14 @@
#ifndef MODULES_VIDEO_CODING_SESSION_INFO_H_
#define MODULES_VIDEO_CODING_SESSION_INFO_H_
+#include <stddef.h>
+#include <stdint.h>
#include <list>
#include <vector>
-#include "modules/include/module_common_types.h"
+#include "common_types.h" // NOLINT(build/include)
+#include "modules/video_coding/codecs/h264/include/h264_globals.h"
+#include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
#include "modules/video_coding/include/video_coding.h"
#include "modules/video_coding/packet.h"
diff --git a/modules/video_coding/test/stream_generator.cc b/modules/video_coding/test/stream_generator.cc
index 9933c21..39eebdc 100644
--- a/modules/video_coding/test/stream_generator.cc
+++ b/modules/video_coding/test/stream_generator.cc
@@ -11,11 +11,10 @@
#include "modules/video_coding/test/stream_generator.h"
#include <string.h>
-
#include <list>
+#include "modules/include/module_common_types.h"
#include "modules/video_coding/packet.h"
-#include "system_wrappers/include/clock.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/test/stream_generator.h b/modules/video_coding/test/stream_generator.h
index 38ca92d..22c9f11 100644
--- a/modules/video_coding/test/stream_generator.h
+++ b/modules/video_coding/test/stream_generator.h
@@ -10,8 +10,10 @@
#ifndef MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_
#define MODULES_VIDEO_CODING_TEST_STREAM_GENERATOR_H_
+#include <stdint.h>
#include <list>
+#include "common_types.h" // NOLINT(build/include)
#include "modules/video_coding/packet.h"
#include "rtc_base/constructormagic.h"
diff --git a/modules/video_coding/timestamp_map.cc b/modules/video_coding/timestamp_map.cc
index 6d946fe..4ddb173 100644
--- a/modules/video_coding/timestamp_map.cc
+++ b/modules/video_coding/timestamp_map.cc
@@ -10,7 +10,7 @@
#include <stdlib.h>
-#include "modules/include/module_common_types.h"
+#include "modules/include/module_common_types_public.h"
#include "modules/video_coding/timestamp_map.h"
namespace webrtc {
diff --git a/modules/video_coding/timing.cc b/modules/video_coding/timing.cc
index 310467b..a2a4e47 100644
--- a/modules/video_coding/timing.cc
+++ b/modules/video_coding/timing.cc
@@ -10,6 +10,7 @@
#include "modules/video_coding/timing.h"
+#include <assert.h>
#include <algorithm>
#include "rtc_base/time/timestamp_extrapolator.h"
diff --git a/modules/video_coding/utility/default_video_bitrate_allocator.cc b/modules/video_coding/utility/default_video_bitrate_allocator.cc
index a3b43fc..3cf8d55 100644
--- a/modules/video_coding/utility/default_video_bitrate_allocator.cc
+++ b/modules/video_coding/utility/default_video_bitrate_allocator.cc
@@ -10,8 +10,8 @@
#include "modules/video_coding/utility/default_video_bitrate_allocator.h"
+#include <stddef.h>
#include <stdint.h>
-
#include <algorithm>
namespace webrtc {
diff --git a/modules/video_coding/utility/default_video_bitrate_allocator.h b/modules/video_coding/utility/default_video_bitrate_allocator.h
index 6a9d040..de5c23f 100644
--- a/modules/video_coding/utility/default_video_bitrate_allocator.h
+++ b/modules/video_coding/utility/default_video_bitrate_allocator.h
@@ -11,6 +11,9 @@
#ifndef MODULES_VIDEO_CODING_UTILITY_DEFAULT_VIDEO_BITRATE_ALLOCATOR_H_
#define MODULES_VIDEO_CODING_UTILITY_DEFAULT_VIDEO_BITRATE_ALLOCATOR_H_
+#include <stdint.h>
+
+#include "api/video/video_bitrate_allocation.h"
#include "api/video/video_bitrate_allocator.h"
#include "api/video_codecs/video_codec.h"
diff --git a/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc b/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc
index 78fcdaa..d081072 100644
--- a/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc
+++ b/modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc
@@ -11,6 +11,7 @@
#include <limits>
#include <memory>
+#include "common_types.h" // NOLINT(build/include)
#include "modules/video_coding/utility/default_video_bitrate_allocator.h"
#include "test/gtest.h"
diff --git a/modules/video_coding/utility/frame_dropper_unittest.cc b/modules/video_coding/utility/frame_dropper_unittest.cc
index 7346f21..df99d08 100644
--- a/modules/video_coding/utility/frame_dropper_unittest.cc
+++ b/modules/video_coding/utility/frame_dropper_unittest.cc
@@ -10,7 +10,6 @@
#include "modules/video_coding/utility/frame_dropper.h"
-#include "rtc_base/logging.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/utility/framerate_controller.cc b/modules/video_coding/utility/framerate_controller.cc
index ce8ab12..c42ba31 100644
--- a/modules/video_coding/utility/framerate_controller.cc
+++ b/modules/video_coding/utility/framerate_controller.cc
@@ -10,7 +10,8 @@
#include "modules/video_coding/utility/framerate_controller.h"
-#include "rtc_base/checks.h"
+#include <stddef.h>
+#include <cstdint>
namespace webrtc {
diff --git a/modules/video_coding/utility/framerate_controller.h b/modules/video_coding/utility/framerate_controller.h
index 63493ea..4b6a6ad 100644
--- a/modules/video_coding/utility/framerate_controller.h
+++ b/modules/video_coding/utility/framerate_controller.h
@@ -11,6 +11,8 @@
#ifndef MODULES_VIDEO_CODING_UTILITY_FRAMERATE_CONTROLLER_H_
#define MODULES_VIDEO_CODING_UTILITY_FRAMERATE_CONTROLLER_H_
+#include <stdint.h>
+
#include "absl/types/optional.h"
#include "rtc_base/rate_statistics.h"
diff --git a/modules/video_coding/utility/framerate_controller_unittest.cc b/modules/video_coding/utility/framerate_controller_unittest.cc
index 6c06ea3..fb6e8cc 100644
--- a/modules/video_coding/utility/framerate_controller_unittest.cc
+++ b/modules/video_coding/utility/framerate_controller_unittest.cc
@@ -10,6 +10,8 @@
#include "modules/video_coding/utility/framerate_controller.h"
+#include <stddef.h>
+
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/utility/ivf_file_writer.cc b/modules/video_coding/utility/ivf_file_writer.cc
index d2de664..d9917c8 100644
--- a/modules/video_coding/utility/ivf_file_writer.cc
+++ b/modules/video_coding/utility/ivf_file_writer.cc
@@ -10,7 +10,6 @@
#include "modules/video_coding/utility/ivf_file_writer.h"
-#include <string>
#include <utility>
#include "api/video_codecs/video_codec.h"
diff --git a/modules/video_coding/utility/ivf_file_writer.h b/modules/video_coding/utility/ivf_file_writer.h
index 4775bed..21ebd97 100644
--- a/modules/video_coding/utility/ivf_file_writer.h
+++ b/modules/video_coding/utility/ivf_file_writer.h
@@ -11,11 +11,12 @@
#ifndef MODULES_VIDEO_CODING_UTILITY_IVF_FILE_WRITER_H_
#define MODULES_VIDEO_CODING_UTILITY_IVF_FILE_WRITER_H_
+#include <stddef.h>
+#include <stdint.h>
#include <memory>
-#include <string>
#include "api/video/encoded_image.h"
-#include "modules/include/module_common_types.h"
+#include "common_types.h" // NOLINT(build/include)
#include "rtc_base/constructormagic.h"
#include "rtc_base/file.h"
#include "rtc_base/timeutils.h"
diff --git a/modules/video_coding/utility/ivf_file_writer_unittest.cc b/modules/video_coding/utility/ivf_file_writer_unittest.cc
index c287920..720402f 100644
--- a/modules/video_coding/utility/ivf_file_writer_unittest.cc
+++ b/modules/video_coding/utility/ivf_file_writer_unittest.cc
@@ -10,13 +10,12 @@
#include "modules/video_coding/utility/ivf_file_writer.h"
+#include <string.h>
#include <memory>
+#include <string>
#include "modules/rtp_rtcp/source/byte_io.h"
-#include "rtc_base/helpers.h"
-#include "rtc_base/logging.h"
-#include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/platform_file.h"
#include "test/gtest.h"
#include "test/testsupport/fileutils.h"
diff --git a/modules/video_coding/utility/quality_scaler.cc b/modules/video_coding/utility/quality_scaler.cc
index 32ae166..4a517dc 100644
--- a/modules/video_coding/utility/quality_scaler.cc
+++ b/modules/video_coding/utility/quality_scaler.cc
@@ -10,11 +10,9 @@
#include "modules/video_coding/utility/quality_scaler.h"
-#include <math.h>
-
-#include <algorithm>
#include <memory>
+#include "absl/types/optional.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/exp_filter.h"
diff --git a/modules/video_coding/utility/quality_scaler.h b/modules/video_coding/utility/quality_scaler.h
index 272c02e..d9df2b8 100644
--- a/modules/video_coding/utility/quality_scaler.h
+++ b/modules/video_coding/utility/quality_scaler.h
@@ -11,15 +11,15 @@
#ifndef MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_
#define MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_
+#include <stddef.h>
+#include <stdint.h>
#include <memory>
-#include <utility>
-#include "absl/types/optional.h"
#include "api/video_codecs/video_encoder.h"
-#include "common_types.h" // NOLINT(build/include)
#include "rtc_base/experiments/quality_scaling_experiment.h"
#include "rtc_base/numerics/moving_average.h"
#include "rtc_base/sequenced_task_checker.h"
+#include "rtc_base/thread_annotations.h"
namespace webrtc {
@@ -66,6 +66,7 @@
private:
class CheckQpTask;
class QpSmoother;
+
void CheckQp();
void ClearSamples();
void ReportQpLow();
diff --git a/modules/video_coding/utility/quality_scaler_unittest.cc b/modules/video_coding/utility/quality_scaler_unittest.cc
index ed79379..9fc0290 100644
--- a/modules/video_coding/utility/quality_scaler_unittest.cc
+++ b/modules/video_coding/utility/quality_scaler_unittest.cc
@@ -13,10 +13,10 @@
#include <memory>
#include <string>
+#include "rtc_base/checks.h"
#include "rtc_base/event.h"
#include "rtc_base/task_queue.h"
#include "test/field_trial.h"
-#include "test/gmock.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/utility/simulcast_rate_allocator.cc b/modules/video_coding/utility/simulcast_rate_allocator.cc
index 41b490f..4e8b708 100644
--- a/modules/video_coding/utility/simulcast_rate_allocator.cc
+++ b/modules/video_coding/utility/simulcast_rate_allocator.cc
@@ -10,10 +10,10 @@
#include "modules/video_coding/utility/simulcast_rate_allocator.h"
+#include <stdio.h>
#include <algorithm>
-#include <memory>
+#include <cstdint>
#include <string>
-#include <utility>
#include <vector>
#include "common_types.h" // NOLINT(build/include)
diff --git a/modules/video_coding/utility/simulcast_rate_allocator.h b/modules/video_coding/utility/simulcast_rate_allocator.h
index de270c6..c1e8967 100644
--- a/modules/video_coding/utility/simulcast_rate_allocator.h
+++ b/modules/video_coding/utility/simulcast_rate_allocator.h
@@ -11,15 +11,13 @@
#ifndef MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_
#define MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_
+#include <stddef.h>
#include <stdint.h>
-
-#include <map>
-#include <memory>
#include <vector>
+#include "api/video/video_bitrate_allocation.h"
#include "api/video/video_bitrate_allocator.h"
-#include "api/video_codecs/video_encoder.h"
-#include "common_types.h" // NOLINT(build/include)
+#include "api/video_codecs/video_codec.h"
#include "rtc_base/constructormagic.h"
namespace webrtc {
diff --git a/modules/video_coding/utility/simulcast_utility.cc b/modules/video_coding/utility/simulcast_utility.cc
index bc8616f..9966682 100644
--- a/modules/video_coding/utility/simulcast_utility.cc
+++ b/modules/video_coding/utility/simulcast_utility.cc
@@ -10,7 +10,9 @@
#include <algorithm>
+#include "common_types.h" // NOLINT(build/include)
#include "modules/video_coding/utility/simulcast_utility.h"
+#include "rtc_base/checks.h"
namespace webrtc {
diff --git a/modules/video_coding/utility/simulcast_utility.h b/modules/video_coding/utility/simulcast_utility.h
index 02ccab6..ab632fd 100644
--- a/modules/video_coding/utility/simulcast_utility.h
+++ b/modules/video_coding/utility/simulcast_utility.h
@@ -11,7 +11,9 @@
#ifndef MODULES_VIDEO_CODING_UTILITY_SIMULCAST_UTILITY_H_
#define MODULES_VIDEO_CODING_UTILITY_SIMULCAST_UTILITY_H_
-#include "api/video_codecs/video_encoder.h"
+#include <stdint.h>
+
+#include "api/video_codecs/video_codec.h"
namespace webrtc {
diff --git a/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc
index 885fa84..cd3f1d7 100644
--- a/modules/video_coding/video_codec_initializer.cc
+++ b/modules/video_coding/video_codec_initializer.cc
@@ -10,17 +10,19 @@
#include "modules/video_coding/include/video_codec_initializer.h"
-#include "api/video/video_bitrate_allocator.h"
+#include <stdint.h>
+#include <string.h>
+#include <algorithm>
+
+#include "absl/types/optional.h"
+#include "api/video/video_bitrate_allocation.h"
#include "api/video_codecs/video_encoder.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/video_coding/codecs/vp9/svc_config.h"
-#include "modules/video_coding/codecs/vp9/svc_rate_allocator.h"
#include "modules/video_coding/include/video_coding_defines.h"
-#include "modules/video_coding/utility/default_video_bitrate_allocator.h"
-#include "modules/video_coding/utility/simulcast_rate_allocator.h"
+#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/system/fallthrough.h"
-#include "system_wrappers/include/clock.h"
+#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
diff --git a/modules/video_coding/video_codec_initializer_unittest.cc b/modules/video_coding/video_codec_initializer_unittest.cc
index 9249cad..8a0ed26 100644
--- a/modules/video_coding/video_codec_initializer_unittest.cc
+++ b/modules/video_coding/video_codec_initializer_unittest.cc
@@ -9,7 +9,16 @@
*/
#include "modules/video_coding/include/video_codec_initializer.h"
+
+#include <stddef.h>
+#include <stdint.h>
+#include <memory>
+
+#include "absl/types/optional.h"
#include "api/video/builtin_video_bitrate_allocator_factory.h"
+#include "api/video/video_bitrate_allocation.h"
+#include "api/video/video_bitrate_allocator.h"
+#include "api/video/video_bitrate_allocator_factory.h"
#include "api/video_codecs/create_vp8_temporal_layers.h"
#include "api/video_codecs/video_encoder.h"
#include "api/video_codecs/vp8_temporal_layers.h"
@@ -17,6 +26,7 @@
#include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
#include "rtc_base/checks.h"
#include "rtc_base/refcountedobject.h"
+#include "rtc_base/scoped_ref_ptr.h"
#include "test/gtest.h"
namespace webrtc {
diff --git a/modules/video_coding/video_coding_impl.cc b/modules/video_coding/video_coding_impl.cc
index 58397ad..39eccb5 100644
--- a/modules/video_coding/video_coding_impl.cc
+++ b/modules/video_coding/video_coding_impl.cc
@@ -11,17 +11,14 @@
#include "modules/video_coding/video_coding_impl.h"
#include <algorithm>
-#include <utility>
+#include <memory>
#include "api/video/builtin_video_bitrate_allocator_factory.h"
+#include "api/video/encoded_image.h"
#include "api/video/video_bitrate_allocator.h"
+#include "api/video/video_bitrate_allocator_factory.h"
#include "common_types.h" // NOLINT(build/include)
-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "modules/video_coding/encoded_frame.h"
-#include "modules/video_coding/include/video_codec_initializer.h"
#include "modules/video_coding/include/video_codec_interface.h"
-#include "modules/video_coding/jitter_buffer.h"
-#include "modules/video_coding/packet.h"
#include "modules/video_coding/timing.h"
#include "rtc_base/criticalsection.h"
#include "rtc_base/thread_checker.h"
diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc
index 8b4ee78..f9b3547 100644
--- a/modules/video_coding/video_receiver.cc
+++ b/modules/video_coding/video_receiver.cc
@@ -8,17 +8,34 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <stddef.h>
+#include <cstdint>
+#include <vector>
+
+#include "api/rtp_headers.h"
+#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_decoder.h"
#include "common_types.h" // NOLINT(build/include)
-#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "modules/include/module_common_types.h"
#include "modules/utility/include/process_thread.h"
+#include "modules/video_coding/decoder_database.h"
#include "modules/video_coding/encoded_frame.h"
-#include "modules/video_coding/include/video_codec_interface.h"
+#include "modules/video_coding/generic_decoder.h"
+#include "modules/video_coding/include/video_coding.h"
+#include "modules/video_coding/include/video_coding_defines.h"
+#include "modules/video_coding/internal_defines.h"
#include "modules/video_coding/jitter_buffer.h"
+#include "modules/video_coding/media_opt_util.h"
#include "modules/video_coding/packet.h"
+#include "modules/video_coding/receiver.h"
+#include "modules/video_coding/timing.h"
#include "modules/video_coding/video_coding_impl.h"
#include "rtc_base/checks.h"
+#include "rtc_base/criticalsection.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
+#include "rtc_base/onetimeevent.h"
+#include "rtc_base/thread_checker.h"
#include "rtc_base/trace_event.h"
#include "system_wrappers/include/clock.h"
diff --git a/modules/video_coding/video_sender.cc b/modules/video_coding/video_sender.cc
index 4bd5253..f8e2106 100644
--- a/modules/video_coding/video_sender.cc
+++ b/modules/video_coding/video_sender.cc
@@ -8,19 +8,31 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <stddef.h>
+#include <stdint.h>
+#include <vector>
-#include <algorithm> // std::max
-
+#include "api/video/video_bitrate_allocation.h"
#include "api/video/video_bitrate_allocator.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_types.h" // NOLINT(build/include)
-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "modules/video_coding/encoded_frame.h"
+#include "modules/video_coding/encoder_database.h"
+#include "modules/video_coding/generic_encoder.h"
#include "modules/video_coding/include/video_codec_interface.h"
+#include "modules/video_coding/include/video_coding_defines.h"
+#include "modules/video_coding/include/video_error_codes.h"
+#include "modules/video_coding/internal_defines.h"
+#include "modules/video_coding/media_optimization.h"
#include "modules/video_coding/utility/default_video_bitrate_allocator.h"
-#include "modules/video_coding/utility/quality_scaler.h"
#include "modules/video_coding/video_coding_impl.h"
#include "rtc_base/checks.h"
+#include "rtc_base/criticalsection.h"
#include "rtc_base/logging.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/sequenced_task_checker.h"
#include "system_wrappers/include/clock.h"
#include "system_wrappers/include/field_trial.h"