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

Apply lower bound of delay based estimate in AimdRateControl::ClampBitrate

Browse Source 
This move the functionality of applying the lower bound of a network estimate to AimdRateControl::ClampBitrate instead of ChangeBitrate.
The purpose is to be able to also clamp probe estimates set by AimdRateControl::SetEstimate as well.

Bug: none
Change-Id: I6a4d64d2e98bb99da06010e2edaf20dc42880e37
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/255823
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Reviewed-by: Diep Bui <diepbp@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36219}
This commit is contained in:
Per Kjellander
2022-03-16 14:27:24 +01:00
committed by WebRTC LUCI CQ
parent 9524c0fa4f
commit e66e6a845b
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/remote_bitrate_estimator/aimd_rate_control.cc
View File

@ -338,11 +338,6 @@ void AimdRateControl::ChangeBitrate(const RateControlInput& input,
decreased_bitrate = beta_ * link_capacity_.estimate(); decreased_bitrate = beta_ * link_capacity_.estimate();
} }
} }
if (estimate_bounded_backoff_ && network_estimate_) {
decreased_bitrate = std::max(
decreased_bitrate, network_estimate_->link_capacity_lower * beta_);
}
// Avoid increasing the rate when over-using. // Avoid increasing the rate when over-using.
if (decreased_bitrate < current_bitrate_) { if (decreased_bitrate < current_bitrate_) {
new_bitrate = decreased_bitrate; new_bitrate = decreased_bitrate;
@ -386,6 +381,12 @@ DataRate AimdRateControl::ClampBitrate(DataRate new_bitrate) const {
} }
new_bitrate = std::min(upper_bound, new_bitrate); new_bitrate = std::min(upper_bound, new_bitrate);
} }
if (estimate_bounded_backoff_ && network_estimate_ &&
network_estimate_->link_capacity_lower.IsFinite() &&
new_bitrate < current_bitrate_) {
new_bitrate =
std::max(new_bitrate, network_estimate_->link_capacity_lower * beta_);
}
new_bitrate = std::max(new_bitrate, min_configured_bitrate_); new_bitrate = std::max(new_bitrate, min_configured_bitrate_);
return new_bitrate; return new_bitrate;
} }

13
modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc
View File

@ -255,7 +255,7 @@ TEST(AimdRateControlTest, SetEstimateIncreaseBweInAlr) {
2 * kInitialBitrateBps); 2 * kInitialBitrateBps);
} }
TEST(AimdRateControlTest, SetEstimateClampedByNetworkEstimate) { TEST(AimdRateControlTest, SetEstimateUpperLimitedByNetworkEstimate) {
auto states = CreateAimdRateControlStates(/*send_side=*/true); auto states = CreateAimdRateControlStates(/*send_side=*/true);
NetworkStateEstimate network_estimate; NetworkStateEstimate network_estimate;
network_estimate.link_capacity_upper = DataRate::KilobitsPerSec(400); network_estimate.link_capacity_upper = DataRate::KilobitsPerSec(400);
@ -265,6 +265,17 @@ TEST(AimdRateControlTest, SetEstimateClampedByNetworkEstimate) {
network_estimate.link_capacity_upper); network_estimate.link_capacity_upper);
} }
TEST(AimdRateControlTest, SetEstimateLowerLimitedByNetworkEstimate) {
auto states = CreateAimdRateControlStates(/*send_side=*/true);
NetworkStateEstimate network_estimate;
network_estimate.link_capacity_lower = DataRate::KilobitsPerSec(400);
states.aimd_rate_control->SetNetworkStateEstimate(network_estimate);
SetEstimate(states, 100'000);
// 0.85 is default backoff factor. (`beta_`)
EXPECT_EQ(states.aimd_rate_control->LatestEstimate(),
network_estimate.link_capacity_lower * 0.85);
}
TEST(AimdRateControlTest, SetEstimateIgnoresNetworkEstimatesLowerThanCurrent) { TEST(AimdRateControlTest, SetEstimateIgnoresNetworkEstimatesLowerThanCurrent) {
test::ScopedFieldTrials override_field_trials( test::ScopedFieldTrials override_field_trials(
"WebRTC-Bwe-EstimateBoundedIncrease/" "WebRTC-Bwe-EstimateBoundedIncrease/"