mediasoup 3.28.0 → 3.29.0

package/worker/test/src/RTC/RTCP/TestFeedbackPsFir.cpp

@@ -25,7 +25,7 @@ SCENARIO("RTCP Feedback PS FIR", "[rtcp][feedback-ps][fir]")
 	const uint8_t seq{ 4 };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::FeedbackPsFirPacket* packet)
+	const auto verify = [](RTC::RTCP::FeedbackPsFirPacket* packet)
 	{
 		REQUIRE(packet->GetSenderSsrc() == senderSsrc);
 		REQUIRE(packet->GetMediaSsrc() == mediaSsrc);

package/worker/test/src/RTC/RTCP/TestFeedbackPsLei.cpp

@@ -23,7 +23,7 @@ SCENARIO("RTCP Feedback PS LEI", "[rtcp][feedback-ps][lei]")
 	const uint32_t ssrc{ 0x02d03702 };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::FeedbackPsLeiPacket* packet)
+	const auto verify = [](RTC::RTCP::FeedbackPsLeiPacket* packet)
 	{
 		REQUIRE(packet->GetSenderSsrc() == senderSsrc);
 		REQUIRE(packet->GetMediaSsrc() == mediaSsrc);

package/worker/test/src/RTC/RTCP/TestFeedbackPsPli.cpp

@@ -21,7 +21,7 @@ SCENARIO("RTCP Feedback RTP PLI", "[rtcp][feedback-ps][pli]")
 	const uint32_t mediaSsrc{ 0x0330bdee };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::FeedbackPsPliPacket* packet)
