Move ownership of PacketRouter from CongestionController to Call.

webrtc/video/video_send_stream.cc

Index: webrtc/video/video_send_stream.cc
diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index a39b76b616c758060937a6748abd753cb476bb50..f54209f900c0dd99901d4e89842e05cf7675ab0b 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -294,6 +294,7 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver,
                       rtc::TaskQueue* worker_queue,
                       CallStats* call_stats,
                       CongestionController* congestion_controller,
+                      PacketRouter* packet_router,
                       BitrateAllocator* bitrate_allocator,
                       SendDelayStats* send_delay_stats,
                       VieRemb* remb,
@@ -373,6 +374,7 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver,
 
   CallStats* const call_stats_;
   CongestionController* const congestion_controller_;
+  PacketRouter* const packet_router_;
   BitrateAllocator* const bitrate_allocator_;
   VieRemb* const remb_;
 
@@ -421,6 +423,7 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
                    ProcessThread* module_process_thread,
                    CallStats* call_stats,
                    CongestionController* congestion_controller,
+                   PacketRouter* packet_router,
                    BitrateAllocator* bitrate_allocator,
                    SendDelayStats* send_delay_stats,
                    VieRemb* remb,
@@ -434,6 +437,7 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
         vie_encoder_(vie_encoder),
         call_stats_(call_stats),
         congestion_controller_(congestion_controller),
+        packet_router_(packet_router),
         bitrate_allocator_(bitrate_allocator),
         send_delay_stats_(send_delay_stats),
         remb_(remb),
@@ -448,9 +452,9 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
   bool Run() override {
     send_stream_->reset(new VideoSendStreamImpl(
         stats_proxy_, rtc::TaskQueue::Current(), call_stats_,
-        congestion_controller_, bitrate_allocator_, send_delay_stats_, remb_,
-        vie_encoder_, event_log_, config_, initial_encoder_max_bitrate_,
-        std::move(suspended_ssrcs_)));
+        congestion_controller_, packet_router_, bitrate_allocator_,
+        send_delay_stats_, remb_, vie_encoder_, event_log_, config_,
+        initial_encoder_max_bitrate_, std::move(suspended_ssrcs_)));
     return true;
   }
 
@@ -460,6 +464,7 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
   ViEEncoder* const vie_encoder_;
   CallStats* const call_stats_;
   CongestionController* const congestion_controller_;
+  PacketRouter* const packet_router_;
   BitrateAllocator* const bitrate_allocator_;
   SendDelayStats* const send_delay_stats_;
   VieRemb* const remb_;
@@ -574,6 +579,7 @@ VideoSendStream::VideoSendStream(
     rtc::TaskQueue* worker_queue,
     CallStats* call_stats,
     CongestionController* congestion_controller,
+    PacketRouter* packet_router,
     BitrateAllocator* bitrate_allocator,
     SendDelayStats* send_delay_stats,
     VieRemb* remb,
@@ -593,7 +599,7 @@ VideoSendStream::VideoSendStream(
 
   worker_queue_->PostTask(std::unique_ptr<rtc::QueuedTask>(new ConstructionTask(
       &send_stream_, &thread_sync_event_, &stats_proxy_, vie_encoder_.get(),
-      module_process_thread, call_stats, congestion_controller,
+      module_process_thread, call_stats, congestion_controller, packet_router,
       bitrate_allocator, send_delay_stats, remb, event_log, &config_,
       encoder_config.max_bitrate_bps, suspended_ssrcs)));
 
@@ -701,6 +707,7 @@ VideoSendStreamImpl::VideoSendStreamImpl(
     rtc::TaskQueue* worker_queue,
     CallStats* call_stats,
     CongestionController* congestion_controller,
+    PacketRouter* packet_router,
     BitrateAllocator* bitrate_allocator,
     SendDelayStats* send_delay_stats,
     VieRemb* remb,
@@ -717,6 +724,7 @@ VideoSendStreamImpl::VideoSendStreamImpl(
       check_encoder_activity_task_(nullptr),
       call_stats_(call_stats),
       congestion_controller_(congestion_controller),
+      packet_router_(packet_router),
       bitrate_allocator_(bitrate_allocator),
       remb_(remb),
       flexfec_sender_(MaybeCreateFlexfecSender(*config_)),
@@ -738,7 +746,7 @@ VideoSendStreamImpl::VideoSendStreamImpl(
           congestion_controller_->GetTransportFeedbackObserver(),
           call_stats_->rtcp_rtt_stats(),
           congestion_controller_->pacer(),
-          congestion_controller_->packet_router(),
+          packet_router_,
           flexfec_sender_.get(),
           stats_proxy_,
           send_delay_stats,
@@ -766,7 +774,7 @@ VideoSendStreamImpl::VideoSendStreamImpl(
 
   // RTP/RTCP initialization.
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
-    congestion_controller_->packet_router()->AddRtpModule(rtp_rtcp);
+    packet_router_->AddRtpModule(rtp_rtcp);
   }
 
   for (size_t i = 0; i < config_->rtp.extensions.size(); ++i) {
@@ -847,7 +855,7 @@ VideoSendStreamImpl::~VideoSendStreamImpl() {
   remb_->RemoveRembSender(rtp_rtcp_modules_[0]);
 
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
-    congestion_controller_->packet_router()->RemoveRtpModule(rtp_rtcp);
+    packet_router_->RemoveRtpModule(rtp_rtcp);
     delete rtp_rtcp;
   }
 }