Index: webrtc/modules/congestion_controller/send_side_congestion_controller.cc |
diff --git a/webrtc/modules/congestion_controller/send_side_congestion_controller.cc b/webrtc/modules/congestion_controller/send_side_congestion_controller.cc |
index 57e7685f88f52362de74e20ac300c41a09aa5c79..0c65a0b04f834b7ea83e690c7ffec7bfbf6daa4b 100644 |
--- a/webrtc/modules/congestion_controller/send_side_congestion_controller.cc |
+++ b/webrtc/modules/congestion_controller/send_side_congestion_controller.cc |
@@ -20,7 +20,7 @@ |
#include "webrtc/base/rate_limiter.h" |
#include "webrtc/base/socket.h" |
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" |
-#include "webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h" |
+#include "webrtc/modules/congestion_controller/acknowledged_bitrate_estimator.h" |
#include "webrtc/modules/congestion_controller/probe_controller.h" |
#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h" |
@@ -89,7 +89,8 @@ SendSideCongestionController::SendSideCongestionController( |
bitrate_controller_( |
BitrateController::CreateBitrateController(clock_, event_log)), |
acknowledged_bitrate_estimator_( |
- rtc::MakeUnique<AcknowledgedBitrateEstimator>()), |
+ rtc::MakeUnique<AcknowledgedBitrateEstimator>( |
+ rtc::MakeUnique<BitrateEstimatorCreator>())), |
probe_controller_(new ProbeController(pacer_.get(), clock_)), |
retransmission_rate_limiter_( |
new RateLimiter(clock, kRetransmitWindowSizeMs)), |
@@ -168,7 +169,8 @@ void SendSideCongestionController::OnNetworkRouteChanged( |
rtc::CritScope cs(&bwe_lock_); |
min_bitrate_bps_ = min_bitrate_bps; |
delay_based_bwe_.reset(new DelayBasedBwe(event_log_, clock_)); |
- acknowledged_bitrate_estimator_.reset(new AcknowledgedBitrateEstimator()); |
+ acknowledged_bitrate_estimator_.reset(new AcknowledgedBitrateEstimator( |
+ rtc::MakeUnique<BitrateEstimatorCreator>())); |
delay_based_bwe_->SetStartBitrate(bitrate_bps); |
delay_based_bwe_->SetMinBitrate(min_bitrate_bps); |
} |
@@ -279,7 +281,8 @@ void SendSideCongestionController::OnTransportFeedback( |
transport_feedback_adapter_.GetTransportFeedbackVector()); |
SortPacketFeedbackVector(&feedback_vector); |
acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector( |
- feedback_vector); |
+ feedback_vector, |
+ static_cast<bool>(pacer_->GetApplicationLimitedRegionStartTime())); |
DelayBasedBwe::Result result; |
{ |
rtc::CritScope cs(&bwe_lock_); |