Remove add/removal of RTP modules in PacketRouter.

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 102 matching lines @@
                                bandwidth_observer_.get(),
                                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)),
-      num_active_rtp_rtcp_modules_(1) {
+                               max_rtp_streams)) {
   vie_receiver_.SetRtpRtcpModule(rtp_rtcp_modules_[0]);
   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);
   }
 }
 
 int32_t ViEChannel::Init() {
   static const int kDefaultRenderDelayMs = 10;
   module_process_thread_->RegisterModule(vie_receiver_.GetReceiveStatistics());
 
   // RTP/RTCP initialization.
-  for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
+  for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     module_process_thread_->RegisterModule(rtp_rtcp);
+    packet_router_->AddRtpModule(rtp_rtcp);
+  }
 
   rtp_rtcp_modules_[0]->SetKeyFrameRequestMethod(kKeyFrameReqPliRtcp);
   if (paced_sender_) {
     for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
       rtp_rtcp->SetStorePacketsStatus(true, kMinSendSidePacketHistorySize);
   }
-  packet_router_->AddRtpModule(rtp_rtcp_modules_[0]);
   if (sender_) {
     send_payload_router_->SetSendingRtpModules(1);
     RTC_DCHECK(!send_payload_router_->active());
   } else {
     if (vcm_->RegisterReceiveCallback(this) != 0) {
       return -1;
     }
     vcm_->RegisterFrameTypeCallback(this);
     vcm_->RegisterReceiveStatisticsCallback(this);
     vcm_->RegisterDecoderTimingCallback(this);
     vcm_->SetRenderDelay(kDefaultRenderDelayMs);
   }
   return 0;
 }
 
 ViEChannel::~ViEChannel() {
   UpdateHistograms();
   // Make sure we don't get more callbacks from the RTP module.
   module_process_thread_->DeRegisterModule(
       vie_receiver_.GetReceiveStatistics());
   if (sender_) {
     send_payload_router_->SetSendingRtpModules(0);
   }
-  for (size_t i = 0; i < num_active_rtp_rtcp_modules_; ++i)
-    packet_router_->RemoveRtpModule(rtp_rtcp_modules_[i]);
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
+    packet_router_->RemoveRtpModule(rtp_rtcp);
     module_process_thread_->DeRegisterModule(rtp_rtcp);
     delete rtp_rtcp;
   }
 }
 
 void ViEChannel::UpdateHistograms() {
   if (sender_) {
     StreamDataCounters rtp;
     StreamDataCounters rtx;
     GetSendStreamDataCounters(&rtp, &rtx);
@@ skipping 57 matching lines @@
   // 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;
-  size_t num_prev_active_modules;
-  {
-    // Cache which modules are active so StartSend can know which ones to start.
-    rtc::CritScope lock(&crit_);
-    num_prev_active_modules = num_active_rtp_rtcp_modules_;
-    num_active_rtp_rtcp_modules_ = num_active_modules;
-  }
   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);
 
-  // Deregister previously registered modules.
-  for (size_t i = num_active_modules; i < num_prev_active_modules; ++i)
-    packet_router_->RemoveRtpModule(rtp_rtcp_modules_[i]);
-  // Register new active modules.
-  for (size_t i = num_prev_active_modules; i < num_active_modules; ++i)
-    packet_router_->AddRtpModule(rtp_rtcp_modules_[i]);
   return 0;
 }
 
 void ViEChannel::SetProtectionMode(bool enable_nack,
                                    bool enable_fec,
                                    int payload_type_red,
                                    int payload_type_fec) {
   // Validate payload types. If either RED or FEC payload types are set then
   // both should be. If FEC is enabled then they both have to be set.
   if (enable_fec || payload_type_red != -1 || payload_type_fec != -1) {
@@ skipping 345 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