From e61d72b37c64d970851976a490dc9d65061e1568 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 15 Jun 2018 13:34:39 +0200 Subject: [PATCH] Disables congestion window in pacer when CongestionWindowPushback is enabled. Bug: None Change-Id: I21a26fd6e32eadf1f2a619f6f3cc72da779fa0d3 Reviewed-on: https://webrtc-review.googlesource.com/83727 Commit-Queue: Ying Wang Reviewed-by: Christoffer Rodbro Reviewed-by: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#23627} --- .../rtp/send_side_congestion_controller.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/congestion_controller/rtp/send_side_congestion_controller.cc b/modules/congestion_controller/rtp/send_side_congestion_controller.cc index a75c1bc0fb..ace522cb46 100644 --- a/modules/congestion_controller/rtp/send_side_congestion_controller.cc +++ b/modules/congestion_controller/rtp/send_side_congestion_controller.cc @@ -236,7 +236,9 @@ void ControlHandler::PostUpdates(NetworkControlUpdate update) { RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_); if (update.congestion_window) { congestion_window_ = update.congestion_window; - pacer_controller_->OnCongestionWindow(*update.congestion_window); + if (!congestion_window_pushback_experiment_) { + pacer_controller_->OnCongestionWindow(*update.congestion_window); + } } if (update.pacer_config) { pacer_controller_->OnPacerConfig(*update.pacer_config);