From e6cefdf9c572cdce55ff0497ad6e516c76132ee8 Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Wed, 7 Feb 2018 10:00:51 +0100 Subject: [PATCH] Moved congestion controller to goog_cc folder. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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} --- modules/bitrate_controller/BUILD.gn | 2 +- .../include/bitrate_controller.h | 2 +- modules/congestion_controller/BUILD.gn | 153 +--------------- .../congestion_controller/goog_cc/BUILD.gn | 163 ++++++++++++++++++ .../acknowledged_bitrate_estimator.cc | 2 +- .../acknowledged_bitrate_estimator.h | 8 +- ...acknowledged_bitrate_estimator_unittest.cc | 2 +- .../{ => goog_cc}/alr_detector.cc | 2 +- .../{ => goog_cc}/alr_detector.h | 6 +- .../{ => goog_cc}/alr_detector_unittest.cc | 2 +- .../{ => goog_cc}/bitrate_estimator.cc | 2 +- .../{ => goog_cc}/bitrate_estimator.h | 6 +- .../{ => goog_cc}/delay_based_bwe.cc | 4 +- .../{ => goog_cc}/delay_based_bwe.h | 10 +- .../{ => goog_cc}/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 +- .../{ => goog_cc}/goog_cc_network_control.cc | 10 +- .../{ => goog_cc}/goog_cc_network_control.h | 14 +- .../{ => goog_cc}/include/goog_cc_factory.h | 6 +- .../{ => goog_cc}/median_slope_estimator.cc | 2 +- .../{ => goog_cc}/median_slope_estimator.h | 6 +- .../median_slope_estimator_unittest.cc | 2 +- .../{ => goog_cc}/probe_bitrate_estimator.cc | 2 +- .../{ => goog_cc}/probe_bitrate_estimator.h | 6 +- .../probe_bitrate_estimator_unittest.cc | 2 +- .../{ => goog_cc}/probe_controller.cc | 2 +- .../{ => goog_cc}/probe_controller.h | 6 +- .../probe_controller_unittest.cc | 2 +- .../{ => goog_cc}/trendline_estimator.cc | 2 +- .../{ => goog_cc}/trendline_estimator.h | 8 +- .../trendline_estimator_unittest.cc | 2 +- .../send_side_congestion_controller.cc | 2 +- modules/remote_bitrate_estimator/BUILD.gn | 4 +- .../test/estimators/send_side.cc | 2 +- .../test/estimators/send_side.h | 2 +- rtc_tools/BUILD.gn | 4 +- rtc_tools/event_log_visualizer/analyzer.cc | 6 +- 39 files changed, 250 insertions(+), 230 deletions(-) create mode 100644 modules/congestion_controller/goog_cc/BUILD.gn rename modules/congestion_controller/{ => goog_cc}/acknowledged_bitrate_estimator.cc (96%) rename modules/congestion_controller/{ => goog_cc}/acknowledged_bitrate_estimator.h (78%) rename modules/congestion_controller/{ => goog_cc}/acknowledged_bitrate_estimator_unittest.cc (98%) rename modules/congestion_controller/{ => goog_cc}/alr_detector.cc (98%) rename modules/congestion_controller/{ => goog_cc}/alr_detector.h (93%) rename modules/congestion_controller/{ => goog_cc}/alr_detector_unittest.cc (98%) rename modules/congestion_controller/{ => goog_cc}/bitrate_estimator.cc (98%) rename modules/congestion_controller/{ => goog_cc}/bitrate_estimator.h (86%) rename modules/congestion_controller/{ => goog_cc}/delay_based_bwe.cc (98%) rename modules/congestion_controller/{ => goog_cc}/delay_based_bwe.h (88%) rename modules/congestion_controller/{ => goog_cc}/delay_based_bwe_unittest.cc (98%) rename modules/congestion_controller/{ => goog_cc}/delay_based_bwe_unittest_helper.cc (99%) rename modules/congestion_controller/{ => goog_cc}/delay_based_bwe_unittest_helper.h (93%) rename modules/congestion_controller/{ => goog_cc}/delay_increase_detector_interface.h (81%) rename modules/congestion_controller/{ => goog_cc}/goog_cc_network_control.cc (97%) rename modules/congestion_controller/{ => goog_cc}/goog_cc_network_control.h (85%) rename modules/congestion_controller/{ => goog_cc}/include/goog_cc_factory.h (80%) rename modules/congestion_controller/{ => goog_cc}/median_slope_estimator.cc (97%) rename modules/congestion_controller/{ => goog_cc}/median_slope_estimator.h (91%) rename modules/congestion_controller/{ => goog_cc}/median_slope_estimator_unittest.cc (96%) rename modules/congestion_controller/{ => goog_cc}/probe_bitrate_estimator.cc (99%) rename modules/congestion_controller/{ => goog_cc}/probe_bitrate_estimator.h (87%) rename modules/congestion_controller/{ => goog_cc}/probe_bitrate_estimator_unittest.cc (99%) rename modules/congestion_controller/{ => goog_cc}/probe_controller.cc (99%) rename modules/congestion_controller/{ => goog_cc}/probe_controller.h (93%) rename modules/congestion_controller/{ => goog_cc}/probe_controller_unittest.cc (99%) rename modules/congestion_controller/{ => goog_cc}/trendline_estimator.cc (98%) rename modules/congestion_controller/{ => goog_cc}/trendline_estimator.h (91%) rename modules/congestion_controller/{ => goog_cc}/trendline_estimator_unittest.cc (97%) diff --git a/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn index 6c478561f4..b316e08667 100644 --- a/modules/bitrate_controller/BUILD.gn +++ b/modules/bitrate_controller/BUILD.gn @@ -41,7 +41,7 @@ rtc_static_library("bitrate_controller") { "../../system_wrappers", "../../system_wrappers:field_trial_api", "../../system_wrappers:metrics_api", - "../congestion_controller:delay_based_bwe", + "../congestion_controller/goog_cc:delay_based_bwe", "../pacing", "../remote_bitrate_estimator:remote_bitrate_estimator", "../rtp_rtcp", diff --git a/modules/bitrate_controller/include/bitrate_controller.h b/modules/bitrate_controller/include/bitrate_controller.h index 5aaf88b95d..0ab99135ec 100644 --- a/modules/bitrate_controller/include/bitrate_controller.h +++ b/modules/bitrate_controller/include/bitrate_controller.h @@ -17,7 +17,7 @@ #include -#include "modules/congestion_controller/delay_based_bwe.h" +#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/include/module.h" #include "modules/pacing/paced_sender.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn index eee190dde9..50af349bbd 100644 --- a/modules/congestion_controller/BUILD.gn +++ b/modules/congestion_controller/BUILD.gn @@ -37,7 +37,6 @@ rtc_static_library("congestion_controller") { } deps = [ - ":goog_cc", ":transport_feedback", "..:module_api", "../..:webrtc_common", @@ -53,7 +52,8 @@ rtc_static_library("congestion_controller") { "../pacing", "../remote_bitrate_estimator", "../rtp_rtcp:rtp_rtcp_format", - "./network_control", + "goog_cc", + "network_control", ] if (!build_with_mozilla) { @@ -79,112 +79,6 @@ rtc_static_library("transport_feedback") { ] } -rtc_static_library("goog_cc") { - configs += [ ":bwe_test_logging" ] - sources = [ - "alr_detector.cc", - "alr_detector.h", - "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 @@ -199,7 +93,6 @@ if (rtc_include_tests) { ] deps = [ ":congestion_controller", - ":goog_cc_unittests", ":mock_congestion_controller", ":transport_feedback", "../../logging:mocks", @@ -215,45 +108,9 @@ if (rtc_include_tests) { "../pacing:pacing", "../remote_bitrate_estimator: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" ] - } - } - - 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", - "./network_control:network_control_unittests", + "goog_cc:goog_cc_unittests", + "network_control", + "network_control:network_control_unittests", "//testing/gmock", ] if (!build_with_chromium && is_clang) { diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn new file mode 100644 index 0000000000..395a418857 --- /dev/null +++ b/modules/congestion_controller/goog_cc/BUILD.gn @@ -0,0 +1,163 @@ +# Copyright (c) 2017 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_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/acknowledged_bitrate_estimator.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc similarity index 96% rename from modules/congestion_controller/acknowledged_bitrate_estimator.cc rename to modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc index ec1a6f278e..49d1b3ac97 100644 --- a/modules/congestion_controller/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/acknowledged_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" #include diff --git a/modules/congestion_controller/acknowledged_bitrate_estimator.h b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h similarity index 78% rename from modules/congestion_controller/acknowledged_bitrate_estimator.h rename to modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h index c009e8682f..c545a4a16b 100644 --- a/modules/congestion_controller/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_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ -#define MODULES_CONGESTION_CONTROLLER_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/bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/bitrate_estimator.h" namespace webrtc { @@ -42,4 +42,4 @@ class AcknowledgedBitrateEstimator { } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/acknowledged_bitrate_estimator_unittest.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc similarity index 98% rename from modules/congestion_controller/acknowledged_bitrate_estimator_unittest.cc rename to modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc index d7bf736781..38f8df7b6e 100644 --- a/modules/congestion_controller/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/acknowledged_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" #include diff --git a/modules/congestion_controller/alr_detector.cc b/modules/congestion_controller/goog_cc/alr_detector.cc similarity index 98% rename from modules/congestion_controller/alr_detector.cc rename to modules/congestion_controller/goog_cc/alr_detector.cc index 249aa18b1b..bf0f156c74 100644 --- a/modules/congestion_controller/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/alr_detector.h" +#include "modules/congestion_controller/goog_cc/alr_detector.h" #include #include diff --git a/modules/congestion_controller/alr_detector.h b/modules/congestion_controller/goog_cc/alr_detector.h similarity index 93% rename from modules/congestion_controller/alr_detector.h rename to modules/congestion_controller/goog_cc/alr_detector.h index 5cb9043014..fc91a52ae4 100644 --- a/modules/congestion_controller/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_ALR_DETECTOR_H_ -#define MODULES_CONGESTION_CONTROLLER_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) @@ -71,4 +71,4 @@ class AlrDetector { } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_ALR_DETECTOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_ diff --git a/modules/congestion_controller/alr_detector_unittest.cc b/modules/congestion_controller/goog_cc/alr_detector_unittest.cc similarity index 98% rename from modules/congestion_controller/alr_detector_unittest.cc rename to modules/congestion_controller/goog_cc/alr_detector_unittest.cc index a7f55413fd..7e15ed4c76 100644 --- a/modules/congestion_controller/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/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/bitrate_estimator.cc b/modules/congestion_controller/goog_cc/bitrate_estimator.cc similarity index 98% rename from modules/congestion_controller/bitrate_estimator.cc rename to modules/congestion_controller/goog_cc/bitrate_estimator.cc index 76c132bbe9..5280b38685 100644 --- a/modules/congestion_controller/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/bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/bitrate_estimator.h" #include diff --git a/modules/congestion_controller/bitrate_estimator.h b/modules/congestion_controller/goog_cc/bitrate_estimator.h similarity index 86% rename from modules/congestion_controller/bitrate_estimator.h rename to modules/congestion_controller/goog_cc/bitrate_estimator.h index 2fa1515d19..f49ace4b7a 100644 --- a/modules/congestion_controller/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_BITRATE_ESTIMATOR_H_ -#define MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_ #include @@ -43,4 +43,4 @@ class BitrateEstimator { } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/delay_based_bwe.cc b/modules/congestion_controller/goog_cc/delay_based_bwe.cc similarity index 98% rename from modules/congestion_controller/delay_based_bwe.cc rename to modules/congestion_controller/goog_cc/delay_based_bwe.cc index b053ef42af..f90ce6c687 100644 --- a/modules/congestion_controller/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/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/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/delay_based_bwe.h b/modules/congestion_controller/goog_cc/delay_based_bwe.h similarity index 88% rename from modules/congestion_controller/delay_based_bwe.h rename to modules/congestion_controller/goog_cc/delay_based_bwe.h index 654fe54719..149e8e0cce 100644 --- a/modules/congestion_controller/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_DELAY_BASED_BWE_H_ -#define MODULES_CONGESTION_CONTROLLER_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/delay_increase_detector_interface.h" -#include "modules/congestion_controller/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" @@ -89,4 +89,4 @@ class DelayBasedBwe { } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_ diff --git a/modules/congestion_controller/delay_based_bwe_unittest.cc b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc similarity index 98% rename from modules/congestion_controller/delay_based_bwe_unittest.cc rename to modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc index d5fb8bfc3c..4cff542552 100644 --- a/modules/congestion_controller/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/delay_based_bwe.h" -#include "modules/congestion_controller/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/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/delay_based_bwe_unittest_helper.cc rename to modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc index 0b005b58e8..1bad5aa61f 100644 --- a/modules/congestion_controller/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/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/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/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/delay_based_bwe_unittest_helper.h rename to modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h index 23969a92ae..3699945ae3 100644 --- a/modules/congestion_controller/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_DELAY_BASED_BWE_UNITTEST_HELPER_H_ -#define MODULES_CONGESTION_CONTROLLER_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/acknowledged_bitrate_estimator.h" -#include "modules/congestion_controller/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" @@ -175,4 +175,4 @@ class DelayBasedBweTest : public ::testing::Test { }; } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_UNITTEST_HELPER_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_UNITTEST_HELPER_H_ diff --git a/modules/congestion_controller/delay_increase_detector_interface.h b/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h similarity index 81% rename from modules/congestion_controller/delay_increase_detector_interface.h rename to modules/congestion_controller/goog_cc/delay_increase_detector_interface.h index b04c8575d9..e109d8fbda 100644 --- a/modules/congestion_controller/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_DELAY_INCREASE_DETECTOR_INTERFACE_H_ -#define MODULES_CONGESTION_CONTROLLER_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 @@ -34,4 +34,4 @@ class DelayIncreaseDetectorInterface { }; } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_DELAY_INCREASE_DETECTOR_INTERFACE_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_INCREASE_DETECTOR_INTERFACE_H_ diff --git a/modules/congestion_controller/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc similarity index 97% rename from modules/congestion_controller/goog_cc_network_control.cc rename to modules/congestion_controller/goog_cc/goog_cc_network_control.cc index b6e473d68a..61344409d5 100644 --- a/modules/congestion_controller/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/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/acknowledged_bitrate_estimator.h" -#include "modules/congestion_controller/alr_detector.h" -#include "modules/congestion_controller/include/goog_cc_factory.h" -#include "modules/congestion_controller/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/goog_cc_network_control.h b/modules/congestion_controller/goog_cc/goog_cc_network_control.h similarity index 85% rename from modules/congestion_controller/goog_cc_network_control.h rename to modules/congestion_controller/goog_cc/goog_cc_network_control.h index 4360aac3e4..06dd1b57b0 100644 --- a/modules/congestion_controller/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_GOOG_CC_NETWORK_CONTROL_H_ -#define MODULES_CONGESTION_CONTROLLER_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/acknowledged_bitrate_estimator.h" -#include "modules/congestion_controller/alr_detector.h" -#include "modules/congestion_controller/delay_based_bwe.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/probe_controller.h" #include "rtc_base/constructormagic.h" namespace webrtc { @@ -89,4 +89,4 @@ class GoogCcNetworkController : public NetworkControllerInterface { } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_NETWORK_CONTROL_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_GOOG_CC_NETWORK_CONTROL_H_ diff --git a/modules/congestion_controller/include/goog_cc_factory.h b/modules/congestion_controller/goog_cc/include/goog_cc_factory.h similarity index 80% rename from modules/congestion_controller/include/goog_cc_factory.h rename to modules/congestion_controller/goog_cc/include/goog_cc_factory.h index 10dddd2715..20717f9f72 100644 --- a/modules/congestion_controller/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_INCLUDE_GOOG_CC_FACTORY_H_ -#define MODULES_CONGESTION_CONTROLLER_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_INCLUDE_GOOG_CC_FACTORY_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_ diff --git a/modules/congestion_controller/median_slope_estimator.cc b/modules/congestion_controller/goog_cc/median_slope_estimator.cc similarity index 97% rename from modules/congestion_controller/median_slope_estimator.cc rename to modules/congestion_controller/goog_cc/median_slope_estimator.cc index ea76239577..0ad7728302 100644 --- a/modules/congestion_controller/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/median_slope_estimator.h" +#include "modules/congestion_controller/goog_cc/median_slope_estimator.h" #include #include diff --git a/modules/congestion_controller/median_slope_estimator.h b/modules/congestion_controller/goog_cc/median_slope_estimator.h similarity index 91% rename from modules/congestion_controller/median_slope_estimator.h rename to modules/congestion_controller/goog_cc/median_slope_estimator.h index f837b24a21..68d18c31c2 100644 --- a/modules/congestion_controller/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_MEDIAN_SLOPE_ESTIMATOR_H_ -#define MODULES_CONGESTION_CONTROLLER_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 @@ -69,4 +69,4 @@ class MedianSlopeEstimator { }; } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_MEDIAN_SLOPE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_MEDIAN_SLOPE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/median_slope_estimator_unittest.cc b/modules/congestion_controller/goog_cc/median_slope_estimator_unittest.cc similarity index 96% rename from modules/congestion_controller/median_slope_estimator_unittest.cc rename to modules/congestion_controller/goog_cc/median_slope_estimator_unittest.cc index a5b90d8c35..3eb8c1fbf5 100644 --- a/modules/congestion_controller/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/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/probe_bitrate_estimator.cc b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc similarity index 99% rename from modules/congestion_controller/probe_bitrate_estimator.cc rename to modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc index 34f489178d..c92930669d 100644 --- a/modules/congestion_controller/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/probe_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h" #include diff --git a/modules/congestion_controller/probe_bitrate_estimator.h b/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h similarity index 87% rename from modules/congestion_controller/probe_bitrate_estimator.h rename to modules/congestion_controller/goog_cc/probe_bitrate_estimator.h index cb10a6fa31..55738d8851 100644 --- a/modules/congestion_controller/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_PROBE_BITRATE_ESTIMATOR_H_ -#define MODULES_CONGESTION_CONTROLLER_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 @@ -52,4 +52,4 @@ class ProbeBitrateEstimator { } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_PROBE_BITRATE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/probe_bitrate_estimator_unittest.cc b/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc similarity index 99% rename from modules/congestion_controller/probe_bitrate_estimator_unittest.cc rename to modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc index df4f24be90..f8a40f839f 100644 --- a/modules/congestion_controller/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/probe_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h" #include #include diff --git a/modules/congestion_controller/probe_controller.cc b/modules/congestion_controller/goog_cc/probe_controller.cc similarity index 99% rename from modules/congestion_controller/probe_controller.cc rename to modules/congestion_controller/goog_cc/probe_controller.cc index b0fca7b3c8..3c1c697407 100644 --- a/modules/congestion_controller/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/probe_controller.h" +#include "modules/congestion_controller/goog_cc/probe_controller.h" #include #include diff --git a/modules/congestion_controller/probe_controller.h b/modules/congestion_controller/goog_cc/probe_controller.h similarity index 93% rename from modules/congestion_controller/probe_controller.h rename to modules/congestion_controller/goog_cc/probe_controller.h index 187a274507..ac6bcab4cf 100644 --- a/modules/congestion_controller/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_PROBE_CONTROLLER_H_ -#define MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_ +#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_CONTROLLER_H_ +#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_CONTROLLER_H_ #include @@ -94,4 +94,4 @@ class ProbeController { } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_CONTROLLER_H_ diff --git a/modules/congestion_controller/probe_controller_unittest.cc b/modules/congestion_controller/goog_cc/probe_controller_unittest.cc similarity index 99% rename from modules/congestion_controller/probe_controller_unittest.cc rename to modules/congestion_controller/goog_cc/probe_controller_unittest.cc index ac889dcd7c..04c2fbd58c 100644 --- a/modules/congestion_controller/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/probe_controller.h" #include "rtc_base/logging.h" #include "system_wrappers/include/clock.h" #include "test/gmock.h" diff --git a/modules/congestion_controller/trendline_estimator.cc b/modules/congestion_controller/goog_cc/trendline_estimator.cc similarity index 98% rename from modules/congestion_controller/trendline_estimator.cc rename to modules/congestion_controller/goog_cc/trendline_estimator.cc index 9ebe17753b..d69ea3f573 100644 --- a/modules/congestion_controller/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/trendline_estimator.h" +#include "modules/congestion_controller/goog_cc/trendline_estimator.h" #include diff --git a/modules/congestion_controller/trendline_estimator.h b/modules/congestion_controller/goog_cc/trendline_estimator.h similarity index 91% rename from modules/congestion_controller/trendline_estimator.h rename to modules/congestion_controller/goog_cc/trendline_estimator.h index 9182647847..2841b49152 100644 --- a/modules/congestion_controller/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_TRENDLINE_ESTIMATOR_H_ -#define MODULES_CONGESTION_CONTROLLER_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/delay_increase_detector_interface.h" +#include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h" #include "rtc_base/constructormagic.h" namespace webrtc { @@ -89,4 +89,4 @@ class TrendlineEstimator : public DelayIncreaseDetectorInterface { }; } // namespace webrtc -#endif // MODULES_CONGESTION_CONTROLLER_TRENDLINE_ESTIMATOR_H_ +#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_TRENDLINE_ESTIMATOR_H_ diff --git a/modules/congestion_controller/trendline_estimator_unittest.cc b/modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc similarity index 97% rename from modules/congestion_controller/trendline_estimator_unittest.cc rename to modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc index e44f5032b0..aa150154b7 100644 --- a/modules/congestion_controller/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/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/send_side_congestion_controller.cc b/modules/congestion_controller/send_side_congestion_controller.cc index fa81f24762..b1ad0b65d9 100644 --- a/modules/congestion_controller/send_side_congestion_controller.cc +++ b/modules/congestion_controller/send_side_congestion_controller.cc @@ -14,7 +14,7 @@ #include #include #include -#include "modules/congestion_controller/include/goog_cc_factory.h" +#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/remote_bitrate_estimator/include/bwe_defines.h" diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn index ddd77d1d8c..ea831ac9ce 100644 --- a/modules/remote_bitrate_estimator/BUILD.gn +++ b/modules/remote_bitrate_estimator/BUILD.gn @@ -149,9 +149,9 @@ if (rtc_include_tests) { "../../test:test_support", "../bitrate_controller", "../congestion_controller", - "../congestion_controller:delay_based_bwe", - "../congestion_controller:estimators", "../congestion_controller:transport_feedback", + "../congestion_controller/goog_cc:delay_based_bwe", + "../congestion_controller/goog_cc:estimators", "../pacing", "../rtp_rtcp", "../rtp_rtcp:rtp_rtcp_format", diff --git a/modules/remote_bitrate_estimator/test/estimators/send_side.cc b/modules/remote_bitrate_estimator/test/estimators/send_side.cc index 123def92ce..cd8f781985 100644 --- a/modules/remote_bitrate_estimator/test/estimators/send_side.cc +++ b/modules/remote_bitrate_estimator/test/estimators/send_side.cc @@ -12,7 +12,7 @@ #include -#include "modules/congestion_controller/delay_based_bwe.h" +#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "rtc_base/logging.h" #include "rtc_base/ptr_util.h" diff --git a/modules/remote_bitrate_estimator/test/estimators/send_side.h b/modules/remote_bitrate_estimator/test/estimators/send_side.h index 1fa07200e6..fab17589bb 100644 --- a/modules/remote_bitrate_estimator/test/estimators/send_side.h +++ b/modules/remote_bitrate_estimator/test/estimators/send_side.h @@ -15,7 +15,7 @@ #include #include "logging/rtc_event_log/mock/mock_rtc_event_log.h" -#include "modules/congestion_controller/acknowledged_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" #include "modules/congestion_controller/send_time_history.h" #include "modules/remote_bitrate_estimator/test/bwe.h" diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn index 32a594b3dc..613fd9cf95 100644 --- a/rtc_tools/BUILD.gn +++ b/rtc_tools/BUILD.gn @@ -239,8 +239,8 @@ if (!build_with_chromium) { # TODO(kwiberg): Remove this dependency. "../api/audio_codecs:audio_codecs_api", "../modules/congestion_controller", - "../modules/congestion_controller:delay_based_bwe", - "../modules/congestion_controller:estimators", + "../modules/congestion_controller/goog_cc:delay_based_bwe", + "../modules/congestion_controller/goog_cc:estimators", "../modules/pacing", "../modules/rtp_rtcp", "../system_wrappers:system_wrappers_default", diff --git a/rtc_tools/event_log_visualizer/analyzer.cc b/rtc_tools/event_log_visualizer/analyzer.cc index 0310cd2769..4d1e77dbb7 100644 --- a/rtc_tools/event_log_visualizer/analyzer.cc +++ b/rtc_tools/event_log_visualizer/analyzer.cc @@ -31,9 +31,9 @@ #include "modules/audio_coding/neteq/tools/neteq_replacement_input.h" #include "modules/audio_coding/neteq/tools/neteq_test.h" #include "modules/audio_coding/neteq/tools/resample_input_audio_file.h" -#include "modules/congestion_controller/acknowledged_bitrate_estimator.h" -#include "modules/congestion_controller/bitrate_estimator.h" -#include "modules/congestion_controller/delay_based_bwe.h" +#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/bitrate_estimator.h" +#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/congestion_controller/include/receive_side_congestion_controller.h" #include "modules/congestion_controller/include/send_side_congestion_controller.h" #include "modules/include/module_common_types.h"