From ca79dc6779d771235586e315f7d4844fdf0b621a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Thu, 12 Sep 2019 09:51:30 +0200 Subject: [PATCH] Delete VideoReceiver2::TriggerDecoderShutdown. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This method used to be wired down to VCMReceiver and to VCMJitterBuffer::Stop, but has become a nop. Also delete some obsoleted comments. Bug: webrtc:7408 Change-Id: I4c1e67272b1ffda786cc0ff358fa38e594aff304 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/152620 Reviewed-by: Philip Eliasson Reviewed-by: Erik Språng Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#29167} --- modules/video_coding/video_receiver2.cc | 5 ----- modules/video_coding/video_receiver2.h | 2 -- video/video_receive_stream.cc | 9 --------- 3 files changed, 16 deletions(-) diff --git a/modules/video_coding/video_receiver2.cc b/modules/video_coding/video_receiver2.cc index 0a9ec49b29..d1e57d17be 100644 --- a/modules/video_coding/video_receiver2.cc +++ b/modules/video_coding/video_receiver2.cc @@ -64,11 +64,6 @@ void VideoReceiver2::RegisterExternalDecoder(VideoDecoder* externalDecoder, codecDataBase_.RegisterExternalDecoder(externalDecoder, payloadType); } -void VideoReceiver2::TriggerDecoderShutdown() { - RTC_DCHECK_RUN_ON(&construction_thread_checker_); - RTC_DCHECK(IsDecoderThreadRunning()); -} - void VideoReceiver2::DecoderThreadStarting() { RTC_DCHECK_RUN_ON(&construction_thread_checker_); RTC_DCHECK(!IsDecoderThreadRunning()); diff --git a/modules/video_coding/video_receiver2.h b/modules/video_coding/video_receiver2.h index 1ab8a1e186..202072a560 100644 --- a/modules/video_coding/video_receiver2.h +++ b/modules/video_coding/video_receiver2.h @@ -40,8 +40,6 @@ class VideoReceiver2 { int32_t Decode(const webrtc::VCMEncodedFrame* frame); - void TriggerDecoderShutdown(); - // Notification methods that are used to check our internal state and validate // threading assumptions. These are called by VideoReceiveStream. // See |IsDecoderThreadRunning()| for more details. diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc index 29cfbbd87d..bfc6d2a241 100644 --- a/video/video_receive_stream.cc +++ b/video/video_receive_stream.cc @@ -382,10 +382,6 @@ void VideoReceiveStream::Start() { // |video_stream_decoder_|. call_stats_->RegisterStatsObserver(this); - // NOTE: *Not* registering video_receiver_ on process_thread_. Its Process - // method does nothing that is useful for us, since we no longer use the old - // jitter buffer. - // Start decoding on task queue. video_receiver_.DecoderThreadStarting(); stats_proxy_.DecoderThreadStarting(); @@ -410,11 +406,6 @@ void VideoReceiveStream::Stop() { call_stats_->DeregisterStatsObserver(this); if (decoder_running_) { - // TriggerDecoderShutdown will release any waiting decoder thread and make - // it stop immediately, instead of waiting for a timeout. Needs to be called - // before joining the decoder thread. - video_receiver_.TriggerDecoderShutdown(); - rtc::Event done; decode_queue_.PostTask([this, &done] { RTC_DCHECK_RUN_ON(&decode_queue_);