From a47ba4119f27fa84831f16b2f7764a5439145a0d Mon Sep 17 00:00:00 2001 From: Elad Alon Date: Thu, 27 Jun 2019 17:50:00 +0200 Subject: [PATCH] Get rid of deprecated version of NackSender::SendNack [1/2] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [1/2] - Make new version pure-virtual, and deprecated version non-pure. This will allow deleting the deprecated version from downstream projects. [2/2] - Remove deprecated version. TBR=stefan@webrtc.org Bug: webrtc:10336 Change-Id: Ia132ef071b1f379fc74834178e75e981ca908125 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144042 Commit-Queue: Elad Alon Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/master@{#28413} --- modules/include/module_common_types.h | 4 ++-- modules/video_coding/nack_module_unittest.cc | 8 -------- video/rtp_video_stream_receiver.cc | 5 ----- video/rtp_video_stream_receiver.h | 1 - video/video_receive_stream.cc | 5 ----- video/video_receive_stream.h | 1 - 6 files changed, 2 insertions(+), 22 deletions(-) diff --git a/modules/include/module_common_types.h b/modules/include/module_common_types.h index 83b63a6e74..027bbdd815 100644 --- a/modules/include/module_common_types.h +++ b/modules/include/module_common_types.h @@ -70,14 +70,14 @@ class NackSender { // // TODO(bugs.webrtc.org/10336): Update downstream and remove this method. // Make the one remaining version of SendNack() pure virtual again. RTC_DEPRECATED virtual void SendNack( - const std::vector& sequence_numbers) = 0; + const std::vector& sequence_numbers) {} // If |buffering_allowed|, other feedback messages (e.g. key frame requests) // may be added to the same outgoing feedback message. In that case, it's up // to the user of the interface to ensure that when all buffer-able messages // have been added, the feedback message is triggered. virtual void SendNack(const std::vector& sequence_numbers, - bool buffering_allowed) {} + bool buffering_allowed) = 0; protected: virtual ~NackSender() {} diff --git a/modules/video_coding/nack_module_unittest.cc b/modules/video_coding/nack_module_unittest.cc index 5d88702f53..8aad2324c4 100644 --- a/modules/video_coding/nack_module_unittest.cc +++ b/modules/video_coding/nack_module_unittest.cc @@ -27,10 +27,6 @@ class TestNackModule : public ::testing::Test, nack_module_(clock_.get(), this, this), keyframes_requested_(0) {} - void SendNack(const std::vector& sequence_numbers) override { - RTC_NOTREACHED(); - } - void SendNack(const std::vector& sequence_numbers, bool buffering_allowed) override { sent_nacks_.insert(sent_nacks_.end(), sequence_numbers.begin(), @@ -307,10 +303,6 @@ class TestNackModuleWithFieldTrial : public ::testing::Test, nack_module_(clock_.get(), this, this), keyframes_requested_(0) {} - void SendNack(const std::vector& sequence_numbers) override { - RTC_NOTREACHED(); - } - void SendNack(const std::vector& sequence_numbers, bool buffering_allowed) override { sent_nacks_.insert(sent_nacks_.end(), sequence_numbers.begin(), diff --git a/video/rtp_video_stream_receiver.cc b/video/rtp_video_stream_receiver.cc index 547c2cf47d..05d7303ce2 100644 --- a/video/rtp_video_stream_receiver.cc +++ b/video/rtp_video_stream_receiver.cc @@ -93,11 +93,6 @@ void RtpVideoStreamReceiver::RtcpFeedbackBuffer::RequestKeyFrame() { request_key_frame_ = true; } -void RtpVideoStreamReceiver::RtcpFeedbackBuffer::SendNack( - const std::vector& sequence_numbers) { - RTC_NOTREACHED(); -} - void RtpVideoStreamReceiver::RtcpFeedbackBuffer::SendNack( const std::vector& sequence_numbers, bool buffering_allowed) { diff --git a/video/rtp_video_stream_receiver.h b/video/rtp_video_stream_receiver.h index 3202a31ecb..2c1f8ba1d5 100644 --- a/video/rtp_video_stream_receiver.h +++ b/video/rtp_video_stream_receiver.h @@ -196,7 +196,6 @@ class RtpVideoStreamReceiver : public LossNotificationSender, void RequestKeyFrame() override; // NackSender implementation. - void SendNack(const std::vector& sequence_numbers) override; void SendNack(const std::vector& sequence_numbers, bool buffering_allowed) override; diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc index 3d27e6d0a6..458330db50 100644 --- a/video/video_receive_stream.cc +++ b/video/video_receive_stream.cc @@ -513,11 +513,6 @@ void VideoReceiveStream::SetFrameDecryptor( rtp_video_stream_receiver_.SetFrameDecryptor(std::move(frame_decryptor)); } -void VideoReceiveStream::SendNack( - const std::vector& sequence_numbers) { - SendNack(sequence_numbers, true); -} - void VideoReceiveStream::SendNack(const std::vector& sequence_numbers, bool buffering_allowed) { RTC_DCHECK(buffering_allowed); diff --git a/video/video_receive_stream.h b/video/video_receive_stream.h index 3acba4675b..869b111b5d 100644 --- a/video/video_receive_stream.h +++ b/video/video_receive_stream.h @@ -101,7 +101,6 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream, void OnFrame(const VideoFrame& video_frame) override; // Implements NackSender. - void SendNack(const std::vector& sequence_numbers) override; // For this particular override of the interface, // only (buffering_allowed == true) is acceptable. void SendNack(const std::vector& sequence_numbers,