Untangle ViEChannel and ViEEncoder.

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 62 matching lines @@
                                      sent_video_rate_bps, sent_nack_rate_bps,
                                      sent_fec_rate_bps);
   }
  private:
   ViEChannel* owner_;
 };
 
 ViEChannel::ViEChannel(uint32_t number_of_cores,
                        Transport* transport,
                        ProcessThread* module_process_thread,
+                       PayloadRouter* send_payload_router,
+                       VideoCodingModule* vcm,
                        RtcpIntraFrameObserver* intra_frame_observer,
                        RtcpBandwidthObserver* bandwidth_observer,
                        TransportFeedbackObserver* transport_feedback_observer,
                        RemoteBitrateEstimator* remote_bitrate_estimator,
                        RtcpRttStats* rtt_stats,
                        PacedSender* paced_sender,
                        PacketRouter* packet_router,
                        size_t max_rtp_streams,
                        bool sender)
     : number_of_cores_(number_of_cores),
       sender_(sender),
       module_process_thread_(module_process_thread),
-      send_payload_router_(new PayloadRouter()),
+      send_payload_router_(send_payload_router),
       vcm_protection_callback_(new ViEChannelProtectionCallback(this)),
-      vcm_(VideoCodingModule::Create(Clock::GetRealTimeClock(),
-                                     nullptr,
-                                     nullptr)),
+      vcm_(vcm),
       vie_receiver_(vcm_, remote_bitrate_estimator, this),
       vie_sync_(vcm_),
       stats_observer_(new ChannelStatsObserver(this)),
       receive_stats_callback_(nullptr),
       incoming_video_stream_(nullptr),
       intra_frame_observer_(intra_frame_observer),
       rtt_stats_(rtt_stats),
       paced_sender_(paced_sender),
       packet_router_(packet_router),
       bandwidth_observer_(bandwidth_observer),
@@ skipping 18 matching lines @@
                                &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) {
   vie_receiver_.SetRtpRtcpModule(rtp_rtcp_modules_[0]);
-  vcm_->SetNackSettings(kMaxNackListSize, max_nack_reordering_threshold_, 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.
   module_process_thread_->RegisterModule(rtp_rtcp_modules_[0]);
 
   rtp_rtcp_modules_[0]->SetKeyFrameRequestMethod(kKeyFrameReqPliRtcp);
   if (paced_sender_) {
     for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
       rtp_rtcp->SetStorePacketsStatus(true, nack_history_size_sender_);
   }
   packet_router_->AddRtpModule(rtp_rtcp_modules_[0], sender_);
   if (sender_) {
     std::list<RtpRtcp*> send_rtp_modules(1, rtp_rtcp_modules_[0]);
     send_payload_router_->SetSendingRtpModules(send_rtp_modules);
     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);
+    module_process_thread_->RegisterModule(&vie_sync_);
   }
-  if (vcm_->RegisterReceiveCallback(this) != 0) {
-    return -1;
-  }
-  vcm_->RegisterFrameTypeCallback(this);
-  vcm_->RegisterReceiveStatisticsCallback(this);
-  vcm_->RegisterDecoderTimingCallback(this);
-  vcm_->SetRenderDelay(kDefaultRenderDelayMs);
-
-  module_process_thread_->RegisterModule(vcm_);
-  module_process_thread_->RegisterModule(&vie_sync_);
-
   return 0;
 }
 
 ViEChannel::~ViEChannel() {
   UpdateHistograms();
   // Make sure we don't get more callbacks from the RTP module.
   module_process_thread_->DeRegisterModule(
       vie_receiver_.GetReceiveStatistics());
-  module_process_thread_->DeRegisterModule(vcm_);
-  module_process_thread_->DeRegisterModule(&vie_sync_);
-  send_payload_router_->SetSendingRtpModules(std::list<RtpRtcp*>());
+  if (sender_) {
+    send_payload_router_->SetSendingRtpModules(std::list<RtpRtcp*>());
+  } else {
+    module_process_thread_->DeRegisterModule(&vie_sync_);
+  }
   for (size_t i = 0; i < num_active_rtp_rtcp_modules_; ++i)
     packet_router_->RemoveRtpModule(rtp_rtcp_modules_[i], sender_);
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     module_process_thread_->DeRegisterModule(rtp_rtcp);
     delete rtp_rtcp;
   }
   if (!sender_)
     StopDecodeThread();
