Split CongestionController into send- and receive-side classes.

webrtc/audio/audio_send_stream.cc

Index: webrtc/audio/audio_send_stream.cc
diff --git a/webrtc/audio/audio_send_stream.cc b/webrtc/audio/audio_send_stream.cc
index 438d1cc78a5aca5d7657b6368bfbac03fa5aed8e..6364202aa65ccc573acbb76e29034e813d5e32a3 100644
--- a/webrtc/audio/audio_send_stream.cc
+++ b/webrtc/audio/audio_send_stream.cc
@@ -20,7 +20,7 @@
 #include "webrtc/base/logging.h"
 #include "webrtc/base/task_queue.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/paced_sender.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/voice_engine/channel_proxy.h"
@@ -45,7 +45,7 @@ AudioSendStream::AudioSendStream(
     const rtc::scoped_refptr<webrtc::AudioState>& audio_state,
     rtc::TaskQueue* worker_queue,
     PacketRouter* packet_router,
-    CongestionController* congestion_controller,
+    SendSideCongestionController* send_side_cc,
     BitrateAllocator* bitrate_allocator,
     RtcEventLog* event_log,
     RtcpRttStats* rtcp_rtt_stats)
@@ -53,11 +53,11 @@ AudioSendStream::AudioSendStream(
       config_(config),
       audio_state_(audio_state),
       bitrate_allocator_(bitrate_allocator),
-      congestion_controller_(congestion_controller) {
+      send_side_cc_(send_side_cc) {
   LOG(LS_INFO) << "AudioSendStream: " << config_.ToString();
   RTC_DCHECK_NE(config_.voe_channel_id, -1);
   RTC_DCHECK(audio_state_.get());
-  RTC_DCHECK(congestion_controller);
+  RTC_DCHECK(send_side_cc);
 
   VoiceEngineImpl* voe_impl = static_cast<VoiceEngineImpl*>(voice_engine());
   channel_proxy_ = voe_impl->GetChannelProxy(config_.voe_channel_id);
@@ -78,15 +78,15 @@ AudioSendStream::AudioSendStream(
       channel_proxy_->SetSendAudioLevelIndicationStatus(true, extension.id);
     } else if (extension.uri == RtpExtension::kTransportSequenceNumberUri) {
       channel_proxy_->EnableSendTransportSequenceNumber(extension.id);
-      congestion_controller->EnablePeriodicAlrProbing(true);
-      bandwidth_observer_.reset(congestion_controller->GetBitrateController()
-                                    ->CreateRtcpBandwidthObserver());
+      send_side_cc->EnablePeriodicAlrProbing(true);
+      bandwidth_observer_.reset(
+          send_side_cc->GetBitrateController()->CreateRtcpBandwidthObserver());
     } else {
       RTC_NOTREACHED() << "Registering unsupported RTP extension.";
     }
   }
   channel_proxy_->RegisterSenderCongestionControlObjects(
-      congestion_controller->pacer(), congestion_controller, packet_router,
+      send_side_cc->pacer(), send_side_cc, packet_router,
       bandwidth_observer_.get());
   if (!SetupSendCodec()) {
     LOG(LS_ERROR) << "Failed to set up send codec state.";
@@ -254,7 +254,7 @@ const webrtc::AudioSendStream::Config& AudioSendStream::config() const {
 
 void AudioSendStream::SetTransportOverhead(int transport_overhead_per_packet) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
-  congestion_controller_->SetTransportOverhead(transport_overhead_per_packet);
+  send_side_cc_->SetTransportOverhead(transport_overhead_per_packet);
   channel_proxy_->SetTransportOverhead(transport_overhead_per_packet);
 }