From ad31c985760b8a41b6e861c8e0b169b112795d58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Thu, 14 Mar 2019 11:20:30 +0100 Subject: [PATCH] Don't use the Process method of vcm::VideoReceiver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's used for driving the old jitter buffer, which is used only when vcm::VideoReceiver is used via the legacy VideoCodingModule api. Bug: webrtc:7408 Change-Id: I179d5b26e112d9f94615d2e1b410b51a657aa05b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127294 Commit-Queue: Niels Moller Reviewed-by: Erik Språng Reviewed-by: Rasmus Brandt Cr-Commit-Position: refs/heads/master@{#27147} --- test/testsupport/perf_test.cc | 4 +++- video/video_receive_stream.cc | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/testsupport/perf_test.cc b/test/testsupport/perf_test.cc index e0a77ae46d..10b530aba4 100644 --- a/test/testsupport/perf_test.cc +++ b/test/testsupport/perf_test.cc @@ -46,7 +46,9 @@ class PerfResultsLogger { const double value, const std::string& units, const bool important) { - RTC_CHECK(std::isfinite(value)); + RTC_CHECK(std::isfinite(value)) + << "Expected finite value for graph " << graph_name << ", trace name " + << trace_name << ", units " << units << ", got " << value; std::ostringstream value_stream; value_stream.precision(8); diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc index 1c1c402b5f..790b7b3074 100644 --- a/video/video_receive_stream.cc +++ b/video/video_receive_stream.cc @@ -375,7 +375,9 @@ void VideoReceiveStream::Start() { // |video_stream_decoder_|. call_stats_->RegisterStatsObserver(this); - process_thread_->RegisterModule(&video_receiver_, RTC_FROM_HERE); + // 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 the decode thread video_receiver_.DecoderThreadStarting(); @@ -393,7 +395,6 @@ void VideoReceiveStream::Stop() { frame_buffer_->Stop(); call_stats_->DeregisterStatsObserver(this); - process_thread_->DeRegisterModule(&video_receiver_); if (decode_thread_.IsRunning()) { // TriggerDecoderShutdown will release any waiting decoder thread and make