Remove BuiltInNetworkBehaviorConfig::link_capacity_kbps
The field is deprecated and all use has been migrated to link_capacity.
Bug: webrtc:42224804
Change-Id: Ic808acbb8b88a01ec49378fceb610832aa2074c7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/376380
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43988}
diff --git a/api/test/simulated_network.h b/api/test/simulated_network.h
index 2b75b99..6f31c60 100644
--- a/api/test/simulated_network.h
+++ b/api/test/simulated_network.h
@@ -74,10 +74,7 @@
int queue_delay_ms = 0;
// Standard deviation of the extra delay.
int delay_standard_deviation_ms = 0;
- // Link capacity in kbps. 0 is treated as infinite capacity.
- // Deprecated, please use link_capacity instead.
- // TODO(bugs.webrtc.org/14525): Remove once all usage has migrated.
- int link_capacity_kbps = 0;
+ // Link capacity.
DataRate link_capacity = DataRate::Infinity();
// Random packet loss, range 0 to 100.
double loss_percent = 0.;
diff --git a/test/network/feedback_generator.cc b/test/network/feedback_generator.cc
index c19b695..7462c99 100644
--- a/test/network/feedback_generator.cc
+++ b/test/network/feedback_generator.cc
@@ -75,7 +75,6 @@
void FeedbackGeneratorImpl::SetSendLinkCapacity(DataRate capacity) {
conf_.send_link.link_capacity = capacity;
- conf_.send_link.link_capacity_kbps = capacity.kbps_or(0);
send_link_->SetConfig(conf_.send_link);
}
diff --git a/test/network/simulated_network.cc b/test/network/simulated_network.cc
index 2fbb183..da0751f 100644
--- a/test/network/simulated_network.cc
+++ b/test/network/simulated_network.cc
@@ -54,15 +54,6 @@
capacity.kbps());
}
-void UpdateLegacyConfiguration(SimulatedNetwork::Config& config) {
- if (config.link_capacity_kbps != 0) {
- RTC_DCHECK(config.link_capacity ==
- DataRate::KilobitsPerSec(config.link_capacity_kbps) ||
- config.link_capacity == DataRate::Infinity());
- config.link_capacity = DataRate::KilobitsPerSec(config.link_capacity_kbps);
- }
-}
-
} // namespace
SimulatedNetwork::SimulatedNetwork(Config config, uint64_t random_seed)
@@ -75,7 +66,6 @@
void SimulatedNetwork::SetConfig(const Config& config) {
MutexLock lock(&config_lock_);
config_state_.config = config; // Shallow copy of the struct.
- UpdateLegacyConfiguration(config_state_.config);
double prob_loss = config.loss_percent / 100.0;
if (config_state_.config.avg_burst_loss_length == -1) {
@@ -127,7 +117,6 @@
std::function<void(BuiltInNetworkBehaviorConfig*)> config_modifier) {
MutexLock lock(&config_lock_);
config_modifier(&config_state_.config);
- UpdateLegacyConfiguration(config_state_.config);
}
void SimulatedNetwork::PauseTransmissionUntil(int64_t until_us) {
