From 836d58408d53143771eefadbef5aba09e7ae06e6 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Wed, 13 Apr 2022 13:16:27 +0200 Subject: [PATCH] Delete deprecated RTPSender constructor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:11340 Change-Id: Id7ade3b15510e32b8bf4653b0e1652c275b58e88 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/258789 Auto-Submit: Danil Chapovalov Reviewed-by: Erik Språng Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/main@{#36549} --- modules/rtp_rtcp/source/rtp_sender.cc | 6 ------ modules/rtp_rtcp/source/rtp_sender.h | 9 --------- modules/rtp_rtcp/source/rtp_sender_unittest.cc | 2 +- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc index 6989efca5d..1c3cb286dd 100644 --- a/modules/rtp_rtcp/source/rtp_sender.cc +++ b/modules/rtp_rtcp/source/rtp_sender.cc @@ -155,12 +155,6 @@ double GetMaxPaddingSizeFactor(const FieldTrialsView* field_trials) { } // namespace -RTPSender::RTPSender(const RtpRtcpInterface::Configuration& config, - RtpPacketHistory* packet_history, - RtpPacketSender* packet_sender, - PacketSequencer*) - : RTPSender(config, packet_history, packet_sender) {} - RTPSender::RTPSender(const RtpRtcpInterface::Configuration& config, RtpPacketHistory* packet_history, RtpPacketSender* packet_sender) diff --git a/modules/rtp_rtcp/source/rtp_sender.h b/modules/rtp_rtcp/source/rtp_sender.h index 0a80836624..cb2c99e122 100644 --- a/modules/rtp_rtcp/source/rtp_sender.h +++ b/modules/rtp_rtcp/source/rtp_sender.h @@ -26,7 +26,6 @@ #include "modules/rtp_rtcp/include/rtp_header_extension_map.h" #include "modules/rtp_rtcp/include/rtp_packet_sender.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" -#include "modules/rtp_rtcp/source/packet_sequencer.h" #include "modules/rtp_rtcp/source/rtp_packet_history.h" #include "modules/rtp_rtcp/source/rtp_rtcp_config.h" #include "modules/rtp_rtcp/source/rtp_rtcp_interface.h" @@ -47,14 +46,6 @@ class RTPSender { RTPSender(const RtpRtcpInterface::Configuration& config, RtpPacketHistory* packet_history, RtpPacketSender* packet_sender); - - ABSL_DEPRECATED("bugs.webrtc.org/11340") - RTPSender(const RtpRtcpInterface::Configuration& config, - RtpPacketHistory* packet_history, - RtpPacketSender* packet_sender, - PacketSequencer* packet_sequencer); - - RTPSender() = delete; RTPSender(const RTPSender&) = delete; RTPSender& operator=(const RTPSender&) = delete; diff --git a/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc index c28dd684db..6eba47741c 100644 --- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc @@ -170,7 +170,7 @@ class RtpSenderTest : public ::testing::Test { /*require_marker_before_media_padding=*/!config.audio, clock_); rtp_sender_ = std::make_unique(config, packet_history_.get(), - config.paced_sender, nullptr); + config.paced_sender); sequencer_->set_media_sequence_number(kSeqNum); rtp_sender_->SetTimestampOffset(0); }