Signal threads for faster receiver destruction.

Unblocks pending threads (render thread + decoder thread) when
destroying renderers and shutting down decoders.

Speeds up SetLocalDescription significantly (10x or so) under
WebRtcVideoEngine2 but also shutdown times in ~ViEChannel and
~ViEReceiver in general.

BUG=1788
R=mflodman@webrtc.org, stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/41959004

Cr-Commit-Position: refs/heads/master@{#8387}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8387 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/video_coding/main/interface/video_coding.h

@@ -582,6 +582,8 @@ public:
         EncodedImageCallback* observer) = 0;
     virtual void RegisterPostEncodeImageCallback(
         EncodedImageCallback* post_encode_callback) = 0;
+    // Releases pending decode calls, permitting faster thread shutdown.
+    virtual void TriggerDecoderShutdown() = 0;
 };
 
 }  // namespace webrtc

webrtc/modules/video_coding/main/source/receiver.cc

@@ -54,7 +54,6 @@ void VCMReceiver::Reset() {
 
 int32_t VCMReceiver::Initialize() {
   Reset();
-  CriticalSectionScoped cs(crit_sect_);
   return VCM_OK;
 }
 
@@ -86,6 +85,11 @@ int32_t VCMReceiver::InsertPacket(const VCMPacket& packet,
   return VCM_OK;
 }
 
+void VCMReceiver::TriggerDecoderShutdown() {
+  jitter_buffer_.Stop();
+  render_wait_event_->Set();
+}
+
 VCMEncodedFrame* VCMReceiver::FrameForDecoding(uint16_t max_wait_time_ms,
                                                int64_t& next_render_time_ms,
                                                bool render_timing) {

webrtc/modules/video_coding/main/source/receiver.h

@@ -81,11 +81,13 @@ class VCMReceiver {
 
   void RegisterStatsCallback(VCMReceiveStatisticsCallback* callback);
 
+  void TriggerDecoderShutdown();
+
  private:
   static int32_t GenerateReceiverId();
 
   CriticalSectionWrapper* crit_sect_;
-  Clock* clock_;
+  Clock* const clock_;
   VCMJitterBuffer jitter_buffer_;
   VCMTiming* timing_;
   scoped_ptr<EventWrapper> render_wait_event_;

webrtc/modules/video_coding/main/source/video_coding_impl.cc

@@ -345,6 +345,10 @@ class VideoCodingModuleImpl : public VideoCodingModule {
     post_encode_callback_.Register(observer);
   }
 
+  void TriggerDecoderShutdown() override {
+    receiver_->TriggerDecoderShutdown();
+  }
+
  private:
   EncodedImageCallbackWrapper post_encode_callback_;
   scoped_ptr<vcm::VideoSender> sender_;

webrtc/modules/video_coding/main/source/video_coding_impl.h

@@ -182,6 +182,7 @@ class VideoReceiver {
   int32_t Process();
 
   void RegisterPreDecodeImageCallback(EncodedImageCallback* observer);
+  void TriggerDecoderShutdown();
 
  protected:
   int32_t Decode(const webrtc::VCMEncodedFrame& frame)

webrtc/modules/video_coding/main/source/video_receiver.cc

@@ -335,6 +335,10 @@ int VideoReceiver::RegisterRenderBufferSizeCallback(
   return VCM_OK;
 }
 
+void VideoReceiver::TriggerDecoderShutdown() {
+  _receiver.TriggerDecoderShutdown();
+}
+
 // Decode next frame, blocking.
 // Should be called as often as possible to get the most out of the decoder.
 int32_t VideoReceiver::Decode(uint16_t maxWaitTimeMs) {

webrtc/modules/video_render/incoming_video_stream.cc

@@ -246,14 +246,21 @@ int32_t IncomingVideoStream::Stop() {
     return 0;
   }
 
-  thread_critsect_.Enter();
+  ThreadWrapper* thread = NULL;
-  if (incoming_render_thread_) {
+  {
-    ThreadWrapper* thread = incoming_render_thread_;
+    CriticalSectionScoped cs_thread(&thread_critsect_);
-    incoming_render_thread_ = NULL;
+    if (incoming_render_thread_ != NULL) {
-#ifndef WIN32_
+      thread = incoming_render_thread_;
-    deliver_buffer_event_.StopTimer();
+      // Setting the incoming render thread to NULL marks that we're performing
-#endif
+      // a shutdown and will make IncomingVideoStreamProcess abort after wakeup.
-    thread_critsect_.Leave();
+      incoming_render_thread_ = NULL;
+      deliver_buffer_event_.StopTimer();
+      // Set the event to allow the thread to wake up and shut down without
+      // waiting for a timeout.
+      deliver_buffer_event_.Set();
+    }
+  }
+  if (thread) {
     if (thread->Stop()) {
       delete thread;
     } else {
@@ -261,8 +268,6 @@ int32_t IncomingVideoStream::Stop() {
       WEBRTC_TRACE(kTraceWarning, kTraceVideoRenderer, module_id_,
                    "%s: Not able to stop thread, leaking", __FUNCTION__);
     }
-  } else {
-    thread_critsect_.Leave();
   }
   running_ = false;
   return 0;

webrtc/video_engine/vie_channel.cc

@@ -1733,6 +1733,8 @@ int32_t ViEChannel::StopDecodeThread() {
     return 0;
   }
 
+  vcm_->TriggerDecoderShutdown();
+
   if (decode_thread_->Stop()) {
     delete decode_thread_;
   } else {