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

Get rid of deprecated version of NackSender::SendNack [1/2]

Browse Source 
[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 <eladalon@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28413}
This commit is contained in:
Elad Alon 2019-06-27 17:50:00 +02:00 committed by Commit Bot
parent a09484940b
commit a47ba4119f
6 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/include/module_common_types.h
View File

@ -70,14 +70,14 @@ class NackSender {
// // TODO(bugs.webrtc.org/10336): Update downstream and remove this method. // // TODO(bugs.webrtc.org/10336): Update downstream and remove this method.
// Make the one remaining version of SendNack() pure virtual again. // Make the one remaining version of SendNack() pure virtual again.
RTC_DEPRECATED virtual void SendNack( RTC_DEPRECATED virtual void SendNack(
const std::vector<uint16_t>& sequence_numbers) = 0; const std::vector<uint16_t>& sequence_numbers) {}
// If |buffering_allowed|, other feedback messages (e.g. key frame requests) // 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 // 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 // to the user of the interface to ensure that when all buffer-able messages
// have been added, the feedback message is triggered. // have been added, the feedback message is triggered.
virtual void SendNack(const std::vector<uint16_t>& sequence_numbers, virtual void SendNack(const std::vector<uint16_t>& sequence_numbers,
bool buffering_allowed) {} bool buffering_allowed) = 0;
protected: protected:
virtual ~NackSender() {} virtual ~NackSender() {}

8
modules/video_coding/nack_module_unittest.cc
View File

@ -27,10 +27,6 @@ class TestNackModule : public ::testing::Test,
nack_module_(clock_.get(), this, this), nack_module_(clock_.get(), this, this),
keyframes_requested_(0) {} keyframes_requested_(0) {}
void SendNack(const std::vector<uint16_t>& sequence_numbers) override {
RTC_NOTREACHED();
}
void SendNack(const std::vector<uint16_t>& sequence_numbers, void SendNack(const std::vector<uint16_t>& sequence_numbers,
bool buffering_allowed) override { bool buffering_allowed) override {
sent_nacks_.insert(sent_nacks_.end(), sequence_numbers.begin(), sent_nacks_.insert(sent_nacks_.end(), sequence_numbers.begin(),
@ -307,10 +303,6 @@ class TestNackModuleWithFieldTrial : public ::testing::Test,
nack_module_(clock_.get(), this, this), nack_module_(clock_.get(), this, this),
keyframes_requested_(0) {} keyframes_requested_(0) {}
void SendNack(const std::vector<uint16_t>& sequence_numbers) override {
RTC_NOTREACHED();
}
void SendNack(const std::vector<uint16_t>& sequence_numbers, void SendNack(const std::vector<uint16_t>& sequence_numbers,
bool buffering_allowed) override { bool buffering_allowed) override {
sent_nacks_.insert(sent_nacks_.end(), sequence_numbers.begin(), sent_nacks_.insert(sent_nacks_.end(), sequence_numbers.begin(),

5
video/rtp_video_stream_receiver.cc
View File

@ -93,11 +93,6 @@ void RtpVideoStreamReceiver::RtcpFeedbackBuffer::RequestKeyFrame() {
request_key_frame_ = true; request_key_frame_ = true;
} }
void RtpVideoStreamReceiver::RtcpFeedbackBuffer::SendNack(
const std::vector<uint16_t>& sequence_numbers) {
RTC_NOTREACHED();
}
void RtpVideoStreamReceiver::RtcpFeedbackBuffer::SendNack( void RtpVideoStreamReceiver::RtcpFeedbackBuffer::SendNack(
const std::vector<uint16_t>& sequence_numbers, const std::vector<uint16_t>& sequence_numbers,
bool buffering_allowed) { bool buffering_allowed) {

1
video/rtp_video_stream_receiver.h
View File

@ -196,7 +196,6 @@ class RtpVideoStreamReceiver : public LossNotificationSender,
void RequestKeyFrame() override; void RequestKeyFrame() override;
// NackSender implementation. // NackSender implementation.
void SendNack(const std::vector<uint16_t>& sequence_numbers) override;
void SendNack(const std::vector<uint16_t>& sequence_numbers, void SendNack(const std::vector<uint16_t>& sequence_numbers,
bool buffering_allowed) override; bool buffering_allowed) override;

5
video/video_receive_stream.cc
View File

@ -513,11 +513,6 @@ void VideoReceiveStream::SetFrameDecryptor(
rtp_video_stream_receiver_.SetFrameDecryptor(std::move(frame_decryptor)); rtp_video_stream_receiver_.SetFrameDecryptor(std::move(frame_decryptor));
} }
void VideoReceiveStream::SendNack(
const std::vector<uint16_t>& sequence_numbers) {
SendNack(sequence_numbers, true);
}
void VideoReceiveStream::SendNack(const std::vector<uint16_t>& sequence_numbers, void VideoReceiveStream::SendNack(const std::vector<uint16_t>& sequence_numbers,
bool buffering_allowed) { bool buffering_allowed) {
RTC_DCHECK(buffering_allowed); RTC_DCHECK(buffering_allowed);

1
video/video_receive_stream.h
View File

@ -101,7 +101,6 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
void OnFrame(const VideoFrame& video_frame) override; void OnFrame(const VideoFrame& video_frame) override;
// Implements NackSender. // Implements NackSender.
void SendNack(const std::vector<uint16_t>& sequence_numbers) override;
// For this particular override of the interface, // For this particular override of the interface,
// only (buffering_allowed == true) is acceptable. // only (buffering_allowed == true) is acceptable.
void SendNack(const std::vector<uint16_t>& sequence_numbers, void SendNack(const std::vector<uint16_t>& sequence_numbers,