Move BitrateAllocator from BitrateController logic to Call.

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 <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/bitrate_controller/include/bitrate_controller.h"

[stefan-webrtc, 2015/11/13 08:29:27]

Why is this needed in video_receive_stream.cc?

[mflodman, 2015/11/13 08:35:36]

It is needed for the line of code you commented on below and was incorrectly not
added here previously.

 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/video/receive_statistics_proxy.h"
 #include "webrtc/video_engine/call_stats.h"
 #include "webrtc/video_receive_stream.h"
 
 namespace webrtc {
 
 static bool UseSendSideBwe(const std::vector<RtpExtension>& extensions) {
   for (const auto& extension : extensions) {
     if (extension.name == RtpExtension::kTransportSequenceNumber)
@@ skipping 123 matching lines @@
   LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString();
 
   bool send_side_bwe = UseSendSideBwe(config_.rtp.extensions);
 
   RemoteBitrateEstimator* bitrate_estimator =
       congestion_controller_->GetRemoteBitrateEstimator(send_side_bwe);
 
   vie_channel_.reset(new ViEChannel(
       num_cpu_cores, &transport_adapter_, process_thread, nullptr,
       congestion_controller_->GetBitrateController()->
           CreateRtcpBandwidthObserver(),

[stefan-webrtc, 2015/11/13 08:29:27]

Is it possible to follow up with removing or setting this ot nullptr if this is
a receive channel? Seems a bit odd that we include bitrate_controller.h in this
file.

[mflodman, 2015/11/13 08:35:36]

Absolutely, I'll take a look at this and I totally agree about it's weird to
have it here.

       nullptr, bitrate_estimator, call_stats_->rtcp_rtt_stats(),
       congestion_controller_->pacer(), congestion_controller_->packet_router(),
       1, false));
 
   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...
@@ skipping 203 matching lines @@
   return 0;
 }
 
 void VideoReceiveStream::SignalNetworkState(NetworkState state) {
   vie_channel_->SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode
                                                 : RtcpMode::kOff);
 }
 
 }  // namespace internal
 }  // namespace webrtc