From c4a205c7fa7d25f2e1c8e66156d353a6a3df0e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Wed, 6 Sep 2023 13:22:20 +0200 Subject: [PATCH] Clean up includes in goog_cc/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I5388bc018d7ddd285d154436b5fc52a15469a97d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/319220 Reviewed-by: Erik Språng Reviewed-by: Per Kjellander Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/main@{#40710} --- modules/congestion_controller/DEPS | 6 ++++++ modules/congestion_controller/goog_cc/BUILD.gn | 10 +++++++++- .../goog_cc/acknowledged_bitrate_estimator.cc | 11 ++++++++--- .../goog_cc/acknowledged_bitrate_estimator.h | 1 + .../acknowledged_bitrate_estimator_interface.cc | 3 +++ .../acknowledged_bitrate_estimator_interface.h | 1 - .../acknowledged_bitrate_estimator_unittest.cc | 10 +++++++++- .../goog_cc/alr_detector_unittest.cc | 3 +++ .../goog_cc/bitrate_estimator.cc | 12 ++++++++---- .../goog_cc/bitrate_estimator.h | 1 + .../congestion_window_pushback_controller.cc | 8 +++----- .../congestion_window_pushback_controller.h | 1 - ...estion_window_pushback_controller_unittest.cc | 2 ++ .../goog_cc/delay_based_bwe.cc | 16 ++++++++++++---- .../goog_cc/delay_based_bwe.h | 5 ++++- .../goog_cc/delay_based_bwe_unittest.cc | 6 ++++-- .../goog_cc/delay_based_bwe_unittest_helper.cc | 12 +++++++++++- .../goog_cc/delay_increase_detector_interface.h | 2 ++ .../goog_cc/goog_cc_network_control.cc | 14 ++++++++++++-- .../goog_cc/goog_cc_network_control.h | 2 ++ .../goog_cc/goog_cc_network_control_unittest.cc | 14 ++++++++++++++ .../goog_cc/inter_arrival_delta.cc | 2 ++ .../goog_cc/inter_arrival_delta.h | 2 ++ .../goog_cc/link_capacity_estimator.cc | 2 ++ .../goog_cc/loss_based_bandwidth_estimation.cc | 7 ++++++- .../goog_cc/loss_based_bwe_v2.cc | 2 -- .../goog_cc/loss_based_bwe_v2.h | 1 - .../goog_cc/probe_bitrate_estimator.cc | 7 ++++++- .../goog_cc/probe_bitrate_estimator.h | 3 ++- .../goog_cc/probe_bitrate_estimator_unittest.cc | 7 +++++++ .../goog_cc/probe_controller.cc | 7 ++++++- .../goog_cc/probe_controller.h | 3 +-- .../goog_cc/probe_controller_unittest.cc | 4 +++- .../goog_cc/robust_throughput_estimator.cc | 4 ++++ .../robust_throughput_estimator_unittest.cc | 5 ++++- .../goog_cc/send_side_bandwidth_estimation.cc | 7 ++++++- .../send_side_bandwidth_estimation_unittest.cc | 5 +++++ .../goog_cc/trendline_estimator.cc | 7 +++++++ .../goog_cc/trendline_estimator.h | 1 - .../goog_cc/trendline_estimator_unittest.cc | 6 ++++-- 40 files changed, 181 insertions(+), 41 deletions(-) diff --git a/modules/congestion_controller/DEPS b/modules/congestion_controller/DEPS index 2ed9952e22..4bb4026c37 100644 --- a/modules/congestion_controller/DEPS +++ b/modules/congestion_controller/DEPS @@ -3,3 +3,9 @@ include_rules = [ "+system_wrappers", "+video", ] +specific_include_rules = { + "goog_cc_network_control_unittest.cc": [ + "+call/video_receive_stream.h", + ], +} + diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn index 150201e1bd..fbde45c9ce 100644 --- a/modules/congestion_controller/goog_cc/BUILD.gn +++ b/modules/congestion_controller/goog_cc/BUILD.gn @@ -231,10 +231,13 @@ rtc_library("delay_based_bwe") { deps = [ ":estimators", + ":link_capacity_estimator", "../../../api:field_trials_view", "../../../api:network_state_predictor_api", "../../../api/rtc_event_log", "../../../api/transport:network_control", + "../../../api/units:data_rate", + "../../../api/units:data_size", "../../../api/units:time_delta", "../../../api/units:timestamp", "../../../logging:rtc_event_bwe", @@ -347,6 +350,7 @@ if (rtc_include_tests) { "../../../api/units:data_size", "../../../api/units:time_delta", "../../../api/units:timestamp", + "../../../call:video_stream_api", "../../../logging:mocks", "../../../logging:rtc_event_bwe", "../../../rtc_base:checks", @@ -360,10 +364,14 @@ if (rtc_include_tests) { "../../../test:field_trial", "../../../test:test_support", "../../../test/scenario", + "../../../test/scenario:column_printer", "../../pacing", "//testing/gmock", ] - absl_deps = [ "//third_party/abseil-cpp/absl/strings:strings" ] + absl_deps = [ + "//third_party/abseil-cpp/absl/strings:strings", + "//third_party/abseil-cpp/absl/types:optional", + ] } } } diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc index 08b42a8168..11bae888f3 100644 --- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc +++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc @@ -10,14 +10,19 @@ #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" -#include - #include #include #include +#include +#include "absl/types/optional.h" +#include "api/field_trials_view.h" +#include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/data_size.h" +#include "api/units/timestamp.h" +#include "modules/congestion_controller/goog_cc/bitrate_estimator.h" #include "rtc_base/checks.h" -#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h index d10846ab3a..a31c4df390 100644 --- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h +++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h @@ -18,6 +18,7 @@ #include "api/field_trials_view.h" #include "api/transport/network_types.h" #include "api/units/data_rate.h" +#include "api/units/timestamp.h" #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h" #include "modules/congestion_controller/goog_cc/bitrate_estimator.h" diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.cc index c043353a7a..571bbff71a 100644 --- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.cc +++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.cc @@ -11,10 +11,13 @@ #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h" #include +#include +#include "api/field_trials_view.h" #include "api/units/time_delta.h" #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" #include "modules/congestion_controller/goog_cc/robust_throughput_estimator.h" +#include "rtc_base/experiments/struct_parameters_parser.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h index 6184cdc114..44e455d9d9 100644 --- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h +++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h @@ -11,7 +11,6 @@ #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_INTERFACE_H_ #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_INTERFACE_H_ -#include #include #include diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc index e5b733b119..6e28f8e478 100644 --- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc +++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc @@ -10,11 +10,19 @@ #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" +#include +#include #include #include +#include +#include "absl/types/optional.h" #include "api/transport/field_trial_based_config.h" -#include "rtc_base/fake_clock.h" +#include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/data_size.h" +#include "api/units/timestamp.h" +#include "modules/congestion_controller/goog_cc/bitrate_estimator.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/congestion_controller/goog_cc/alr_detector_unittest.cc b/modules/congestion_controller/goog_cc/alr_detector_unittest.cc index eac19d0081..da5852cbb3 100644 --- a/modules/congestion_controller/goog_cc/alr_detector_unittest.cc +++ b/modules/congestion_controller/goog_cc/alr_detector_unittest.cc @@ -10,6 +10,9 @@ #include "modules/congestion_controller/goog_cc/alr_detector.h" +#include + +#include "absl/types/optional.h" #include "api/transport/field_trial_based_config.h" #include "rtc_base/checks.h" #include "rtc_base/experiments/alr_experiment.h" diff --git a/modules/congestion_controller/goog_cc/bitrate_estimator.cc b/modules/congestion_controller/goog_cc/bitrate_estimator.cc index 9c68e48886..e4f12ae06f 100644 --- a/modules/congestion_controller/goog_cc/bitrate_estimator.cc +++ b/modules/congestion_controller/goog_cc/bitrate_estimator.cc @@ -10,15 +10,19 @@ #include "modules/congestion_controller/goog_cc/bitrate_estimator.h" -#include - #include #include -#include +#include +#include "absl/types/optional.h" +#include "api/field_trials_view.h" #include "api/units/data_rate.h" +#include "api/units/data_size.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" -#include "rtc_base/logging.h" +#include "rtc_base/checks.h" +#include "rtc_base/experiments/field_trial_parser.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/bitrate_estimator.h b/modules/congestion_controller/goog_cc/bitrate_estimator.h index a6f985800e..5ca8234ba8 100644 --- a/modules/congestion_controller/goog_cc/bitrate_estimator.h +++ b/modules/congestion_controller/goog_cc/bitrate_estimator.h @@ -16,6 +16,7 @@ #include "absl/types/optional.h" #include "api/field_trials_view.h" #include "api/units/data_rate.h" +#include "api/units/data_size.h" #include "api/units/timestamp.h" #include "rtc_base/experiments/field_trial_parser.h" diff --git a/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.cc b/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.cc index 2f188f30ca..8a5bf93aa3 100644 --- a/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.cc +++ b/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.cc @@ -10,14 +10,12 @@ #include "modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h" -#include -#include - #include -#include +#include #include "absl/strings/match.h" -#include "rtc_base/checks.h" +#include "api/field_trials_view.h" +#include "api/units/data_size.h" #include "rtc_base/experiments/rate_control_settings.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h b/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h index ea9ed97c3d..c18d9c686f 100644 --- a/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h +++ b/modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h @@ -11,7 +11,6 @@ #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_CONGESTION_WINDOW_PUSHBACK_CONTROLLER_H_ #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_CONGESTION_WINDOW_PUSHBACK_CONTROLLER_H_ -#include #include #include "absl/types/optional.h" diff --git a/modules/congestion_controller/goog_cc/congestion_window_pushback_controller_unittest.cc b/modules/congestion_controller/goog_cc/congestion_window_pushback_controller_unittest.cc index 62dde02323..c584c05eba 100644 --- a/modules/congestion_controller/goog_cc/congestion_window_pushback_controller_unittest.cc +++ b/modules/congestion_controller/goog_cc/congestion_window_pushback_controller_unittest.cc @@ -10,9 +10,11 @@ #include "modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h" +#include #include #include "api/transport/field_trial_based_config.h" +#include "api/units/data_size.h" #include "test/field_trial.h" #include "test/gmock.h" #include "test/gtest.h" diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.cc b/modules/congestion_controller/goog_cc/delay_based_bwe.cc index f0562bc964..fbbe507dc7 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe.cc +++ b/modules/congestion_controller/goog_cc/delay_based_bwe.cc @@ -12,21 +12,29 @@ #include #include -#include #include -#include #include +#include -#include "absl/strings/match.h" -#include "api/rtc_event_log/rtc_event.h" +#include "absl/types/optional.h" +#include "api/field_trials_view.h" +#include "api/network_state_predictor.h" #include "api/rtc_event_log/rtc_event_log.h" +#include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/data_size.h" #include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h" +#include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h" +#include "modules/congestion_controller/goog_cc/inter_arrival_delta.h" #include "modules/congestion_controller/goog_cc/trendline_estimator.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "rtc_base/checks.h" +#include "rtc_base/experiments/struct_parameters_parser.h" #include "rtc_base/logging.h" +#include "rtc_base/race_checker.h" #include "system_wrappers/include/metrics.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.h b/modules/congestion_controller/goog_cc/delay_based_bwe.h index e91a1dff54..741b10c157 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe.h +++ b/modules/congestion_controller/goog_cc/delay_based_bwe.h @@ -11,7 +11,6 @@ #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_ #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_ -#include #include #include @@ -21,8 +20,12 @@ #include "api/field_trials_view.h" #include "api/network_state_predictor.h" #include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h" #include "modules/congestion_controller/goog_cc/inter_arrival_delta.h" +#include "modules/congestion_controller/goog_cc/link_capacity_estimator.h" #include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h" #include "modules/remote_bitrate_estimator/aimd_rate_control.h" #include "modules/remote_bitrate_estimator/inter_arrival.h" diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc index 5a4dbfdcc0..a824d90f92 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc +++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc @@ -10,10 +10,12 @@ #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" -#include +#include +#include "api/network_state_predictor.h" #include "api/transport/network_types.h" -#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" +#include "api/units/data_rate.h" +#include "api/units/time_delta.h" #include "modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h" #include "system_wrappers/include/clock.h" #include "test/gtest.h" diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc index 2730c5d49b..073e3f9081 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc +++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc @@ -10,12 +10,22 @@ #include "modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h" #include +#include #include #include +#include -#include "absl/strings/string_view.h" +#include "absl/types/optional.h" +#include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/data_size.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h" #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" +#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h" #include "rtc_base/checks.h" +#include "test/field_trial.h" namespace webrtc { constexpr size_t kMtu = 1200; diff --git a/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h b/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h index fc12cff7d5..7b2f790f65 100644 --- a/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h +++ b/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h @@ -12,6 +12,8 @@ #include +#include + #include "api/network_state_predictor.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc index 68e623189e..d2a30ec7b5 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -10,30 +10,40 @@ #include "modules/congestion_controller/goog_cc/goog_cc_network_control.h" -#include #include #include #include #include #include -#include #include #include #include "absl/strings/match.h" +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" +#include "api/field_trials_view.h" #include "api/network_state_predictor.h" +#include "api/transport/network_control.h" +#include "api/transport/network_types.h" #include "api/units/data_rate.h" +#include "api/units/data_size.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "logging/rtc_event_log/events/rtc_event_remote_estimate.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h" #include "modules/congestion_controller/goog_cc/alr_detector.h" +#include "modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h" +#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/congestion_controller/goog_cc/loss_based_bwe_v2.h" +#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h" #include "modules/congestion_controller/goog_cc/probe_controller.h" #include "modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "rtc_base/checks.h" +#include "rtc_base/experiments/field_trial_parser.h" +#include "rtc_base/experiments/rate_control_settings.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.h b/modules/congestion_controller/goog_cc/goog_cc_network_control.h index 37a064e37c..df918e1392 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.h +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.h @@ -26,11 +26,13 @@ #include "api/transport/network_types.h" #include "api/units/data_rate.h" #include "api/units/data_size.h" +#include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h" #include "modules/congestion_controller/goog_cc/alr_detector.h" #include "modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h" #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" +#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h" #include "modules/congestion_controller/goog_cc/probe_controller.h" #include "modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h" #include "rtc_base/experiments/field_trial_parser.h" diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc index 0483dbf54d..025ab94eca 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc @@ -8,20 +8,34 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include +#include +#include +#include #include +#include +#include +#include #include "absl/strings/string_view.h" +#include "absl/types/optional.h" #include "api/test/network_emulation/create_cross_traffic.h" #include "api/test/network_emulation/cross_traffic.h" #include "api/transport/goog_cc_factory.h" +#include "api/transport/network_control.h" #include "api/transport/network_types.h" #include "api/units/data_rate.h" +#include "api/units/data_size.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" +#include "call/video_receive_stream.h" #include "logging/rtc_event_log/mock/mock_rtc_event_log.h" #include "test/field_trial.h" #include "test/gtest.h" +#include "test/scenario/call_client.h" +#include "test/scenario/column_printer.h" #include "test/scenario/scenario.h" +#include "test/scenario/scenario_config.h" using ::testing::IsEmpty; using ::testing::NiceMock; diff --git a/modules/congestion_controller/goog_cc/inter_arrival_delta.cc b/modules/congestion_controller/goog_cc/inter_arrival_delta.cc index 2d50d08e6a..0d69257355 100644 --- a/modules/congestion_controller/goog_cc/inter_arrival_delta.cc +++ b/modules/congestion_controller/goog_cc/inter_arrival_delta.cc @@ -11,9 +11,11 @@ #include "modules/congestion_controller/goog_cc/inter_arrival_delta.h" #include +#include #include "api/units/time_delta.h" #include "api/units/timestamp.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/inter_arrival_delta.h b/modules/congestion_controller/goog_cc/inter_arrival_delta.h index 4046590eeb..cfa87f8631 100644 --- a/modules/congestion_controller/goog_cc/inter_arrival_delta.h +++ b/modules/congestion_controller/goog_cc/inter_arrival_delta.h @@ -11,6 +11,8 @@ #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_INTER_ARRIVAL_DELTA_H_ #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_INTER_ARRIVAL_DELTA_H_ +#include + #include "api/units/time_delta.h" #include "api/units/timestamp.h" diff --git a/modules/congestion_controller/goog_cc/link_capacity_estimator.cc b/modules/congestion_controller/goog_cc/link_capacity_estimator.cc index 9fd537a422..05664bcac7 100644 --- a/modules/congestion_controller/goog_cc/link_capacity_estimator.cc +++ b/modules/congestion_controller/goog_cc/link_capacity_estimator.cc @@ -10,7 +10,9 @@ #include "modules/congestion_controller/goog_cc/link_capacity_estimator.h" #include +#include +#include "api/units/data_rate.h" #include "rtc_base/numerics/safe_minmax.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.cc b/modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.cc index 7524c84d92..fa2e468f4f 100644 --- a/modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.cc +++ b/modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.cc @@ -11,12 +11,17 @@ #include "modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.h" #include -#include #include #include "absl/strings/match.h" +#include "absl/strings/string_view.h" +#include "api/field_trials_view.h" +#include "api/transport/network_types.h" #include "api/units/data_rate.h" #include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "rtc_base/checks.h" +#include "rtc_base/experiments/field_trial_parser.h" namespace webrtc { namespace { diff --git a/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc b/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc index 4c0f5fc5ee..4d1a097a63 100644 --- a/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc +++ b/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc @@ -12,11 +12,9 @@ #include #include -#include #include #include #include -#include #include #include "absl/algorithm/container.h" diff --git a/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h b/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h index f5a6396de2..fe17e635af 100644 --- a/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h +++ b/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h @@ -11,7 +11,6 @@ #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_LOSS_BASED_BWE_V2_H_ #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_LOSS_BASED_BWE_V2_H_ -#include #include #include diff --git a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc index a94f653157..99d7d4c591 100644 --- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc +++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc @@ -13,12 +13,17 @@ #include #include +#include "absl/types/optional.h" #include "api/rtc_event_log/rtc_event_log.h" +#include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/data_size.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "logging/rtc_event_log/events/rtc_event_probe_result_failure.h" #include "logging/rtc_event_log/events/rtc_event_probe_result_success.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/numerics/safe_conversions.h" namespace webrtc { namespace { diff --git a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h index d5a523b7f3..f11aeceeb8 100644 --- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h +++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h @@ -11,12 +11,13 @@ #ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_ #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_ -#include #include #include "absl/types/optional.h" #include "api/transport/network_types.h" #include "api/units/data_rate.h" +#include "api/units/data_size.h" +#include "api/units/timestamp.h" namespace webrtc { class RtcEventLog; diff --git a/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc b/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc index 6b4146d2bf..efb9725215 100644 --- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc +++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc @@ -12,7 +12,14 @@ #include +#include + +#include "absl/types/optional.h" #include "api/transport/network_types.h" +#include "api/units/data_rate.h" +#include "api/units/data_size.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "test/gtest.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/probe_controller.cc b/modules/congestion_controller/goog_cc/probe_controller.cc index 8fde515934..4e58830f33 100644 --- a/modules/congestion_controller/goog_cc/probe_controller.cc +++ b/modules/congestion_controller/goog_cc/probe_controller.cc @@ -11,18 +11,23 @@ #include "modules/congestion_controller/goog_cc/probe_controller.h" #include +#include #include #include -#include +#include #include "absl/strings/match.h" #include "absl/types/optional.h" +#include "api/field_trials_view.h" +#include "api/rtc_event_log/rtc_event_log.h" +#include "api/transport/network_types.h" #include "api/units/data_rate.h" #include "api/units/data_size.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "logging/rtc_event_log/events/rtc_event_probe_cluster_created.h" #include "rtc_base/checks.h" +#include "rtc_base/experiments/field_trial_parser.h" #include "rtc_base/logging.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/congestion_controller/goog_cc/probe_controller.h b/modules/congestion_controller/goog_cc/probe_controller.h index ae00182c68..c8653b8d69 100644 --- a/modules/congestion_controller/goog_cc/probe_controller.h +++ b/modules/congestion_controller/goog_cc/probe_controller.h @@ -13,16 +13,15 @@ #include -#include #include #include "absl/base/attributes.h" #include "absl/types/optional.h" #include "api/field_trials_view.h" #include "api/rtc_event_log/rtc_event_log.h" -#include "api/transport/network_control.h" #include "api/transport/network_types.h" #include "api/units/data_rate.h" +#include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "rtc_base/experiments/field_trial_parser.h" diff --git a/modules/congestion_controller/goog_cc/probe_controller_unittest.cc b/modules/congestion_controller/goog_cc/probe_controller_unittest.cc index 99efde80e0..939a95ae8c 100644 --- a/modules/congestion_controller/goog_cc/probe_controller_unittest.cc +++ b/modules/congestion_controller/goog_cc/probe_controller_unittest.cc @@ -10,12 +10,14 @@ #include "modules/congestion_controller/goog_cc/probe_controller.h" #include +#include +#include "absl/strings/string_view.h" +#include "api/transport/network_types.h" #include "api/units/data_rate.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "rtc_base/logging.h" #include "system_wrappers/include/clock.h" #include "test/explicit_key_value_config.h" #include "test/gmock.h" diff --git a/modules/congestion_controller/goog_cc/robust_throughput_estimator.cc b/modules/congestion_controller/goog_cc/robust_throughput_estimator.cc index 3f66f7fdae..5a22910fe3 100644 --- a/modules/congestion_controller/goog_cc/robust_throughput_estimator.cc +++ b/modules/congestion_controller/goog_cc/robust_throughput_estimator.cc @@ -14,11 +14,15 @@ #include #include +#include +#include "absl/types/optional.h" +#include "api/transport/network_types.h" #include "api/units/data_rate.h" #include "api/units/data_size.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/modules/congestion_controller/goog_cc/robust_throughput_estimator_unittest.cc b/modules/congestion_controller/goog_cc/robust_throughput_estimator_unittest.cc index f41ee7f3d6..c207149ee4 100644 --- a/modules/congestion_controller/goog_cc/robust_throughput_estimator_unittest.cc +++ b/modules/congestion_controller/goog_cc/robust_throughput_estimator_unittest.cc @@ -14,12 +14,15 @@ #include #include -#include +#include #include "absl/strings/string_view.h" +#include "api/transport/network_types.h" +#include "api/units/data_rate.h" #include "api/units/data_size.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_interface.h" #include "test/explicit_key_value_config.h" #include "test/gtest.h" diff --git a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc index 55270be7f5..1d978ae82b 100644 --- a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc +++ b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc @@ -11,22 +11,27 @@ #include "modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h" #include +#include #include #include #include #include +#include #include "absl/strings/match.h" +#include "absl/types/optional.h" #include "api/field_trials_view.h" #include "api/network_state_predictor.h" -#include "api/rtc_event_log/rtc_event.h" #include "api/rtc_event_log/rtc_event_log.h" +#include "api/transport/network_types.h" #include "api/units/data_rate.h" #include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" #include "modules/congestion_controller/goog_cc/loss_based_bwe_v2.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "rtc_base/checks.h" +#include "rtc_base/experiments/field_trial_parser.h" #include "rtc_base/logging.h" #include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/metrics.h" diff --git a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation_unittest.cc b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation_unittest.cc index 1e4ca6a01d..866700b09a 100644 --- a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation_unittest.cc +++ b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation_unittest.cc @@ -10,7 +10,12 @@ #include "modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h" +#include + #include "api/rtc_event_log/rtc_event.h" +#include "api/units/data_rate.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_loss_based.h" #include "logging/rtc_event_log/mock/mock_rtc_event_log.h" #include "test/explicit_key_value_config.h" diff --git a/modules/congestion_controller/goog_cc/trendline_estimator.cc b/modules/congestion_controller/goog_cc/trendline_estimator.cc index 88182d4f80..13fb55e6b8 100644 --- a/modules/congestion_controller/goog_cc/trendline_estimator.cc +++ b/modules/congestion_controller/goog_cc/trendline_estimator.cc @@ -13,10 +13,17 @@ #include #include +#include +#include +#include +#include +#include #include +#include #include "absl/strings/match.h" #include "absl/types/optional.h" +#include "api/field_trials_view.h" #include "api/network_state_predictor.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "rtc_base/checks.h" diff --git a/modules/congestion_controller/goog_cc/trendline_estimator.h b/modules/congestion_controller/goog_cc/trendline_estimator.h index ffda25df74..fa5a41ea53 100644 --- a/modules/congestion_controller/goog_cc/trendline_estimator.h +++ b/modules/congestion_controller/goog_cc/trendline_estimator.h @@ -15,7 +15,6 @@ #include #include -#include #include "api/field_trials_view.h" #include "api/network_state_predictor.h" diff --git a/modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc b/modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc index b0195abdf5..b7a3089ba2 100644 --- a/modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc +++ b/modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc @@ -11,11 +11,13 @@ #include "modules/congestion_controller/goog_cc/trendline_estimator.h" #include -#include +#include +#include #include +#include "api/network_state_predictor.h" #include "api/transport/field_trial_based_config.h" -#include "rtc_base/random.h" +#include "rtc_base/checks.h" #include "test/gtest.h" namespace webrtc {