diff --git a/modules/congestion_controller/include/send_side_congestion_controller.h b/modules/congestion_controller/include/send_side_congestion_controller.h index b33fad0d30..ac70d6066e 100644 --- a/modules/congestion_controller/include/send_side_congestion_controller.h +++ b/modules/congestion_controller/include/send_side_congestion_controller.h @@ -11,6 +11,7 @@ #ifndef MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_H_ #define MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_H_ +#include #include #include @@ -136,7 +137,11 @@ class SendSideCongestionController : public CallStatsObserver, const std::unique_ptr probe_controller_; const std::unique_ptr retransmission_rate_limiter_; TransportFeedbackAdapter transport_feedback_adapter_; + rtc::CriticalSection network_state_lock_; + std::deque feedback_rtts_ RTC_GUARDED_BY(network_state_lock_); + rtc::Optional min_feedback_rtt_ms_ + RTC_GUARDED_BY(network_state_lock_); uint32_t last_reported_bitrate_bps_ RTC_GUARDED_BY(network_state_lock_); uint8_t last_reported_fraction_loss_ RTC_GUARDED_BY(network_state_lock_); int64_t last_reported_rtt_ RTC_GUARDED_BY(network_state_lock_); diff --git a/modules/congestion_controller/send_side_congestion_controller.cc b/modules/congestion_controller/send_side_congestion_controller.cc index ccca692712..5bee61f01d 100644 --- a/modules/congestion_controller/send_side_congestion_controller.cc +++ b/modules/congestion_controller/send_side_congestion_controller.cc @@ -315,11 +315,36 @@ void SendSideCongestionController::AddPacket( void SendSideCongestionController::OnTransportFeedback( const rtcp::TransportFeedback& feedback) { RTC_DCHECK_RUNS_SERIALIZED(&worker_race_); + int64_t feedback_time_ms = clock_->TimeInMilliseconds(); + transport_feedback_adapter_.OnTransportFeedback(feedback); - std::vector feedback_vector = ReceivedPacketFeedbackVector( - transport_feedback_adapter_.GetTransportFeedbackVector()); + std::vector feedback_vector = + transport_feedback_adapter_.GetTransportFeedbackVector(); SortPacketFeedbackVector(&feedback_vector); + int64_t feedback_rtt = -1; + for (const auto& packet_feedback : feedback_vector) { + if (packet_feedback.send_time_ms != PacketFeedback::kNoSendTime && + packet_feedback.arrival_time_ms != PacketFeedback::kNotReceived) { + int64_t rtt = feedback_time_ms - packet_feedback.send_time_ms; + // max() is used to account for feedback being delayed by the + // receiver. + feedback_rtt = std::max(rtt, feedback_rtt); + } + } + if (feedback_rtt > -1) { + rtc::CritScope cs(&network_state_lock_); + feedback_rtts_.push_back(feedback_rtt); + const size_t kFeedbackRttWindow = 32; + if (feedback_rtts_.size() > kFeedbackRttWindow) + feedback_rtts_.pop_front(); + min_feedback_rtt_ms_.emplace( + *std::min_element(feedback_rtts_.begin(), feedback_rtts_.end())); + } + + std::vector received_feedback_vector = + ReceivedPacketFeedbackVector(feedback_vector); + bool currently_in_alr = pacer_->GetApplicationLimitedRegionStartTime().has_value(); if (was_in_alr_ && !currently_in_alr) { @@ -352,22 +377,20 @@ void SendSideCongestionController::LimitOutstandingBytes( size_t num_outstanding_bytes) { RTC_DCHECK(in_cwnd_experiment_); rtc::CritScope lock(&network_state_lock_); - rtc::Optional min_rtt_ms = - transport_feedback_adapter_.GetMinFeedbackLoopRtt(); // No valid RTT. Could be because send-side BWE isn't used, in which case // we don't try to limit the outstanding packets. - if (!min_rtt_ms) + if (!min_feedback_rtt_ms_) return; const size_t kMinCwndBytes = 2 * 1500; size_t max_outstanding_bytes = - std::max((*min_rtt_ms + accepted_queue_ms_) * + std::max((*min_feedback_rtt_ms_ + accepted_queue_ms_) * last_reported_bitrate_bps_ / 1000 / 8, kMinCwndBytes); RTC_LOG(LS_INFO) << clock_->TimeInMilliseconds() << " Outstanding bytes: " << num_outstanding_bytes << " pacer queue: " << pacer_->QueueInMs() << " max outstanding: " << max_outstanding_bytes; - RTC_LOG(LS_INFO) << "Feedback rtt: " << *min_rtt_ms + RTC_LOG(LS_INFO) << "Feedback rtt: " << *min_feedback_rtt_ms_ << " Bitrate: " << last_reported_bitrate_bps_; pause_pacer_ = num_outstanding_bytes > max_outstanding_bytes; } diff --git a/modules/congestion_controller/transport_feedback_adapter.cc b/modules/congestion_controller/transport_feedback_adapter.cc index 0989875df9..89ddce0032 100644 --- a/modules/congestion_controller/transport_feedback_adapter.cc +++ b/modules/congestion_controller/transport_feedback_adapter.cc @@ -131,7 +131,6 @@ std::vector TransportFeedbackAdapter::GetPacketFeedbackVector( return packet_feedback_vector; } packet_feedback_vector.reserve(feedback.GetPacketStatusCount()); - int64_t feedback_rtt = -1; { rtc::CritScope cs(&lock_); size_t failed_lookups = 0; @@ -161,12 +160,6 @@ std::vector TransportFeedbackAdapter::GetPacketFeedbackVector( ++failed_lookups; if (packet_feedback.local_net_id == local_net_id_ && packet_feedback.remote_net_id == remote_net_id_) { - if (packet_feedback.send_time_ms >= 0) { - int64_t rtt = now_ms - packet_feedback.send_time_ms; - // max() is used to account for feedback being delayed by the - // receiver. - feedback_rtt = std::max(rtt, feedback_rtt); - } packet_feedback_vector.push_back(packet_feedback); } @@ -178,14 +171,6 @@ std::vector TransportFeedbackAdapter::GetPacketFeedbackVector( << " packet" << (failed_lookups > 1 ? "s" : "") << ". Send time history too small?"; } - if (feedback_rtt > -1) { - feedback_rtts_.push_back(feedback_rtt); - const size_t kFeedbackRttWindow = 32; - if (feedback_rtts_.size() > kFeedbackRttWindow) - feedback_rtts_.pop_front(); - min_feedback_rtt_.emplace( - *std::min_element(feedback_rtts_.begin(), feedback_rtts_.end())); - } } return packet_feedback_vector; } @@ -206,11 +191,6 @@ TransportFeedbackAdapter::GetTransportFeedbackVector() const { return last_packet_feedback_vector_; } -rtc::Optional TransportFeedbackAdapter::GetMinFeedbackLoopRtt() const { - rtc::CritScope cs(&lock_); - return min_feedback_rtt_; -} - size_t TransportFeedbackAdapter::GetOutstandingBytes() const { rtc::CritScope cs(&lock_); return send_time_history_.GetOutstandingBytes(local_net_id_, remote_net_id_); diff --git a/modules/congestion_controller/transport_feedback_adapter.h b/modules/congestion_controller/transport_feedback_adapter.h index 008bab87f1..bb3a1f79d0 100644 --- a/modules/congestion_controller/transport_feedback_adapter.h +++ b/modules/congestion_controller/transport_feedback_adapter.h @@ -11,7 +11,6 @@ #ifndef MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ #define MODULES_CONGESTION_CONTROLLER_TRANSPORT_FEEDBACK_ADAPTER_H_ -#include #include #include "modules/remote_bitrate_estimator/include/send_time_history.h" @@ -47,7 +46,6 @@ class TransportFeedbackAdapter { // to the CongestionController interface. void OnTransportFeedback(const rtcp::TransportFeedback& feedback); std::vector GetTransportFeedbackVector() const; - rtc::Optional GetMinFeedbackLoopRtt() const; void SetTransportOverhead(int transport_overhead_bytes_per_packet); @@ -69,8 +67,6 @@ class TransportFeedbackAdapter { std::vector last_packet_feedback_vector_; uint16_t local_net_id_ RTC_GUARDED_BY(&lock_); uint16_t remote_net_id_ RTC_GUARDED_BY(&lock_); - std::deque feedback_rtts_ RTC_GUARDED_BY(&lock_); - rtc::Optional min_feedback_rtt_ RTC_GUARDED_BY(&lock_); rtc::CriticalSection observers_lock_; std::vector observers_