Simplify EncoderStateFeedback.

webrtc/video/video_send_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 160 matching lines @@
       overuse_detector_(
           Clock::GetRealTimeClock(),
           GetCpuOveruseOptions(config.encoder_settings.full_overuse_time),
           this,
           config.post_encode_callback,
           &stats_proxy_),
       vie_channel_(config.send_transport,
                    module_process_thread_,
                    &payload_router_,
                    nullptr,
-                   encoder_feedback_.GetRtcpIntraFrameObserver(),
+                   &encoder_feedback_,
                    congestion_controller_->GetBitrateController()
                        ->CreateRtcpBandwidthObserver(),
                    congestion_controller_->GetTransportFeedbackObserver(),
                    nullptr,
                    call_stats_->rtcp_rtt_stats(),
                    congestion_controller_->pacer(),
                    congestion_controller_->packet_router(),
                    config_.rtp.ssrcs.size(),
                    true),
       vie_receiver_(vie_channel_.vie_receiver()),
@@ skipping 11 matching lines @@
              &stats_proxy_,
              &overuse_detector_) {
   LOG(LS_INFO) << "VideoSendStream: " << config_.ToString();
 
   RTC_DCHECK(!config_.rtp.ssrcs.empty());
   RTC_DCHECK(module_process_thread_);
   RTC_DCHECK(call_stats_);
   RTC_DCHECK(congestion_controller_);
   RTC_DCHECK(remb_);
 
+  encoder_feedback_.Init(config_.rtp.ssrcs, &vie_encoder_);

[danilchap, 2016/02/17 16:14:01]

encoder_feedback obviously depends on vie_encoder_.
may be initialize order should reflect that. (i.e. move it one line down)

[pbos-webrtc, 2016/02/18 16:00:29]

Done.

   RTC_CHECK(vie_encoder_.Init());
   RTC_CHECK(vie_channel_.Init() == 0);
 
   vcm_->RegisterProtectionCallback(vie_channel_.vcm_protection_callback());
 
   call_stats_->RegisterStatsObserver(vie_channel_.GetStatsObserver());
 
   vie_encoder_.SetSsrcs(std::vector<uint32_t>(1, config_.rtp.ssrcs[0]));
 
   for (size_t i = 0; i < config_.rtp.extensions.size(); ++i) {
@@ skipping 60 matching lines @@
   RTC_CHECK(ReconfigureVideoEncoder(encoder_config));
 
   vie_channel_.RegisterSendSideDelayObserver(&stats_proxy_);
 
   if (config_.post_encode_callback)
     vie_encoder_.RegisterPostEncodeImageCallback(&encoded_frame_proxy_);
 
   if (config_.suspend_below_min_bitrate)
     vie_encoder_.SuspendBelowMinBitrate();
 
-  encoder_feedback_.AddEncoder(config_.rtp.ssrcs, &vie_encoder_);
-
   vie_channel_.RegisterSendChannelRtcpStatisticsCallback(&stats_proxy_);
   vie_channel_.RegisterSendChannelRtpStatisticsCallback(&stats_proxy_);
   vie_channel_.RegisterRtcpPacketTypeCounterObserver(&stats_proxy_);
   vie_channel_.RegisterSendBitrateObserver(&stats_proxy_);
   vie_channel_.RegisterSendFrameCountObserver(&stats_proxy_);
 
   module_process_thread_->RegisterModule(&overuse_detector_);
 }
 
 VideoSendStream::~VideoSendStream() {
   LOG(LS_INFO) << "~VideoSendStream: " << config_.ToString();
   Stop();
 
   module_process_thread_->DeRegisterModule(&overuse_detector_);
   vie_channel_.RegisterSendFrameCountObserver(nullptr);
   vie_channel_.RegisterSendBitrateObserver(nullptr);
   vie_channel_.RegisterRtcpPacketTypeCounterObserver(nullptr);
   vie_channel_.RegisterSendChannelRtpStatisticsCallback(nullptr);
   vie_channel_.RegisterSendChannelRtcpStatisticsCallback(nullptr);
 
   vie_encoder_.DeRegisterExternalEncoder(
       config_.encoder_settings.payload_type);
 
   call_stats_->DeregisterStatsObserver(vie_channel_.GetStatsObserver());
 
   RtpRtcp* rtp_module = vie_channel_.rtp_rtcp();
   rtp_module->SetREMBStatus(false);
   remb_->RemoveRembSender(rtp_module);
 
-  // Remove the feedback, stop all encoding threads and processing. This must be
-  // done before deleting the channel.
-  encoder_feedback_.RemoveEncoder(&vie_encoder_);
+  // ViEChannel outlives ViEEncoder so remove encoder from feedback before
+  // destruction.
+  encoder_feedback_.TearDown();
 
   congestion_controller_->GetRemoteBitrateEstimator(false)->RemoveStream(
       vie_receiver_->GetRemoteSsrc());
 }
 
 VideoCaptureInput* VideoSendStream::Input() {
   return &input_;
 }
 
 void VideoSendStream::Start() {
@@ skipping 291 matching lines @@
   used_ssrcs.resize(static_cast<size_t>(video_codec.numberOfSimulcastStreams));
   vie_encoder_.SetSsrcs(used_ssrcs);
 
   // Restart the media flow
   vie_encoder_.Restart();
 
   return true;
 }
 }  // namespace internal
 }  // namespace webrtc