Move simple RtpRtcp calls to VideoSendStream.

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.
  */
 
 #ifndef WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
 #define WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
 
 #include <map>
 #include <vector>
 
 #include "webrtc/call.h"
 #include "webrtc/call/transport_adapter.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/video/encoded_frame_callback_adapter.h"
 #include "webrtc/video/encoder_state_feedback.h"
 #include "webrtc/video/payload_router.h"
 #include "webrtc/video/send_statistics_proxy.h"
 #include "webrtc/video/video_capture_input.h"
 #include "webrtc/video/vie_channel.h"
 #include "webrtc/video/vie_encoder.h"
 #include "webrtc/video_receive_stream.h"
 #include "webrtc/video_send_stream.h"
 
 namespace webrtc {
 
 class BitrateAllocator;
 class CallStats;
 class CongestionController;
 class ProcessThread;
+class RtpRtcp;
 class ViEChannel;
 class ViEEncoder;
 class VieRemb;
 
 namespace internal {
 
 class VideoSendStream : public webrtc::VideoSendStream,
                         public webrtc::CpuOveruseObserver {
  public:
   VideoSendStream(int num_cpu_cores,
@@ skipping 45 matching lines @@
   CongestionController* const congestion_controller_;
   VieRemb* const remb_;
 
   OveruseFrameDetector overuse_detector_;
   PayloadRouter payload_router_;
   ViEEncoder vie_encoder_;
   VideoCodingModule* const vcm_;
   EncoderStateFeedback encoder_feedback_;
   ViEChannel vie_channel_;
   ViEReceiver* const vie_receiver_;
+  // TODO(pbos): Move RtpRtcp ownership to VideoSendStream.
+  // RtpRtcp modules, currently owned by ViEChannel but ownership should
+  // eventually move here.
+  const std::vector<RtpRtcp*> rtp_rtcp_modules_;
   VideoCaptureInput input_;
 };
 }  // namespace internal
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_