From 62b340545f80baaa449c2159a8e44052c74116c9 Mon Sep 17 00:00:00 2001 From: Christoffer Rodbro Date: Tue, 14 Sep 2021 16:24:02 +0200 Subject: [PATCH] Default the safetyped calculation of packet interarrival times. This defaults the calculation landed in cl 196502. The less readable legacy calculation method will be deleted in a future CL. Bug: none Change-Id: Ida02a5208e354835b964c69355ad1e9d5bba18aa Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/231956 Reviewed-by: Per Kjellander Commit-Queue: Christoffer Rodbro Cr-Commit-Position: refs/heads/main@{#35027} --- modules/congestion_controller/goog_cc/delay_based_bwe.cc | 4 ++-- .../goog_cc/delay_based_bwe_unittest.cc | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.cc b/modules/congestion_controller/goog_cc/delay_based_bwe.cc index 185b09d8ab..4c5bdb67a0 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe.cc +++ b/modules/congestion_controller/goog_cc/delay_based_bwe.cc @@ -95,9 +95,9 @@ DelayBasedBwe::DelayBasedBwe(const WebRtcKeyValueConfig* key_value_config, prev_bitrate_(DataRate::Zero()), has_once_detected_overuse_(false), prev_state_(BandwidthUsage::kBwNormal), - use_new_inter_arrival_delta_(absl::StartsWith( + use_new_inter_arrival_delta_(!absl::StartsWith( key_value_config->Lookup("WebRTC-Bwe-NewInterArrivalDelta"), - "Enabled")), + "Disabled")), alr_limited_backoff_enabled_(absl::StartsWith( key_value_config->Lookup("WebRTC-Bwe-AlrLimitedBackoff"), "Enabled")) { diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc index 06345c4d9b..0cc6068b6b 100644 --- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc +++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest.cc @@ -31,9 +31,10 @@ constexpr float kTargetUtilizationFraction = 0.95f; INSTANTIATE_TEST_SUITE_P( , DelayBasedBweTest, - ::testing::Values("", "WebRTC-Bwe-NewInterArrivalDelta/Enabled/"), + ::testing::Values("", "WebRTC-Bwe-NewInterArrivalDelta/Disabled/"), [](::testing::TestParamInfo info) { - return info.param == "" ? "Default" : "NewInterArrival"; + return info.param.empty() ? "SafetypedInterArrival" + : "LegacyInterArrival"; }); TEST_P(DelayBasedBweTest, ProbeDetection) {