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 d5f966aeaa7818d721c53aef4e6caf2f50121b1d..0972ccda2b33353235962063db7f6637b7211f65 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" |
@@ -278,7 +278,8 @@ void SendSideCongestionController::OnTransportFeedback( |
transport_feedback_adapter_.GetTransportFeedbackVector()); |
SortPacketFeedbackVector(&feedback_vector); |
acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector( |
- feedback_vector); |
+ feedback_vector, |
+ static_cast<bool>(pacer_->GetApplicationLimitedRegionStartTime())); |
stefan-webrtc
2017/07/06 15:28:37
I prefer:
pacer_->GetApplicationLimitedRegionStart
tschumi
2017/07/07 07:51:14
GetApplicationLimitedRegionStartTime returns a rtc
holmer
2017/07/07 07:53:06
Ah, my bad :)
Maybe you don't even need the cast
terelius
2017/07/07 08:01:19
I think the cast is needed, but there is a .has_va
tschumi
2017/07/07 09:07:59
Ok use has_value() now.
|
DelayBasedBwe::Result result; |
{ |
rtc::CritScope cs(&bwe_lock_); |