From 31251fa81725d4a208381db97b49b3370b3ee9e2 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Tue, 15 Aug 2023 13:32:54 +0200 Subject: [PATCH] Delete deprecated RTPSender::SetCsrcs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I0ce16dc51fa8aa9dcb1f3e96e62f05be11e3cba2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/315941 Reviewed-by: Åsa Persson Auto-Submit: Danil Chapovalov Commit-Queue: Åsa Persson Cr-Commit-Position: refs/heads/main@{#40566} --- modules/rtp_rtcp/source/rtp_sender.cc | 17 +---------------- modules/rtp_rtcp/source/rtp_sender.h | 5 ----- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc index a94a7c4240..bb65b9823c 100644 --- a/modules/rtp_rtcp/source/rtp_sender.cc +++ b/modules/rtp_rtcp/source/rtp_sender.cc @@ -161,7 +161,6 @@ RTPSender::RTPSender(const RtpRtcpInterface::Configuration& config, always_send_mid_and_rid_(config.always_send_mid_and_rid), ssrc_has_acked_(false), rtx_ssrc_has_acked_(false), - csrcs_(), rtx_(kRtxOff), supports_bwe_extension_(false), retransmission_rate_limiter_(config.retransmission_rate_limiter) { @@ -507,13 +506,6 @@ size_t RTPSender::ExpectedPerPacketOverhead() const { std::unique_ptr RTPSender::AllocatePacket( rtc::ArrayView csrcs) { MutexLock lock(&send_mutex_); - // TODO(danilchap): Remove this fallback together with SetCsrcs. - // New code shouldn't set csrcs_, keeping it empty, - // Old code would pass default value for csrcs, which is empty. - RTC_DCHECK(csrcs.empty() || csrcs_.empty()); - if (csrcs.empty()) { - csrcs = csrcs_; - } RTC_DCHECK_LE(csrcs.size(), kRtpCsrcSize); if (csrcs.size() > max_num_csrcs_) { max_num_csrcs_ = csrcs.size(); @@ -618,12 +610,6 @@ void RTPSender::SetMid(absl::string_view mid) { UpdateHeaderSizes(); } -void RTPSender::SetCsrcs(const std::vector& csrcs) { - RTC_DCHECK_LE(csrcs.size(), kRtpCsrcSize); - MutexLock lock(&send_mutex_); - csrcs_ = csrcs; -} - static void CopyHeaderAndExtensionsToRtxPacket(const RtpPacketToSend& packet, RtpPacketToSend* rtx_packet) { // Set the relevant fixed packet headers. The following are not set: @@ -636,8 +622,7 @@ static void CopyHeaderAndExtensionsToRtxPacket(const RtpPacketToSend& packet, // Set the variable fields in the packet header: // * CSRCs - must be set before header extensions. // * Header extensions - replace Rid header with RepairedRid header. - const std::vector csrcs = packet.Csrcs(); - rtx_packet->SetCsrcs(csrcs); + rtx_packet->SetCsrcs(packet.Csrcs()); for (int extension_num = kRtpExtensionNone + 1; extension_num < kRtpExtensionNumberOfExtensions; ++extension_num) { auto extension = static_cast(extension_num); diff --git a/modules/rtp_rtcp/source/rtp_sender.h b/modules/rtp_rtcp/source/rtp_sender.h index 082d1501ab..b6a04a7406 100644 --- a/modules/rtp_rtcp/source/rtp_sender.h +++ b/modules/rtp_rtcp/source/rtp_sender.h @@ -65,10 +65,6 @@ class RTPSender { uint16_t SequenceNumber() const RTC_LOCKS_EXCLUDED(send_mutex_); void SetSequenceNumber(uint16_t seq) RTC_LOCKS_EXCLUDED(send_mutex_); - [[deprecated("Pass csrcs in the AllocatePacket")]] // - void - SetCsrcs(const std::vector& csrcs) RTC_LOCKS_EXCLUDED(send_mutex_); - void SetMaxRtpPacketSize(size_t max_packet_size) RTC_LOCKS_EXCLUDED(send_mutex_); @@ -208,7 +204,6 @@ class RTPSender { // when to stop sending the MID and RID header extensions. bool ssrc_has_acked_ RTC_GUARDED_BY(send_mutex_); bool rtx_ssrc_has_acked_ RTC_GUARDED_BY(send_mutex_); - std::vector csrcs_ RTC_GUARDED_BY(send_mutex_); // Maximum number of csrcs this sender is used with. size_t max_num_csrcs_ RTC_GUARDED_BY(send_mutex_) = 0; int rtx_ RTC_GUARDED_BY(send_mutex_);