zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Moved congestion controller to goog_cc folder."

Browse Source 
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}
This commit is contained in:
Danil Chapovalov
2018-02-14 09:08:28 +00:00
committed by Commit Bot
parent 4feb2044db
commit bda5068fae
39 changed files with 230 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/bitrate_controller/BUILD.gn
View File

@ -41,7 +41,7 @@ rtc_static_library("bitrate_controller") {
"../../system_wrappers", "../../system_wrappers",
"../../system_wrappers:field_trial_api", "../../system_wrappers:field_trial_api",
"../../system_wrappers:metrics_api", "../../system_wrappers:metrics_api",
"../congestion_controller/goog_cc:delay_based_bwe", "../congestion_controller:delay_based_bwe",
"../pacing", "../pacing",
"../remote_bitrate_estimator:remote_bitrate_estimator", "../remote_bitrate_estimator:remote_bitrate_estimator",
"../rtp_rtcp", "../rtp_rtcp",

2
modules/bitrate_controller/include/bitrate_controller.h
View File

@ -17,7 +17,7 @@
#include <map> #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/include/module.h"
#include "modules/pacing/paced_sender.h" #include "modules/pacing/paced_sender.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"

153
modules/congestion_controller/BUILD.gn
View File

@ -37,6 +37,7 @@ rtc_static_library("congestion_controller") {
} }
deps = [ deps = [
":goog_cc",
":transport_feedback", ":transport_feedback",
"..:module_api", "..:module_api",
"../..:webrtc_common", "../..:webrtc_common",
@ -52,8 +53,7 @@ rtc_static_library("congestion_controller") {
"../pacing", "../pacing",
"../remote_bitrate_estimator", "../remote_bitrate_estimator",
"../rtp_rtcp:rtp_rtcp_format", "../rtp_rtcp:rtp_rtcp_format",
"goog_cc", "./network_control",
"network_control",
] ]
if (!build_with_mozilla) { if (!build_with_mozilla) {
@ -79,6 +79,112 @@ 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) { if (rtc_include_tests) {
rtc_source_set("congestion_controller_unittests") { rtc_source_set("congestion_controller_unittests") {
testonly = true testonly = true
@ -93,6 +199,7 @@ if (rtc_include_tests) {
] ]
deps = [ deps = [
":congestion_controller", ":congestion_controller",
":goog_cc_unittests",
":mock_congestion_controller", ":mock_congestion_controller",
":transport_feedback", ":transport_feedback",
"../../logging:mocks", "../../logging:mocks",
@ -108,9 +215,45 @@ if (rtc_include_tests) {
"../pacing:pacing", "../pacing:pacing",
"../remote_bitrate_estimator:remote_bitrate_estimator", "../remote_bitrate_estimator:remote_bitrate_estimator",
"../rtp_rtcp:rtp_rtcp_format", "../rtp_rtcp:rtp_rtcp_format",
"goog_cc:goog_cc_unittests", "./network_control",
"network_control", "//testing/gmock",
"network_control:network_control_unittests", ]
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", "//testing/gmock",
] ]
if (!build_with_chromium && is_clang) { if (!build_with_chromium && is_clang) {

2
modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.cc → modules/congestion_controller/acknowledged_bitrate_estimator.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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> #include <utility>

8
modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h → modules/congestion_controller/acknowledged_bitrate_estimator.h
View File

@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ #ifndef MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_
#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ #define MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_
#include <memory> #include <memory>
#include <vector> #include <vector>
#include "api/optional.h" #include "api/optional.h"
#include "modules/congestion_controller/goog_cc/bitrate_estimator.h" #include "modules/congestion_controller/bitrate_estimator.h"
namespace webrtc { namespace webrtc {
@ -42,4 +42,4 @@ class AcknowledgedBitrateEstimator {
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_ #endif // MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGED_BITRATE_ESTIMATOR_H_

2
modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc → modules/congestion_controller/acknowledged_bitrate_estimator_unittest.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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> #include <utility>

2
modules/congestion_controller/goog_cc/alr_detector.cc → modules/congestion_controller/alr_detector.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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 <algorithm>
#include <cstdio> #include <cstdio>

6
modules/congestion_controller/goog_cc/alr_detector.h → modules/congestion_controller/alr_detector.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_ #ifndef MODULES_CONGESTION_CONTROLLER_ALR_DETECTOR_H_
#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_ #define MODULES_CONGESTION_CONTROLLER_ALR_DETECTOR_H_
#include "api/optional.h" #include "api/optional.h"
#include "common_types.h" // NOLINT(build/include) #include "common_types.h" // NOLINT(build/include)
@ -71,4 +71,4 @@ class AlrDetector {
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_ALR_DETECTOR_H_ #endif // MODULES_CONGESTION_CONTROLLER_ALR_DETECTOR_H_

2
modules/congestion_controller/goog_cc/alr_detector_unittest.cc → modules/congestion_controller/alr_detector_unittest.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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 "rtc_base/experiments/alr_experiment.h"
#include "test/field_trial.h" #include "test/field_trial.h"

2
modules/congestion_controller/goog_cc/bitrate_estimator.cc → modules/congestion_controller/bitrate_estimator.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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> #include <cmath>

6
modules/congestion_controller/goog_cc/bitrate_estimator.h → modules/congestion_controller/bitrate_estimator.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_ #ifndef MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_
#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_ #define MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_
#include <vector> #include <vector>
@ -43,4 +43,4 @@ class BitrateEstimator {
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_BITRATE_ESTIMATOR_H_ #endif // MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_

4
modules/congestion_controller/goog_cc/delay_based_bwe.cc → modules/congestion_controller/delay_based_bwe.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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 <algorithm>
#include <cmath> #include <cmath>
@ -17,7 +17,7 @@
#include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h" #include "logging/rtc_event_log/events/rtc_event_bwe_update_delay_based.h"
#include "logging/rtc_event_log/rtc_event_log.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/pacing/paced_sender.h"
#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"

10
modules/congestion_controller/goog_cc/delay_based_bwe.h → modules/congestion_controller/delay_based_bwe.h
View File

@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_ #ifndef MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_
#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_ #define MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h" #include "modules/congestion_controller/delay_increase_detector_interface.h"
#include "modules/congestion_controller/goog_cc/probe_bitrate_estimator.h" #include "modules/congestion_controller/probe_bitrate_estimator.h"
#include "modules/remote_bitrate_estimator/aimd_rate_control.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/include/remote_bitrate_estimator.h"
#include "modules/remote_bitrate_estimator/inter_arrival.h" #include "modules/remote_bitrate_estimator/inter_arrival.h"
@ -89,4 +89,4 @@ class DelayBasedBwe {
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_H_ #endif // MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_H_

4
modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc → modules/congestion_controller/delay_based_bwe_unittest.cc
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * 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 "modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h" #include "modules/congestion_controller/delay_based_bwe_unittest_helper.h"
#include "modules/pacing/paced_sender.h" #include "modules/pacing/paced_sender.h"
#include "rtc_base/constructormagic.h" #include "rtc_base/constructormagic.h"
#include "system_wrappers/include/clock.h" #include "system_wrappers/include/clock.h"

4
modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.cc → modules/congestion_controller/delay_based_bwe_unittest_helper.cc
View File

@ -7,13 +7,13 @@
* in the file PATENTS. All contributing project authors may * in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree. * 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 <algorithm>
#include <limits> #include <limits>
#include <utility> #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/checks.h"
#include "rtc_base/ptr_util.h" #include "rtc_base/ptr_util.h"

10
modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h → modules/congestion_controller/delay_based_bwe_unittest_helper.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * 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_ #ifndef MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_UNITTEST_HELPER_H_
#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_UNITTEST_HELPER_H_ #define MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_UNITTEST_HELPER_H_
#include <list> #include <list>
#include <map> #include <map>
@ -17,8 +17,8 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" #include "modules/congestion_controller/acknowledged_bitrate_estimator.h"
#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/congestion_controller/delay_based_bwe.h"
#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#include "rtc_base/constructormagic.h" #include "rtc_base/constructormagic.h"
#include "system_wrappers/include/clock.h" #include "system_wrappers/include/clock.h"
@ -175,4 +175,4 @@ class DelayBasedBweTest : public ::testing::Test {
}; };
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_BASED_BWE_UNITTEST_HELPER_H_ #endif // MODULES_CONGESTION_CONTROLLER_DELAY_BASED_BWE_UNITTEST_HELPER_H_

6
modules/congestion_controller/goog_cc/delay_increase_detector_interface.h → modules/congestion_controller/delay_increase_detector_interface.h
View File

@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may * in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_INCREASE_DETECTOR_INTERFACE_H_ #ifndef MODULES_CONGESTION_CONTROLLER_DELAY_INCREASE_DETECTOR_INTERFACE_H_
#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_INCREASE_DETECTOR_INTERFACE_H_ #define MODULES_CONGESTION_CONTROLLER_DELAY_INCREASE_DETECTOR_INTERFACE_H_
#include <stdint.h> #include <stdint.h>
@ -34,4 +34,4 @@ class DelayIncreaseDetectorInterface {
}; };
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_DELAY_INCREASE_DETECTOR_INTERFACE_H_ #endif // MODULES_CONGESTION_CONTROLLER_DELAY_INCREASE_DETECTOR_INTERFACE_H_

163
modules/congestion_controller/goog_cc/BUILD.gn
View File

@ -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" ]
}
}
}

10
modules/congestion_controller/goog_cc/goog_cc_network_control.cc → modules/congestion_controller/goog_cc_network_control.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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 <algorithm>
#include <functional> #include <functional>
@ -18,10 +18,10 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" #include "modules/congestion_controller/acknowledged_bitrate_estimator.h"
#include "modules/congestion_controller/goog_cc/alr_detector.h" #include "modules/congestion_controller/alr_detector.h"
#include "modules/congestion_controller/goog_cc/include/goog_cc_factory.h" #include "modules/congestion_controller/include/goog_cc_factory.h"
#include "modules/congestion_controller/goog_cc/probe_controller.h" #include "modules/congestion_controller/probe_controller.h"
#include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
#include "modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"

14
modules/congestion_controller/goog_cc/goog_cc_network_control.h → modules/congestion_controller/goog_cc_network_control.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef 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_GOOG_CC_NETWORK_CONTROL_H_ #define MODULES_CONGESTION_CONTROLLER_GOOG_CC_NETWORK_CONTROL_H_
#include <stdint.h> #include <stdint.h>
#include <deque> #include <deque>
@ -19,11 +19,11 @@
#include "api/optional.h" #include "api/optional.h"
#include "logging/rtc_event_log/rtc_event_log.h" #include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/bitrate_controller/send_side_bandwidth_estimation.h" #include "modules/bitrate_controller/send_side_bandwidth_estimation.h"
#include "modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator.h" #include "modules/congestion_controller/acknowledged_bitrate_estimator.h"
#include "modules/congestion_controller/goog_cc/alr_detector.h" #include "modules/congestion_controller/alr_detector.h"
#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/congestion_controller/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/network_control/include/network_control.h"
#include "modules/congestion_controller/probe_controller.h"
#include "rtc_base/constructormagic.h" #include "rtc_base/constructormagic.h"
namespace webrtc { namespace webrtc {
@ -89,4 +89,4 @@ class GoogCcNetworkController : public NetworkControllerInterface {
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_GOOG_CC_NETWORK_CONTROL_H_ #endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_NETWORK_CONTROL_H_

6
modules/congestion_controller/goog_cc/include/goog_cc_factory.h → modules/congestion_controller/include/goog_cc_factory.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_ #ifndef MODULES_CONGESTION_CONTROLLER_INCLUDE_GOOG_CC_FACTORY_H_
#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_ #define MODULES_CONGESTION_CONTROLLER_INCLUDE_GOOG_CC_FACTORY_H_
#include "modules/congestion_controller/network_control/include/network_control.h" #include "modules/congestion_controller/network_control/include/network_control.h"
namespace webrtc { namespace webrtc {
@ -29,4 +29,4 @@ class GoogCcNetworkControllerFactory
}; };
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_INCLUDE_GOOG_CC_FACTORY_H_ #endif // MODULES_CONGESTION_CONTROLLER_INCLUDE_GOOG_CC_FACTORY_H_

2
modules/congestion_controller/goog_cc/median_slope_estimator.cc → modules/congestion_controller/median_slope_estimator.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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 <algorithm>
#include <vector> #include <vector>

6
modules/congestion_controller/goog_cc/median_slope_estimator.h → modules/congestion_controller/median_slope_estimator.h
View File

@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may * in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_MEDIAN_SLOPE_ESTIMATOR_H_ #ifndef MODULES_CONGESTION_CONTROLLER_MEDIAN_SLOPE_ESTIMATOR_H_
#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_MEDIAN_SLOPE_ESTIMATOR_H_ #define MODULES_CONGESTION_CONTROLLER_MEDIAN_SLOPE_ESTIMATOR_H_
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -69,4 +69,4 @@ class MedianSlopeEstimator {
}; };
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_MEDIAN_SLOPE_ESTIMATOR_H_ #endif // MODULES_CONGESTION_CONTROLLER_MEDIAN_SLOPE_ESTIMATOR_H_

2
modules/congestion_controller/goog_cc/median_slope_estimator_unittest.cc → modules/congestion_controller/median_slope_estimator_unittest.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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 "rtc_base/random.h"
#include "test/gtest.h" #include "test/gtest.h"

2
modules/congestion_controller/goog_cc/probe_bitrate_estimator.cc → modules/congestion_controller/probe_bitrate_estimator.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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> #include <algorithm>

6
modules/congestion_controller/goog_cc/probe_bitrate_estimator.h → modules/congestion_controller/probe_bitrate_estimator.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_ #ifndef MODULES_CONGESTION_CONTROLLER_PROBE_BITRATE_ESTIMATOR_H_
#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_ #define MODULES_CONGESTION_CONTROLLER_PROBE_BITRATE_ESTIMATOR_H_
#include <limits> #include <limits>
#include <map> #include <map>
@ -52,4 +52,4 @@ class ProbeBitrateEstimator {
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_BITRATE_ESTIMATOR_H_ #endif // MODULES_CONGESTION_CONTROLLER_PROBE_BITRATE_ESTIMATOR_H_

2
modules/congestion_controller/goog_cc/probe_bitrate_estimator_unittest.cc → modules/congestion_controller/probe_bitrate_estimator_unittest.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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 <utility>
#include <vector> #include <vector>

2
modules/congestion_controller/goog_cc/probe_controller.cc → modules/congestion_controller/probe_controller.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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 <algorithm>
#include <initializer_list> #include <initializer_list>

6
modules/congestion_controller/goog_cc/probe_controller.h → modules/congestion_controller/probe_controller.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_CONTROLLER_H_ #ifndef MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_
#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_CONTROLLER_H_ #define MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_
#include <stdint.h> #include <stdint.h>
@ -94,4 +94,4 @@ class ProbeController {
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_PROBE_CONTROLLER_H_ #endif // MODULES_CONGESTION_CONTROLLER_PROBE_CONTROLLER_H_

2
modules/congestion_controller/goog_cc/probe_controller_unittest.cc → modules/congestion_controller/probe_controller_unittest.cc
View File

@ -9,8 +9,8 @@
*/ */
#include <memory> #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/network_control/include/network_types.h"
#include "modules/congestion_controller/probe_controller.h"
#include "rtc_base/logging.h" #include "rtc_base/logging.h"
#include "system_wrappers/include/clock.h" #include "system_wrappers/include/clock.h"
#include "test/gmock.h" #include "test/gmock.h"

2
modules/congestion_controller/send_side_congestion_controller.cc
View File

@ -14,7 +14,7 @@
#include <functional> #include <functional>
#include <memory> #include <memory>
#include <vector> #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_types.h"
#include "modules/congestion_controller/network_control/include/network_units.h" #include "modules/congestion_controller/network_control/include/network_units.h"
#include "modules/remote_bitrate_estimator/include/bwe_defines.h" #include "modules/remote_bitrate_estimator/include/bwe_defines.h"

2
modules/congestion_controller/goog_cc/trendline_estimator.cc → modules/congestion_controller/trendline_estimator.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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> #include <math.h>

8
modules/congestion_controller/goog_cc/trendline_estimator.h → modules/congestion_controller/trendline_estimator.h
View File

@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may * in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef MODULES_CONGESTION_CONTROLLER_GOOG_CC_TRENDLINE_ESTIMATOR_H_ #ifndef MODULES_CONGESTION_CONTROLLER_TRENDLINE_ESTIMATOR_H_
#define MODULES_CONGESTION_CONTROLLER_GOOG_CC_TRENDLINE_ESTIMATOR_H_ #define MODULES_CONGESTION_CONTROLLER_TRENDLINE_ESTIMATOR_H_
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -16,7 +16,7 @@
#include <deque> #include <deque>
#include <utility> #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" #include "rtc_base/constructormagic.h"
namespace webrtc { namespace webrtc {
@ -89,4 +89,4 @@ class TrendlineEstimator : public DelayIncreaseDetectorInterface {
}; };
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_TRENDLINE_ESTIMATOR_H_ #endif // MODULES_CONGESTION_CONTROLLER_TRENDLINE_ESTIMATOR_H_

2
modules/congestion_controller/goog_cc/trendline_estimator_unittest.cc → modules/congestion_controller/trendline_estimator_unittest.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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 "rtc_base/random.h"
#include "test/gtest.h" #include "test/gtest.h"

4
modules/remote_bitrate_estimator/BUILD.gn
View File

@ -149,9 +149,9 @@ if (rtc_include_tests) {
"../../test:test_support", "../../test:test_support",
"../bitrate_controller", "../bitrate_controller",
"../congestion_controller", "../congestion_controller",
"../congestion_controller:delay_based_bwe",
"../congestion_controller:estimators",
"../congestion_controller:transport_feedback", "../congestion_controller:transport_feedback",
"../congestion_controller/goog_cc:delay_based_bwe",
"../congestion_controller/goog_cc:estimators",
"../pacing", "../pacing",
"../rtp_rtcp", "../rtp_rtcp",
"../rtp_rtcp:rtp_rtcp_format", "../rtp_rtcp:rtp_rtcp_format",

2
modules/remote_bitrate_estimator/test/estimators/send_side.cc
View File

@ -12,7 +12,7 @@
#include <algorithm> #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 "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
#include "rtc_base/logging.h" #include "rtc_base/logging.h"
#include "rtc_base/ptr_util.h" #include "rtc_base/ptr_util.h"

2
modules/remote_bitrate_estimator/test/estimators/send_side.h
View File

@ -15,7 +15,7 @@
#include <vector> #include <vector>
#include "logging/rtc_event_log/mock/mock_rtc_event_log.h" #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/congestion_controller/send_time_history.h"
#include "modules/remote_bitrate_estimator/test/bwe.h" #include "modules/remote_bitrate_estimator/test/bwe.h"

4
rtc_tools/BUILD.gn
View File

@ -239,8 +239,8 @@ if (!build_with_chromium) {
# TODO(kwiberg): Remove this dependency. # TODO(kwiberg): Remove this dependency.
"../api/audio_codecs:audio_codecs_api", "../api/audio_codecs:audio_codecs_api",
"../modules/congestion_controller", "../modules/congestion_controller",
"../modules/congestion_controller/goog_cc:delay_based_bwe", "../modules/congestion_controller:delay_based_bwe",
"../modules/congestion_controller/goog_cc:estimators", "../modules/congestion_controller:estimators",
"../modules/pacing", "../modules/pacing",
"../modules/rtp_rtcp", "../modules/rtp_rtcp",
"../system_wrappers:system_wrappers_default", "../system_wrappers:system_wrappers_default",

6
rtc_tools/event_log_visualizer/analyzer.cc
View File

@ -31,9 +31,9 @@
#include "modules/audio_coding/neteq/tools/neteq_replacement_input.h" #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/neteq_test.h"
#include "modules/audio_coding/neteq/tools/resample_input_audio_file.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/acknowledged_bitrate_estimator.h"
#include "modules/congestion_controller/goog_cc/bitrate_estimator.h" #include "modules/congestion_controller/bitrate_estimator.h"
#include "modules/congestion_controller/goog_cc/delay_based_bwe.h" #include "modules/congestion_controller/delay_based_bwe.h"
#include "modules/congestion_controller/include/receive_side_congestion_controller.h" #include "modules/congestion_controller/include/receive_side_congestion_controller.h"
#include "modules/congestion_controller/include/send_side_congestion_controller.h" #include "modules/congestion_controller/include/send_side_congestion_controller.h"
#include "modules/include/module_common_types.h" #include "modules/include/module_common_types.h"