Move Ownership of RtpModules to VideoSendStream.

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.
  */
 
@@ skipping 141 matching lines @@
     VieRemb* remb)
     : transport_adapter_(config.rtcp_send_transport),
       encoded_frame_proxy_(config.pre_decode_callback),
       config_(config),
       process_thread_(process_thread),
       clock_(Clock::GetRealTimeClock()),
       decode_thread_(DecodeThreadFunction, this, "DecodingThread"),
       congestion_controller_(congestion_controller),
       call_stats_(call_stats),
       remb_(remb),
-      vcm_(VideoCodingModule::Create(clock_,
-                                     nullptr,
-                                     nullptr,
-                                     this,
-                                     this)),
+      vcm_(VideoCodingModule::Create(clock_, nullptr, nullptr, this, this)),
       incoming_video_stream_(0, config.disable_prerenderer_smoothing),
       stats_proxy_(config_, clock_),
       vie_channel_(&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),
+                   congestion_controller_->packet_router()),
       vie_receiver_(vie_channel_.vie_receiver()),
       vie_sync_(vcm_.get()),
-      rtp_rtcp_(vie_channel_.rtp_rtcp().front()) {
+      rtp_rtcp_(vie_channel_.rtp_rtcp()) {
   LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString();
 
   RTC_DCHECK(process_thread_);
   RTC_DCHECK(congestion_controller_);
   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());
@@ skipping 232 matching lines @@
     const std::vector<uint16_t>& sequence_numbers) {
   rtp_rtcp_->SendNack(sequence_numbers);
 }
 
 void VideoReceiveStream::RequestKeyFrame() {
   rtp_rtcp_->RequestKeyFrame();
 }
 
 }  // namespace internal
 }  // namespace webrtc