Clean up of CongestionController.

webrtc/video/video_receive_stream.cc

 /*
  *  Copyright (c) 2013 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/video/video_receive_stream.h"
 
 #include <stdlib.h>
 
 #include <set>
 #include <string>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/call/congestion_controller.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/video/call_stats.h"
 #include "webrtc/video/receive_statistics_proxy.h"
+#include "webrtc/video/vie_remb.h"
 #include "webrtc/video_receive_stream.h"
 
 namespace webrtc {
 
 static bool UseSendSideBwe(const VideoReceiveStream::Config& config) {
   if (!config.rtp.transport_cc)
     return false;
   for (const auto& extension : config.rtp.extensions) {
     if (extension.name == RtpExtension::kTransportSequenceNumber)
       return true;
@@ skipping 104 matching lines @@
   return codec;
 }
 }  // namespace
 
 VideoReceiveStream::VideoReceiveStream(
     int num_cpu_cores,
     CongestionController* congestion_controller,
     const VideoReceiveStream::Config& config,
     webrtc::VoiceEngine* voice_engine,
     ProcessThread* process_thread,
-    CallStats* call_stats)
+    CallStats* call_stats,
+    VieRemb* remb)
     : transport_adapter_(config.rtcp_send_transport),
       encoded_frame_proxy_(config.pre_decode_callback),
       config_(config),
       process_thread_(process_thread),
       clock_(Clock::GetRealTimeClock()),
       congestion_controller_(congestion_controller),
       call_stats_(call_stats),
+      remb_(remb),
       vcm_(VideoCodingModule::Create(clock_, nullptr, nullptr)),
       incoming_video_stream_(
           0,
           config.renderer ? config.renderer->SmoothsRenderedFrames() : false),
       stats_proxy_(config_.rtp.remote_ssrc, clock_),
       vie_channel_(num_cpu_cores,
                    &transport_adapter_,
                    process_thread,
                    nullptr,
                    vcm_.get(),
                    nullptr,
                    nullptr,
                    nullptr,
                    congestion_controller_->GetRemoteBitrateEstimator(
                        UseSendSideBwe(config_)),
                    call_stats_->rtcp_rtt_stats(),
                    congestion_controller_->pacer(),
                    congestion_controller_->packet_router(),
                    1,
                    false) {
   LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString();
 
+  RTC_DCHECK(congestion_controller_);

[the sun, 2016/02/08 10:39:23]

nit: process_thread missing

[stefan-webrtc, 2016/02/08 13:30:54]

Done.

+  RTC_DCHECK(call_stats_);
+  RTC_DCHECK(remb_);
   RTC_CHECK(vie_channel_.Init() == 0);
 
   // Register the channel to receive stats updates.
   call_stats_->RegisterStatsObserver(vie_channel_.GetStatsObserver());
 
   // TODO(pbos): This is not fine grained enough...
   vie_channel_.SetProtectionMode(config_.rtp.nack.rtp_history_ms > 0, false,
                                   -1, -1);
   RTC_DCHECK(config_.rtp.rtcp_mode != RtcpMode::kOff)
       << "A stream should not be configured with RTCP disabled. This value is "
@@ skipping 13 matching lines @@
     RTC_DCHECK(it->second.payload_type != 0);
 
     vie_channel_.SetRemoteSSRCType(kViEStreamTypeRtx, it->second.ssrc);
     vie_channel_.SetRtxReceivePayloadType(it->second.payload_type, it->first);
   }
   // TODO(holmer): When Chrome no longer depends on this being false by default,
   // always use the mapping and remove this whole codepath.
   vie_channel_.SetUseRtxPayloadMappingOnRestore(
       config_.rtp.use_rtx_payload_mapping_on_restore);
 
-  congestion_controller_->SetChannelRembStatus(false, config_.rtp.remb,
-                                               vie_channel_.rtp_rtcp());
+  RtpRtcp* rtp_module = vie_channel_.rtp_rtcp();
+  if (config_.rtp.remb) {
+    rtp_module->SetREMBStatus(true);
+    remb_->AddReceiveChannel(rtp_module);
+  }
 
   for (size_t i = 0; i < config_.rtp.extensions.size(); ++i) {
     const std::string& extension = config_.rtp.extensions[i].name;
     int id = config_.rtp.extensions[i].id;
     // One-byte-extension local identifiers are in the range 1-14 inclusive.
     RTC_DCHECK_GE(id, 1);
     RTC_DCHECK_LE(id, 14);
     if (extension == RtpExtension::kTOffset) {
       RTC_CHECK_EQ(0, vie_channel_.SetReceiveTimestampOffsetStatus(true, id));
     } else if (extension == RtpExtension::kAbsSendTime) {
@@ skipping 70 matching lines @@
 }
 
 VideoReceiveStream::~VideoReceiveStream() {
   LOG(LS_INFO) << "~VideoReceiveStream: " << config_.ToString();
   incoming_video_stream_.Stop();
   process_thread_->DeRegisterModule(vcm_.get());
   vie_channel_.RegisterPreRenderCallback(nullptr);
   vie_channel_.RegisterPreDecodeImageCallback(nullptr);
 
   call_stats_->DeregisterStatsObserver(vie_channel_.GetStatsObserver());
-  congestion_controller_->SetChannelRembStatus(false, false,
-                                               vie_channel_.rtp_rtcp());
+
+  RtpRtcp* rtp_module = vie_channel_.rtp_rtcp();
+  rtp_module->SetREMBStatus(false);
+  remb_->RemoveReceiveChannel(rtp_module);
 
   uint32_t remote_ssrc = vie_channel_.GetRemoteSSRC();
   congestion_controller_->GetRemoteBitrateEstimator(UseSendSideBwe(config_))
       ->RemoveStream(remote_ssrc);
 }
 
 void VideoReceiveStream::Start() {
   transport_adapter_.Enable();
   incoming_video_stream_.Start();
   vie_channel_.StartReceive();
@@ skipping 71 matching lines @@
   return 0;
 }
 
 void VideoReceiveStream::SignalNetworkState(NetworkState state) {
   vie_channel_.SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode
                                                 : RtcpMode::kOff);
 }
 
 }  // namespace internal
 }  // namespace webrtc