57daeb7ac7
This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. Original change's description: > Moved congestion controller to task queue. > > The goal of this work is to make it easier to experiment with the > bandwidth estimation implementation. For this reason network control > functionality is moved from SendSideCongestionController(SSCC), > PacedSender and BitrateController to the newly created > GoogCcNetworkController which implements the newly created > NetworkControllerInterface. This allows the implementation to be > replaced at runtime in the future. > > This is the first part of a split of a larger CL, see: > https://webrtc-review.googlesource.com/c/src/+/39788/8 > For further explanations. > > Bug: webrtc:8415 > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > Reviewed-on: https://webrtc-review.googlesource.com/43840 > 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@{#21868} Bug: webrtc:8415 Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da Reviewed-on: https://webrtc-review.googlesource.com/48000 Reviewed-by: Stefan Holmer <stefan@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21899}
277 lines
8.0 KiB
Plaintext
277 lines
8.0 KiB
Plaintext
# Copyright (c) 2014 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("congestion_controller") {
|
|
visibility = [ "*" ]
|
|
configs += [ ":bwe_test_logging" ]
|
|
sources = [
|
|
"include/receive_side_congestion_controller.h",
|
|
"include/send_side_congestion_controller.h",
|
|
"pacer_controller.cc",
|
|
"pacer_controller.h",
|
|
"receive_side_congestion_controller.cc",
|
|
"send_side_congestion_controller.cc",
|
|
]
|
|
|
|
# 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 = [
|
|
":goog_cc",
|
|
":transport_feedback",
|
|
"..:module_api",
|
|
"../..:webrtc_common",
|
|
"../../rtc_base:checks",
|
|
"../../rtc_base:rate_limiter",
|
|
"../../rtc_base:rtc_task_queue_api",
|
|
"../../rtc_base:sequenced_task_checker",
|
|
"../../system_wrappers",
|
|
"../../system_wrappers:field_trial_api",
|
|
"../../system_wrappers:metrics_api",
|
|
"../../system_wrappers:runtime_enabled_features_api",
|
|
"../bitrate_controller",
|
|
"../pacing",
|
|
"../remote_bitrate_estimator",
|
|
"../rtp_rtcp:rtp_rtcp_format",
|
|
"./network_control",
|
|
]
|
|
|
|
if (!build_with_mozilla) {
|
|
deps += [ "../../rtc_base:rtc_base" ]
|
|
}
|
|
}
|
|
|
|
rtc_static_library("transport_feedback") {
|
|
visibility = [ "*" ]
|
|
sources = [
|
|
"send_time_history.cc",
|
|
"send_time_history.h",
|
|
"transport_feedback_adapter.cc",
|
|
"transport_feedback_adapter.h",
|
|
]
|
|
|
|
deps = [
|
|
"..:module_api",
|
|
"../../rtc_base:checks",
|
|
"../../rtc_base:rtc_base_approved",
|
|
"../../system_wrappers",
|
|
"../rtp_rtcp:rtp_rtcp_format",
|
|
]
|
|
}
|
|
|
|
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
|
|
|
|
sources = [
|
|
"congestion_controller_unittests_helper.cc",
|
|
"congestion_controller_unittests_helper.h",
|
|
"receive_side_congestion_controller_unittest.cc",
|
|
"send_side_congestion_controller_unittest.cc",
|
|
"send_time_history_unittest.cc",
|
|
"transport_feedback_adapter_unittest.cc",
|
|
]
|
|
deps = [
|
|
":congestion_controller",
|
|
":goog_cc_unittests",
|
|
":mock_congestion_controller",
|
|
":transport_feedback",
|
|
"../../logging:mocks",
|
|
"../../rtc_base:checks",
|
|
"../../rtc_base:rtc_base",
|
|
"../../rtc_base:rtc_base_approved",
|
|
"../../rtc_base:rtc_base_tests_utils",
|
|
"../../system_wrappers",
|
|
"../../test:field_trial",
|
|
"../../test:test_support",
|
|
"../bitrate_controller:mocks",
|
|
"../pacing:mock_paced_sender",
|
|
"../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",
|
|
"//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("mock_congestion_controller") {
|
|
testonly = true
|
|
sources = [
|
|
"include/mock/mock_congestion_observer.h",
|
|
"include/mock/mock_send_side_congestion_controller.h",
|
|
]
|
|
deps = [
|
|
":congestion_controller",
|
|
"../../test:test_support",
|
|
]
|
|
}
|
|
}
|