Move the decoder thread into VideoReceiveStream.

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 244 matching lines @@
   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_);
   // Remove vcm_protection_callback (part of vie_channel_) before destroying
   // ViEChannel. vcm_ is owned by ViEEncoder and the registered callback does
   // not outlive it.
   vcm_->RegisterProtectionCallback(nullptr);
   vie_channel_.RegisterSendFrameCountObserver(nullptr);
   vie_channel_.RegisterSendBitrateObserver(nullptr);
   vie_channel_.RegisterRtcpPacketTypeCounterObserver(nullptr);
   vie_channel_.RegisterSendChannelRtpStatisticsCallback(nullptr);
   vie_channel_.RegisterSendChannelRtcpStatisticsCallback(nullptr);
@@ skipping 20 matching lines @@
 }
 
 void VideoSendStream::Start() {
   transport_adapter_.Enable();
   vie_encoder_.Pause();
   if (vie_channel_.StartSend() == 0) {
     // Was not already started, trigger a keyframe.
     vie_encoder_.SendKeyFrame();
   }
   vie_encoder_.Restart();
-  vie_channel_.StartReceive();
+  vie_receiver_->StartReceive();
 }
 
 void VideoSendStream::Stop() {
   // TODO(pbos): Make sure the encoder stops here.
   vie_channel_.StopSend();
-  vie_channel_.StopReceive();
+  vie_receiver_->StopReceive();
   transport_adapter_.Disable();
 }
 
 bool VideoSendStream::ReconfigureVideoEncoder(
     const VideoEncoderConfig& config) {
   TRACE_EVENT0("webrtc", "VideoSendStream::(Re)configureVideoEncoder");
   LOG(LS_INFO) << "(Re)configureVideoEncoder: " << config.ToString();
   const std::vector<VideoStream>& streams = config.streams;
   RTC_DCHECK(!streams.empty());
   RTC_DCHECK_GE(config_.rtp.ssrcs.size(), streams.size());
@@ skipping 274 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