-  // Release modules.
-  VideoCodingModule::Destroy(vcm_);
 }
 
 void ViEChannel::UpdateHistograms() {
   int64_t now = Clock::GetRealTimeClock()->TimeInMilliseconds();
 
   {
     rtc::CritScope lock(&crit_);
     int64_t elapsed_sec = (now - time_of_first_rtt_ms_) / 1000;
     if (time_of_first_rtt_ms_ != -1 && num_rtts_ > 0 &&
         elapsed_sec > metrics::kMinRunTimeInSeconds) {
@@ skipping 233 matching lines @@
 }
 
 int32_t ViEChannel::ReceiveCodecStatistics(uint32_t* num_key_frames,
                                            uint32_t* num_delta_frames) {
   rtc::CritScope lock(&crit_);
   *num_key_frames = receive_frame_counts_.key_frames;
   *num_delta_frames = receive_frame_counts_.delta_frames;
   return 0;
 }
 
-uint32_t ViEChannel::DiscardedPackets() const {
-  return vcm_->DiscardedPackets();
-}
-
-int ViEChannel::ReceiveDelay() const {
-  return vcm_->Delay();
-}
-
 void ViEChannel::SetExpectedRenderDelay(int delay_ms) {
+  RTC_DCHECK(!sender_);
   vcm_->SetRenderDelay(delay_ms);
 }
 
 void ViEChannel::SetRTCPMode(const RtcpMode rtcp_mode) {
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
     rtp_rtcp->SetRTCPStatus(rtcp_mode);
 }
 
 void ViEChannel::SetProtectionMode(bool enable_nack,
                                    bool enable_fec,
@@ skipping 13 matching lines @@
     payload_type_fec = 0;
   }
 
   VCMVideoProtection protection_method;
   if (enable_nack) {
     protection_method = enable_fec ? kProtectionNackFEC : kProtectionNack;
   } else {
     protection_method = kProtectionNone;
   }
 
-  vcm_->SetVideoProtection(protection_method, true);
+  if (!sender_)
+    vcm_->SetVideoProtection(protection_method, true);
 
   // Set NACK.
   ProcessNACKRequest(enable_nack);
 
   // Set FEC.
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     rtp_rtcp->SetGenericFECStatus(enable_fec,
                                   static_cast<uint8_t>(payload_type_red),
                                   static_cast<uint8_t>(payload_type_fec));
   }
 }
 
 void ViEChannel::ProcessNACKRequest(const bool enable) {
   if (enable) {
     // Turn on NACK.
     if (rtp_rtcp_modules_[0]->RTCP() == RtcpMode::kOff)
       return;
     vie_receiver_.SetNackStatus(true, max_nack_reordering_threshold_);
 
     for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
       rtp_rtcp->SetStorePacketsStatus(true, nack_history_size_sender_);
 
-    vcm_->RegisterPacketRequestCallback(this);
-    // Don't introduce errors when NACK is enabled.
-    vcm_->SetDecodeErrorMode(kNoErrors);
+    if (!sender_) {
+      vcm_->RegisterPacketRequestCallback(this);
+      // Don't introduce errors when NACK is enabled.
+      vcm_->SetDecodeErrorMode(kNoErrors);
+    }
   } else {
-    vcm_->RegisterPacketRequestCallback(NULL);
+    if (!sender_)
+      vcm_->RegisterPacketRequestCallback(nullptr);

[stefan-webrtc, 2016/02/04 10:46:14]

Canw e move this down to line 522?

[pbos-webrtc, 2016/02/04 14:04:20]

Merged below things with this one.

     if (paced_sender_ == nullptr) {

[stefan-webrtc, 2016/02/04 10:46:14]

Should always be nullptr for a receiver, right? Should we make sure it is in
this CL too?

[pbos-webrtc, 2016/02/04 14:04:20]

Merged with above !sender_ check.

       for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
         rtp_rtcp->SetStorePacketsStatus(false, 0);
     }
     vie_receiver_.SetNackStatus(false, max_nack_reordering_threshold_);
-    // When NACK is off, allow decoding with errors. Otherwise, the video
-    // will freeze, and will only recover with a complete key frame.
-    vcm_->SetDecodeErrorMode(kWithErrors);
+    if (!sender_) {
+      // When NACK is off, allow decoding with errors. Otherwise, the video
+      // will freeze, and will only recover with a complete key frame.
+      vcm_->SetDecodeErrorMode(kWithErrors);
+    }
   }
 }
 
 bool ViEChannel::IsSendingFecEnabled() {
   bool fec_enabled = false;
   uint8_t pltype_red = 0;
   uint8_t pltype_fec = 0;
 
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     rtp_rtcp->GenericFECStatus(&fec_enabled, &pltype_red, &pltype_fec);
@@ skipping 341 matching lines @@
 }
 
 int32_t ViEChannel::StartSend() {
   rtc::CritScope lock(&crit_);
 
   if (rtp_rtcp_modules_[0]->Sending())
     return -1;
 
   for (size_t i = 0; i < num_active_rtp_rtcp_modules_; ++i) {
     RtpRtcp* rtp_rtcp = rtp_rtcp_modules_[i];
     rtp_rtcp->SetSendingMediaStatus(true);

[stefan-webrtc, 2016/02/04 10:46:14]

Should we set this to true only for the senders?

[pbos-webrtc, 2016/02/04 14:04:20]

Done.

     rtp_rtcp->SetSendingStatus(true);
   }
-  send_payload_router_->set_active(true);
+  if (sender_)
+    send_payload_router_->set_active(true);
   return 0;
 }
 
 int32_t ViEChannel::StopSend() {
-  send_payload_router_->set_active(false);
+  if (sender_)
+    send_payload_router_->set_active(false);
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
     rtp_rtcp->SetSendingMediaStatus(false);
 
   if (!rtp_rtcp_modules_[0]->Sending()) {
     return -1;
   }
 
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     rtp_rtcp->SetSendingStatus(false);
   }
