Default the behavior allowing fast rampup when REMB cap is lifted.
Bug: none
Change-Id: I60d5ed448b3cfb6591bd77b97f406a62e2fdd704
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/234523
Reviewed-by: Magnus Flodman <mflodman@webrtc.org>
Commit-Queue: Christoffer Rodbro <crodbro@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35164}
diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc
index 7e8d7b9..402afcb 100644
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc
+++ b/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc
@@ -879,16 +879,16 @@
EXPECT_LT(client->send_bandwidth().kbps(), 750);
}
-TEST(GoogCcScenario, FastRampupOnRembCapLiftedWithFieldTrial) {
- ScopedFieldTrials trial("WebRTC-Bwe-ReceiverLimitCapsOnly/Enabled/");
+TEST(GoogCcScenario, FastRampupOnRembCapLifted) {
DataRate final_estimate =
- RunRembDipScenario("googcc_unit/fast_rampup_on_remb_cap_lifted");
+ RunRembDipScenario("googcc_unit/default_fast_rampup_on_remb_cap_lifted");
EXPECT_GT(final_estimate.kbps(), 1500);
}
-TEST(GoogCcScenario, SlowRampupOnRembCapLifted) {
+TEST(GoogCcScenario, SlowRampupOnRembCapLiftedWithFieldTrial) {
+ ScopedFieldTrials trial("WebRTC-Bwe-ReceiverLimitCapsOnly/Disabled/");
DataRate final_estimate =
- RunRembDipScenario("googcc_unit/default_slow_rampup_on_remb_cap_lifted");
+ RunRembDipScenario("googcc_unit/legacy_slow_rampup_on_remb_cap_lifted");
EXPECT_LT(final_estimate.kbps(), 1000);
}
diff --git a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc
index 8fb3275..5bb145c 100644
--- a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc
+++ b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.cc
@@ -229,7 +229,7 @@
bitrate_threshold_(kDefaultBitrateThreshold),
loss_based_bandwidth_estimator_v1_(key_value_config),
loss_based_bandwidth_estimator_v2_(key_value_config),
- receiver_limit_caps_only_("Enabled") {
+ disable_receiver_limit_caps_only_("Disabled") {
RTC_DCHECK(event_log);
if (BweLossExperimentIsEnabled()) {
uint32_t bitrate_threshold_kbps;
@@ -242,7 +242,7 @@
bitrate_threshold_ = DataRate::KilobitsPerSec(bitrate_threshold_kbps);
}
}
- ParseFieldTrial({&receiver_limit_caps_only_},
+ ParseFieldTrial({&disable_receiver_limit_caps_only_},
key_value_config->Lookup("WebRTC-Bwe-ReceiverLimitCapsOnly"));
}
@@ -313,7 +313,7 @@
DataRate SendSideBandwidthEstimation::target_rate() const {
DataRate target = current_target_;
- if (receiver_limit_caps_only_)
+ if (!disable_receiver_limit_caps_only_)
target = std::min(target, receiver_limit_);
return std::max(min_bitrate_configured_, target);
}
@@ -609,7 +609,7 @@
DataRate SendSideBandwidthEstimation::GetUpperLimit() const {
DataRate upper_limit = delay_based_limit_;
- if (!receiver_limit_caps_only_)
+ if (disable_receiver_limit_caps_only_)
upper_limit = std::min(upper_limit, receiver_limit_);
return std::min(upper_limit, max_bitrate_configured_);
}
diff --git a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h
index 63be1f0..f31f30f 100644
--- a/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h
+++ b/modules/congestion_controller/goog_cc/send_side_bandwidth_estimation.h
@@ -198,7 +198,7 @@
DataRate bitrate_threshold_;
LossBasedBandwidthEstimation loss_based_bandwidth_estimator_v1_;
LossBasedBweV2 loss_based_bandwidth_estimator_v2_;
- FieldTrialFlag receiver_limit_caps_only_;
+ FieldTrialFlag disable_receiver_limit_caps_only_;
};
} // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_SEND_SIDE_BANDWIDTH_ESTIMATION_H_
