Index: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc |
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc |
index 032de13e728a070bb00e2c1f3b8a9a49960b11fb..bca8ba6ed61a0e99f702b9165c1ec48b2dafa169 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc |
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc |
@@ -105,9 +105,9 @@ void RemoteBitrateEstimatorSingleStream::IncomingPacket(int64_t arrival_time_ms, |
estimator->estimator.num_of_deltas(), now_ms); |
} |
if (estimator->detector.State() == kBwOverusing) { |
- uint32_t incoming_bitrate = incoming_bitrate_.Rate(now_ms); |
+ uint32_t incoming_bitrate_bps = incoming_bitrate_.Rate(now_ms); |
if (prior_state != kBwOverusing || |
- remote_rate_->TimeToReduceFurther(now_ms, incoming_bitrate)) { |
+ remote_rate_->TimeToReduceFurther(now_ms, incoming_bitrate_bps)) { |
// The first overuse should immediately trigger a new estimate. |
// We also have to update the estimate immediately if we are overusing |
// and the target bitrate is too high compared to what we are receiving. |
@@ -172,7 +172,7 @@ void RemoteBitrateEstimatorSingleStream::UpdateEstimate(int64_t now_ms) { |
const RateControlInput input(bw_state, |
incoming_bitrate_.Rate(now_ms), |
mean_noise_var); |
- const RateControlRegion region = remote_rate_->Update(&input, now_ms); |
+ remote_rate_->Update(&input, now_ms); |
unsigned int target_bitrate = remote_rate_->UpdateBandwidthEstimate(now_ms); |
if (remote_rate_->ValidEstimate()) { |
process_interval_ms_ = remote_rate_->GetFeedbackInterval(); |
@@ -180,9 +180,6 @@ void RemoteBitrateEstimatorSingleStream::UpdateEstimate(int64_t now_ms) { |
GetSsrcs(&ssrcs); |
observer_->OnReceiveBitrateChanged(ssrcs, target_bitrate); |
} |
- for (it = overuse_detectors_.begin(); it != overuse_detectors_.end(); ++it) { |
- it->second->detector.SetRateControlRegion(region); |
- } |
} |
void RemoteBitrateEstimatorSingleStream::OnRttUpdate(int64_t rtt) { |