[fix] fix pacer rate setting

src/transport/ice_transport_controller.cpp

@@ -17,6 +17,7 @@ IceTransportController::IceTransportController(
       audio_codec_inited_(false),
       load_nvcodec_dll_success_(false),
       hardware_acceleration_(false),
+      congestion_window_size_(DataSize::PlusInfinity()),
       clock_(clock),
       webrtc_clock_(webrtc::Clock::GetWebrtcClockShared(clock)) {
   SetPeriod(std::chrono::milliseconds(25));
@@ -515,7 +516,20 @@ void IceTransportController::OnSentRtpPacket(
 }
 
 void IceTransportController::PostUpdates(webrtc::NetworkControlUpdate update) {
-  // UpdateControlState();
+  if (update.congestion_window) {
+    congestion_window_size_ = *update.congestion_window;
+    UpdateCongestedState();
+  }
+
+  if (update.pacer_config) {
+    packet_sender_->SetPacingRates(update.pacer_config->data_rate(),
+                                   update.pacer_config->pad_rate());
+  }
+
+  if (!update.probe_cluster_configs.empty()) {
+    packet_sender_->CreateProbeClusters(
+        std::move(update.probe_cluster_configs));
+  }
 
   if (update.target_rate) {
     int target_bitrate = update.target_rate.has_value()
@@ -543,11 +557,7 @@ void IceTransportController::PostUpdates(webrtc::NetworkControlUpdate update) {
       video_encoder_->SetTargetBitrate(target_bitrate_);
       // LOG_WARN("Set target bitrate [{}]bps", target_bitrate_);
     }
-  }
-
-  if (!update.probe_cluster_configs.empty()) {
-    packet_sender_->CreateProbeClusters(
-        std::move(update.probe_cluster_configs));
+    UpdateControlState();
   }
 }
 
@@ -557,10 +567,19 @@ void IceTransportController::UpdateControlState() {
 }
 
 void IceTransportController::UpdateCongestedState() {
-  if (controller_) {
+  if (auto update = GetCongestedStateUpdate()) {
+    is_congested_ = update.value();
+    packet_sender_->SetCongested(update.value());
   }
 }
 
+std::optional<bool> IceTransportController::GetCongestedStateUpdate() const {
+  bool congested = transport_feedback_adapter_.GetOutstandingData() >=
+                   congestion_window_size_;
+  if (congested != is_congested_) return congested;
+  return std::nullopt;
+}
+
 bool IceTransportController::Process() {
   webrtc::ProcessInterval msg;
   msg.at_time = Timestamp::Millis(webrtc_clock_->TimeInMilliseconds());

src/transport/ice_transport_controller.h

@@ -88,6 +88,7 @@ class IceTransportController
   void PostUpdates(webrtc::NetworkControlUpdate update);
   void UpdateControlState();
   void UpdateCongestedState();
+  std::optional<bool> GetCongestedStateUpdate() const;
 
  private:
   bool Process() override;
@@ -119,6 +120,8 @@ class IceTransportController
   webrtc::TransportFeedbackAdapter transport_feedback_adapter_;
   std::unique_ptr<CongestionControl> controller_;
   BitrateProber prober_;
+  webrtc::DataSize congestion_window_size_;
+  bool is_congested_ = false;
 
  private:
   std::unique_ptr<VideoEncoder> video_encoder_ = nullptr;

src/transport/packet_sender/packet_sender_imp.cpp

@@ -17,7 +17,8 @@ PacketSenderImp::PacketSenderImp(std::shared_ptr<IceAgent> ice_agent,
       is_shutdown_(false),
       packet_size_(/*alpha=*/0.95),
       include_overhead_(false),
-      last_send_time_(webrtc::Timestamp::Millis(0)) {}
+      last_send_time_(webrtc::Timestamp::Millis(0)),
+      last_call_time_(webrtc::Timestamp::Millis(0)) {}
 
 PacketSenderImp::~PacketSenderImp() {}
 
@@ -281,6 +282,9 @@ int PacketSenderImp::EnqueueRtpPacket(
         break;
     }
 
+    // webrtc::PacedPacketInfo cluster_info;
+    // SendPacket(std::move(rtp_packet_to_send), cluster_info);
+
     to_send_rtp_packets.push_back(std::move(rtp_packet_to_send));
   }
 

src/transport/packet_sender/packet_sender_imp.h

@@ -60,7 +60,6 @@ class PacketSenderImp : public PacketSender,
       }
 
       packet->UpdateSequenceNumber(ssrc_seq_[packet->Ssrc()]++);
-
       on_sent_packet_func_(*packet);
     }
   }
@@ -218,6 +217,7 @@ class PacketSenderImp : public PacketSender,
   std::map<int32_t, int16_t> ssrc_seq_;
 
   webrtc::Timestamp last_send_time_;
+  webrtc::Timestamp last_call_time_;
 };
 
 #endif