Index: webrtc/modules/congestion_controller/congestion_controller.cc |
diff --git a/webrtc/modules/congestion_controller/congestion_controller.cc b/webrtc/modules/congestion_controller/congestion_controller.cc |
index 94b3d8c6da98bbaee3a070e8e9f2421044a758b9..c970ffe9c0ec1b7f0c1b570fb8ba07a538a47229 100644 |
--- a/webrtc/modules/congestion_controller/congestion_controller.cc |
+++ b/webrtc/modules/congestion_controller/congestion_controller.cc |
@@ -327,14 +327,18 @@ void CongestionController::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { |
} |
int64_t CongestionController::TimeUntilNextProcess() { |
- return std::min(bitrate_controller_->TimeUntilNextProcess(), |
- remote_bitrate_estimator_->TimeUntilNextProcess()); |
+ return std::min({bitrate_controller_->TimeUntilNextProcess(), |
+ remote_bitrate_estimator_->TimeUntilNextProcess(), |
+ pacer_->TimeUntilNextProcess(), |
+ remote_estimator_proxy_.TimeUntilNextProcess()}); |
} |
void CongestionController::Process() { |
bitrate_controller_->Process(); |
remote_bitrate_estimator_->Process(); |
probe_controller_->Process(); |
+ pacer_->Process(); |
+ remote_estimator_proxy_.Process(); |
MaybeTriggerOnNetworkChanged(); |
danilchap
2017/01/16 17:09:39
look like it is this function that SetEstimatedBit
nisse-webrtc
2017/01/17 07:42:39
Reorder isn't enough, first call to MaybeTriggerOn
stefan-webrtc
2017/01/17 07:59:54
It might be a good idea to call MaybeTriggerOnNetw
nisse-webrtc
2017/01/17 08:39:35
Done.
|
} |