admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete VideoReceiver2::TriggerDecoderShutdown.

Browse Source 
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 <philipel@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29167}
This commit is contained in:
Niels Möller 2019-09-12 09:51:30 +02:00 committed by Commit Bot
parent d8ac383bba
commit ca79dc6779
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/video_coding/video_receiver2.cc
View File

@ -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());

2
modules/video_coding/video_receiver2.h
View File

@ -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.

9
video/video_receive_stream.cc
View File

@ -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_);