Stop decoders in VideoReceiveStream destructor.

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 260 matching lines @@
   vie_receiver_->GetReceiveStatistics()->RegisterRtpStatisticsCallback(
       &stats_proxy_);
   vie_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 (size_t i = 0; i < config_.decoders.size(); ++i) {
-    const Decoder& decoder = config_.decoders[i];
+  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);
     vcm_->RegisterExternalDecoder(decoder.decoder, decoder.payload_type);
 
     VideoCodec codec = CreateDecoderVideoCodec(decoder);
 
@@ skipping 10 matching lines @@
   vie_channel_.RegisterPreRenderCallback(this);
 
   process_thread_->RegisterModule(vcm_.get());
 }
 
 VideoReceiveStream::~VideoReceiveStream() {
   LOG(LS_INFO) << "~VideoReceiveStream: " << config_.ToString();
   Stop();
 
   process_thread_->DeRegisterModule(vcm_.get());
+
+  // 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)
+    vcm_->RegisterExternalDecoder(nullptr, decoder.payload_type);
+
   vie_channel_.RegisterPreRenderCallback(nullptr);
   vcm_->RegisterPreDecodeImageCallback(nullptr);
 
   call_stats_->DeregisterStatsObserver(vie_channel_.GetStatsObserver());
   rtp_rtcp_->SetREMBStatus(false);
   remb_->RemoveReceiveChannel(rtp_rtcp_);
 
   congestion_controller_->GetRemoteBitrateEstimator(UseSendSideBwe(config_))
       ->RemoveStream(vie_receiver_->GetRemoteSsrc());
 }
@@ skipping 93 matching lines @@
   return true;
 }
 
 void VideoReceiveStream::Decode() {
   static const int kMaxDecodeWaitTimeMs = 50;
   vcm_->Decode(kMaxDecodeWaitTimeMs);
 }
 
 }  // namespace internal
 }  // namespace webrtc