mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-17 07:37:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removes redundant members in congestion controller.

Browse source 
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 <terelius@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22909}
This commit is contained in:
Sebastian Jansson 2018-04-17 16:44:30 +02:00 committed by Commit Bot
parent 98c704fcfd
commit 010eace381
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/congestion_controller/rtp/send_side_congestion_controller.cc
View file

@ -172,7 +172,6 @@ class ControlHandler {
void OnPacerQueueUpdate(PacerQueueUpdate msg); void OnPacerQueueUpdate(PacerQueueUpdate msg);
rtc::Optional<TargetTransferRate> last_transfer_rate(); rtc::Optional<TargetTransferRate> last_transfer_rate();
bool pacer_configured();
private: private:
void OnNetworkInvalidation(); void OnNetworkInvalidation();
@ -186,9 +185,6 @@ class ControlHandler {
NetworkChangedObserver* observer_ = nullptr; NetworkChangedObserver* observer_ = nullptr;
PacerController* pacer_controller_; PacerController* pacer_controller_;
rtc::Optional<TargetTransferRate> last_target_rate_;
bool pacer_configured_ = false;
rtc::Optional<TargetTransferRate> current_target_rate_msg_; rtc::Optional<TargetTransferRate> current_target_rate_msg_;
bool network_available_ = true; bool network_available_ = true;
int64_t last_reported_target_bitrate_bps_ = 0; int64_t last_reported_target_bitrate_bps_ = 0;
@ -219,7 +215,6 @@ void ControlHandler::OnCongestionWindow(CongestionWindow window) {
void ControlHandler::OnPacerConfig(PacerConfig config) { void ControlHandler::OnPacerConfig(PacerConfig config) {
RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_); RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_);
pacer_controller_->OnPacerConfig(config); pacer_controller_->OnPacerConfig(config);
pacer_configured_ = true;
} }
void ControlHandler::OnProbeClusterConfig(ProbeClusterConfig config) { void ControlHandler::OnProbeClusterConfig(ProbeClusterConfig config) {
@ -230,7 +225,6 @@ void ControlHandler::OnProbeClusterConfig(ProbeClusterConfig config) {
void ControlHandler::OnTargetTransferRate(TargetTransferRate target_rate) { void ControlHandler::OnTargetTransferRate(TargetTransferRate target_rate) {
RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_); RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_);
current_target_rate_msg_ = target_rate; current_target_rate_msg_ = target_rate;
last_target_rate_ = target_rate;
OnNetworkInvalidation(); OnNetworkInvalidation();
} }
@ -312,12 +306,7 @@ bool ControlHandler::IsSendQueueFull() const {
rtc::Optional<TargetTransferRate> ControlHandler::last_transfer_rate() { rtc::Optional<TargetTransferRate> ControlHandler::last_transfer_rate() {
RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_); RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_);
return last_target_rate_; return current_target_rate_msg_;
}
bool ControlHandler::pacer_configured() {
RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_);
return pacer_configured_;
} }
} // namespace send_side_cc_internal } // namespace send_side_cc_internal