diff --git a/modules/bitrate_controller/bitrate_controller_impl.cc b/modules/bitrate_controller/bitrate_controller_impl.cc index 05d967bd1d..9a57dc9d85 100644 --- a/modules/bitrate_controller/bitrate_controller_impl.cc +++ b/modules/bitrate_controller/bitrate_controller_impl.cc @@ -257,8 +257,6 @@ bool BitrateControllerImpl::GetNetworkParameters(uint32_t* bitrate, int current_bitrate; bandwidth_estimation_.CurrentEstimate(¤t_bitrate, fraction_loss, rtt); *bitrate = current_bitrate; - *bitrate = - std::max(*bitrate, bandwidth_estimation_.GetMinBitrate()); bool new_bitrate = false; if (*bitrate != last_bitrate_bps_ || *fraction_loss != last_fraction_loss_ || @@ -286,7 +284,6 @@ bool BitrateControllerImpl::AvailableBandwidth(uint32_t* bandwidth) const { int64_t rtt; bandwidth_estimation_.CurrentEstimate(&bitrate, &fraction_loss, &rtt); if (bitrate > 0) { - bitrate = std::max(bitrate, bandwidth_estimation_.GetMinBitrate()); *bandwidth = bitrate; return true; } diff --git a/modules/bitrate_controller/send_side_bandwidth_estimation.cc b/modules/bitrate_controller/send_side_bandwidth_estimation.cc index 0764ee37ac..58028012c9 100644 --- a/modules/bitrate_controller/send_side_bandwidth_estimation.cc +++ b/modules/bitrate_controller/send_side_bandwidth_estimation.cc @@ -310,7 +310,7 @@ int SendSideBandwidthEstimation::GetMinBitrate() const { void SendSideBandwidthEstimation::CurrentEstimate(int* bitrate, uint8_t* loss, int64_t* rtt) const { - *bitrate = current_bitrate_.bps(); + *bitrate = std::max(current_bitrate_.bps(), GetMinBitrate()); *loss = last_fraction_loss_; *rtt = last_round_trip_time_.ms(); } diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc index 408df93753..e3e1dccbd0 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.cc @@ -564,8 +564,6 @@ void GoogCcNetworkController::MaybeTriggerOnNetworkChanged( bandwidth_estimation_->CurrentEstimate(&estimated_bitrate_bps, &fraction_loss, &rtt_ms); - estimated_bitrate_bps = std::max( - estimated_bitrate_bps, bandwidth_estimation_->GetMinBitrate()); BWE_TEST_LOGGING_PLOT(1, "fraction_loss_%", at_time.ms(), (fraction_loss * 100) / 256);