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

Delete deprecated variant of IncomingRtcpPacket function

Browse Source 
Bug: webrtc:14870
Change-Id: Ifc7a5f7d19d5555c8bbcba27ba08c019ca65b5c7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/292840
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39284}
This commit is contained in:
Danil Chapovalov 2023-02-09 12:06:50 +01:00 committed by WebRTC LUCI CQ
parent 16579cc81d
commit e1137d7201
7 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
View File

@ -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<const uint8_t> packet),

5
modules/rtp_rtcp/source/rtcp_receiver.h
View File

@ -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<const uint8_t> packet);
int64_t LastReceivedReportBlockMs() const;

6
modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@ -192,9 +192,9 @@ absl::optional<uint32_t> 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<const uint8_t> rtcp_packet) {
rtcp_receiver_.IncomingPacket(rtcp_packet);
}
void ModuleRtpRtcpImpl::RegisterSendPayloadFrequency(int payload_type,

6
modules/rtp_rtcp/source/rtp_rtcp_impl.h
View File

@ -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<const uint8_t> packet) override {
IncomingRtcpPacket(packet.data(), packet.size());
}
void IncomingRtcpPacket(rtc::ArrayView<const uint8_t> packet) override;
void SetRemoteSSRC(uint32_t ssrc) override;
void SetLocalSsrc(uint32_t ssrc) override;

6
modules/rtp_rtcp/source/rtp_rtcp_impl2.h
View File

@ -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<const uint8_t> incoming_packet) override;

11
modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
View File

@ -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(),

3
modules/rtp_rtcp/source/rtp_rtcp_interface.h
View File

@ -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<const uint8_t> incoming_packet) = 0;