Remove deprecated RecoveredPacketReceiver::OnRecoveredPacket signature
Bug: webrtc:7135, webrtc:14795
Change-Id: Ib2f434b59542d6d8a2b8a287047417b784187602
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/290567
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Auto-Submit: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39049}
diff --git a/modules/rtp_rtcp/include/recovered_packet_receiver.h b/modules/rtp_rtcp/include/recovered_packet_receiver.h
index 0be539d..4e92c48 100644
--- a/modules/rtp_rtcp/include/recovered_packet_receiver.h
+++ b/modules/rtp_rtcp/include/recovered_packet_receiver.h
@@ -20,16 +20,7 @@
// the recovered RTP packets based on SSRC.
class RecoveredPacketReceiver {
public:
- // TODO(bugs.webrtc.org/7135,perkj): Remove when all
- // implementations implement OnRecoveredPacket(const RtpPacketReceived&)
- virtual void OnRecoveredPacket(const uint8_t* packet, size_t length) {
- RTC_DCHECK_NOTREACHED();
- }
- // TODO(bugs.webrtc.org/7135,perkj): Make pure virtual when all
- // implementations are updated.
- virtual void OnRecoveredPacket(const RtpPacketReceived& packet) {
- OnRecoveredPacket(packet.Buffer().data(), packet.Buffer().size());
- }
+ virtual void OnRecoveredPacket(const RtpPacketReceived& packet) = 0;
protected:
virtual ~RecoveredPacketReceiver() = default;
diff --git a/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h b/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h
index 404ded0..d308b2c 100644
--- a/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h
+++ b/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h
@@ -12,6 +12,7 @@
#define MODULES_RTP_RTCP_MOCKS_MOCK_RECOVERED_PACKET_RECEIVER_H_
#include "modules/rtp_rtcp/include/flexfec_receiver.h"
+#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "test/gmock.h"
namespace webrtc {
@@ -20,7 +21,7 @@
public:
MOCK_METHOD(void,
OnRecoveredPacket,
- (const uint8_t* packet, size_t length),
+ (const RtpPacketReceived& packet),
(override));
};
diff --git a/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc b/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
index 5e21b97..1243858 100644
--- a/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
@@ -25,8 +25,8 @@
namespace {
using ::testing::_;
-using ::testing::Args;
-using ::testing::ElementsAreArray;
+using ::testing::Eq;
+using ::testing::Property;
using test::fec::FlexfecPacketGenerator;
using Packet = ForwardErrorCorrection::Packet;
@@ -239,9 +239,8 @@
packet_generator_.BuildFlexfecPacket(**fec_it);
media_it++;
EXPECT_CALL(recovered_packet_receiver_,
- OnRecoveredPacket(_, (*media_it)->data.size()))
- .With(Args<0, 1>(ElementsAreArray((*media_it)->data.cdata(),
- (*media_it)->data.size())));
+ OnRecoveredPacket(
+ Property(&RtpPacketReceived::Buffer, Eq((*media_it)->data))));
receiver_.OnRtpPacket(ParsePacket(*packet_with_rtp_header));
}
@@ -261,9 +260,8 @@
packet_generator_.BuildFlexfecPacket(**fec_it);
auto media_it = media_packets.begin();
EXPECT_CALL(recovered_packet_receiver_,
- OnRecoveredPacket(_, (*media_it)->data.size()))
- .With(Args<0, 1>(ElementsAreArray((*media_it)->data.cdata(),
- (*media_it)->data.size())));
+ OnRecoveredPacket(
+ Property(&RtpPacketReceived::Buffer, Eq((*media_it)->data))));
receiver_.OnRtpPacket(ParsePacket(*packet_with_rtp_header));
// Receive second FEC packet and recover second lost media packet.
@@ -271,9 +269,9 @@
packet_with_rtp_header = packet_generator_.BuildFlexfecPacket(**fec_it);
media_it++;
EXPECT_CALL(recovered_packet_receiver_,
- OnRecoveredPacket(_, (*media_it)->data.size()))
- .With(Args<0, 1>(ElementsAreArray((*media_it)->data.cdata(),
- (*media_it)->data.size())));
+ OnRecoveredPacket(
+ Property(&RtpPacketReceived::Buffer, Eq((*media_it)->data))));
+
receiver_.OnRtpPacket(ParsePacket(*packet_with_rtp_header));
}
@@ -310,9 +308,8 @@
packet_generator_.BuildFlexfecPacket(**fec_it);
media_it++;
EXPECT_CALL(recovered_packet_receiver_,
- OnRecoveredPacket(_, (*media_it)->data.size()))
- .With(Args<0, 1>(ElementsAreArray((*media_it)->data.cdata(),
- (*media_it)->data.size())));
+ OnRecoveredPacket(
+ Property(&RtpPacketReceived::Buffer, Eq((*media_it)->data))));
receiver_.OnRtpPacket(ParsePacket(*packet_with_rtp_header));
// Receive the FEC packet again, but do not call back.
@@ -363,9 +360,8 @@
break;
}
EXPECT_CALL(recovered_packet_receiver_,
- OnRecoveredPacket(_, (*media_it)->data.size()))
- .With(Args<0, 1>(ElementsAreArray((*media_it)->data.cdata(),
- (*media_it)->data.size())));
+ OnRecoveredPacket(Property(&RtpPacketReceived::Buffer,
+ Eq((*media_it)->data))));
receiver_.OnRtpPacket(ParsePacket(*fec_packet_with_rtp_header));
++media_it;
}
@@ -404,9 +400,8 @@
packet_generator_.BuildFlexfecPacket(**fec_it);
media_it = media_packets.begin();
EXPECT_CALL(recovered_packet_receiver_,
- OnRecoveredPacket(_, (*media_it)->data.size()))
- .With(Args<0, 1>(ElementsAreArray((*media_it)->data.cdata(),
- (*media_it)->data.size())));
+ OnRecoveredPacket(
+ Property(&RtpPacketReceived::Buffer, Eq((*media_it)->data))));
receiver_.OnRtpPacket(ParsePacket(*packet_with_rtp_header));
}
@@ -532,14 +527,11 @@
// Expect to recover lost media packets.
EXPECT_CALL(recovered_packet_receiver_,
- OnRecoveredPacket(_, (*media_packet1)->data.size()))
- .With(Args<0, 1>(ElementsAreArray((*media_packet1)->data.cdata(),
- (*media_packet1)->data.size())));
+ OnRecoveredPacket(Property(&RtpPacketReceived::Buffer,
+ Eq((*media_packet1)->data))));
EXPECT_CALL(recovered_packet_receiver_,
- OnRecoveredPacket(_, (*media_packet4)->data.size()))
- .With(Args<0, 1>(ElementsAreArray((*media_packet4)->data.cdata(),
- (*media_packet4)->data.size())));
-
+ OnRecoveredPacket(Property(&RtpPacketReceived::Buffer,
+ Eq((*media_packet4)->data))));
// Add FEC packets.
auto fec_it = fec_packets.begin();
std::unique_ptr<Packet> packet_with_rtp_header;
@@ -631,9 +623,8 @@
packet_generator_.BuildFlexfecPacket(**fec_it);
media_it++;
EXPECT_CALL(recovered_packet_receiver_,
- OnRecoveredPacket(_, (*media_it)->data.size()))
- .With(Args<0, 1>(ElementsAreArray((*media_it)->data.cdata(),
- (*media_it)->data.size())));
+ OnRecoveredPacket(
+ Property(&RtpPacketReceived::Buffer, Eq((*media_it)->data))));
receiver_.OnRtpPacket(ParsePacket(*packet_with_rtp_header));
// Check stats calculations.
diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc b/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc
index 81dd399..676e20c 100644
--- a/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/ulpfec_receiver_unittest.cc
@@ -29,8 +29,8 @@
namespace {
using ::testing::_;
-using ::testing::Args;
-using ::testing::ElementsAreArray;
+using ::testing::Eq;
+using ::testing::Property;
using test::fec::AugmentedPacket;
using Packet = ForwardErrorCorrection::Packet;
@@ -41,7 +41,7 @@
class NullRecoveredPacketReceiver : public RecoveredPacketReceiver {
public:
- void OnRecoveredPacket(const uint8_t* packet, size_t length) override {}
+ void OnRecoveredPacket(const RtpPacketReceived& packet) override {}
};
} // namespace
@@ -143,15 +143,14 @@
// Verify that the content of the reconstructed packet is equal to the
// content of `packet`, and that the same content is received `times` number
// of times in a row.
- EXPECT_CALL(recovered_packet_receiver_,
- OnRecoveredPacket(_, packet.data.size()))
- .With(
- Args<0, 1>(ElementsAreArray(packet.data.cdata(), packet.data.size())))
+ EXPECT_CALL(
+ recovered_packet_receiver_,
+ OnRecoveredPacket(Property(&RtpPacketReceived::Buffer, Eq(packet.data))))
.Times(times);
}
void UlpfecReceiverTest::InjectGarbagePacketLength(size_t fec_garbage_offset) {
- EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, _));
+ EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_));
const size_t kNumFecPackets = 1;
std::list<AugmentedPacket*> augmented_media_packets;
@@ -389,7 +388,7 @@
EncodeFec(media_packets_batch1, kNumFecPacketsBatch1, &fec_packets);
BuildAndAddRedMediaPacket(augmented_media_packets_batch1.front());
- EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, _)).Times(1);
+ EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_)).Times(1);
receiver_fec_.ProcessReceivedFec();
delayed_fec = fec_packets.front();
@@ -404,13 +403,13 @@
for (auto it = augmented_media_packets_batch2.begin();
it != augmented_media_packets_batch2.end(); ++it) {
BuildAndAddRedMediaPacket(*it);
- EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, _)).Times(1);
+ EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_)).Times(1);
receiver_fec_.ProcessReceivedFec();
}
// Add the delayed FEC packet. One packet should be reconstructed.
BuildAndAddRedFecPacket(delayed_fec);
- EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, _)).Times(1);
+ EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_)).Times(1);
receiver_fec_.ProcessReceivedFec();
}
@@ -428,7 +427,7 @@
EncodeFec(media_packets_batch1, kNumFecPacketsBatch1, &fec_packets);
BuildAndAddRedMediaPacket(augmented_media_packets_batch1.front());
- EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, _)).Times(1);
+ EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_)).Times(1);
receiver_fec_.ProcessReceivedFec();
delayed_fec = fec_packets.front();
@@ -443,14 +442,14 @@
for (auto it = augmented_media_packets_batch2.begin();
it != augmented_media_packets_batch2.end(); ++it) {
BuildAndAddRedMediaPacket(*it);
- EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, _)).Times(1);
+ EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_)).Times(1);
receiver_fec_.ProcessReceivedFec();
}
// Add the delayed FEC packet. No packet should be reconstructed since the
// first media packet of that frame has been dropped due to being too old.
BuildAndAddRedFecPacket(delayed_fec);
- EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, _)).Times(0);
+ EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_)).Times(0);
receiver_fec_.ProcessReceivedFec();
}
@@ -469,7 +468,7 @@
for (auto it = fec_packets.begin(); it != fec_packets.end(); ++it) {
// Only FEC packets inserted. No packets recoverable at this time.
BuildAndAddRedFecPacket(*it);
- EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, _)).Times(0);
+ EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_)).Times(0);
receiver_fec_.ProcessReceivedFec();
}
// Move unique_ptr's to media_packets for lifetime management.
@@ -484,7 +483,7 @@
// and should have been dropped. Only the media packet we inserted will be
// returned.
BuildAndAddRedMediaPacket(augmented_media_packets.front());
- EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_, _)).Times(1);
+ EXPECT_CALL(recovered_packet_receiver_, OnRecoveredPacket(_)).Times(1);
receiver_fec_.ProcessReceivedFec();
}
