Revert "Moved congestion controller to goog_cc folder."
This reverts commit e6cefdf9c572cdce55ff0497ad6e516c76132ee8.
Reason for revert: conflicts with reverting https://webrtc-review.googlesource.com/c/src/+/52980
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 <srte@webrtc.org>
> Reviewed-by: Björn Terelius <terelius@webrtc.org>
> Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#21928}
TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: webrtc:8415
Change-Id: If8965e1e745e57694192b9ca2a69503c722658d9
Reviewed-on: https://webrtc-review.googlesource.com/53020
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22012}diff --git a/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn
index b316e08..6c47856 100644
--- a/modules/bitrate_controller/BUILD.gn
+++ b/modules/bitrate_controller/BUILD.gn
@@ -41,7 +41,7 @@
"../../system_wrappers",
"../../system_wrappers:field_trial_api",
"../../system_wrappers:metrics_api",
- "../congestion_controller/goog_cc:delay_based_bwe",
+ "../congestion_controller: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 0ab9913..5aaf88b 100644
--- a/modules/bitrate_controller/include/bitrate_controller.h
+++ b/modules/bitrate_controller/include/bitrate_controller.h
@@ -17,7 +17,7 @@
#include <map>
-#include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
+#include "modules/congestion_controller/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 50af349..eee190d 100644
--- a/modules/congestion_controller/BUILD.gn
+++ b/modules/congestion_controller/BUILD.gn
@@ -37,6 +37,7 @@
}
deps = [
+ ":goog_cc",
":transport_feedback",
"..:module_api",
"../..:webrtc_common",
@@ -52,8 +53,7 @@
"../pacing",
"../remote_bitrate_estimator",
"../rtp_rtcp:rtp_rtcp_format",
- "goog_cc",
- "network_control",
+ "./network_control",
]
if (!build_with_mozilla) {
@@ -79,6 +79,112 @@
]
}
+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
@@ -93,6 +199,7 @@
]
deps = [
":congestion_controller",
+ ":goog_cc_unittests",
":mock_congestion_controller",
":transport_feedback",
"../../logging:mocks",
@@ -108,9 +215,45 @@
"../pacing:pacing",
"../remote_bitrate_estimator:remote_bitrate_estimator",
"../rtp_rtcp:rtp_rtcp_format",
- "goog_cc:goog_cc_unittests",
- "network_control",
- "network_control:network_control_unittests",
+ "./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",
"//testing/gmock",
]
if (!build_with_chromium && is_clang) {
diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc b/modules/congestion_controller/acknowledged_bitrate_estimator.cc
similarity index 96%
rename from modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc
rename to modules/congestion_controller/acknowledged_bitrate_estimator.cc
index 49d1b3a..ec1a6f2 100644
--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc
+++ b/modules/congestion_controller/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/goog_cc/acknowledged_bitrate_estimator.h"
+#include "modules/congestion_controller/acknowledged_bitrate_estimator.h"
#include <utility>
diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h b/modules/congestion_controller/acknowledged_bitrate_estimator.h
similarity index 78%
rename from modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h
rename to modules/congestion_controller/acknowledged_bitrate_estimator.h
index c545a4a..c009e86 100644
--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h
+++ b/modules/congestion_controller/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_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_
-#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_
+#ifndef MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_
+#define MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_
#include <memory>
#include <vector>
#include "api/optional.h"
-#include "modules/congestion_controller/goog_cc/bitrate_estimator.h"
+#include "modules/congestion_controller/bitrate_estimator.h"
namespace webrtc {
@@ -42,4 +42,4 @@
} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_
+#endif // MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_
diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc b/modules/congestion_controller/acknowledged_bitrate_estimator_unittest.cc
similarity index 98%
rename from modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
rename to modules/congestion_controller/acknowledged_bitrate_estimator_unittest.cc
index 38f8df7..d7bf736 100644
--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
+++ b/modules/congestion_controller/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/goog_cc/acknowledged_bitrate_estimator.h"
+#include "modules/congestion_controller/acknowledged_bitrate_estimator.h"
#include <utility>
diff --git a/modules/congestion_controller/goog_cc/alr_detector.cc b/modules/congestion_controller/alr_detector.cc
similarity index 97%
rename from modules/congestion_controller/goog_cc/alr_detector.cc
rename to modules/congestion_controller/alr_detector.cc
index bf0f156..249aa18 100644
--- a/modules/congestion_controller/goog_cc/alr_detector.cc
+++ b/modules/congestion_controller/alr_detector.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "modules/congestion_controller/goog_cc/alr_detector.h"
+#include "modules/congestion_controller/alr_detector.h"
#include <algorithm>
#include <cstdio>
diff --git a/modules/congestion_controller/goog_cc/alr_detector.h b/modules/congestion_controller/alr_detector.h
similarity index 92%
rename from modules/congestion_controller/goog_cc/alr_detector.h
rename to modules/congestion_controller/alr_detector.h
index fc91a52..5cb9043 100644
--- a/modules/congestion_controller/goog_cc/alr_detector.h
+++ b/modules/congestion_controller/alr_detector.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_
-#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_
+#ifndef MODULES_CONGESTION_CONTROLLER_ALR_DETECTOR_H_
+#define MODULES_CONGESTION_CONTROLLER_ALR_DETECTOR_H_
#include "api/optional.h"
#include "common_types.h" // NOLINT(build/include)
@@ -71,4 +71,4 @@
} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_
+#endif // MODULES_CONGESTION_CONTROLLER_ALR_DETECTOR_H_
diff --git a/modules/congestion_controller/goog_cc/alr_detector_unittest.cc b/modules/congestion_controller/alr_detector_unittest.cc
similarity index 98%
rename from modules/congestion_controller/goog_cc/alr_detector_unittest.cc
rename to modules/congestion_controller/alr_detector_unittest.cc
index 7e15ed4..a7f5541 100644
--- a/modules/congestion_controller/goog_cc/alr_detector_unittest.cc
+++ b/modules/congestion_controller/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/goog_cc/alr_detector.h"
+#include "modules/congestion_controller/alr_detector.h"
#include "rtc_base/experiments/alr_experiment.h"
#include "test/field_trial.h"
diff --git a/modules/congestion_controller/goog_cc/bitrate_estimator.cc b/modules/congestion_controller/bitrate_estimator.cc
similarity index 97%
rename from modules/congestion_controller/goog_cc/bitrate_estimator.cc
rename to modules/congestion_controller/bitrate_estimator.cc
index 5280b38..76c132b 100644
--- a/modules/congestion_controller/goog_cc/bitrate_estimator.cc
+++ b/modules/congestion_controller/bitrate_estimator.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "modules/congestion_controller/goog_cc/bitrate_estimator.h"
+#include "modules/congestion_controller/bitrate_estimator.h"
#include <cmath>
diff --git a/modules/congestion_controller/goog_cc/bitrate_estimator.h b/modules/congestion_controller/bitrate_estimator.h
similarity index 86%
rename from modules/congestion_controller/goog_cc/bitrate_estimator.h
rename to modules/congestion_controller/bitrate_estimator.h
index f49ace4..2fa1515 100644
--- a/modules/congestion_controller/goog_cc/bitrate_estimator.h
+++ b/modules/congestion_controller/bitrate_estimator.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_
-#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_
+#ifndef MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_
+#define MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_
#include <vector>
@@ -43,4 +43,4 @@
} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_
+#endif // MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_
diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.cc b/modules/congestion_controller/delay_based_bwe.cc
similarity index 98%
rename from modules/congestion_controller/goog_cc/delay_based_bwe.cc
rename to modules/congestion_controller/delay_based_bwe.cc
index f90ce6c..b053ef4 100644
--- a/modules/congestion_controller/goog_cc/delay_based_bwe.cc
+++ b/modules/congestion_controller/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/goog_cc/delay_based_bwe.h"
+#include "modules/congestion_controller/delay_based_bwe.h"
#include <algorithm>
#include <cmath>
@@ -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/goog_cc/trendline_estimator.h"
+#include "modules/congestion_controller/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/goog_cc/delay_based_bwe.h b/modules/congestion_controller/delay_based_bwe.h
similarity index 88%
rename from modules/congestion_controller/goog_cc/delay_based_bwe.h
rename to modules/congestion_controller/delay_based_bwe.h
index 149e8e0..654fe54 100644
--- a/modules/congestion_controller/goog_cc/delay_based_bwe.h
+++ b/modules/congestion_controller/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_GOOG_CC_DELAY_BASED_BWE_H_
-#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_
+#ifndef MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_
+#define MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_
#include <memory>
#include <utility>
#include <vector>
-#include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h"
-#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h"
+#include "modules/congestion_controller/delay_increase_detector_interface.h"
+#include "modules/congestion_controller/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 @@
} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_
+#endif // MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_
diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc b/modules/congestion_controller/delay_based_bwe_unittest.cc
similarity index 98%
rename from modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc
rename to modules/congestion_controller/delay_based_bwe_unittest.cc
index 4cff542..d5fb8bf 100644
--- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc
+++ b/modules/congestion_controller/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/goog_cc/delay_based_bwe.h"
-#include "modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h"
+#include "modules/congestion_controller/delay_based_bwe.h"
+#include "modules/congestion_controller/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/goog_cc/delay_based_bwe_unittest_helper.cc b/modules/congestion_controller/delay_based_bwe_unittest_helper.cc
similarity index 98%
rename from modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc
rename to modules/congestion_controller/delay_based_bwe_unittest_helper.cc
index 1bad5aa..0b005b5 100644
--- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc
+++ b/modules/congestion_controller/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/goog_cc/delay_based_bwe_unittest_helper.h"
+#include "modules/congestion_controller/delay_based_bwe_unittest_helper.h"
#include <algorithm>
#include <limits>
#include <utility>
-#include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
+#include "modules/congestion_controller/delay_based_bwe.h"
#include "rtc_base/checks.h"
#include "rtc_base/ptr_util.h"
diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h b/modules/congestion_controller/delay_based_bwe_unittest_helper.h
similarity index 93%
rename from modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h
rename to modules/congestion_controller/delay_based_bwe_unittest_helper.h
index 3699945..23969a9 100644
--- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h
+++ b/modules/congestion_controller/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_GOOG_CC_DELAY_BASED_BWE_UNITTEST_HELPER_H_
-#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_UNITTEST_HELPER_H_
+#ifndef MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_UNITTEST_HELPER_H_
+#define MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_UNITTEST_HELPER_H_
#include <list>
#include <map>
@@ -17,8 +17,8 @@
#include <utility>
#include <vector>
-#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h"
-#include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
+#include "modules/congestion_controller/acknowledged_bitrate_estimator.h"
+#include "modules/congestion_controller/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 @@
};
} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_UNITTEST_HELPER_H_
+#endif // MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_UNITTEST_HELPER_H_
diff --git a/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h b/modules/congestion_controller/delay_increase_detector_interface.h
similarity index 81%
rename from modules/congestion_controller/goog_cc/delay_increase_detector_interface.h
rename to modules/congestion_controller/delay_increase_detector_interface.h
index e109d8f..b04c857 100644
--- a/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h
+++ b/modules/congestion_controller/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_GOOG_CC_DELAY_INCREASE_DETECTOR_INTERFACE_H_
-#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_INCREASE_DETECTOR_INTERFACE_H_
+#ifndef MODULES_CONGESTION_CONTROLLER_DELAY_INCREASE_DETECTOR_INTERFACE_H_
+#define MODULES_CONGESTION_CONTROLLER_DELAY_INCREASE_DETECTOR_INTERFACE_H_
#include <stdint.h>
@@ -34,4 +34,4 @@
};
} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_INCREASE_DETECTOR_INTERFACE_H_
+#endif // MODULES_CONGESTION_CONTROLLER_DELAY_INCREASE_DETECTOR_INTERFACE_H_
diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn
deleted file mode 100644
index 395a418..0000000
--- a/modules/congestion_controller/goog_cc/BUILD.gn
+++ /dev/null
@@ -1,163 +0,0 @@
-# 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/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc_network_control.cc
similarity index 97%
rename from modules/congestion_controller/goog_cc/goog_cc_network_control.cc
rename to modules/congestion_controller/goog_cc_network_control.cc
index 6134440..b6e473d 100644
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc
+++ b/modules/congestion_controller/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/goog_cc_network_control.h"
+#include "modules/congestion_controller/goog_cc_network_control.h"
#include <algorithm>
#include <functional>
@@ -18,10 +18,10 @@
#include <utility>
#include <vector>
-#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/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/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/goog_cc_network_control.h b/modules/congestion_controller/goog_cc_network_control.h
similarity index 85%
rename from modules/congestion_controller/goog_cc/goog_cc_network_control.h
rename to modules/congestion_controller/goog_cc_network_control.h
index 06dd1b5..4360aac 100644
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control.h
+++ b/modules/congestion_controller/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_GOOG_CC_NETWORK_CONTROL_H_
-#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_GOOG_CC_NETWORK_CONTROL_H_
+#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_NETWORK_CONTROL_H_
+#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_NETWORK_CONTROL_H_
#include <stdint.h>
#include <deque>
@@ -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/acknowledged_bitrate_estimator.h"
+#include "modules/congestion_controller/alr_detector.h"
+#include "modules/congestion_controller/delay_based_bwe.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 @@
} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_GOOG_CC_NETWORK_CONTROL_H_
+#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_NETWORK_CONTROL_H_
diff --git a/modules/congestion_controller/goog_cc/include/goog_cc_factory.h b/modules/congestion_controller/include/goog_cc_factory.h
similarity index 80%
rename from modules/congestion_controller/goog_cc/include/goog_cc_factory.h
rename to modules/congestion_controller/include/goog_cc_factory.h
index 20717f9..10dddd2 100644
--- a/modules/congestion_controller/goog_cc/include/goog_cc_factory.h
+++ b/modules/congestion_controller/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_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_
-#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_
+#ifndef MODULES_CONGESTION_CONTROLLER_INCLUDE_GOOG_CC_FACTORY_H_
+#define MODULES_CONGESTION_CONTROLLER_INCLUDE_GOOG_CC_FACTORY_H_
#include "modules/congestion_controller/network_control/include/network_control.h"
namespace webrtc {
@@ -29,4 +29,4 @@
};
} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_
+#endif // MODULES_CONGESTION_CONTROLLER_INCLUDE_GOOG_CC_FACTORY_H_
diff --git a/modules/congestion_controller/goog_cc/median_slope_estimator.cc b/modules/congestion_controller/median_slope_estimator.cc
similarity index 97%
rename from modules/congestion_controller/goog_cc/median_slope_estimator.cc
rename to modules/congestion_controller/median_slope_estimator.cc
index 0ad7728..ea76239 100644
--- a/modules/congestion_controller/goog_cc/median_slope_estimator.cc
+++ b/modules/congestion_controller/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/goog_cc/median_slope_estimator.h"
+#include "modules/congestion_controller/median_slope_estimator.h"
#include <algorithm>
#include <vector>
diff --git a/modules/congestion_controller/goog_cc/median_slope_estimator.h b/modules/congestion_controller/median_slope_estimator.h
similarity index 91%
rename from modules/congestion_controller/goog_cc/median_slope_estimator.h
rename to modules/congestion_controller/median_slope_estimator.h
index 68d18c3..f837b24 100644
--- a/modules/congestion_controller/goog_cc/median_slope_estimator.h
+++ b/modules/congestion_controller/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_GOOG_CC_MEDIAN_SLOPE_ESTIMATOR_H_
-#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_MEDIAN_SLOPE_ESTIMATOR_H_
+#ifndef MODULES_CONGESTION_CONTROLLER_MEDIAN_SLOPE_ESTIMATOR_H_
+#define MODULES_CONGESTION_CONTROLLER_MEDIAN_SLOPE_ESTIMATOR_H_
#include <stddef.h>
#include <stdint.h>
@@ -69,4 +69,4 @@
};
} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_MEDIAN_SLOPE_ESTIMATOR_H_
+#endif // MODULES_CONGESTION_CONTROLLER_MEDIAN_SLOPE_ESTIMATOR_H_
diff --git a/modules/congestion_controller/goog_cc/median_slope_estimator_unittest.cc b/modules/congestion_controller/median_slope_estimator_unittest.cc
similarity index 96%
rename from modules/congestion_controller/goog_cc/median_slope_estimator_unittest.cc
rename to modules/congestion_controller/median_slope_estimator_unittest.cc
index 3eb8c1f..a5b90d8 100644
--- a/modules/congestion_controller/goog_cc/median_slope_estimator_unittest.cc
+++ b/modules/congestion_controller/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/goog_cc/median_slope_estimator.h"
+#include "modules/congestion_controller/median_slope_estimator.h"
#include "rtc_base/random.h"
#include "test/gtest.h"
diff --git a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc b/modules/congestion_controller/probe_bitrate_estimator.cc
similarity index 98%
rename from modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
rename to modules/congestion_controller/probe_bitrate_estimator.cc
index c929306..34f4891 100644
--- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc
+++ b/modules/congestion_controller/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/goog_cc/probe_bitrate_estimator.h"
+#include "modules/congestion_controller/probe_bitrate_estimator.h"
#include <algorithm>
diff --git a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h b/modules/congestion_controller/probe_bitrate_estimator.h
similarity index 87%
rename from modules/congestion_controller/goog_cc/probe_bitrate_estimator.h
rename to modules/congestion_controller/probe_bitrate_estimator.h
index 55738d8..cb10a6f 100644
--- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator.h
+++ b/modules/congestion_controller/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_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_
-#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_
+#ifndef MODULES_CONGESTION_CONTROLLER_PROBE_BITRATE_ESTIMATOR_H_
+#define MODULES_CONGESTION_CONTROLLER_PROBE_BITRATE_ESTIMATOR_H_
#include <limits>
#include <map>
@@ -52,4 +52,4 @@
} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_
+#endif // MODULES_CONGESTION_CONTROLLER_PROBE_BITRATE_ESTIMATOR_H_
diff --git a/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc b/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
similarity index 98%
rename from modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc
rename to modules/congestion_controller/probe_bitrate_estimator_unittest.cc
index f8a40f8..df4f24b 100644
--- a/modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc
+++ b/modules/congestion_controller/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/goog_cc/probe_bitrate_estimator.h"
+#include "modules/congestion_controller/probe_bitrate_estimator.h"
#include <utility>
#include <vector>
diff --git a/modules/congestion_controller/goog_cc/probe_controller.cc b/modules/congestion_controller/probe_controller.cc
similarity index 99%
rename from modules/congestion_controller/goog_cc/probe_controller.cc
rename to modules/congestion_controller/probe_controller.cc
index 3c1c697..b0fca7b 100644
--- a/modules/congestion_controller/goog_cc/probe_controller.cc
+++ b/modules/congestion_controller/probe_controller.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "modules/congestion_controller/goog_cc/probe_controller.h"
+#include "modules/congestion_controller/probe_controller.h"
#include <algorithm>
#include <initializer_list>
diff --git a/modules/congestion_controller/goog_cc/probe_controller.h b/modules/congestion_controller/probe_controller.h
similarity index 93%
rename from modules/congestion_controller/goog_cc/probe_controller.h
rename to modules/congestion_controller/probe_controller.h
index ac6bcab..187a274 100644
--- a/modules/congestion_controller/goog_cc/probe_controller.h
+++ b/modules/congestion_controller/probe_controller.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_CONTROLLER_H_
-#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_CONTROLLER_H_
+#ifndef MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_
+#define MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_
#include <stdint.h>
@@ -94,4 +94,4 @@
} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_CONTROLLER_H_
+#endif // MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_
diff --git a/modules/congestion_controller/goog_cc/probe_controller_unittest.cc b/modules/congestion_controller/probe_controller_unittest.cc
similarity index 99%
rename from modules/congestion_controller/goog_cc/probe_controller_unittest.cc
rename to modules/congestion_controller/probe_controller_unittest.cc
index 04c2fbd..ac889dc 100644
--- a/modules/congestion_controller/goog_cc/probe_controller_unittest.cc
+++ b/modules/congestion_controller/probe_controller_unittest.cc
@@ -9,8 +9,8 @@
*/
#include <memory>
-#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/send_side_congestion_controller.cc b/modules/congestion_controller/send_side_congestion_controller.cc
index b1ad0b6..fa81f24 100644
--- a/modules/congestion_controller/send_side_congestion_controller.cc
+++ b/modules/congestion_controller/send_side_congestion_controller.cc
@@ -14,7 +14,7 @@
#include <functional>
#include <memory>
#include <vector>
-#include "modules/congestion_controller/goog_cc/include/goog_cc_factory.h"
+#include "modules/congestion_controller/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/congestion_controller/goog_cc/trendline_estimator.cc b/modules/congestion_controller/trendline_estimator.cc
similarity index 98%
rename from modules/congestion_controller/goog_cc/trendline_estimator.cc
rename to modules/congestion_controller/trendline_estimator.cc
index d69ea3f..9ebe177 100644
--- a/modules/congestion_controller/goog_cc/trendline_estimator.cc
+++ b/modules/congestion_controller/trendline_estimator.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "modules/congestion_controller/goog_cc/trendline_estimator.h"
+#include "modules/congestion_controller/trendline_estimator.h"
#include <math.h>
diff --git a/modules/congestion_controller/goog_cc/trendline_estimator.h b/modules/congestion_controller/trendline_estimator.h
similarity index 90%
rename from modules/congestion_controller/goog_cc/trendline_estimator.h
rename to modules/congestion_controller/trendline_estimator.h
index 2841b49..9182647 100644
--- a/modules/congestion_controller/goog_cc/trendline_estimator.h
+++ b/modules/congestion_controller/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_GOOG_CC_TRENDLINE_ESTIMATOR_H_
-#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_TRENDLINE_ESTIMATOR_H_
+#ifndef MODULES_CONGESTION_CONTROLLER_TRENDLINE_ESTIMATOR_H_
+#define MODULES_CONGESTION_CONTROLLER_TRENDLINE_ESTIMATOR_H_
#include <stddef.h>
#include <stdint.h>
@@ -16,7 +16,7 @@
#include <deque>
#include <utility>
-#include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h"
+#include "modules/congestion_controller/delay_increase_detector_interface.h"
#include "rtc_base/constructormagic.h"
namespace webrtc {
@@ -89,4 +89,4 @@
};
} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_TRENDLINE_ESTIMATOR_H_
+#endif // MODULES_CONGESTION_CONTROLLER_TRENDLINE_ESTIMATOR_H_
diff --git a/modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc b/modules/congestion_controller/trendline_estimator_unittest.cc
similarity index 96%
rename from modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc
rename to modules/congestion_controller/trendline_estimator_unittest.cc
index aa15015..e44f503 100644
--- a/modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc
+++ b/modules/congestion_controller/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/goog_cc/trendline_estimator.h"
+#include "modules/congestion_controller/trendline_estimator.h"
#include "rtc_base/random.h"
#include "test/gtest.h"
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index ea831ac..ddd77d1 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -149,9 +149,9 @@
"../../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 cd8f781..123def9 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 <algorithm>
-#include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
+#include "modules/congestion_controller/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 fab1758..1fa0720 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 <vector>
#include "logging/rtc_event_log/mock/mock_rtc_event_log.h"
-#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h"
+#include "modules/congestion_controller/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 613fd9c..32a594b 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -239,8 +239,8 @@
# TODO(kwiberg): Remove this dependency.
"../api/audio_codecs:audio_codecs_api",
"../modules/congestion_controller",
- "../modules/congestion_controller/goog_cc:delay_based_bwe",
- "../modules/congestion_controller/goog_cc:estimators",
+ "../modules/congestion_controller:delay_based_bwe",
+ "../modules/congestion_controller: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 4d1e77d..0310cd2 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/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/acknowledged_bitrate_estimator.h"
+#include "modules/congestion_controller/bitrate_estimator.h"
+#include "modules/congestion_controller/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"
