Remove VideoReceiveStream deregister of decoders.

webrtc/video_engine/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 169 matching lines @@
       vie_receiver_.GetReceiveStatistics());
   module_process_thread_->DeRegisterModule(vcm_);
   module_process_thread_->DeRegisterModule(&vie_sync_);
   send_payload_router_->SetSendingRtpModules(std::list<RtpRtcp*>());
   for (size_t i = 0; i < num_active_rtp_rtcp_modules_; ++i)
     packet_router_->RemoveRtpModule(rtp_rtcp_modules_[i]);
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     module_process_thread_->DeRegisterModule(rtp_rtcp);
     delete rtp_rtcp;
   }
-  StopDecodeThread();
+  if (!sender_)
+    StopDecodeThread();
   // Release modules.
   VideoCodingModule::Destroy(vcm_);
 }
 
 void ViEChannel::UpdateHistograms() {
   int64_t now = Clock::GetRealTimeClock()->TimeInMilliseconds();
 
   {
     CriticalSectionScoped cs(crit_.get());
     int64_t elapsed_sec = (now - time_of_first_rtt_ms_) / 1000;
@@ skipping 231 matching lines @@
 
 int32_t ViEChannel::RegisterExternalDecoder(const uint8_t pl_type,
                                             VideoDecoder* decoder,
                                             bool buffered_rendering,
                                             int32_t render_delay) {
   RTC_DCHECK(!sender_);
   vcm_->RegisterExternalDecoder(decoder, pl_type, buffered_rendering);
   return vcm_->SetRenderDelay(render_delay);
 }
 
-int32_t ViEChannel::DeRegisterExternalDecoder(const uint8_t pl_type) {
-  RTC_DCHECK(!sender_);
-  VideoCodec current_receive_codec;
-  int32_t result = 0;
-  result = vcm_->ReceiveCodec(&current_receive_codec);
-  vcm_->RegisterExternalDecoder(NULL, pl_type, false);
-
-  if (result == 0 && current_receive_codec.plType == pl_type) {
-    result = vcm_->RegisterReceiveCodec(&current_receive_codec,
-                                        number_of_cores_, false);
-  }
-  return result;
-}
-
 int32_t ViEChannel::ReceiveCodecStatistics(uint32_t* num_key_frames,
                                            uint32_t* num_delta_frames) {
   CriticalSectionScoped cs(crit_.get());
   *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();
@@ skipping 741 matching lines @@
   CriticalSectionScoped cs(crit_.get());
   receive_stats_callback_ = receive_statistics_proxy;
 }
 
 void ViEChannel::SetIncomingVideoStream(
     IncomingVideoStream* incoming_video_stream) {
   CriticalSectionScoped cs(crit_.get());
   incoming_video_stream_ = incoming_video_stream;
 }
 }  // namespace webrtc