Split CongestionController into send- and receive-side classes.

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 25bb4683cc5c8a241f818ae4b08cbe8756c5bcc5..5c44efa904247eeba97db1040e9afc2fd5a59128 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -25,7 +25,7 @@
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/include/video_bitrate_allocator.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
-#include "webrtc/modules/congestion_controller/include/congestion_controller.h"
+#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h"
 #include "webrtc/modules/pacing/packet_router.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/utility/include/process_thread.h"
@@ -325,7 +325,7 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver,
   VideoSendStreamImpl(SendStatisticsProxy* stats_proxy,
                       rtc::TaskQueue* worker_queue,
                       CallStats* call_stats,
-                      CongestionController* congestion_controller,
+                      SendSideCongestionController* congestion_controller,
                       PacketRouter* packet_router,
                       BitrateAllocator* bitrate_allocator,
                       SendDelayStats* send_delay_stats,
@@ -411,7 +411,7 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver,
       GUARDED_BY(encoder_activity_crit_sect_);
 
   CallStats* const call_stats_;
-  CongestionController* const congestion_controller_;
+  SendSideCongestionController* const congestion_controller_;

[philipel, 2017/03/20 16:48:19]

Same here, WDYT about renaming this to |send_side_cc_|, or to
|send_side_congestion_controller_| which is used in CongestionController?

   PacketRouter* const packet_router_;
   BitrateAllocator* const bitrate_allocator_;
   VieRemb* const remb_;
@@ -460,7 +460,7 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
                    ViEEncoder* vie_encoder,
                    ProcessThread* module_process_thread,
                    CallStats* call_stats,
-                   CongestionController* congestion_controller,
+                   SendSideCongestionController* congestion_controller,
                    PacketRouter* packet_router,
                    BitrateAllocator* bitrate_allocator,
                    SendDelayStats* send_delay_stats,
@@ -501,7 +501,7 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
   SendStatisticsProxy* const stats_proxy_;
   ViEEncoder* const vie_encoder_;
   CallStats* const call_stats_;
-  CongestionController* const congestion_controller_;
+  SendSideCongestionController* const congestion_controller_;
   PacketRouter* const packet_router_;
   BitrateAllocator* const bitrate_allocator_;
   SendDelayStats* const send_delay_stats_;
@@ -616,7 +616,7 @@ VideoSendStream::VideoSendStream(
     ProcessThread* module_process_thread,
     rtc::TaskQueue* worker_queue,
     CallStats* call_stats,
-    CongestionController* congestion_controller,
+    SendSideCongestionController* congestion_controller,
     PacketRouter* packet_router,
     BitrateAllocator* bitrate_allocator,
     SendDelayStats* send_delay_stats,
@@ -750,7 +750,7 @@ VideoSendStreamImpl::VideoSendStreamImpl(
     SendStatisticsProxy* stats_proxy,
     rtc::TaskQueue* worker_queue,
     CallStats* call_stats,
-    CongestionController* congestion_controller,
+    SendSideCongestionController* congestion_controller,
     PacketRouter* packet_router,
     BitrateAllocator* bitrate_allocator,
     SendDelayStats* send_delay_stats,