2016-02-23 13:30:42 +01:00
|
|
|
# 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.
|
|
|
|
|
|
2017-01-24 06:58:22 -08:00
|
|
|
import("../../webrtc.gni")
|
2016-02-23 13:30:42 +01:00
|
|
|
|
2016-09-23 00:38:52 -07:00
|
|
|
rtc_static_library("congestion_controller") {
|
2016-02-23 13:30:42 +01:00
|
|
|
sources = [
|
Revert of Test and fix for huge bwe drop after alr state. (patchset #13 id:320001 of https://codereview.webrtc.org/2931873002/ )
Reason for revert:
Resetting the estimate means that we need to start gathering data from scratch again. The combination of
1) DelayBasedEstimator not reacting to overuse unless there is a valid estimate of the acknowledged bitrate, and
2) AcknowledgedBitrateEstimator needing a significant amount of time/data to obtain an provide an estimate
causes poor performance in simulations/tests. It is not clear whether this will affect real networks negatively, but I suggest reverting this to be on the safe side.
See also https://bugs.chromium.org/p/webrtc/issues/detail?id=7884
Original issue's description:
> Test and fix for huge bwe drop after alr state.
>
> BUG=webrtc:7746
>
> Review-Url: https://codereview.webrtc.org/2931873002
> Cr-Commit-Position: refs/heads/master@{#18692}
> Committed: https://chromium.googlesource.com/external/webrtc/+/37aa8ba61641962119071646175bfe3bc2bda063
TBR=solenberg@webrtc.org,kwiberg@webrtc.org,minyue@webrtc.org,holmer@chromium.org,philipel@webrtc.org,oprypin@webrtc.org,holmer@google.com,stefan@webrtc.org,tschumim@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7746
Review-Url: https://codereview.webrtc.org/2964213002
Cr-Commit-Position: refs/heads/master@{#18866}
2017-06-30 08:11:44 -07:00
|
|
|
"acknowledge_bitrate_estimator.cc",
|
|
|
|
|
"acknowledge_bitrate_estimator.h",
|
2016-02-23 13:30:42 +01:00
|
|
|
"congestion_controller.cc",
|
2016-06-17 09:21:34 -07:00
|
|
|
"delay_based_bwe.cc",
|
|
|
|
|
"delay_based_bwe.h",
|
2016-02-23 13:30:42 +01:00
|
|
|
"include/congestion_controller.h",
|
2017-03-21 06:41:12 -07:00
|
|
|
"include/receive_side_congestion_controller.h",
|
|
|
|
|
"include/send_side_congestion_controller.h",
|
2016-12-09 05:50:01 -08:00
|
|
|
"median_slope_estimator.cc",
|
|
|
|
|
"median_slope_estimator.h",
|
2016-08-01 08:49:04 -07:00
|
|
|
"probe_bitrate_estimator.cc",
|
|
|
|
|
"probe_bitrate_estimator.h",
|
2016-09-12 12:28:54 -07:00
|
|
|
"probe_controller.cc",
|
|
|
|
|
"probe_controller.h",
|
2017-03-21 06:41:12 -07:00
|
|
|
"receive_side_congestion_controller.cc",
|
|
|
|
|
"send_side_congestion_controller.cc",
|
2016-09-30 10:06:51 +02:00
|
|
|
"transport_feedback_adapter.cc",
|
|
|
|
|
"transport_feedback_adapter.h",
|
2016-11-17 03:48:18 -08:00
|
|
|
"trendline_estimator.cc",
|
|
|
|
|
"trendline_estimator.h",
|
2016-02-23 13:30:42 +01:00
|
|
|
]
|
|
|
|
|
|
2016-11-17 03:48:18 -08:00
|
|
|
if (rtc_enable_bwe_test_logging) {
|
|
|
|
|
defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1" ]
|
|
|
|
|
} else {
|
|
|
|
|
defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ]
|
|
|
|
|
}
|
|
|
|
|
|
2016-06-02 02:09:52 -07:00
|
|
|
# TODO(jschuh): Bug 1348: fix this warning.
|
|
|
|
|
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
|
|
|
|
|
|
2016-10-16 23:56:12 -07:00
|
|
|
if (!build_with_chromium && is_clang) {
|
|
|
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
2016-09-02 04:10:34 -07:00
|
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
2016-02-23 13:30:42 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
deps = [
|
2017-04-26 03:38:35 -07:00
|
|
|
"..:module_api",
|
2016-12-28 04:43:46 -08:00
|
|
|
"../..:webrtc_common",
|
2017-07-10 05:58:42 -07:00
|
|
|
"../../base:rtc_base",
|
|
|
|
|
"../../base:rtc_base_approved",
|
|
|
|
|
"../../base:rtc_numerics",
|
2017-02-17 03:38:28 -08:00
|
|
|
"../../logging:rtc_event_log_api",
|
2016-12-28 04:43:46 -08:00
|
|
|
"../../system_wrappers",
|
2016-02-23 13:30:42 +01:00
|
|
|
"../bitrate_controller",
|
|
|
|
|
"../pacing",
|
2016-12-28 04:43:46 -08:00
|
|
|
"../remote_bitrate_estimator",
|
|
|
|
|
"../rtp_rtcp",
|
|
|
|
|
"../utility",
|
2016-02-23 13:30:42 +01:00
|
|
|
]
|
|
|
|
|
}
|
2017-01-19 08:27:11 -08:00
|
|
|
|
|
|
|
|
if (rtc_include_tests) {
|
|
|
|
|
rtc_source_set("congestion_controller_unittests") {
|
|
|
|
|
testonly = true
|
2017-04-25 04:04:50 -07:00
|
|
|
|
|
|
|
|
# Skip restricting visibility on mobile platforms since the tests on those
|
|
|
|
|
# gets additional generated targets which would require many lines here to
|
|
|
|
|
# cover (which would be confusing to read and hard to maintain).
|
|
|
|
|
if (!is_android && !is_ios) {
|
|
|
|
|
visibility = [ "//webrtc/modules:modules_unittests" ]
|
|
|
|
|
}
|
2017-01-19 08:27:11 -08:00
|
|
|
sources = [
|
|
|
|
|
"congestion_controller_unittest.cc",
|
2017-03-09 06:40:08 -08:00
|
|
|
"congestion_controller_unittests_helper.cc",
|
|
|
|
|
"congestion_controller_unittests_helper.h",
|
2017-01-19 08:27:11 -08:00
|
|
|
"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",
|
|
|
|
|
"transport_feedback_adapter_unittest.cc",
|
|
|
|
|
"trendline_estimator_unittest.cc",
|
|
|
|
|
]
|
|
|
|
|
deps = [
|
|
|
|
|
":congestion_controller",
|
2017-05-08 11:52:38 -07:00
|
|
|
":mock_congestion_controller",
|
2017-07-10 05:58:42 -07:00
|
|
|
"../../base:rtc_base",
|
|
|
|
|
"../../base:rtc_base_approved",
|
2017-01-19 08:27:11 -08:00
|
|
|
"../../system_wrappers:system_wrappers",
|
|
|
|
|
"../../test:field_trial",
|
|
|
|
|
"../../test:test_support",
|
|
|
|
|
"../bitrate_controller:bitrate_controller",
|
|
|
|
|
"../pacing:pacing",
|
2017-04-25 04:04:50 -07:00
|
|
|
"../remote_bitrate_estimator:mock_remote_bitrate_observer",
|
2017-01-19 08:27:11 -08:00
|
|
|
"../remote_bitrate_estimator:remote_bitrate_estimator",
|
|
|
|
|
"../rtp_rtcp:rtp_rtcp",
|
|
|
|
|
"//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" ]
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-05-08 11:52:38 -07:00
|
|
|
|
|
|
|
|
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",
|
|
|
|
|
]
|
|
|
|
|
}
|
2017-01-19 08:27:11 -08:00
|
|
|
}
|