From d297c4c23f444c2b778277f3aea503d089c88f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Fri, 24 May 2024 17:31:36 +0200 Subject: [PATCH] Include-what-you-use goog_cc/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:42226242 Change-Id: I34ce35c78dbe3d08f8c43fbbe70e420a9eb3dd4c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/351662 Reviewed-by: Per Kjellander Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/main@{#42385} --- modules/congestion_controller/goog_cc/BUILD.gn | 6 ++++++ .../congestion_controller/goog_cc/alr_detector.cc | 6 ++++-- .../congestion_controller/goog_cc/alr_detector.h | 1 - ...ongestion_window_pushback_controller_unittest.cc | 1 - .../goog_cc/delay_based_bwe.cc | 1 + .../congestion_controller/goog_cc/delay_based_bwe.h | 1 + .../goog_cc/delay_based_bwe_unittest.cc | 2 +- .../goog_cc/delay_based_bwe_unittest_helper.h | 3 ++- .../goog_cc/goog_cc_network_control.cc | 3 +-- .../goog_cc/goog_cc_network_control.h | 3 ++- .../goog_cc/loss_based_bandwidth_estimation.cc | 1 + .../goog_cc/probe_controller_unittest.cc | 1 + .../goog_cc/send_side_bandwidth_estimation.cc | 2 +- .../goog_cc/test/goog_cc_printer.cc | 13 +++++++++++++ .../goog_cc/test/goog_cc_printer.h | 4 ++-- .../goog_cc/trendline_estimator.cc | 1 + .../goog_cc/trendline_estimator.h | 1 + 17 files changed, 38 insertions(+), 12 deletions(-) diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn index f222f9e317..75126c8a90 100644 --- a/modules/congestion_controller/goog_cc/BUILD.gn +++ b/modules/congestion_controller/goog_cc/BUILD.gn @@ -35,6 +35,7 @@ rtc_library("goog_cc") { "../../../api:network_state_predictor_api", "../../../api/environment", "../../../api/rtc_event_log", + "../../../api/transport:bandwidth_usage", "../../../api/transport:network_control", "../../../api/units:data_rate", "../../../api/units:data_size", @@ -225,6 +226,7 @@ rtc_library("delay_based_bwe") { "../../../api:field_trials_view", "../../../api:network_state_predictor_api", "../../../api/rtc_event_log", + "../../../api/transport:bandwidth_usage", "../../../api/transport:network_control", "../../../api/units:data_rate", "../../../api/units:data_size", @@ -282,9 +284,13 @@ if (rtc_include_tests) { ":delay_based_bwe", ":estimators", ":goog_cc", + "../../../api:libjingle_logging_api", "../../../api/rtc_event_log", "../../../api/transport:goog_cc", "../../../api/transport:network_control", + "../../../api/units:data_rate", + "../../../api/units:data_size", + "../../../api/units:time_delta", "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../test/logging:log_writer", diff --git a/modules/congestion_controller/goog_cc/alr_detector.cc b/modules/congestion_controller/goog_cc/alr_detector.cc index f1e649b7cd..33dbdef4be 100644 --- a/modules/congestion_controller/goog_cc/alr_detector.cc +++ b/modules/congestion_controller/goog_cc/alr_detector.cc @@ -14,11 +14,13 @@ #include #include -#include "api/rtc_event_log/rtc_event.h" +#include "absl/types/optional.h" +#include "api/field_trials_view.h" #include "api/rtc_event_log/rtc_event_log.h" #include "logging/rtc_event_log/events/rtc_event_alr_state.h" #include "rtc_base/checks.h" -#include "rtc_base/numerics/safe_conversions.h" +#include "rtc_base/experiments/alr_experiment.h" +#include "rtc_base/experiments/struct_parameters_parser.h" #include "rtc_base/time_utils.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/alr_detector.h b/modules/congestion_controller/goog_cc/alr_detector.h index 5e7a3e1075..bddcab39aa 100644 --- a/modules/congestion_controller/goog_cc/alr_detector.h +++ b/modules/congestion_controller/goog_cc/alr_detector.h @@ -19,7 +19,6 @@ #include "absl/types/optional.h" #include "api/field_trials_view.h" #include "modules/pacing/interval_budget.h" -#include "rtc_base/experiments/alr_experiment.h" #include "rtc_base/experiments/struct_parameters_parser.h" namespace webrtc { 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 4299e05420..5f17883fe8 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 @@ -11,7 +11,6 @@ #include "modules/congestion_controller/goog_cc/congestion_window_pushback_controller.h" #include -#include #include "api/units/data_size.h" #include "test/explicit_key_value_config.h" diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.cc b/modules/congestion_controller/goog_cc/delay_based_bwe.cc index fbbe507dc7..ac6a36d08f 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe.cc +++ b/modules/congestion_controller/goog_cc/delay_based_bwe.cc @@ -20,6 +20,7 @@ #include "api/field_trials_view.h" #include "api/network_state_predictor.h" #include "api/rtc_event_log/rtc_event_log.h" +#include "api/transport/bandwidth_usage.h" #include "api/transport/network_types.h" #include "api/units/data_rate.h" #include "api/units/data_size.h" diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.h b/modules/congestion_controller/goog_cc/delay_based_bwe.h index 741b10c157..3bdab4a0a8 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe.h +++ b/modules/congestion_controller/goog_cc/delay_based_bwe.h @@ -19,6 +19,7 @@ #include "absl/types/optional.h" #include "api/field_trials_view.h" #include "api/network_state_predictor.h" +#include "api/transport/bandwidth_usage.h" #include "api/transport/network_types.h" #include "api/units/data_rate.h" #include "api/units/time_delta.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 a824d90f92..024e1962d6 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc +++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc @@ -12,7 +12,7 @@ #include -#include "api/network_state_predictor.h" +#include "api/transport/bandwidth_usage.h" #include "api/transport/network_types.h" #include "api/units/data_rate.h" #include "api/units/time_delta.h" diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h index 634e6a4d82..b885ef2d23 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h +++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h @@ -20,8 +20,9 @@ #include "api/transport/field_trial_based_config.h" #include "api/transport/network_types.h" #include "api/units/timestamp.h" -#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.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 "system_wrappers/include/clock.h" #include "test/field_trial.h" #include "test/gtest.h" 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 cbaabfa75b..5de8a40a26 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -19,12 +19,11 @@ #include #include -#include "absl/strings/match.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "api/environment/environment.h" #include "api/field_trials_view.h" -#include "api/network_state_predictor.h" +#include "api/transport/bandwidth_usage.h" #include "api/transport/network_control.h" #include "api/transport/network_types.h" #include "api/units/data_rate.h" 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 63691a7a28..f2210c953f 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.h +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.h @@ -18,7 +18,7 @@ #include #include "absl/types/optional.h" -#include "api/field_trials_view.h" +#include "api/environment/environment.h" #include "api/network_state_predictor.h" #include "api/transport/network_control.h" #include "api/transport/network_types.h" @@ -30,6 +30,7 @@ #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" 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 fa2e468f4f..81cdad512e 100644 --- a/modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.cc +++ b/modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.cc @@ -11,6 +11,7 @@ #include "modules/congestion_controller/goog_cc/loss_based_bandwidth_estimation.h" #include +#include #include #include "absl/strings/match.h" diff --git a/modules/congestion_controller/goog_cc/probe_controller_unittest.cc b/modules/congestion_controller/goog_cc/probe_controller_unittest.cc index e75c2c8760..5ee7cc7476 100644 --- a/modules/congestion_controller/goog_cc/probe_controller_unittest.cc +++ b/modules/congestion_controller/goog_cc/probe_controller_unittest.cc @@ -13,6 +13,7 @@ #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/time_delta.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 ddeab505e0..c5e11179d7 100644 --- a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc +++ b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc @@ -11,6 +11,7 @@ #include "modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h" #include +#include #include #include #include @@ -18,7 +19,6 @@ #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" diff --git a/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc b/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc index 6a8849ed6d..51a67deb1b 100644 --- a/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc +++ b/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc @@ -11,15 +11,28 @@ #include +#include +#include +#include #include #include "absl/strings/string_view.h" #include "absl/types/optional.h" +#include "api/rtc_event_log_output.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 "modules/congestion_controller/goog_cc/alr_detector.h" #include "modules/congestion_controller/goog_cc/delay_based_bwe.h" +#include "modules/congestion_controller/goog_cc/goog_cc_network_control.h" #include "modules/congestion_controller/goog_cc/trendline_estimator.h" #include "modules/remote_bitrate_estimator/aimd_rate_control.h" #include "rtc_base/checks.h" +#include "test/logging/log_writer.h" namespace webrtc { namespace { diff --git a/modules/congestion_controller/goog_cc/test/goog_cc_printer.h b/modules/congestion_controller/goog_cc/test/goog_cc_printer.h index 16fa657e71..cdea139e40 100644 --- a/modules/congestion_controller/goog_cc/test/goog_cc_printer.h +++ b/modules/congestion_controller/goog_cc/test/goog_cc_printer.h @@ -14,13 +14,13 @@ #include #include -#include "api/rtc_event_log/rtc_event_log.h" +#include "api/rtc_event_log_output.h" #include "api/transport/goog_cc_factory.h" #include "api/transport/network_control.h" #include "api/transport/network_types.h" +#include "api/units/data_size.h" #include "api/units/timestamp.h" #include "modules/congestion_controller/goog_cc/goog_cc_network_control.h" -#include "test/logging/log_writer.h" namespace webrtc { diff --git a/modules/congestion_controller/goog_cc/trendline_estimator.cc b/modules/congestion_controller/goog_cc/trendline_estimator.cc index 13fb55e6b8..958ce53b5e 100644 --- a/modules/congestion_controller/goog_cc/trendline_estimator.cc +++ b/modules/congestion_controller/goog_cc/trendline_estimator.cc @@ -25,6 +25,7 @@ #include "absl/types/optional.h" #include "api/field_trials_view.h" #include "api/network_state_predictor.h" +#include "api/transport/bandwidth_usage.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "rtc_base/checks.h" #include "rtc_base/experiments/struct_parameters_parser.h" diff --git a/modules/congestion_controller/goog_cc/trendline_estimator.h b/modules/congestion_controller/goog_cc/trendline_estimator.h index fa5a41ea53..5636c08ea9 100644 --- a/modules/congestion_controller/goog_cc/trendline_estimator.h +++ b/modules/congestion_controller/goog_cc/trendline_estimator.h @@ -18,6 +18,7 @@ #include "api/field_trials_view.h" #include "api/network_state_predictor.h" +#include "api/transport/bandwidth_usage.h" #include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h" #include "rtc_base/experiments/struct_parameters_parser.h"