From 010eace381f8c01f7d9d9f920df05cb290b1042f Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Tue, 17 Apr 2018 16:44:30 +0200 Subject: [PATCH] Removes redundant members in congestion controller. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit last_target_rate_ and current_target_rate_msg_ both kept track of the same value. pacer_configured_ was not used at all. This CL removes both last_target_rate_ and pacer_configured_. Bug: None Change-Id: Ieb15c38c7d0c44730bef95492e3e677d505f054e Reviewed-on: https://webrtc-review.googlesource.com/70184 Reviewed-by: Björn Terelius Commit-Queue: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#22909} --- .../rtp/send_side_congestion_controller.cc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/modules/congestion_controller/rtp/send_side_congestion_controller.cc b/modules/congestion_controller/rtp/send_side_congestion_controller.cc index 66867ea805..d0e13f380f 100644 --- a/modules/congestion_controller/rtp/send_side_congestion_controller.cc +++ b/modules/congestion_controller/rtp/send_side_congestion_controller.cc @@ -172,7 +172,6 @@ class ControlHandler { void OnPacerQueueUpdate(PacerQueueUpdate msg); rtc::Optional last_transfer_rate(); - bool pacer_configured(); private: void OnNetworkInvalidation(); @@ -186,9 +185,6 @@ class ControlHandler { NetworkChangedObserver* observer_ = nullptr; PacerController* pacer_controller_; - rtc::Optional last_target_rate_; - bool pacer_configured_ = false; - rtc::Optional current_target_rate_msg_; bool network_available_ = true; int64_t last_reported_target_bitrate_bps_ = 0; @@ -219,7 +215,6 @@ void ControlHandler::OnCongestionWindow(CongestionWindow window) { void ControlHandler::OnPacerConfig(PacerConfig config) { RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_); pacer_controller_->OnPacerConfig(config); - pacer_configured_ = true; } void ControlHandler::OnProbeClusterConfig(ProbeClusterConfig config) { @@ -230,7 +225,6 @@ void ControlHandler::OnProbeClusterConfig(ProbeClusterConfig config) { void ControlHandler::OnTargetTransferRate(TargetTransferRate target_rate) { RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_); current_target_rate_msg_ = target_rate; - last_target_rate_ = target_rate; OnNetworkInvalidation(); } @@ -312,12 +306,7 @@ bool ControlHandler::IsSendQueueFull() const { rtc::Optional ControlHandler::last_transfer_rate() { RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_); - return last_target_rate_; -} - -bool ControlHandler::pacer_configured() { - RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_); - return pacer_configured_; + return current_target_rate_msg_; } } // namespace send_side_cc_internal