Clean up of CongestionController.

webrtc/call/congestion_controller.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/call/congestion_controller.h"
 
+#include <vector>
+
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
+#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/pacing/packet_router.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"
 #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h"
 #include "webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/video/call_stats.h"
 #include "webrtc/video/payload_router.h"
-#include "webrtc/video/vie_encoder.h"
-#include "webrtc/video/vie_remb.h"
-#include "webrtc/voice_engine/include/voe_video_sync.h"
 
 namespace webrtc {
 namespace {
 
 static const uint32_t kTimeOffsetSwitchThreshold = 30;
 
 class WrappingBitrateEstimator : public RemoteBitrateEstimator {
  public:
   WrappingBitrateEstimator(RemoteBitrateObserver* observer, Clock* clock)
       : observer_(observer),
@@ skipping 94 matching lines @@
   rtc::scoped_ptr<RemoteBitrateEstimator> rbe_;
   bool using_absolute_send_time_;
   uint32_t packets_since_absolute_send_time_;
   int min_bitrate_bps_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WrappingBitrateEstimator);
 };
 
 }  // namespace
 
-CongestionController::CongestionController(ProcessThread* process_thread,
-                                           CallStats* call_stats,
-                                           BitrateObserver* bitrate_observer)
-    : remb_(new VieRemb(Clock::GetRealTimeClock())),
-      packet_router_(new PacketRouter()),
-      pacer_(new PacedSender(Clock::GetRealTimeClock(),
+CongestionController::CongestionController(
+    Clock* clock,

[the sun, 2016/02/05 15:12:37]

Store clock in a field and use instead of GetRealTimeClock throughout this file?

[stefan-webrtc, 2016/02/07 18:29:27]

Good suggestion, I don't know why I didn't do that.

+    ProcessThread* process_thread,
+    CallStats* call_stats,
+    BitrateObserver* bitrate_observer,
+    RemoteBitrateObserver* remote_bitrate_observer)
+    : packet_router_(new PacketRouter()),
+      pacer_(new PacedSender(clock,
                              packet_router_.get(),
                              BitrateController::kDefaultStartBitrateKbps,
                              PacedSender::kDefaultPaceMultiplier *
                                  BitrateController::kDefaultStartBitrateKbps,
                              0)),
       remote_bitrate_estimator_(
-          new WrappingBitrateEstimator(remb_.get(), Clock::GetRealTimeClock())),
+          new WrappingBitrateEstimator(remote_bitrate_observer,
+                                       Clock::GetRealTimeClock())),
       remote_estimator_proxy_(
           new RemoteEstimatorProxy(Clock::GetRealTimeClock(),
                                    packet_router_.get())),
       process_thread_(process_thread),
       call_stats_(call_stats),
       pacer_thread_(ProcessThread::Create("PacerThread")),
       // Constructed last as this object calls the provided callback on
       // construction.
       bitrate_controller_(
-          BitrateController::CreateBitrateController(Clock::GetRealTimeClock(),
-                                                     bitrate_observer)),
+          BitrateController::CreateBitrateController(clock, bitrate_observer)),
       min_bitrate_bps_(RemoteBitrateEstimator::kDefaultMinBitrateBps) {
   call_stats_->RegisterStatsObserver(remote_bitrate_estimator_.get());
 
   pacer_thread_->RegisterModule(pacer_.get());
   pacer_thread_->RegisterModule(remote_estimator_proxy_.get());
   pacer_thread_->Start();
 
-  process_thread->RegisterModule(remote_bitrate_estimator_.get());
-  process_thread->RegisterModule(bitrate_controller_.get());
+  process_thread_->RegisterModule(remote_bitrate_estimator_.get());
+  process_thread_->RegisterModule(bitrate_controller_.get());
 }
 
 CongestionController::~CongestionController() {
   pacer_thread_->Stop();
   pacer_thread_->DeRegisterModule(pacer_.get());
   pacer_thread_->DeRegisterModule(remote_estimator_proxy_.get());
   process_thread_->DeRegisterModule(bitrate_controller_.get());
   process_thread_->DeRegisterModule(remote_bitrate_estimator_.get());
   call_stats_->DeregisterStatsObserver(remote_bitrate_estimator_.get());
   if (transport_feedback_adapter_.get())
     call_stats_->DeregisterStatsObserver(transport_feedback_adapter_.get());
-  RTC_DCHECK(!remb_->InUse());
-  RTC_DCHECK(encoders_.empty());
 }
 
-void CongestionController::AddEncoder(ViEEncoder* encoder) {
-  rtc::CritScope lock(&encoder_crit_);
-  encoders_.push_back(encoder);
-}
-
-void CongestionController::RemoveEncoder(ViEEncoder* encoder) {
-  rtc::CritScope lock(&encoder_crit_);
-  for (auto it = encoders_.begin(); it != encoders_.end(); ++it) {
-    if (*it == encoder) {
-      encoders_.erase(it);
-      return;
-    }
-  }
-}
 
 void CongestionController::SetBweBitrates(int min_bitrate_bps,
                                           int start_bitrate_bps,
                                           int max_bitrate_bps) {
   if (start_bitrate_bps > 0)
     bitrate_controller_->SetStartBitrate(start_bitrate_bps);
   bitrate_controller_->SetMinMaxBitrate(min_bitrate_bps, max_bitrate_bps);
   if (remote_bitrate_estimator_.get())
     remote_bitrate_estimator_->SetMinBitrate(min_bitrate_bps);
   if (transport_feedback_adapter_.get())
@@ skipping 33 matching lines @@
 void CongestionController::UpdatePacerBitrate(int bitrate_kbps,
                                               int max_bitrate_kbps,
                                               int min_bitrate_kbps) {
   pacer_->UpdateBitrate(bitrate_kbps, max_bitrate_kbps, min_bitrate_kbps);
 }
 
 int64_t CongestionController::GetPacerQueuingDelayMs() const {
   return pacer_->QueueInMs();
 }
 
-// TODO(mflodman): Move out of this class.
-void CongestionController::SetChannelRembStatus(bool sender,
-                                                bool receiver,
-                                                RtpRtcp* rtp_module) {
-  rtp_module->SetREMBStatus(sender || receiver);
-  if (sender) {
-    remb_->AddRembSender(rtp_module);
-  } else {
-    remb_->RemoveRembSender(rtp_module);
-  }
-  if (receiver) {
-    remb_->AddReceiveChannel(rtp_module);
-  } else {
-    remb_->RemoveReceiveChannel(rtp_module);
-  }
-}
-
 void CongestionController::SignalNetworkState(NetworkState state) {
   if (state == kNetworkUp) {
     pacer_->Resume();
   } else {
     pacer_->Pause();
   }
 }
 
 void CongestionController::OnSentPacket(const rtc::SentPacket& sent_packet) {
   if (transport_feedback_adapter_) {
     transport_feedback_adapter_->OnSentPacket(sent_packet.packet_id,
                                               sent_packet.send_time_ms);
   }
 }
 }  // namespace webrtc