@@ skipping 33 matching lines @@
 int32_t ViEChannel::SetMTU(uint16_t mtu) {
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
     rtp_rtcp->SetMaxTransferUnit(mtu);
   return 0;
 }
 
 RtpRtcp* ViEChannel::rtp_rtcp() {
   return rtp_rtcp_modules_[0];
 }
 
-rtc::scoped_refptr<PayloadRouter> ViEChannel::send_payload_router() {
-  return send_payload_router_;
-}
-
 VCMProtectionCallback* ViEChannel::vcm_protection_callback() {
   return vcm_protection_callback_.get();
 }
 
 CallStatsObserver* ViEChannel::GetStatsObserver() {
   return stats_observer_.get();
 }
 
 // Do not acquire the lock of |vcm_| in this function. Decode callback won't
 // necessarily be called from the decoding thread. The decoding thread may have
@@ skipping 74 matching lines @@
 int32_t ViEChannel::ResendPackets(const uint16_t* sequence_numbers,
                                   uint16_t length) {
   return rtp_rtcp_modules_[0]->SendNACK(sequence_numbers, length);
 }
 
 bool ViEChannel::ChannelDecodeThreadFunction(void* obj) {
   return static_cast<ViEChannel*>(obj)->ChannelDecodeProcess();
 }
 
 bool ViEChannel::ChannelDecodeProcess() {
+  RTC_DCHECK(!sender_);
   vcm_->Decode(kMaxDecodeWaitTimeMs);
   return true;
 }
 
 void ViEChannel::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) {
-  vcm_->SetReceiveChannelParameters(max_rtt_ms);
+  if (!sender_)
+    vcm_->SetReceiveChannelParameters(max_rtt_ms);
 
   rtc::CritScope lock(&crit_);
   if (time_of_first_rtt_ms_ == -1)
     time_of_first_rtt_ms_ = Clock::GetRealTimeClock()->TimeInMilliseconds();
   rtt_sum_ms_ += avg_rtt_ms;
   last_rtt_ms_ = avg_rtt_ms;
   ++num_rtts_;
 }
 
 int ViEChannel::ProtectionRequest(const FecProtectionParams* delta_fec_params,
@@ skipping 73 matching lines @@
 void ViEChannel::StartDecodeThread() {
   RTC_DCHECK(!sender_);
   if (decode_thread_.IsRunning())
     return;
   // Start the decode thread
   decode_thread_.Start();
   decode_thread_.SetPriority(rtc::kHighestPriority);
 }
 
 void ViEChannel::StopDecodeThread() {
+  RTC_DCHECK(!sender_);
   vcm_->TriggerDecoderShutdown();
 
   decode_thread_.Stop();
 }
 
 int32_t ViEChannel::SetVoiceChannel(int32_t ve_channel_id,
                                     VoEVideoSync* ve_sync_interface) {
+  RTC_DCHECK(!sender_);
   return vie_sync_.ConfigureSync(ve_channel_id, ve_sync_interface,
                                  rtp_rtcp_modules_[0],
                                  vie_receiver_.GetRtpReceiver());
 }
 
 int32_t ViEChannel::VoiceChannel() {
+  RTC_DCHECK(!sender_);
   return vie_sync_.VoiceChannel();
 }
 
 void ViEChannel::RegisterPreRenderCallback(
     I420FrameCallback* pre_render_callback) {
   rtc::CritScope lock(&crit_);
   pre_render_callback_ = pre_render_callback;
 }
 
 void ViEChannel::RegisterPreDecodeImageCallback(
     EncodedImageCallback* pre_decode_callback) {
+  RTC_DCHECK(!sender_);
   vcm_->RegisterPreDecodeImageCallback(pre_decode_callback);
 }
 
 // TODO(pbos): Remove OnInitializeDecoder which is called from the RTP module,
 // any decoder resetting should be handled internally within the VCM.
 int32_t ViEChannel::OnInitializeDecoder(
     const int8_t payload_type,
     const char payload_name[RTP_PAYLOAD_NAME_SIZE],
     const int frequency,
     const size_t channels,
@@ skipping 21 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