Clean up of CongestionController.

webrtc/video/video_send_stream.h

 /*
  *  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.
  */
 
@@ skipping 16 matching lines @@
 
 namespace webrtc {
 
 class BitrateAllocator;
 class CallStats;
 class CongestionController;
 class EncoderStateFeedback;
 class ProcessThread;
 class ViEChannel;
 class ViEEncoder;
+class VieRemb;
 
 namespace internal {
 
 class VideoSendStream : public webrtc::VideoSendStream,
                         public webrtc::CpuOveruseObserver {
  public:
   VideoSendStream(int num_cpu_cores,
                   ProcessThread* module_process_thread,
                   CallStats* call_stats,
                   CongestionController* congestion_controller,
+                  VieRemb* remb,
                   BitrateAllocator* bitrate_allocator,
                   const VideoSendStream::Config& config,
                   const VideoEncoderConfig& encoder_config,
                   const std::map<uint32_t, RtpState>& suspended_ssrcs);
 
   ~VideoSendStream() override;
 
   // webrtc::SendStream implementation.
   void Start() override;
   void Stop() override;
@@ skipping 22 matching lines @@
   SendStatisticsProxy stats_proxy_;
   TransportAdapter transport_adapter_;
   EncodedFrameCallbackAdapter encoded_frame_proxy_;
   const VideoSendStream::Config config_;
   VideoEncoderConfig encoder_config_;
   std::map<uint32_t, RtpState> suspended_ssrcs_;
 
   ProcessThread* const module_process_thread_;
   CallStats* const call_stats_;
   CongestionController* const congestion_controller_;
+  VieRemb* const remb_;
 
   OveruseFrameDetector overuse_detector_;
   rtc::scoped_ptr<VideoCaptureInput> input_;
   PayloadRouter payload_router_;
   rtc::scoped_ptr<ViEEncoder> vie_encoder_;
   rtc::scoped_ptr<ViEChannel> vie_channel_;
   // TODO(pbos): Make proper const.
   // const after construction.
   VideoCodingModule* vcm_;
   rtc::scoped_ptr<EncoderStateFeedback> encoder_feedback_;
 
   // Used as a workaround to indicate that we should be using the configured
   // start bitrate initially, instead of the one reported by VideoEngine (which
   // defaults to too high).
   bool use_config_bitrate_;
 };
 }  // namespace internal
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_