Move the decoder thread into 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 88 matching lines @@
   for (size_t i = 0; i < extensions.size(); ++i) {
     ss << extensions[i].ToString();
     if (i != extensions.size() - 1)
       ss << ", ";
   }
   ss << ']';
   ss << '}';
   return ss.str();
 }
 
-namespace internal {
 namespace {
-
 VideoCodec CreateDecoderVideoCodec(const VideoReceiveStream::Decoder& decoder) {
   VideoCodec codec;
   memset(&codec, 0, sizeof(codec));
 
   codec.plType = decoder.payload_type;
   strncpy(codec.plName, decoder.payload_name.c_str(), sizeof(codec.plName));
   if (decoder.payload_name == "VP8") {
     codec.codecType = kVideoCodecVP8;
   } else if (decoder.payload_name == "VP9") {
     codec.codecType = kVideoCodecVP9;
@@ skipping 13 matching lines @@
 
   codec.width = 320;
   codec.height = 180;
   codec.startBitrate = codec.minBitrate = codec.maxBitrate =
       Call::Config::kDefaultStartBitrateBps / 1000;
 
   return codec;
 }
 }  // namespace
 
+namespace internal {
 VideoReceiveStream::VideoReceiveStream(
     int num_cpu_cores,
     CongestionController* congestion_controller,
     const VideoReceiveStream::Config& config,
     webrtc::VoiceEngine* voice_engine,
     ProcessThread* process_thread,
     CallStats* call_stats,
     VieRemb* remb)
     : transport_adapter_(config.rtcp_send_transport),
       encoded_frame_proxy_(config.pre_decode_callback),
       config_(config),
       process_thread_(process_thread),
       clock_(Clock::GetRealTimeClock()),
+      decode_thread_(DecodeThreadFunction, this, "DecodingThread"),
       congestion_controller_(congestion_controller),
       call_stats_(call_stats),
       remb_(remb),
       vcm_(VideoCodingModule::Create(clock_, nullptr, nullptr)),
       incoming_video_stream_(
           0,
           config.renderer ? config.renderer->SmoothsRenderedFrames() : false),
       stats_proxy_(config_.rtp.remote_ssrc, clock_),
       vie_channel_(&transport_adapter_,
                    process_thread,
@@ skipping 132 matching lines @@
   vcm_->RegisterPreDecodeImageCallback(this);
   incoming_video_stream_.SetExternalCallback(this);
   vie_channel_.SetIncomingVideoStream(&incoming_video_stream_);
   vie_channel_.RegisterPreRenderCallback(this);
 
   process_thread_->RegisterModule(vcm_.get());
 }
 
 VideoReceiveStream::~VideoReceiveStream() {
   LOG(LS_INFO) << "~VideoReceiveStream: " << config_.ToString();
-  incoming_video_stream_.Stop();
+  Stop();
+
   process_thread_->DeRegisterModule(vcm_.get());
   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());
 }
 
 void VideoReceiveStream::Start() {
+  if (decode_thread_.IsRunning())
+    return;
   transport_adapter_.Enable();
   incoming_video_stream_.Start();
-  vie_channel_.StartReceive();
+  // Start the decode thread
+  decode_thread_.Start();
+  decode_thread_.SetPriority(rtc::kHighestPriority);
+  vie_receiver_->StartReceive();
 }
 
 void VideoReceiveStream::Stop() {
   incoming_video_stream_.Stop();
-  vie_channel_.StopReceive();
+  vie_receiver_->StopReceive();
+  vcm_->TriggerDecoderShutdown();
+  decode_thread_.Stop();
   transport_adapter_.Disable();
 }
 
 void VideoReceiveStream::SetSyncChannel(VoiceEngine* voice_engine,
                                         int audio_channel_id) {
   if (voice_engine != nullptr && audio_channel_id != -1) {
     VoEVideoSync* voe_sync_interface = VoEVideoSync::GetInterface(voice_engine);
     vie_channel_.SetVoiceChannel(audio_channel_id, voe_sync_interface);
     voe_sync_interface->Release();
   } else {
@@ skipping 54 matching lines @@
         encoded_image, codec_specific_info, fragmentation);
   }
   return 0;
 }
 
 void VideoReceiveStream::SignalNetworkState(NetworkState state) {
   rtp_rtcp_->SetRTCPStatus(state == kNetworkUp ? config_.rtp.rtcp_mode
                                                : RtcpMode::kOff);
 }
 
+bool VideoReceiveStream::DecodeThreadFunction(void* ptr) {
+  static_cast<VideoReceiveStream*>(ptr)->Decode();
+  return true;
+}
+
+void VideoReceiveStream::Decode() {
+  static const int kMaxDecodeWaitTimeMs = 50;
+  vcm_->Decode(kMaxDecodeWaitTimeMs);
+}
+
 }  // namespace internal
 }  // namespace webrtc