From e1137d720114ec569e350caa535eeb6da34397ba Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Thu, 9 Feb 2023 12:06:50 +0100 Subject: [PATCH] Delete deprecated variant of IncomingRtcpPacket function Bug: webrtc:14870 Change-Id: Ifc7a5f7d19d5555c8bbcba27ba08c019ca65b5c7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/292840 Commit-Queue: Danil Chapovalov Reviewed-by: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#39284} --- modules/rtp_rtcp/mocks/mock_rtp_rtcp.h | 4 ---- modules/rtp_rtcp/source/rtcp_receiver.h | 5 ----- modules/rtp_rtcp/source/rtp_rtcp_impl.cc | 6 +++--- modules/rtp_rtcp/source/rtp_rtcp_impl.h | 6 +----- modules/rtp_rtcp/source/rtp_rtcp_impl2.h | 6 ------ modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc | 11 ++++------- modules/rtp_rtcp/source/rtp_rtcp_interface.h | 3 --- 7 files changed, 8 insertions(+), 33 deletions(-) diff --git a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h index 44a64841d0..1bf7f4766d 100644 --- a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h +++ b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h @@ -29,10 +29,6 @@ namespace webrtc { class MockRtpRtcpInterface : public RtpRtcpInterface { public: - MOCK_METHOD(void, - IncomingRtcpPacket, - (const uint8_t* incoming_packet, size_t packet_length), - (override)); MOCK_METHOD(void, IncomingRtcpPacket, (rtc::ArrayView packet), diff --git a/modules/rtp_rtcp/source/rtcp_receiver.h b/modules/rtp_rtcp/source/rtcp_receiver.h index 696e0fbd7e..d3c07929dd 100644 --- a/modules/rtp_rtcp/source/rtcp_receiver.h +++ b/modules/rtp_rtcp/source/rtcp_receiver.h @@ -98,11 +98,6 @@ class RTCPReceiver final { ~RTCPReceiver(); - [[deprecated("Use ArrayView verwsion")]] void IncomingPacket( - const uint8_t* packet, - size_t packet_size) { - IncomingPacket(rtc::MakeArrayView(packet, packet_size)); - } void IncomingPacket(rtc::ArrayView packet); int64_t LastReceivedReportBlockMs() const; diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index b7f23236fe..8340a667f3 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -192,9 +192,9 @@ absl::optional ModuleRtpRtcpImpl::FlexfecSsrc() const { return absl::nullopt; } -void ModuleRtpRtcpImpl::IncomingRtcpPacket(const uint8_t* rtcp_packet, - const size_t length) { - rtcp_receiver_.IncomingPacket(rtcp_packet, length); +void ModuleRtpRtcpImpl::IncomingRtcpPacket( + rtc::ArrayView rtcp_packet) { + rtcp_receiver_.IncomingPacket(rtcp_packet); } void ModuleRtpRtcpImpl::RegisterSendPayloadFrequency(int payload_type, diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h index 38a9bf0305..58e7b9da9f 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h @@ -60,11 +60,7 @@ class ABSL_DEPRECATED("") ModuleRtpRtcpImpl // Receiver part. // Called when we receive an RTCP packet. - void IncomingRtcpPacket(const uint8_t* incoming_packet, - size_t incoming_packet_length) override; - void IncomingRtcpPacket(rtc::ArrayView packet) override { - IncomingRtcpPacket(packet.data(), packet.size()); - } + void IncomingRtcpPacket(rtc::ArrayView packet) override; void SetRemoteSSRC(uint32_t ssrc) override; void SetLocalSsrc(uint32_t ssrc) override; diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h index b6071d96ee..59a99019f2 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h @@ -66,12 +66,6 @@ class ModuleRtpRtcpImpl2 final : public RtpRtcpInterface, // Receiver part. // Called when we receive an RTCP packet. - [[deprecated("Use ArrayView version")]] void IncomingRtcpPacket( - const uint8_t* incoming_packet, - size_t incoming_packet_length) override { - IncomingRtcpPacket( - rtc::MakeArrayView(incoming_packet, incoming_packet_length)); - } void IncomingRtcpPacket( rtc::ArrayView incoming_packet) override; diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc index 4c621d70cf..5987b01302 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc @@ -89,7 +89,7 @@ class SendTransport : public Transport { clock_->AdvanceTimeMilliseconds(delay_ms_); } EXPECT_TRUE(receiver_); - receiver_->IncomingRtcpPacket(data, len); + receiver_->IncomingRtcpPacket(rtc::MakeArrayView(data, len)); ++rtcp_packets_sent_; return true; } @@ -240,8 +240,7 @@ class RtpRtcpImplTest : public ::testing::Test { nack.SetSenderSsrc(sender ? kReceiverSsrc : kSenderSsrc); nack.SetMediaSsrc(sender ? kSenderSsrc : kReceiverSsrc); nack.SetPacketIds(list, kListLength); - rtc::Buffer packet = nack.Build(); - module->impl_->IncomingRtcpPacket(packet.data(), packet.size()); + module->impl_->IncomingRtcpPacket(nack.Build()); } }; @@ -628,8 +627,7 @@ TEST_F(RtpRtcpImplTest, SenderReportStatsNotUpdatedWithUnexpectedSsrc) { sr.SetNtp({/*seconds=*/1u, /*fractions=*/1u << 31}); sr.SetPacketCount(123u); sr.SetOctetCount(456u); - auto raw_packet = sr.Build(); - receiver_.impl_->IncomingRtcpPacket(raw_packet.data(), raw_packet.size()); + receiver_.impl_->IncomingRtcpPacket(sr.Build()); EXPECT_THAT(receiver_.impl_->GetSenderReportStats(), Eq(absl::nullopt)); } @@ -646,8 +644,7 @@ TEST_F(RtpRtcpImplTest, SenderReportStatsCheckStatsFromLastReport) { sr.SetNtp(ntp); sr.SetPacketCount(kPacketCount); sr.SetOctetCount(kOctetCount); - auto raw_packet = sr.Build(); - receiver_.impl_->IncomingRtcpPacket(raw_packet.data(), raw_packet.size()); + receiver_.impl_->IncomingRtcpPacket(sr.Build()); EXPECT_THAT( receiver_.impl_->GetSenderReportStats(), diff --git a/modules/rtp_rtcp/source/rtp_rtcp_interface.h b/modules/rtp_rtcp/source/rtp_rtcp_interface.h index 4bcae06fbf..f0c1650daf 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_interface.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_interface.h @@ -186,9 +186,6 @@ class RtpRtcpInterface : public RtcpFeedbackSenderInterface { // Receiver functions // ************************************************************************** - [[deprecated("Use ArrayView version")]] virtual void IncomingRtcpPacket( - const uint8_t* incoming_packet, - size_t incoming_packet_length) = 0; virtual void IncomingRtcpPacket( rtc::ArrayView incoming_packet) = 0;