From fc7ec8e9f8b67033bcb5516268c0442653ef34e6 Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Wed, 28 Feb 2018 16:48:00 +0100 Subject: [PATCH] Reland "Moved congestion controller to goog_cc folder." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a reland of e6cefdf9c572cdce55ff0497ad6e516c76132ee8. Original change's description: > Moved congestion controller to goog_cc folder. > > Bug: webrtc:8415 > Change-Id: I2070da0cacf1dbfc4b6a89285af3e68fd03497ab > Reviewed-on: https://webrtc-review.googlesource.com/43841 > Commit-Queue: Sebastian Jansson > Reviewed-by: Björn Terelius > Reviewed-by: Stefan Holmer > Cr-Commit-Position: refs/heads/master@{#21928} Bug: webrtc:8415 Change-Id: Ib5cf8641466655d64ac80f720561817f4cab49a9 Reviewed-on: https://webrtc-review.googlesource.com/53062 Commit-Queue: Sebastian Jansson Reviewed-by: Björn Terelius Cr-Commit-Position: refs/heads/master@{#22244} --- modules/congestion_controller/BUILD.gn | 1 + .../congestion_controller/goog_cc/BUILD.gn | 164 ++++++++++++++++++ .../acknowledged_bitrate_estimator.cc | 2 +- .../acknowledged_bitrate_estimator.h | 8 +- ...acknowledged_bitrate_estimator_unittest.cc | 2 +- .../{rtp => goog_cc}/alr_detector.cc | 2 +- .../{rtp => goog_cc}/alr_detector.h | 6 +- .../{rtp => goog_cc}/alr_detector_unittest.cc | 2 +- .../{rtp => goog_cc}/bitrate_estimator.cc | 2 +- .../{rtp => goog_cc}/bitrate_estimator.h | 6 +- .../{rtp => goog_cc}/delay_based_bwe.cc | 4 +- .../{rtp => goog_cc}/delay_based_bwe.h | 10 +- .../delay_based_bwe_unittest.cc | 4 +- .../delay_based_bwe_unittest_helper.cc | 4 +- .../delay_based_bwe_unittest_helper.h | 10 +- .../delay_increase_detector_interface.h | 6 +- .../{rtp => goog_cc}/goog_cc_factory.cc | 4 +- .../goog_cc_network_control.cc | 10 +- .../goog_cc_network_control.h | 14 +- .../include/goog_cc_factory.h | 6 +- .../median_slope_estimator.cc | 2 +- .../{rtp => goog_cc}/median_slope_estimator.h | 6 +- .../median_slope_estimator_unittest.cc | 2 +- .../probe_bitrate_estimator.cc | 2 +- .../probe_bitrate_estimator.h | 6 +- .../probe_bitrate_estimator_unittest.cc | 2 +- .../{rtp => goog_cc}/probe_controller.cc | 2 +- .../{rtp => goog_cc}/probe_controller.h | 6 +- .../probe_controller_unittest.cc | 2 +- .../{rtp => goog_cc}/trendline_estimator.cc | 2 +- .../{rtp => goog_cc}/trendline_estimator.h | 8 +- .../trendline_estimator_unittest.cc | 2 +- modules/congestion_controller/rtp/BUILD.gn | 147 +--------------- .../rtp/send_side_congestion_controller.cc | 2 +- 34 files changed, 239 insertions(+), 219 deletions(-) create mode 100644 modules/congestion_controller/goog_cc/BUILD.gn rename modules/congestion_controller/{rtp => goog_cc}/acknowledged_bitrate_estimator.cc (96%) rename modules/congestion_controller/{rtp => goog_cc}/acknowledged_bitrate_estimator.h (79%) rename modules/congestion_controller/{rtp => goog_cc}/acknowledged_bitrate_estimator_unittest.cc (98%) rename modules/congestion_controller/{rtp => goog_cc}/alr_detector.cc (98%) rename modules/congestion_controller/{rtp => goog_cc}/alr_detector.h (93%) rename modules/congestion_controller/{rtp => goog_cc}/alr_detector_unittest.cc (98%) rename modules/congestion_controller/{rtp => goog_cc}/bitrate_estimator.cc (98%) rename modules/congestion_controller/{rtp => goog_cc}/bitrate_estimator.h (86%) rename modules/congestion_controller/{rtp => goog_cc}/delay_based_bwe.cc (98%) rename modules/congestion_controller/{rtp => goog_cc}/delay_based_bwe.h (89%) rename modules/congestion_controller/{rtp => goog_cc}/delay_based_bwe_unittest.cc (98%) rename modules/congestion_controller/{rtp => goog_cc}/delay_based_bwe_unittest_helper.cc (99%) rename modules/congestion_controller/{rtp => goog_cc}/delay_based_bwe_unittest_helper.h (93%) rename modules/congestion_controller/{rtp => goog_cc}/delay_increase_detector_interface.h (82%) rename modules/congestion_controller/{rtp => goog_cc}/goog_cc_factory.cc (87%) rename modules/congestion_controller/{rtp => goog_cc}/goog_cc_network_control.cc (97%) rename modules/congestion_controller/{rtp => goog_cc}/goog_cc_network_control.h (85%) rename modules/congestion_controller/{rtp => goog_cc}/include/goog_cc_factory.h (80%) rename modules/congestion_controller/{rtp => goog_cc}/median_slope_estimator.cc (97%) rename modules/congestion_controller/{rtp => goog_cc}/median_slope_estimator.h (91%) rename modules/congestion_controller/{rtp => goog_cc}/median_slope_estimator_unittest.cc (96%) rename modules/congestion_controller/{rtp => goog_cc}/probe_bitrate_estimator.cc (99%) rename modules/congestion_controller/{rtp => goog_cc}/probe_bitrate_estimator.h (87%) rename modules/congestion_controller/{rtp => goog_cc}/probe_bitrate_estimator_unittest.cc (99%) rename modules/congestion_controller/{rtp => goog_cc}/probe_controller.cc (99%) rename modules/congestion_controller/{rtp => goog_cc}/probe_controller.h (93%) rename modules/congestion_controller/{rtp => goog_cc}/probe_controller_unittest.cc (99%) rename modules/congestion_controller/{rtp => goog_cc}/trendline_estimator.cc (98%) rename modules/congestion_controller/{rtp => goog_cc}/trendline_estimator.h (91%) rename modules/congestion_controller/{rtp => goog_cc}/trendline_estimator_unittest.cc (97%) diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn index 4f3607dcf6..7446df947f 100644 --- a/modules/congestion_controller/BUILD.gn +++ b/modules/congestion_controller/BUILD.gn @@ -182,6 +182,7 @@ if (rtc_include_tests) { "../pacing:pacing", "../remote_bitrate_estimator:remote_bitrate_estimator", "../rtp_rtcp:rtp_rtcp_format", + "goog_cc:goog_cc_unittests", "network_control:network_control_unittests", "rtp:congestion_controller_unittests", ] diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn new file mode 100644 index 0000000000..bc17af14bc --- /dev/null +++ b/modules/congestion_controller/goog_cc/BUILD.gn @@ -0,0 +1,164 @@ +# Copyright (c) 2018 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. + +import("../../../webrtc.gni") + +config("bwe_test_logging") { + if (rtc_enable_bwe_test_logging) { + defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1" ] + } else { + defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ] + } +} + +rtc_static_library("goog_cc") { + configs += [ ":bwe_test_logging" ] + sources = [ + "alr_detector.cc", + "alr_detector.h", + "goog_cc_factory.cc", + "goog_cc_network_control.cc", + "goog_cc_network_control.h", + "include/goog_cc_factory.h", + "probe_controller.cc", + "probe_controller.h", + ] + + # TODO(jschuh): Bug 1348: fix this warning. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + + if (!build_with_chromium && is_clang) { + # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). + suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] + } + + deps = [ + ":delay_based_bwe", + ":estimators", + "../..:module_api", + "../../..:webrtc_common", + "../../../:typedefs", + "../../../api:optional", + "../../../logging:rtc_event_log_api", + "../../../logging:rtc_event_pacing", + "../../../rtc_base:checks", + "../../../rtc_base:rtc_base_approved", + "../../../rtc_base/experiments:alr_experiment", + "../../../system_wrappers", + "../../../system_wrappers:field_trial_api", + "../../../system_wrappers:metrics_api", + "../../bitrate_controller", + "../../pacing", + "../../remote_bitrate_estimator", + "../../rtp_rtcp:rtp_rtcp_format", + "../network_control", + ] +} + +rtc_source_set("estimators") { + configs += [ ":bwe_test_logging" ] + sources = [ + "acknowledged_bitrate_estimator.cc", + "acknowledged_bitrate_estimator.h", + "bitrate_estimator.cc", + "bitrate_estimator.h", + "delay_increase_detector_interface.h", + "median_slope_estimator.cc", + "median_slope_estimator.h", + "probe_bitrate_estimator.cc", + "probe_bitrate_estimator.h", + "trendline_estimator.cc", + "trendline_estimator.h", + ] + + # TODO(jschuh): Bug 1348: fix this warning. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + + if (!build_with_chromium && is_clang) { + # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). + suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] + } + + deps = [ + "../../../api:optional", + "../../../logging:rtc_event_bwe", + "../../../logging:rtc_event_log_api", + "../../../rtc_base:checks", + "../../../rtc_base:rtc_base_approved", + "../../../rtc_base:rtc_numerics", + "../../../system_wrappers:field_trial_api", + "../../../system_wrappers:metrics_api", + "../../remote_bitrate_estimator", + "../../rtp_rtcp:rtp_rtcp_format", + ] +} + +rtc_source_set("delay_based_bwe") { + configs += [ ":bwe_test_logging" ] + sources = [ + "delay_based_bwe.cc", + "delay_based_bwe.h", + ] + + deps = [ + ":estimators", + "../../../:typedefs", + "../../../logging:rtc_event_bwe", + "../../../logging:rtc_event_log_api", + "../../../rtc_base:checks", + "../../../rtc_base:rtc_base_approved", + "../../../system_wrappers:field_trial_api", + "../../../system_wrappers:metrics_api", + "../../pacing", + "../../remote_bitrate_estimator", + ] + + if (!build_with_chromium && is_clang) { + # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). + suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] + } +} + +if (rtc_include_tests) { + rtc_source_set("goog_cc_unittests") { + testonly = true + + sources = [ + "acknowledged_bitrate_estimator_unittest.cc", + "alr_detector_unittest.cc", + "delay_based_bwe_unittest.cc", + "delay_based_bwe_unittest_helper.cc", + "delay_based_bwe_unittest_helper.h", + "median_slope_estimator_unittest.cc", + "probe_bitrate_estimator_unittest.cc", + "probe_controller_unittest.cc", + "trendline_estimator_unittest.cc", + ] + deps = [ + ":delay_based_bwe", + ":estimators", + ":goog_cc", + "../../../rtc_base:checks", + "../../../rtc_base:rtc_base_approved", + "../../../rtc_base:rtc_base_tests_utils", + "../../../rtc_base/experiments:alr_experiment", + "../../../system_wrappers", + "../../../test:field_trial", + "../../../test:test_support", + "../../pacing", + "../../remote_bitrate_estimator", + "../../rtp_rtcp:rtp_rtcp_format", + "../network_control", + "//testing/gmock", + ] + if (!build_with_chromium && is_clang) { + # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). + suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] + } + } +} diff --git a/modules/congestion_controller/rtp/acknowledged_bitrate_estimator.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc similarity index 96% rename from modules/congestion_controller/rtp/acknowledged_bitrate_estimator.cc rename to modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc index 55cd176a83..7e1855df32 100644 --- a/modules/congestion_controller/rtp/acknowledged_bitrate_estimator.cc +++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/acknowledged_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" #include diff --git a/modules/congestion_controller/rtp/acknowledged_bitrate_estimator.h b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h similarity index 79% rename from modules/congestion_controller/rtp/acknowledged_bitrate_estimator.h rename to modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h index 7fbd3ed821..f584792ba4 100644 --- a/modules/congestion_controller/rtp/acknowledged_bitrate_estimator.h +++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h @@ -8,14 +8,14 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_CONGESTION_CONTROLLER_RTP_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ -#define MODULES_CONGESTION_CONTROLLER_RTP_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ #include #include #include "api/optional.h" -#include "modules/congestion_controller/rtp/bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/bitrate_estimator.h" namespace webrtc { @@ -45,4 +45,4 @@ class AcknowledgedBitrateEstimator { } // namespace webrtc_cc } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_RTP_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/rtp/acknowledged_bitrate_estimator_unittest.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc similarity index 98% rename from modules/congestion_controller/rtp/acknowledged_bitrate_estimator_unittest.cc rename to modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc index 5c81cf2ac3..f8f5025bc1 100644 --- a/modules/congestion_controller/rtp/acknowledged_bitrate_estimator_unittest.cc +++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/acknowledged_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" #include diff --git a/modules/congestion_controller/rtp/alr_detector.cc b/modules/congestion_controller/goog_cc/alr_detector.cc similarity index 98% rename from modules/congestion_controller/rtp/alr_detector.cc rename to modules/congestion_controller/goog_cc/alr_detector.cc index 30d89d1312..f36b1f9aba 100644 --- a/modules/congestion_controller/rtp/alr_detector.cc +++ b/modules/congestion_controller/goog_cc/alr_detector.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/alr_detector.h" +#include "modules/congestion_controller/goog_cc/alr_detector.h" #include #include diff --git a/modules/congestion_controller/rtp/alr_detector.h b/modules/congestion_controller/goog_cc/alr_detector.h similarity index 93% rename from modules/congestion_controller/rtp/alr_detector.h rename to modules/congestion_controller/goog_cc/alr_detector.h index 270fb2e77b..98293a7361 100644 --- a/modules/congestion_controller/rtp/alr_detector.h +++ b/modules/congestion_controller/goog_cc/alr_detector.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_CONGESTION_CONTROLLER_RTP_ALR_DETECTOR_H_ -#define MODULES_CONGESTION_CONTROLLER_RTP_ALR_DETECTOR_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_ #include "api/optional.h" #include "common_types.h" // NOLINT(build/include) @@ -74,4 +74,4 @@ class AlrDetector { } // namespace webrtc_cc } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_RTP_ALR_DETECTOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_ diff --git a/modules/congestion_controller/rtp/alr_detector_unittest.cc b/modules/congestion_controller/goog_cc/alr_detector_unittest.cc similarity index 98% rename from modules/congestion_controller/rtp/alr_detector_unittest.cc rename to modules/congestion_controller/goog_cc/alr_detector_unittest.cc index d5420d3954..9aeab51d80 100644 --- a/modules/congestion_controller/rtp/alr_detector_unittest.cc +++ b/modules/congestion_controller/goog_cc/alr_detector_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/alr_detector.h" +#include "modules/congestion_controller/goog_cc/alr_detector.h" #include "rtc_base/experiments/alr_experiment.h" #include "test/field_trial.h" diff --git a/modules/congestion_controller/rtp/bitrate_estimator.cc b/modules/congestion_controller/goog_cc/bitrate_estimator.cc similarity index 98% rename from modules/congestion_controller/rtp/bitrate_estimator.cc rename to modules/congestion_controller/goog_cc/bitrate_estimator.cc index 2b28ac558d..2cd53311a3 100644 --- a/modules/congestion_controller/rtp/bitrate_estimator.cc +++ b/modules/congestion_controller/goog_cc/bitrate_estimator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/bitrate_estimator.h" #include diff --git a/modules/congestion_controller/rtp/bitrate_estimator.h b/modules/congestion_controller/goog_cc/bitrate_estimator.h similarity index 86% rename from modules/congestion_controller/rtp/bitrate_estimator.h rename to modules/congestion_controller/goog_cc/bitrate_estimator.h index 1704d3f93e..ca5a40e486 100644 --- a/modules/congestion_controller/rtp/bitrate_estimator.h +++ b/modules/congestion_controller/goog_cc/bitrate_estimator.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_CONGESTION_CONTROLLER_RTP_BITRATE_ESTIMATOR_H_ -#define MODULES_CONGESTION_CONTROLLER_RTP_BITRATE_ESTIMATOR_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_ #include @@ -45,4 +45,4 @@ class BitrateEstimator { } // namespace webrtc_cc } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_RTP_BITRATE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/rtp/delay_based_bwe.cc b/modules/congestion_controller/goog_cc/delay_based_bwe.cc similarity index 98% rename from modules/congestion_controller/rtp/delay_based_bwe.cc rename to modules/congestion_controller/goog_cc/delay_based_bwe.cc index d5256288a6..fea5a66e5a 100644 --- a/modules/congestion_controller/rtp/delay_based_bwe.cc +++ b/modules/congestion_controller/goog_cc/delay_based_bwe.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/delay_based_bwe.h" +#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include #include @@ -17,7 +17,7 @@ #include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h" #include "logging/rtc_event_log/rtc_event_log.h" -#include "modules/congestion_controller/rtp/trendline_estimator.h" +#include "modules/congestion_controller/goog_cc/trendline_estimator.h" #include "modules/pacing/paced_sender.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" diff --git a/modules/congestion_controller/rtp/delay_based_bwe.h b/modules/congestion_controller/goog_cc/delay_based_bwe.h similarity index 89% rename from modules/congestion_controller/rtp/delay_based_bwe.h rename to modules/congestion_controller/goog_cc/delay_based_bwe.h index e7dd568caa..485f687c39 100644 --- a/modules/congestion_controller/rtp/delay_based_bwe.h +++ b/modules/congestion_controller/goog_cc/delay_based_bwe.h @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_CONGESTION_CONTROLLER_RTP_DELAY_BASED_BWE_H_ -#define MODULES_CONGESTION_CONTROLLER_RTP_DELAY_BASED_BWE_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_ #include #include #include -#include "modules/congestion_controller/rtp/delay_increase_detector_interface.h" -#include "modules/congestion_controller/rtp/probe_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.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/include/remote_bitrate_estimator.h" #include "modules/remote_bitrate_estimator/inter_arrival.h" @@ -91,4 +91,4 @@ class DelayBasedBwe { } // namespace webrtc_cc } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_RTP_DELAY_BASED_BWE_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_ diff --git a/modules/congestion_controller/rtp/delay_based_bwe_unittest.cc b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc similarity index 98% rename from modules/congestion_controller/rtp/delay_based_bwe_unittest.cc rename to modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc index 339d8452f3..b19e8f91d6 100644 --- a/modules/congestion_controller/rtp/delay_based_bwe_unittest.cc +++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/delay_based_bwe.h" -#include "modules/congestion_controller/rtp/delay_based_bwe_unittest_helper.h" +#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" +#include "modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h" #include "modules/pacing/paced_sender.h" #include "rtc_base/constructormagic.h" #include "system_wrappers/include/clock.h" diff --git a/modules/congestion_controller/rtp/delay_based_bwe_unittest_helper.cc b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc similarity index 99% rename from modules/congestion_controller/rtp/delay_based_bwe_unittest_helper.cc rename to modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc index c306e66d6c..35019b0e8c 100644 --- a/modules/congestion_controller/rtp/delay_based_bwe_unittest_helper.cc +++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc @@ -7,13 +7,13 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/delay_based_bwe_unittest_helper.h" +#include "modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h" #include #include #include -#include "modules/congestion_controller/rtp/delay_based_bwe.h" +#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "rtc_base/checks.h" #include "rtc_base/ptr_util.h" diff --git a/modules/congestion_controller/rtp/delay_based_bwe_unittest_helper.h b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h similarity index 93% rename from modules/congestion_controller/rtp/delay_based_bwe_unittest_helper.h rename to modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h index 8658d0292a..4ccf228956 100644 --- a/modules/congestion_controller/rtp/delay_based_bwe_unittest_helper.h +++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_CONGESTION_CONTROLLER_RTP_DELAY_BASED_BWE_UNITTEST_HELPER_H_ -#define MODULES_CONGESTION_CONTROLLER_RTP_DELAY_BASED_BWE_UNITTEST_HELPER_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_UNITTEST_HELPER_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_UNITTEST_HELPER_H_ #include #include @@ -17,8 +17,8 @@ #include #include -#include "modules/congestion_controller/rtp/acknowledged_bitrate_estimator.h" -#include "modules/congestion_controller/rtp/delay_based_bwe.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "rtc_base/constructormagic.h" #include "system_wrappers/include/clock.h" @@ -177,4 +177,4 @@ class DelayBasedBweTest : public ::testing::Test { } // namespace webrtc_cc } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_RTP_DELAY_BASED_BWE_UNITTEST_HELPER_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_UNITTEST_HELPER_H_ diff --git a/modules/congestion_controller/rtp/delay_increase_detector_interface.h b/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h similarity index 82% rename from modules/congestion_controller/rtp/delay_increase_detector_interface.h rename to modules/congestion_controller/goog_cc/delay_increase_detector_interface.h index d8a3647f9f..d748c282b8 100644 --- a/modules/congestion_controller/rtp/delay_increase_detector_interface.h +++ b/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_CONGESTION_CONTROLLER_RTP_DELAY_INCREASE_DETECTOR_INTERFACE_H_ -#define MODULES_CONGESTION_CONTROLLER_RTP_DELAY_INCREASE_DETECTOR_INTERFACE_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_INCREASE_DETECTOR_INTERFACE_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_INCREASE_DETECTOR_INTERFACE_H_ #include @@ -36,4 +36,4 @@ class DelayIncreaseDetectorInterface { } // namespace webrtc_cc } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_RTP_DELAY_INCREASE_DETECTOR_INTERFACE_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_INCREASE_DETECTOR_INTERFACE_H_ diff --git a/modules/congestion_controller/rtp/goog_cc_factory.cc b/modules/congestion_controller/goog_cc/goog_cc_factory.cc similarity index 87% rename from modules/congestion_controller/rtp/goog_cc_factory.cc rename to modules/congestion_controller/goog_cc/goog_cc_factory.cc index 3bfb57f351..ad230bc1e9 100644 --- a/modules/congestion_controller/rtp/goog_cc_factory.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_factory.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/include/goog_cc_factory.h" +#include "modules/congestion_controller/goog_cc/include/goog_cc_factory.h" -#include "modules/congestion_controller/rtp/goog_cc_network_control.h" +#include "modules/congestion_controller/goog_cc/goog_cc_network_control.h" #include "rtc_base/ptr_util.h" namespace webrtc { GoogCcNetworkControllerFactory::GoogCcNetworkControllerFactory( diff --git a/modules/congestion_controller/rtp/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc similarity index 97% rename from modules/congestion_controller/rtp/goog_cc_network_control.cc rename to modules/congestion_controller/goog_cc/goog_cc_network_control.cc index ad4dfce045..a360e9cce3 100644 --- a/modules/congestion_controller/rtp/goog_cc_network_control.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/goog_cc_network_control.h" +#include "modules/congestion_controller/goog_cc/goog_cc_network_control.h" #include #include @@ -18,10 +18,10 @@ #include #include -#include "modules/congestion_controller/rtp/acknowledged_bitrate_estimator.h" -#include "modules/congestion_controller/rtp/alr_detector.h" -#include "modules/congestion_controller/rtp/include/goog_cc_factory.h" -#include "modules/congestion_controller/rtp/probe_controller.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/alr_detector.h" +#include "modules/congestion_controller/goog_cc/include/goog_cc_factory.h" +#include "modules/congestion_controller/goog_cc/probe_controller.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" diff --git a/modules/congestion_controller/rtp/goog_cc_network_control.h b/modules/congestion_controller/goog_cc/goog_cc_network_control.h similarity index 85% rename from modules/congestion_controller/rtp/goog_cc_network_control.h rename to modules/congestion_controller/goog_cc/goog_cc_network_control.h index cc61009326..47ae0842d9 100644 --- a/modules/congestion_controller/rtp/goog_cc_network_control.h +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_CONGESTION_CONTROLLER_RTP_GOOG_CC_NETWORK_CONTROL_H_ -#define MODULES_CONGESTION_CONTROLLER_RTP_GOOG_CC_NETWORK_CONTROL_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_GOOG_CC_NETWORK_CONTROL_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_GOOG_CC_NETWORK_CONTROL_H_ #include #include @@ -19,11 +19,11 @@ #include "api/optional.h" #include "logging/rtc_event_log/rtc_event_log.h" #include "modules/bitrate_controller/send_side_bandwidth_estimation.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.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/probe_controller.h" #include "modules/congestion_controller/network_control/include/network_control.h" -#include "modules/congestion_controller/rtp/acknowledged_bitrate_estimator.h" -#include "modules/congestion_controller/rtp/alr_detector.h" -#include "modules/congestion_controller/rtp/delay_based_bwe.h" -#include "modules/congestion_controller/rtp/probe_controller.h" #include "rtc_base/constructormagic.h" namespace webrtc { @@ -91,4 +91,4 @@ class GoogCcNetworkController : public NetworkControllerInterface { } // namespace webrtc_cc } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_RTP_GOOG_CC_NETWORK_CONTROL_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_GOOG_CC_NETWORK_CONTROL_H_ diff --git a/modules/congestion_controller/rtp/include/goog_cc_factory.h b/modules/congestion_controller/goog_cc/include/goog_cc_factory.h similarity index 80% rename from modules/congestion_controller/rtp/include/goog_cc_factory.h rename to modules/congestion_controller/goog_cc/include/goog_cc_factory.h index b7e91dc8fb..20717f9f72 100644 --- a/modules/congestion_controller/rtp/include/goog_cc_factory.h +++ b/modules/congestion_controller/goog_cc/include/goog_cc_factory.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_CONGESTION_CONTROLLER_RTP_INCLUDE_GOOG_CC_FACTORY_H_ -#define MODULES_CONGESTION_CONTROLLER_RTP_INCLUDE_GOOG_CC_FACTORY_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_ #include "modules/congestion_controller/network_control/include/network_control.h" namespace webrtc { @@ -29,4 +29,4 @@ class GoogCcNetworkControllerFactory }; } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_RTP_INCLUDE_GOOG_CC_FACTORY_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_ diff --git a/modules/congestion_controller/rtp/median_slope_estimator.cc b/modules/congestion_controller/goog_cc/median_slope_estimator.cc similarity index 97% rename from modules/congestion_controller/rtp/median_slope_estimator.cc rename to modules/congestion_controller/goog_cc/median_slope_estimator.cc index 2c025cc31d..3ad5e3fae9 100644 --- a/modules/congestion_controller/rtp/median_slope_estimator.cc +++ b/modules/congestion_controller/goog_cc/median_slope_estimator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/median_slope_estimator.h" +#include "modules/congestion_controller/goog_cc/median_slope_estimator.h" #include #include diff --git a/modules/congestion_controller/rtp/median_slope_estimator.h b/modules/congestion_controller/goog_cc/median_slope_estimator.h similarity index 91% rename from modules/congestion_controller/rtp/median_slope_estimator.h rename to modules/congestion_controller/goog_cc/median_slope_estimator.h index 3dd3c21c9f..acac830e12 100644 --- a/modules/congestion_controller/rtp/median_slope_estimator.h +++ b/modules/congestion_controller/goog_cc/median_slope_estimator.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_CONGESTION_CONTROLLER_RTP_MEDIAN_SLOPE_ESTIMATOR_H_ -#define MODULES_CONGESTION_CONTROLLER_RTP_MEDIAN_SLOPE_ESTIMATOR_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_MEDIAN_SLOPE_ESTIMATOR_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_MEDIAN_SLOPE_ESTIMATOR_H_ #include #include @@ -71,4 +71,4 @@ class MedianSlopeEstimator { } // namespace webrtc_cc } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_RTP_MEDIAN_SLOPE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_MEDIAN_SLOPE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/rtp/median_slope_estimator_unittest.cc b/modules/congestion_controller/goog_cc/median_slope_estimator_unittest.cc similarity index 96% rename from modules/congestion_controller/rtp/median_slope_estimator_unittest.cc rename to modules/congestion_controller/goog_cc/median_slope_estimator_unittest.cc index 7e5e90426c..c1ead91653 100644 --- a/modules/congestion_controller/rtp/median_slope_estimator_unittest.cc +++ b/modules/congestion_controller/goog_cc/median_slope_estimator_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/median_slope_estimator.h" +#include "modules/congestion_controller/goog_cc/median_slope_estimator.h" #include "rtc_base/random.h" #include "test/gtest.h" diff --git a/modules/congestion_controller/rtp/probe_bitrate_estimator.cc b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc similarity index 99% rename from modules/congestion_controller/rtp/probe_bitrate_estimator.cc rename to modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc index f091aec6df..5effa2fdf8 100644 --- a/modules/congestion_controller/rtp/probe_bitrate_estimator.cc +++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/probe_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h" #include diff --git a/modules/congestion_controller/rtp/probe_bitrate_estimator.h b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h similarity index 87% rename from modules/congestion_controller/rtp/probe_bitrate_estimator.h rename to modules/congestion_controller/goog_cc/probe_bitrate_estimator.h index 96eca0aa2b..23d61ee803 100644 --- a/modules/congestion_controller/rtp/probe_bitrate_estimator.h +++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_CONGESTION_CONTROLLER_RTP_PROBE_BITRATE_ESTIMATOR_H_ -#define MODULES_CONGESTION_CONTROLLER_RTP_PROBE_BITRATE_ESTIMATOR_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_ #include #include @@ -54,4 +54,4 @@ class ProbeBitrateEstimator { } // namespace webrtc_cc } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_RTP_PROBE_BITRATE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/rtp/probe_bitrate_estimator_unittest.cc b/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc similarity index 99% rename from modules/congestion_controller/rtp/probe_bitrate_estimator_unittest.cc rename to modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc index a45bf822fb..4a74778e3c 100644 --- a/modules/congestion_controller/rtp/probe_bitrate_estimator_unittest.cc +++ b/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/probe_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h" #include #include diff --git a/modules/congestion_controller/rtp/probe_controller.cc b/modules/congestion_controller/goog_cc/probe_controller.cc similarity index 99% rename from modules/congestion_controller/rtp/probe_controller.cc rename to modules/congestion_controller/goog_cc/probe_controller.cc index 863524d064..b2570323b0 100644 --- a/modules/congestion_controller/rtp/probe_controller.cc +++ b/modules/congestion_controller/goog_cc/probe_controller.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/probe_controller.h" +#include "modules/congestion_controller/goog_cc/probe_controller.h" #include #include diff --git a/modules/congestion_controller/rtp/probe_controller.h b/modules/congestion_controller/goog_cc/probe_controller.h similarity index 93% rename from modules/congestion_controller/rtp/probe_controller.h rename to modules/congestion_controller/goog_cc/probe_controller.h index fa049dda1d..23fc4f7c49 100644 --- a/modules/congestion_controller/rtp/probe_controller.h +++ b/modules/congestion_controller/goog_cc/probe_controller.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_CONGESTION_CONTROLLER_RTP_PROBE_CONTROLLER_H_ -#define MODULES_CONGESTION_CONTROLLER_RTP_PROBE_CONTROLLER_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_CONTROLLER_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_CONTROLLER_H_ #include @@ -97,4 +97,4 @@ class ProbeController { } // namespace webrtc_cc } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_RTP_PROBE_CONTROLLER_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_CONTROLLER_H_ diff --git a/modules/congestion_controller/rtp/probe_controller_unittest.cc b/modules/congestion_controller/goog_cc/probe_controller_unittest.cc similarity index 99% rename from modules/congestion_controller/rtp/probe_controller_unittest.cc rename to modules/congestion_controller/goog_cc/probe_controller_unittest.cc index 1889cf6839..7ac6b3f018 100644 --- a/modules/congestion_controller/rtp/probe_controller_unittest.cc +++ b/modules/congestion_controller/goog_cc/probe_controller_unittest.cc @@ -9,8 +9,8 @@ */ #include +#include "modules/congestion_controller/goog_cc/probe_controller.h" #include "modules/congestion_controller/network_control/include/network_types.h" -#include "modules/congestion_controller/rtp/probe_controller.h" #include "rtc_base/logging.h" #include "system_wrappers/include/clock.h" #include "test/gmock.h" diff --git a/modules/congestion_controller/rtp/trendline_estimator.cc b/modules/congestion_controller/goog_cc/trendline_estimator.cc similarity index 98% rename from modules/congestion_controller/rtp/trendline_estimator.cc rename to modules/congestion_controller/goog_cc/trendline_estimator.cc index 1c07e5ca2d..0dfa822b4a 100644 --- a/modules/congestion_controller/rtp/trendline_estimator.cc +++ b/modules/congestion_controller/goog_cc/trendline_estimator.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/trendline_estimator.h" +#include "modules/congestion_controller/goog_cc/trendline_estimator.h" #include diff --git a/modules/congestion_controller/rtp/trendline_estimator.h b/modules/congestion_controller/goog_cc/trendline_estimator.h similarity index 91% rename from modules/congestion_controller/rtp/trendline_estimator.h rename to modules/congestion_controller/goog_cc/trendline_estimator.h index 7628fbc1e5..162c174aa9 100644 --- a/modules/congestion_controller/rtp/trendline_estimator.h +++ b/modules/congestion_controller/goog_cc/trendline_estimator.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ -#ifndef MODULES_CONGESTION_CONTROLLER_RTP_TRENDLINE_ESTIMATOR_H_ -#define MODULES_CONGESTION_CONTROLLER_RTP_TRENDLINE_ESTIMATOR_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_TRENDLINE_ESTIMATOR_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_TRENDLINE_ESTIMATOR_H_ #include #include @@ -16,7 +16,7 @@ #include #include -#include "modules/congestion_controller/rtp/delay_increase_detector_interface.h" +#include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h" #include "rtc_base/constructormagic.h" namespace webrtc { @@ -91,4 +91,4 @@ class TrendlineEstimator : public DelayIncreaseDetectorInterface { } // namespace webrtc_cc } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_RTP_TRENDLINE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_TRENDLINE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/rtp/trendline_estimator_unittest.cc b/modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc similarity index 97% rename from modules/congestion_controller/rtp/trendline_estimator_unittest.cc rename to modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc index 737b7b48de..376f27703a 100644 --- a/modules/congestion_controller/rtp/trendline_estimator_unittest.cc +++ b/modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/congestion_controller/rtp/trendline_estimator.h" +#include "modules/congestion_controller/goog_cc/trendline_estimator.h" #include "rtc_base/random.h" #include "test/gtest.h" diff --git a/modules/congestion_controller/rtp/BUILD.gn b/modules/congestion_controller/rtp/BUILD.gn index e39d207a9c..4842591e83 100644 --- a/modules/congestion_controller/rtp/BUILD.gn +++ b/modules/congestion_controller/rtp/BUILD.gn @@ -35,7 +35,6 @@ rtc_static_library("congestion_controller") { } deps = [ - ":goog_cc", ":transport_feedback", "../:congestion_controller", "../..:module_api", @@ -51,6 +50,7 @@ rtc_static_library("congestion_controller") { "../../pacing", "../../remote_bitrate_estimator", "../../rtp_rtcp:rtp_rtcp_format", + "../goog_cc", "../network_control", ] @@ -77,113 +77,6 @@ rtc_static_library("transport_feedback") { ] } -rtc_static_library("goog_cc") { - configs += [ ":bwe_test_logging" ] - sources = [ - "alr_detector.cc", - "alr_detector.h", - "goog_cc_factory.cc", - "goog_cc_network_control.cc", - "goog_cc_network_control.h", - "include/goog_cc_factory.h", - "probe_controller.cc", - "probe_controller.h", - ] - - # TODO(jschuh): Bug 1348: fix this warning. - configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] - - if (!build_with_chromium && is_clang) { - # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). - suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] - } - - deps = [ - ":delay_based_bwe", - ":estimators", - "../..:module_api", - "../../..:webrtc_common", - "../../../:typedefs", - "../../../api:optional", - "../../../logging:rtc_event_log_api", - "../../../logging:rtc_event_pacing", - "../../../rtc_base:checks", - "../../../rtc_base:rtc_base_approved", - "../../../rtc_base/experiments:alr_experiment", - "../../../system_wrappers", - "../../../system_wrappers:field_trial_api", - "../../../system_wrappers:metrics_api", - "../../bitrate_controller", - "../../pacing", - "../../remote_bitrate_estimator", - "../../rtp_rtcp:rtp_rtcp_format", - "../network_control", - ] -} - -rtc_source_set("estimators") { - configs += [ ":bwe_test_logging" ] - sources = [ - "acknowledged_bitrate_estimator.cc", - "acknowledged_bitrate_estimator.h", - "bitrate_estimator.cc", - "bitrate_estimator.h", - "delay_increase_detector_interface.h", - "median_slope_estimator.cc", - "median_slope_estimator.h", - "probe_bitrate_estimator.cc", - "probe_bitrate_estimator.h", - "trendline_estimator.cc", - "trendline_estimator.h", - ] - - # TODO(jschuh): Bug 1348: fix this warning. - configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] - - if (!build_with_chromium && is_clang) { - # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). - suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] - } - - deps = [ - "../../../api:optional", - "../../../logging:rtc_event_bwe", - "../../../logging:rtc_event_log_api", - "../../../rtc_base:checks", - "../../../rtc_base:rtc_base_approved", - "../../../rtc_base:rtc_numerics", - "../../../system_wrappers:field_trial_api", - "../../../system_wrappers:metrics_api", - "../../remote_bitrate_estimator", - "../../rtp_rtcp:rtp_rtcp_format", - ] -} - -rtc_source_set("delay_based_bwe") { - configs += [ ":bwe_test_logging" ] - sources = [ - "delay_based_bwe.cc", - "delay_based_bwe.h", - ] - deps = [ - ":estimators", - "../../../:typedefs", - "../../../logging:rtc_event_bwe", - "../../../logging:rtc_event_log_api", - "../../../rtc_base:checks", - "../../../rtc_base:rtc_base_approved", - "../../../system_wrappers:field_trial_api", - "../../../system_wrappers:metrics_api", - "../../pacing", - "../../remote_bitrate_estimator", - ] - - if (!build_with_chromium && is_clang) { - # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). - suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] - } -} - if (rtc_include_tests) { rtc_source_set("congestion_controller_unittests") { testonly = true @@ -197,7 +90,6 @@ if (rtc_include_tests) { ] deps = [ ":congestion_controller", - ":goog_cc_unittests", ":transport_feedback", "../:congestion_controller", "../:mock_congestion_controller", @@ -222,41 +114,4 @@ if (rtc_include_tests) { suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] } } - - rtc_source_set("goog_cc_unittests") { - testonly = true - - sources = [ - "acknowledged_bitrate_estimator_unittest.cc", - "alr_detector_unittest.cc", - "delay_based_bwe_unittest.cc", - "delay_based_bwe_unittest_helper.cc", - "delay_based_bwe_unittest_helper.h", - "median_slope_estimator_unittest.cc", - "probe_bitrate_estimator_unittest.cc", - "probe_controller_unittest.cc", - "trendline_estimator_unittest.cc", - ] - deps = [ - ":delay_based_bwe", - ":estimators", - ":goog_cc", - "../../../rtc_base:checks", - "../../../rtc_base:rtc_base_approved", - "../../../rtc_base:rtc_base_tests_utils", - "../../../rtc_base/experiments:alr_experiment", - "../../../system_wrappers", - "../../../test:field_trial", - "../../../test:test_support", - "../../pacing", - "../../remote_bitrate_estimator", - "../../rtp_rtcp:rtp_rtcp_format", - "../network_control", - "//testing/gmock", - ] - if (!build_with_chromium && is_clang) { - # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). - suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] - } - } } diff --git a/modules/congestion_controller/rtp/send_side_congestion_controller.cc b/modules/congestion_controller/rtp/send_side_congestion_controller.cc index 367f002147..925fe32706 100644 --- a/modules/congestion_controller/rtp/send_side_congestion_controller.cc +++ b/modules/congestion_controller/rtp/send_side_congestion_controller.cc @@ -14,9 +14,9 @@ #include #include #include +#include "modules/congestion_controller/goog_cc/include/goog_cc_factory.h" #include "modules/congestion_controller/network_control/include/network_types.h" #include "modules/congestion_controller/network_control/include/network_units.h" -#include "modules/congestion_controller/rtp/include/goog_cc_factory.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "rtc_base/checks.h" #include "rtc_base/format_macros.h"