From 054995011389d5adaf82804ea667d0727eb8002e Mon Sep 17 00:00:00 2001 From: Per Kjellander Date: Tue, 1 Oct 2024 14:56:22 +0000 Subject: [PATCH] Revert "Per defaul probe max to 2x current BWE if max total allocated bitrate change" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 37458ce40a1741f9d5358d49fe49beed20140502. Reason for revert: Will be wired up as an experiment instead. Original change's description: > Per defaul probe max to 2x current BWE if max total allocated bitrate change > > This aligns to probe limits in ALR for example. > > Bug: webrtc:369044000, b/369021234 > Change-Id: I3823b308cf97a8b7060b35b2ac38864e75d6f983 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/363301 > Reviewed-by: Jonas Oreland > Reviewed-by: Diep Bui > Commit-Queue: Per Kjellander > Cr-Commit-Position: refs/heads/main@{#43074} Bug: webrtc:369044000, b/369021234 Change-Id: I22b457254c9c21d2d951af2bda01a349ef83b3c7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364242 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Commit-Queue: Per Kjellander Commit-Queue: Ranveer Aggarwal‎ Reviewed-by: Diep Bui Cr-Commit-Position: refs/heads/main@{#43130} --- .../congestion_controller/goog_cc/probe_controller.cc | 2 +- .../goog_cc/probe_controller_unittest.cc | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/congestion_controller/goog_cc/probe_controller.cc b/modules/congestion_controller/goog_cc/probe_controller.cc index 3a4454bbba..b031814774 100644 --- a/modules/congestion_controller/goog_cc/probe_controller.cc +++ b/modules/congestion_controller/goog_cc/probe_controller.cc @@ -109,7 +109,7 @@ ProbeControllerConfig::ProbeControllerConfig( probe_on_max_allocated_bitrate_change("probe_max_allocation", true), first_allocation_probe_scale("alloc_p1", 1), second_allocation_probe_scale("alloc_p2", 2), - allocation_probe_limit_by_current_scale("alloc_current_bwe_limit", 2.0), + allocation_probe_limit_by_current_scale("alloc_current_bwe_limit"), min_probe_packets_sent("min_probe_packets_sent", 5), min_probe_duration("min_probe_duration", TimeDelta::Millis(15)), min_probe_delta("min_probe_delta", TimeDelta::Millis(2)), diff --git a/modules/congestion_controller/goog_cc/probe_controller_unittest.cc b/modules/congestion_controller/goog_cc/probe_controller_unittest.cc index b841c2bac2..bb3c79c466 100644 --- a/modules/congestion_controller/goog_cc/probe_controller_unittest.cc +++ b/modules/congestion_controller/goog_cc/probe_controller_unittest.cc @@ -217,7 +217,9 @@ TEST(ProbeControllerTest, ProbesOnMaxAllocatedBitrateIncreaseOnlyWhenInAlr) { } TEST(ProbeControllerTest, ProbesOnMaxAllocatedBitrateLimitedByCurrentBwe) { - ProbeControllerFixture fixture; + ProbeControllerFixture fixture( + "WebRTC-Bwe-ProbingConfiguration/" + "alloc_current_bwe_limit:1.5/"); ASSERT_TRUE(kMaxBitrate > 1.5 * kStartBitrate); std::unique_ptr probe_controller = fixture.CreateController(); @@ -240,7 +242,7 @@ TEST(ProbeControllerTest, ProbesOnMaxAllocatedBitrateLimitedByCurrentBwe) { probes = probe_controller->OnMaxTotalAllocatedBitrate(kMaxBitrate, fixture.CurrentTime()); EXPECT_EQ(probes.size(), 1u); - EXPECT_EQ(probes.at(0).target_data_rate, 2 * kStartBitrate); + EXPECT_EQ(probes.at(0).target_data_rate, 1.5 * kStartBitrate); // Continue probing if probe succeeds. probes = probe_controller->SetEstimatedBitrate( @@ -764,9 +766,7 @@ TEST(ProbeControllerTest, ConfigurableProbingFieldTrial) { ProbeControllerFixture fixture( "WebRTC-Bwe-ProbingConfiguration/" "p1:2,p2:5,step_size:3,further_probe_threshold:0.8," - "alloc_p1:2,alloc_p2,alloc_current_bwe_limit:1000.0,min_probe_packets_" - "sent:" - "2/"); + "alloc_p1:2,alloc_p2,min_probe_packets_sent:2/"); std::unique_ptr probe_controller = fixture.CreateController(); ASSERT_THAT(