Remove add/removal of ViEReceiver RTP modules.

webrtc/video/vie_channel.cc

 /*
  *  Copyright (c) 2012 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 103 matching lines @@
                                transport_feedback_observer_,
                                rtt_stats_,
                                &rtcp_packet_type_counter_observer_,
                                remote_bitrate_estimator,
                                paced_sender_,
                                packet_router_,
                                &send_bitrate_observer_,
                                &send_frame_count_observer_,
                                &send_side_delay_observer_,
                                max_rtp_streams)) {
-  vie_receiver_.SetRtpRtcpModule(rtp_rtcp_modules_[0]);
+  vie_receiver_.Init(rtp_rtcp_modules_);
   if (sender_) {
     RTC_DCHECK(send_payload_router_);
     RTC_DCHECK(!vcm_);
   } else {
     RTC_DCHECK(!send_payload_router_);
     RTC_DCHECK(vcm_);
     vcm_->SetNackSettings(kMaxNackListSize, max_nack_reordering_threshold_, 0);
   }
 }
 
@@ skipping 103 matching lines @@
   }
   // Update the RTP module with the settings.
   // Stop and Start the RTP module -> trigger new SSRC, if an SSRC hasn't been
   // set explicitly.
   // The first layer is always active, so the first module can be checked for
   // sending status.
   bool is_sending = rtp_rtcp_modules_[0]->Sending();
   send_payload_router_->set_active(false);
   send_payload_router_->SetSendingRtpModules(0);
 
-  std::vector<RtpRtcp*> registered_modules;
   size_t num_active_modules = video_codec.numberOfSimulcastStreams > 0
                                    ? video_codec.numberOfSimulcastStreams
                                    : 1;
-  for (size_t i = 0; i < num_active_modules; ++i)
-    registered_modules.push_back(rtp_rtcp_modules_[i]);
-
-  // |RegisterSimulcastRtpRtcpModules| resets all old weak pointers and old
-  // modules can be deleted after this step.
-  vie_receiver_.RegisterRtpRtcpModules(registered_modules);
 
   // Update the packet and payload routers with the sending RtpRtcp modules.
   send_payload_router_->SetSendingRtpModules(num_active_modules);
 
   send_payload_router_->set_active(is_sending);
 
   return 0;
 }
 
 void ViEChannel::SetProtectionMode(bool enable_nack,
@@ skipping 351 matching lines @@
   rtc::CritScope lock(&crit_);
   receive_stats_callback_ = receive_statistics_proxy;
 }
 
 void ViEChannel::SetIncomingVideoStream(
     IncomingVideoStream* incoming_video_stream) {
   rtc::CritScope lock(&crit_);
   incoming_video_stream_ = incoming_video_stream;
 }
 }  // namespace webrtc