| 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 ce6b96b0b4c430f1cb3afe8ce98257bd8104c4f9..d5f966aeaa7818d721c53aef4e6caf2f50121b1d 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/acknowledged_bitrate_estimator.h"
|
| +#include "webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h"
|
| #include "webrtc/modules/congestion_controller/probe_controller.h"
|
| #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
|
|
|
| @@ -89,8 +89,7 @@
|
| bitrate_controller_(
|
| BitrateController::CreateBitrateController(clock_, event_log)),
|
| acknowledged_bitrate_estimator_(
|
| - rtc::MakeUnique<AcknowledgedBitrateEstimator>(
|
| - rtc::MakeUnique<BitrateEstimatorCreator>())),
|
| + rtc::MakeUnique<AcknowledgedBitrateEstimator>()),
|
| probe_controller_(new ProbeController(pacer_.get(), clock_)),
|
| retransmission_rate_limiter_(
|
| new RateLimiter(clock, kRetransmitWindowSizeMs)),
|
| @@ -279,8 +278,7 @@
|
| transport_feedback_adapter_.GetTransportFeedbackVector());
|
| SortPacketFeedbackVector(&feedback_vector);
|
| acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector(
|
| - feedback_vector,
|
| - static_cast<bool>(pacer_->GetApplicationLimitedRegionStartTime()));
|
| + feedback_vector);
|
| DelayBasedBwe::Result result;
|
| {
|
| rtc::CritScope cs(&bwe_lock_);
|
|
|