From 4eb4b05556ffef64f6ae51781cfba498da30d920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Tue, 14 Aug 2018 10:31:58 +0200 Subject: [PATCH] Delete unused method VideoReceiver::SetMinReceiverDelay Bug: None Change-Id: I4d3b74c2af53177355e92d3f9190d6ea58552c8f Reviewed-on: https://webrtc-review.googlesource.com/94061 Reviewed-by: Stefan Holmer Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#24308} --- modules/video_coding/receiver.cc | 11 ----------- modules/video_coding/receiver.h | 3 --- modules/video_coding/receiver_unittest.cc | 8 ++++---- modules/video_coding/video_coding_impl.h | 1 - modules/video_coding/video_receiver.cc | 10 ---------- modules/video_coding/video_receiver_unittest.cc | 7 ------- 6 files changed, 4 insertions(+), 36 deletions(-) diff --git a/modules/video_coding/receiver.cc b/modules/video_coding/receiver.cc index a1eeded3b8..4c56d12043 100644 --- a/modules/video_coding/receiver.cc +++ b/modules/video_coding/receiver.cc @@ -272,17 +272,6 @@ VCMDecodeErrorMode VCMReceiver::DecodeErrorMode() const { return jitter_buffer_.decode_error_mode(); } -int VCMReceiver::SetMinReceiverDelay(int desired_delay_ms) { - rtc::CritScope cs(&crit_sect_); - if (desired_delay_ms < 0 || desired_delay_ms > kMaxReceiverDelayMs) { - return -1; - } - max_video_delay_ms_ = desired_delay_ms + kMaxVideoDelayMs; - // Initializing timing to the desired delay. - timing_->set_min_playout_delay(desired_delay_ms); - return 0; -} - void VCMReceiver::RegisterStatsCallback( VCMReceiveStatisticsCallback* callback) { jitter_buffer_.RegisterStatsCallback(callback); diff --git a/modules/video_coding/receiver.h b/modules/video_coding/receiver.h index 91e264533e..4f6590d274 100644 --- a/modules/video_coding/receiver.h +++ b/modules/video_coding/receiver.h @@ -79,9 +79,6 @@ class VCMReceiver { VCMNackMode NackMode() const; std::vector NackList(bool* request_key_frame); - // Receiver video delay. - int SetMinReceiverDelay(int desired_delay_ms); - // Decoding with errors. void SetDecodeErrorMode(VCMDecodeErrorMode decode_error_mode); VCMDecodeErrorMode DecodeErrorMode() const; diff --git a/modules/video_coding/receiver_unittest.cc b/modules/video_coding/receiver_unittest.cc index 5920f800a5..1ff866298e 100644 --- a/modules/video_coding/receiver_unittest.cc +++ b/modules/video_coding/receiver_unittest.cc @@ -132,7 +132,7 @@ TEST_F(TestVCMReceiver, NonDecodableDuration_OneIncomplete) { const int kMinDelayMs = 500; receiver_.SetNackSettings(kMaxNackListSize, kMaxPacketAgeToNack, kMaxNonDecodableDuration); - receiver_.SetMinReceiverDelay(kMinDelayMs); + timing_.set_min_playout_delay(kMinDelayMs); int64_t key_frame_inserted = clock_->TimeInMilliseconds(); EXPECT_GE(InsertFrame(kVideoFrameKey, true), kNoError); // Insert an incomplete frame. @@ -162,7 +162,7 @@ TEST_F(TestVCMReceiver, NonDecodableDuration_NoTrigger) { const int kMinDelayMs = 500; receiver_.SetNackSettings(kMaxNackListSize, kMaxPacketAgeToNack, kMaxNonDecodableDuration); - receiver_.SetMinReceiverDelay(kMinDelayMs); + timing_.set_min_playout_delay(kMinDelayMs); int64_t key_frame_inserted = clock_->TimeInMilliseconds(); EXPECT_GE(InsertFrame(kVideoFrameKey, true), kNoError); // Insert an incomplete frame. @@ -194,7 +194,7 @@ TEST_F(TestVCMReceiver, NonDecodableDuration_NoTrigger2) { const int kMinDelayMs = 500; receiver_.SetNackSettings(kMaxNackListSize, kMaxPacketAgeToNack, kMaxNonDecodableDuration); - receiver_.SetMinReceiverDelay(kMinDelayMs); + timing_.set_min_playout_delay(kMinDelayMs); int64_t key_frame_inserted = clock_->TimeInMilliseconds(); EXPECT_GE(InsertFrame(kVideoFrameKey, true), kNoError); // Insert enough frames to have too long non-decodable sequence, except that @@ -226,7 +226,7 @@ TEST_F(TestVCMReceiver, NonDecodableDuration_KeyFrameAfterIncompleteFrames) { const int kMinDelayMs = 500; receiver_.SetNackSettings(kMaxNackListSize, kMaxPacketAgeToNack, kMaxNonDecodableDuration); - receiver_.SetMinReceiverDelay(kMinDelayMs); + timing_.set_min_playout_delay(kMinDelayMs); int64_t key_frame_inserted = clock_->TimeInMilliseconds(); EXPECT_GE(InsertFrame(kVideoFrameKey, true), kNoError); // Insert an incomplete frame. diff --git a/modules/video_coding/video_coding_impl.h b/modules/video_coding/video_coding_impl.h index 0f3903fd74..2e28b0fbe9 100644 --- a/modules/video_coding/video_coding_impl.h +++ b/modules/video_coding/video_coding_impl.h @@ -169,7 +169,6 @@ class VideoReceiver : public Module { int max_incomplete_time_ms); void SetDecodeErrorMode(VCMDecodeErrorMode decode_error_mode); - int SetMinReceiverDelay(int desired_delay_ms); int32_t SetReceiveChannelParameters(int64_t rtt); int32_t SetVideoProtection(VCMVideoProtection videoProtection, bool enable); diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc index 2ab69870a3..5baf430b5d 100644 --- a/modules/video_coding/video_receiver.cc +++ b/modules/video_coding/video_receiver.cc @@ -485,16 +485,6 @@ void VideoReceiver::SetNackSettings(size_t max_nack_list_size, max_incomplete_time_ms); } -int VideoReceiver::SetMinReceiverDelay(int desired_delay_ms) { - RTC_DCHECK_RUN_ON(&construction_thread_checker_); - RTC_DCHECK(!IsDecoderThreadRunning()); - // TODO(tommi): Is the method only used by tests? Maybe could be offered - // via a test only subclass? - // Info from Stefan: If it is indeed only used by tests I think it's just that - // it hasn't been cleaned up when the calling code was cleaned up. - return _receiver.SetMinReceiverDelay(desired_delay_ms); -} - bool VideoReceiver::IsDecoderThreadRunning() { #if RTC_DCHECK_IS_ON return decoder_thread_is_running_; diff --git a/modules/video_coding/video_receiver_unittest.cc b/modules/video_coding/video_receiver_unittest.cc index a4778e8e88..bec1e96bb8 100644 --- a/modules/video_coding/video_receiver_unittest.cc +++ b/modules/video_coding/video_receiver_unittest.cc @@ -208,13 +208,6 @@ TEST_F(TestVideoReceiver, PaddingOnlyAndVideo) { } } -TEST_F(TestVideoReceiver, ReceiverDelay) { - EXPECT_EQ(0, receiver_->SetMinReceiverDelay(0)); - EXPECT_EQ(0, receiver_->SetMinReceiverDelay(5000)); - EXPECT_EQ(-1, receiver_->SetMinReceiverDelay(-100)); - EXPECT_EQ(-1, receiver_->SetMinReceiverDelay(10010)); -} - } // namespace } // namespace vcm } // namespace webrtc