+	const auto verify = [](RTC::RTCP::FeedbackPsPliPacket* packet)
 	{
 		REQUIRE(packet->GetSenderSsrc() == senderSsrc);
 		REQUIRE(packet->GetMediaSsrc() == mediaSsrc);

package/worker/test/src/RTC/RTCP/TestFeedbackPsRemb.cpp

@@ -27,7 +27,7 @@ SCENARIO("RTCP Feedback PS REMB", "[rtcp][feedback-ps][remb]")
 	const std::vector<uint32_t> ssrcs{ 0x02d03702, 0x04a76747 };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [&ssrcs](RTC::RTCP::FeedbackPsRembPacket* packet)
+	const auto verify = [&ssrcs](RTC::RTCP::FeedbackPsRembPacket* packet)
 	{
 		REQUIRE(packet->GetSenderSsrc() == senderSsrc);
 		REQUIRE(packet->GetMediaSsrc() == mediaSsrc);

package/worker/test/src/RTC/RTCP/TestFeedbackPsRpsi.cpp

@@ -28,7 +28,7 @@ SCENARIO("RTCP Feedback PS RPSI", "[rtcp][feedback-ps][rpsi]")
 	const size_t length{ 5 };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::FeedbackPsRpsiPacket* packet)
+	const auto verify = [](RTC::RTCP::FeedbackPsRpsiPacket* packet)
 	{
 		REQUIRE(packet->GetSenderSsrc() == senderSsrc);
 		REQUIRE(packet->GetMediaSsrc() == mediaSsrc);

package/worker/test/src/RTC/RTCP/TestFeedbackPsSli.cpp

@@ -25,7 +25,7 @@ SCENARIO("RTCP Feedback PS SLI", "[rtcp][feedback-ps][sli]")
 	const uint8_t pictureId{ 1 };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::FeedbackPsSliPacket* packet)
+	const auto verify = [](RTC::RTCP::FeedbackPsSliPacket* packet)
 	{
 		REQUIRE(packet->GetSenderSsrc() == senderSsrc);
 		REQUIRE(packet->GetMediaSsrc() == mediaSsrc);

package/worker/test/src/RTC/RTCP/TestFeedbackPsTst.cpp

@@ -26,7 +26,7 @@ SCENARIO("RTCP Feedback PS TSTN", "[rtcp][feedback-ps][tstn]")
 	const uint8_t index{ 1 };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::FeedbackPsTstnPacket* packet)
+	const auto verify = [](RTC::RTCP::FeedbackPsTstnPacket* packet)
 	{
 		REQUIRE(packet->GetSenderSsrc() == senderSsrc);
 		REQUIRE(packet->GetMediaSsrc() == mediaSsrc);

package/worker/test/src/RTC/RTCP/TestFeedbackPsVbcm.cpp

@@ -32,7 +32,7 @@ SCENARIO("RTCP Feedback PS VBCM", "[rtcp][feedback-ps][vbcm]")
 	const uint8_t valueMask{ 1 };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::FeedbackPsVbcmPacket* packet)
+	const auto verify = [](RTC::RTCP::FeedbackPsVbcmPacket* packet)
 	{
 		REQUIRE(packet->GetSenderSsrc() == senderSsrc);
 		REQUIRE(packet->GetMediaSsrc() == mediaSsrc);

package/worker/test/src/RTC/RTCP/TestFeedbackRtpEcn.cpp

@@ -33,7 +33,7 @@ SCENARIO("RTCP Feedback RTP ECN", "[rtcp][feedback-rtp][ecn]")
 	const uint16_t duplicatedPackets{ 1 };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::FeedbackRtpEcnPacket* packet)
+	const auto verify = [](RTC::RTCP::FeedbackRtpEcnPacket* packet)
 	{
 		REQUIRE(packet->GetSenderSsrc() == senderSsrc);
 		REQUIRE(packet->GetMediaSsrc() == mediaSsrc);

package/worker/test/src/RTC/RTCP/TestFeedbackRtpNack.cpp

@@ -24,7 +24,7 @@ SCENARIO("RTCP Feedback RTP NACK", "[rtcp][feedback-rtp][nack]")
 	const uint16_t lostPacketBitmask{ 0x0003 };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::FeedbackRtpNackPacket* packet)
+	const auto verify = [](RTC::RTCP::FeedbackRtpNackPacket* packet)
 	{
 		REQUIRE(packet->GetSenderSsrc() == senderSsrc);
 		REQUIRE(packet->GetMediaSsrc() == mediaSsrc);

package/worker/test/src/RTC/RTCP/TestFeedbackRtpSrReq.cpp

@@ -21,7 +21,7 @@ SCENARIO("RTCP Feedback RTP SR-REQ", "[rtcp][feedback-rtp][sr-req]")
 	const uint32_t mediaSsrc{ 0x0330bdee };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::FeedbackRtpSrReqPacket* packet)
+	const auto verify = [](RTC::RTCP::FeedbackRtpSrReqPacket* packet)
 	{
 		REQUIRE(packet->GetSenderSsrc() == senderSsrc);
 		REQUIRE(packet->GetMediaSsrc() == mediaSsrc);

package/worker/test/src/RTC/RTCP/TestFeedbackRtpTllei.cpp

@@ -24,7 +24,7 @@ SCENARIO("RTCP Feedback RTP TLLEI", "[rtcp][feedback-rtp][tllei]")
 	const uint16_t lostPacketBitmask{ 0b1010101001010101 };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::FeedbackRtpTlleiPacket* packet)
+	const auto verify = [](RTC::RTCP::FeedbackRtpTlleiPacket* packet)
 	{
 		REQUIRE(packet->GetSenderSsrc() == senderSsrc);
 		REQUIRE(packet->GetMediaSsrc() == mediaSsrc);

package/worker/test/src/RTC/RTCP/TestFeedbackRtpTmmb.cpp

@@ -26,7 +26,7 @@ SCENARIO("RTCP Feedback RTP TMMBR", "[rtcp][feedback-rtp][tmmb]")
 	const uint16_t overhead{ 0 };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::FeedbackRtpTmmbrPacket* packet)
+	const auto verify = [](RTC::RTCP::FeedbackRtpTmmbrPacket* packet)
 	{
 		REQUIRE(packet->GetSenderSsrc() == senderSsrc);
 		REQUIRE(packet->GetMediaSsrc() == mediaSsrc);

package/worker/test/src/RTC/RTCP/TestFeedbackRtpTransport.cpp

@@ -22,7 +22,7 @@ SCENARIO("RTCP Feedback RTP Transport", "[rtcp][feedback-rtp][transport]")
 	const uint32_t senderSsrc{ 1111u };
 	const uint32_t mediaSsrc{ 2222u };
 
-	auto verify =
+	const auto verify =
 	  [](
 	    const std::vector<struct TestFeedbackRtpTransportInput>& inputs,
 	    const std::vector<struct RTC::RTCP::FeedbackRtpTransportPacket::PacketStatus>& packetStatuses)

package/worker/test/src/RTC/RTCP/TestReceiverReport.cpp

@@ -34,7 +34,7 @@ SCENARIO("RTCP ReceiverReport", "[rtcp][receiver-report]")
 	const uint32_t delaySinceLastSenderReport{ 5 };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::ReceiverReport* report)
+	const auto verify = [](RTC::RTCP::ReceiverReport* report)
 	{
 		REQUIRE(report->GetSsrc() == ssrc);
 		REQUIRE(report->GetFractionLost() == fractionLost);

package/worker/test/src/RTC/RTCP/TestSenderReport.cpp

@@ -32,7 +32,7 @@ SCENARIO("RTCP SenderReport", "[rtcp][sender-report]")
 	const uint32_t octetCount{ 577280 };
 
 	// NOTE: No need to pass const integers to the lambda.
-	auto verify = [](RTC::RTCP::SenderReport* report)
+	const auto verify = [](RTC::RTCP::SenderReport* report)
 	{
 		REQUIRE(report->GetSsrc() == ssrc);
 		REQUIRE(report->GetNtpSec() == ntpSec);

package/worker/test/src/RTC/RTP/TestRetransmissionBuffer.cpp

@@ -26,7 +26,7 @@ SCENARIO("RTP RetransmissionBuffer", "[rtp][rtx]")
 		}
 
 	public:
-		void Insert(uint16_t seq, uint32_t timestamp)
+		void Insert(uint16_t seq, uint32_t timestamp, int64_t nowMs = 0)
 		{
 			// clang-format off
 		uint8_t rtpBuffer[] =
@@ -44,7 +44,7 @@ SCENARIO("RTP RetransmissionBuffer", "[rtp][rtx]")
 
 			const RTC::RTP::SharedPacket sharedPacket;
 
-			RTC::RTP::RetransmissionBuffer::Insert(packet.get(), sharedPacket);
+			RTC::RTP::RetransmissionBuffer::Insert(packet.get(), sharedPacket, nowMs);
 		}
 
 		void AssertBuffer(std::vector<VerificationItem> verificationBuffer)
@@ -83,10 +83,10 @@ SCENARIO("RTP RetransmissionBuffer", "[rtp][rtx]")
 		// clang-format off
 		myRetransmissionBuffer.AssertBuffer(
 			{
-				{ true, 10001, 1000000000 },
-				{ true, 10002, 1000000000 },
-				{ true, 10003, 1000000200 },
-				{ true, 10004, 1000000200 }
+				{ .isPresent = true, .sequenceNumber = 10001, .timestamp = 1000000000 },
+				{ .isPresent = true, .sequenceNumber = 10002, .timestamp = 1000000000 },
+				{ .isPresent = true, .sequenceNumber = 10003, .timestamp = 1000000200 },
+				{ .isPresent = true, .sequenceNumber = 10004, .timestamp = 1000000200 }
 			}
 		);
 		// clang-format on
@@ -108,10 +108,10 @@ SCENARIO("RTP RetransmissionBuffer", "[rtp][rtx]")
 		// clang-format off
 		myRetransmissionBuffer.AssertBuffer(
 			{
-				{ true, 20001, 2000000000 },
-				{ true, 20002, 2000000000 },
-				{ true, 20003, 2000000200 },
-				{ true, 20004, 2000000200 }
+				{ .isPresent = true, .sequenceNumber = 20001, .timestamp = 2000000000 },
+				{ .isPresent = true, .sequenceNumber = 20002, .timestamp = 2000000000 },
+				{ .isPresent = true, .sequenceNumber = 20003, .timestamp = 2000000200 },
+				{ .isPresent = true, .sequenceNumber = 20004, .timestamp = 2000000200 }
 			}
 		);
 		// clang-format on
@@ -133,7 +133,7 @@ SCENARIO("RTP RetransmissionBuffer", "[rtp][rtx]")
 		// clang-format off
 		myRetransmissionBuffer.AssertBuffer(
 			{
-				{ true, 40000, 3000003000 }
+				{ .isPresent = true, .sequenceNumber = 40000, .timestamp = 3000003000 }
 			}
 		);
 		// clang-format on
@@ -163,15 +163,15 @@ SCENARIO("RTP RetransmissionBuffer", "[rtp][rtx]")
 		// clang-format off
 		myRetransmissionBuffer.AssertBuffer(
 			{
-				{ true, 40000, 4000000000 },
-				{ false, 0, 0 },
-				{ true, 40002, 4000000002 },
-				{ false, 0, 0 },
-				{ true, 40004, 4000000004 },
-				{ false, 0, 0 },
-				{ true, 40006, 4000000006 },
-				{ false, 0, 0 },
-				{ true, 40008, 4000000008 }
+				{ .isPresent = true, .sequenceNumber = 40000, .timestamp = 4000000000 },
+				{ .isPresent = false, .sequenceNumber = 0, .timestamp = 0 },
+				{ .isPresent = true, .sequenceNumber = 40002, .timestamp = 4000000002 },
+				{ .isPresent = false, .sequenceNumber = 0, .timestamp = 0 },
+				{ .isPresent = true, .sequenceNumber = 40004, .timestamp = 4000000004 },
+				{ .isPresent = false, .sequenceNumber = 0, .timestamp = 0 },
+				{ .isPresent = true, .sequenceNumber = 40006, .timestamp = 4000000006 },
+				{ .isPresent = false, .sequenceNumber = 0, .timestamp = 0 },
+				{ .isPresent = true, .sequenceNumber = 40008, .timestamp = 4000000008 }
 			}
 		);
 		// clang-format on
@@ -194,9 +194,9 @@ SCENARIO("RTP RetransmissionBuffer", "[rtp][rtx]")
 		// clang-format off
 		myRetransmissionBuffer.AssertBuffer(
 			{
-				{ true, 10001, 1000000001 },
-				{ true, 10002, 1000000002 },
-				{ true, 10003, 1000000003 }
+				{ .isPresent = true, .sequenceNumber = 10001, .timestamp = 1000000001 },
+				{ .isPresent = true, .sequenceNumber = 10002, .timestamp = 1000000002 },
+				{ .isPresent = true, .sequenceNumber = 10003, .timestamp = 1000000003 }
 			}
 		);
 		// clang-format on
@@ -221,9 +221,9 @@ SCENARIO("RTP RetransmissionBuffer", "[rtp][rtx]")
 		// clang-format off
 		myRetransmissionBuffer.AssertBuffer(
 			{
-				{ true, 10001, 1000000001 },
-				{ true, 10002, 1000000002 },
-				{ true, 10003, 1000000003 }
+				{ .isPresent = true, .sequenceNumber = 10001, .timestamp = 1000000001 },
+				{ .isPresent = true, .sequenceNumber = 10002, .timestamp = 1000000002 },
+				{ .isPresent = true, .sequenceNumber = 10003, .timestamp = 1000000003 }
 			}
 		);
 		// clang-format on
@@ -246,7 +246,7 @@ SCENARIO("RTP RetransmissionBuffer", "[rtp][rtx]")
 		// clang-format off
 		myRetransmissionBuffer.AssertBuffer(
 			{
-				{ true, 18365, 1026593387 }
+				{ .isPresent = true, .sequenceNumber = 18365, .timestamp = 1026593387 }
 			}
 		);
 		// clang-format on
@@ -268,12 +268,44 @@ SCENARIO("RTP RetransmissionBuffer", "[rtp][rtx]")
 		// clang-format off
 		myRetransmissionBuffer.AssertBuffer(
 			{
-				{ true, 33330, 1000000003 }
+				{ .isPresent = true, .sequenceNumber = 33330, .timestamp = 1000000003 }
 			}
 		);
 		// clang-format on
 	}
 
+	SECTION("stored packet is too old once maxRetransmissionDelayMs elapsed since it was stored")
+	{
+		const uint16_t maxItems{ 4 };
+		const int64_t maxRetransmissionDelayMs{ 2000 };
+		const uint32_t clockRate{ 90000 };
+		const int64_t firstStoredAtMs{ 5000 };
+
+		RtpMyRetransmissionBuffer myRetransmissionBuffer(maxItems, maxRetransmissionDelayMs, clockRate);
+
+		// Both packets have the same timestamp so the age measured by timestamp
+		// doesn't play any role here.
+		myRetransmissionBuffer.Insert(10001, 1000000000, firstStoredAtMs);
+		myRetransmissionBuffer.Insert(10002, 1000000000, firstStoredAtMs + 1);
+
+		const RTC::RTP::RetransmissionBuffer::Item* const item1 = myRetransmissionBuffer.Get(10001);
+		const RTC::RTP::RetransmissionBuffer::Item* const item2 = myRetransmissionBuffer.Get(10002);
+
+		REQUIRE(item1);
+		REQUIRE(item2);
+
+		// Right at the limit the packet is not too old yet.
+		REQUIRE(
+		  myRetransmissionBuffer.IsTooOld(item1, firstStoredAtMs + maxRetransmissionDelayMs) == false);
+
+		// Past the limit it is, even if no newer packet has been stored.
+		REQUIRE(myRetransmissionBuffer.IsTooOld(item1, firstStoredAtMs + maxRetransmissionDelayMs + 1));
+
+		// Each packet counts from the instant it was stored.
+		REQUIRE(
+		  myRetransmissionBuffer.IsTooOld(item2, firstStoredAtMs + maxRetransmissionDelayMs + 1) == false);
+	}
+
 	SECTION("fuzzer generated packets")
 	{
 		const uint16_t maxItems{ 2500 };

package/worker/test/src/RTC/RTP/TestRtpStreamRecv.cpp

@@ -250,7 +250,7 @@ SCENARIO("RtpStreamRecv", "[rtp][rtpstream][rtpstreamrecv]")
 		RTC::RTP::RtpStreamRecv rtpStream(
 		  std::addressof(listener), std::addressof(shared), params, SendNackDelay, UseRtpInactivityCheck);
 
-		auto receiveDelaySinceLastRr = [&](int64_t receivedAtUs, uint32_t lastRr, uint32_t dlrr)
+		const auto receiveDelaySinceLastRr = [&](int64_t receivedAtUs, uint32_t lastRr, uint32_t dlrr)
 		{
 			RTC::RTCP::DelaySinceLastRr::SsrcInfo ssrcInfo;