Rename ViEReceiver and move ownership to VideoReceiveStream.

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 147 matching lines @@
       config_(config),
       process_thread_(process_thread),
       clock_(Clock::GetRealTimeClock()),
       decode_thread_(DecodeThreadFunction, this, "DecodingThread"),
       congestion_controller_(congestion_controller),
       call_stats_(call_stats),
       remb_(remb),
       video_receiver_(clock_, nullptr, this, this, this),
       incoming_video_stream_(0, config.disable_prerenderer_smoothing),
       stats_proxy_(config_, clock_),
-      vie_channel_(&transport_adapter_,
-                   process_thread,
-                   &video_receiver_,
-                   congestion_controller_->GetRemoteBitrateEstimator(
-                       UseSendSideBwe(config_)),
-                   call_stats_->rtcp_rtt_stats(),
-                   congestion_controller_->pacer(),
-                   congestion_controller_->packet_router()),
-      vie_receiver_(vie_channel_.vie_receiver()),
+      rtp_stream_receiver_(&video_receiver_,
+                           congestion_controller_->GetRemoteBitrateEstimator(
+                               UseSendSideBwe(config_)),
+                           &transport_adapter_,
+                           call_stats_->rtcp_rtt_stats(),
+                           congestion_controller_->pacer(),
+                           congestion_controller_->packet_router()),
+      vie_channel_(&video_receiver_,
+                   &rtp_stream_receiver_),
       vie_sync_(&video_receiver_),
       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);
 
@@ skipping 12 matching lines @@
   // TODO(pbos): What's an appropriate local_ssrc for receive-only streams?
   RTC_DCHECK(config_.rtp.local_ssrc != 0);
   RTC_DCHECK(config_.rtp.remote_ssrc != config_.rtp.local_ssrc);
   rtp_rtcp_->SetSSRC(config_.rtp.local_ssrc);
 
   // TODO(pbos): Support multiple RTX, per video payload.
   for (const auto& kv : config_.rtp.rtx) {
     RTC_DCHECK(kv.second.ssrc != 0);
     RTC_DCHECK(kv.second.payload_type != 0);
 
-    vie_receiver_->SetRtxSsrc(kv.second.ssrc);
-    vie_receiver_->SetRtxPayloadType(kv.second.payload_type, kv.first);
+    rtp_stream_receiver_.SetRtxSsrc(kv.second.ssrc);
+    rtp_stream_receiver_.SetRtxPayloadType(kv.second.payload_type, kv.first);
   }
   // TODO(holmer): When Chrome no longer depends on this being false by default,
   // always use the mapping and remove this whole codepath.
