Remove SendPacer from ViEEncoder

webrtc/modules/congestion_controller/congestion_controller.cc

Index: webrtc/modules/congestion_controller/congestion_controller.cc
diff --git a/webrtc/modules/congestion_controller/congestion_controller.cc b/webrtc/modules/congestion_controller/congestion_controller.cc
index 4517fc44f75a4de12b552e780131b1e12ecc2135..6858da2724ffa2a52e59cc0e61495aa603a7ddf4 100644
--- a/webrtc/modules/congestion_controller/congestion_controller.cc
+++ b/webrtc/modules/congestion_controller/congestion_controller.cc
@@ -20,7 +20,6 @@
 #include "webrtc/base/socket.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
-#include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h"
 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h"
 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h"
@@ -142,17 +141,16 @@ CongestionController::CongestionController(
     RemoteBitrateObserver* remote_bitrate_observer)
     : clock_(clock),
       pacer_(new PacedSender(clock_,
-             &packet_router_,
-             BitrateController::kDefaultStartBitrateKbps,
-             PacedSender::kDefaultPaceMultiplier *
-                 BitrateController::kDefaultStartBitrateKbps,
-             0)),
+                             &packet_router_,
+                             BitrateController::kDefaultStartBitratebps)),
       remote_bitrate_estimator_(
           new WrappingBitrateEstimator(remote_bitrate_observer, clock_)),
       // Constructed last as this object calls the provided callback on
       // construction.
       bitrate_controller_(
-          BitrateController::CreateBitrateController(clock_, bitrate_observer)),
+          BitrateController::CreateBitrateController(clock_,
+                                                     bitrate_observer,
+                                                     pacer_.get())),
       remote_estimator_proxy_(clock_, &packet_router_),
       transport_feedback_adapter_(bitrate_controller_.get(), clock_),
       min_bitrate_bps_(RemoteBitrateEstimator::kDefaultMinBitrateBps) {
@@ -207,10 +205,12 @@ CongestionController::GetTransportFeedbackObserver() {
   return &transport_feedback_adapter_;
 }
 
-void CongestionController::UpdatePacerBitrate(int bitrate_kbps,
-                                              int max_bitrate_kbps,
-                                              int min_bitrate_kbps) {
-  pacer_->UpdateBitrate(bitrate_kbps, max_bitrate_kbps, min_bitrate_kbps);
+void CongestionController::UpdatePaddingBitrate(int bitrate_bps) {
+  pacer_->SetPaddingBitrate(bitrate_bps);
+}
+
+void CongestionController::SetMinimumSendBitrate(int bitrate_bps) {
+  pacer_->SetMinimumSendBitrate(bitrate_bps);
 }
 
 int64_t CongestionController::GetPacerQueuingDelayMs() const {