-  vie_receiver_->SetUseRtxPayloadMappingOnRestore(
+  rtp_stream_receiver_.SetUseRtxPayloadMappingOnRestore(
       config_.rtp.use_rtx_payload_mapping_on_restore);
 
   if (config_.rtp.remb) {
     rtp_rtcp_->SetREMBStatus(true);
     remb_->AddReceiveChannel(rtp_rtcp_);
   }
 
   for (size_t i = 0; i < config_.rtp.extensions.size(); ++i) {
     const std::string& extension = config_.rtp.extensions[i].name;
     int id = config_.rtp.extensions[i].id;
     // One-byte-extension local identifiers are in the range 1-14 inclusive.
     RTC_DCHECK_GE(id, 1);
     RTC_DCHECK_LE(id, 14);
-    vie_receiver_->EnableReceiveRtpHeaderExtension(extension, id);
+    rtp_stream_receiver_.EnableReceiveRtpHeaderExtension(extension, id);
   }
 
   if (config_.rtp.fec.ulpfec_payload_type != -1) {
     // ULPFEC without RED doesn't make sense.
     RTC_DCHECK(config_.rtp.fec.red_payload_type != -1);
     VideoCodec codec;
     memset(&codec, 0, sizeof(codec));
     codec.codecType = kVideoCodecULPFEC;
     strncpy(codec.plName, "ulpfec", sizeof(codec.plName));
     codec.plType = config_.rtp.fec.ulpfec_payload_type;
-    RTC_CHECK(vie_receiver_->SetReceiveCodec(codec));
+    RTC_CHECK(rtp_stream_receiver_.SetReceiveCodec(codec));
   }
   if (config_.rtp.fec.red_payload_type != -1) {
     VideoCodec codec;
     memset(&codec, 0, sizeof(codec));
     codec.codecType = kVideoCodecRED;
     strncpy(codec.plName, "red", sizeof(codec.plName));
     codec.plType = config_.rtp.fec.red_payload_type;
-    RTC_CHECK(vie_receiver_->SetReceiveCodec(codec));
+    RTC_CHECK(rtp_stream_receiver_.SetReceiveCodec(codec));
     if (config_.rtp.fec.red_rtx_payload_type != -1) {
-      vie_receiver_->SetRtxPayloadType(config_.rtp.fec.red_rtx_payload_type,
-                                       config_.rtp.fec.red_payload_type);
+      rtp_stream_receiver_.SetRtxPayloadType(
+          config_.rtp.fec.red_rtx_payload_type,
+          config_.rtp.fec.red_payload_type);
     }
   }
 
   if (config.rtp.rtcp_xr.receiver_reference_time_report)
     rtp_rtcp_->SetRtcpXrRrtrStatus(true);
 
   vie_channel_.RegisterReceiveStatisticsProxy(&stats_proxy_);
-  vie_receiver_->GetReceiveStatistics()->RegisterRtpStatisticsCallback(
+  rtp_stream_receiver_.GetReceiveStatistics()->RegisterRtpStatisticsCallback(
       &stats_proxy_);
-  vie_receiver_->GetReceiveStatistics()->RegisterRtcpStatisticsCallback(
+  rtp_stream_receiver_.GetReceiveStatistics()->RegisterRtcpStatisticsCallback(
       &stats_proxy_);
   // Stats callback for CNAME changes.
   rtp_rtcp_->RegisterRtcpStatisticsCallback(&stats_proxy_);
   vie_channel_.RegisterRtcpPacketTypeCounterObserver(&stats_proxy_);
 
   RTC_DCHECK(!config_.decoders.empty());
   std::set<int> decoder_payload_types;
   for (const Decoder& decoder : config_.decoders) {
     RTC_CHECK(decoder.decoder);
     RTC_CHECK(decoder_payload_types.find(decoder.payload_type) ==
               decoder_payload_types.end())
         << "Duplicate payload type (" << decoder.payload_type
         << ") for different decoders.";
     decoder_payload_types.insert(decoder.payload_type);
     video_receiver_.RegisterExternalDecoder(decoder.decoder,
                                             decoder.payload_type);
 
     VideoCodec codec = CreateDecoderVideoCodec(decoder);
 
-    RTC_CHECK(vie_receiver_->SetReceiveCodec(codec));
+    RTC_CHECK(rtp_stream_receiver_.SetReceiveCodec(codec));
     RTC_CHECK_EQ(VCM_OK, video_receiver_.RegisterReceiveCodec(
                              &codec, num_cpu_cores, false));
   }
 
   video_receiver_.SetRenderDelay(config.render_delay_ms);
   incoming_video_stream_.SetExpectedRenderDelay(config.render_delay_ms);
   incoming_video_stream_.SetExternalCallback(this);
   vie_channel_.SetIncomingVideoStream(&incoming_video_stream_);
   vie_channel_.RegisterPreRenderCallback(this);
 
+  process_thread_->RegisterModule(rtp_stream_receiver_.GetReceiveStatistics());
+  process_thread_->RegisterModule(rtp_stream_receiver_.rtp_rtcp());
   process_thread_->RegisterModule(&video_receiver_);
   process_thread_->RegisterModule(&vie_sync_);
 }
 
 VideoReceiveStream::~VideoReceiveStream() {
   LOG(LS_INFO) << "~VideoReceiveStream: " << config_.ToString();
   Stop();
 
   process_thread_->DeRegisterModule(&vie_sync_);
   process_thread_->DeRegisterModule(&video_receiver_);
+  process_thread_->DeRegisterModule(rtp_stream_receiver_.rtp_rtcp());
+  process_thread_->DeRegisterModule(
+      rtp_stream_receiver_.GetReceiveStatistics());
 
   // Deregister external decoders so that they are no longer running during
   // destruction. This effectively stops the VCM since the decoder thread is
   // stopped, the VCM is deregistered and no asynchronous decoder threads are
   // running.
   for (const Decoder& decoder : config_.decoders)
     video_receiver_.RegisterExternalDecoder(nullptr, decoder.payload_type);
 
   vie_channel_.RegisterPreRenderCallback(nullptr);
 
   call_stats_->DeregisterStatsObserver(vie_channel_.GetStatsObserver());
   rtp_rtcp_->SetREMBStatus(false);
   remb_->RemoveReceiveChannel(rtp_rtcp_);
 
   congestion_controller_->GetRemoteBitrateEstimator(UseSendSideBwe(config_))
-      ->RemoveStream(vie_receiver_->GetRemoteSsrc());
+      ->RemoveStream(rtp_stream_receiver_.GetRemoteSsrc());
 }
 
 void VideoReceiveStream::Start() {
   if (decode_thread_.IsRunning())
     return;
   transport_adapter_.Enable();
   incoming_video_stream_.Start();
   // Start the decode thread
   decode_thread_.Start();
   decode_thread_.SetPriority(rtc::kHighestPriority);
-  vie_receiver_->StartReceive();
+  rtp_stream_receiver_.StartReceive();
 }
 
 void VideoReceiveStream::Stop() {
   incoming_video_stream_.Stop();
-  vie_receiver_->StopReceive();
+  rtp_stream_receiver_.StopReceive();
   video_receiver_.TriggerDecoderShutdown();
   decode_thread_.Stop();
   transport_adapter_.Disable();
 }
 
 void VideoReceiveStream::SetSyncChannel(VoiceEngine* voice_engine,
                                         int audio_channel_id) {
   if (voice_engine && audio_channel_id != -1) {
     VoEVideoSync* voe_sync_interface = VoEVideoSync::GetInterface(voice_engine);
     vie_sync_.ConfigureSync(audio_channel_id, voe_sync_interface, rtp_rtcp_,
-                            vie_receiver_->GetRtpReceiver());
+                            rtp_stream_receiver_.GetRtpReceiver());
     voe_sync_interface->Release();
     return;
   }
   vie_sync_.ConfigureSync(-1, nullptr, rtp_rtcp_,
-                          vie_receiver_->GetRtpReceiver());
+                          rtp_stream_receiver_.GetRtpReceiver());
 }
 
 VideoReceiveStream::Stats VideoReceiveStream::GetStats() const {
   return stats_proxy_.GetStats();
 }
 
 bool VideoReceiveStream::DeliverRtcp(const uint8_t* packet, size_t length) {
-  return vie_receiver_->DeliverRtcp(packet, length);
+  return rtp_stream_receiver_.DeliverRtcp(packet, length);
 }
 
 bool VideoReceiveStream::DeliverRtp(const uint8_t* packet,
                                     size_t length,
                                     const PacketTime& packet_time) {
-  return vie_receiver_->DeliverRtp(packet, length, packet_time);
+  return rtp_stream_receiver_.DeliverRtp(packet, length, packet_time);
 }
 
 void VideoReceiveStream::FrameCallback(VideoFrame* video_frame) {
   stats_proxy_.OnDecodedFrame();
 
   // Post processing is not supported if the frame is backed by a texture.
   if (!video_frame->video_frame_buffer()->native_handle()) {
     if (config_.pre_render_callback)
       config_.pre_render_callback->FrameCallback(video_frame);
   }
@@ skipping 61 matching lines @@
     const std::vector<uint16_t>& sequence_numbers) {
   rtp_rtcp_->SendNack(sequence_numbers);
 }
 
 void VideoReceiveStream::RequestKeyFrame() {
   rtp_rtcp_->RequestKeyFrame();
 }
 
 }  // namespace internal
 }  // namespace webrtc