mediasoup 3.15.3 → 3.15.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mediasoup",
-	"version": "3.15.3",
+	"version": "3.15.4",
 	"description": "Cutting Edge WebRTC Video Conferencing",
 	"contributors": [
 		"Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -101,7 +101,7 @@
 	"dependencies": {
 		"@types/ini": "^4.1.1",
 		"debug": "^4.4.0",
-		"flatbuffers": "^25.1.24",
+		"flatbuffers": "^25.2.10",
 		"h264-profile-level-id": "^2.0.0",
 		"ini": "^5.0.0",
 		"node-fetch": "^3.3.2",
@@ -109,24 +109,24 @@
 		"tar": "^7.4.3"
 	},
 	"devDependencies": {
-		"@eslint/js": "^9.19.0",
-		"@octokit/rest": "^21.1.0",
+		"@eslint/js": "^9.20.0",
+		"@octokit/rest": "^21.1.1",
 		"@types/debug": "^4.1.12",
 		"@types/jest": "^29.5.14",
-		"@types/node": "^22.12.0",
-		"eslint": "^9.19.0",
+		"@types/node": "^22.13.4",
+		"eslint": "^9.20.1",
 		"eslint-config-prettier": "^10.0.1",
 		"eslint-plugin-jest": "^28.11.0",
 		"eslint-plugin-prettier": "^5.2.3",
-		"globals": "^15.14.0",
+		"globals": "^16.0.0",
 		"jest": "^29.7.0",
-		"marked": "^15.0.6",
+		"marked": "^15.0.7",
 		"open-cli": "^8.0.0",
 		"pick-port": "^2.1.0",
-		"prettier": "^3.4.2",
+		"prettier": "^3.5.1",
 		"sctp": "^1.0.0",
 		"ts-jest": "^29.2.5",
 		"typescript": "^5.7.3",
-		"typescript-eslint": "^8.22.0"
+		"typescript-eslint": "^8.24.1"
 	}
 }

package/worker/fuzzer/src/RTC/FuzzerRateCalculator.cpp

@@ -1,8 +1,8 @@
 #include "RTC/FuzzerRateCalculator.hpp"
 #include "DepLibUV.hpp"
 #include "Utils.hpp"
+#include "RTC/Consts.hpp"
 #include "RTC/RateCalculator.hpp"
-#include "RTC/RtpPacket.hpp" // RTC::MtuSize
 
 static ::RTC::RateCalculator rateCalculator;
 static uint64_t nowMs;
@@ -25,8 +25,8 @@ void Fuzzer::RTC::RateCalculator::Fuzz(const uint8_t* data, size_t len)
 		return;
 	}
 
-	auto size =
-	  static_cast<size_t>(Utils::Crypto::GetRandomUInt(0u, static_cast<uint32_t>(::RTC::MtuSize)));
+	auto size = static_cast<size_t>(
+	  Utils::Crypto::GetRandomUInt(0u, static_cast<uint32_t>(::RTC::Consts::MtuSize)));
 
 	nowMs += Utils::Crypto::GetRandomUInt(0u, 1000u);
 

package/worker/include/RTC/Consts.hpp

@@ -0,0 +1,32 @@
+#ifndef MS_RTC_CONSTS_HPP
+#define MS_RTC_CONSTS_HPP
+
+namespace RTC
+{
+	namespace Consts
+	{
+		/**
+		 * Max MTU size.
+		 */
+		constexpr size_t MtuSize{ 1500u };
+
+		/**
+		 * Maximum size for a RTCP compound packet.
+		 * IPv4|Ipv6 header size: 20|40 bytes. IPv6 considered.
+		 * UDP|TCP header size:   8|20  bytes. TCP considered.
+		 * SRTP Encryption: 148 bytes.
+		     SRTP_MAX_TRAILER_LEN+4 is the maximum number of octects that will be
+		     added to an RTCP packet by srtp_protect_rtcp().
+		     srtp.h: SRTP_MAX_TRAILER_LEN (SRTP_MAX_TAG_LEN + SRTP_MAX_MKI_LEN).
+		 */
+		constexpr size_t RtcpPacketMaxSize{ RTC::Consts::MtuSize - 40 - 20 - 148u };
+
+		/**
+		 * MID RTP header extension max length (just used when setting/updating MID
+		 * extension).
+		 */
+		constexpr uint8_t MidRtpExtensionMaxLength{ 8u };
+	} // namespace Consts
+} // namespace RTC
+
+#endif

package/worker/include/RTC/RTCP/CompoundPacket.hpp

@@ -7,7 +7,6 @@
 #include "RTC/RTCP/SenderReport.hpp"
 #include "RTC/RTCP/XrDelaySinceLastRr.hpp"
 #include "RTC/RTCP/XrReceiverReferenceTime.hpp"
-#include "RTC/RtpPacket.hpp" // MtuSize.
 #include <vector>
 
 namespace RTC
@@ -16,16 +15,6 @@ namespace RTC
 	{
 		class CompoundPacket
 		{
-		public:
-			// Maximum size for a CompundPacket.
-			// * IPv4|Ipv6 header size: 20|40 bytes. IPv6 considered.
-			// * UDP|TCP header size:   8|20  bytes. TCP considered.
-			// * SRTP Encryption: 148 bytes.
-			//    SRTP_MAX_TRAILER_LEN+4 is the maximum number of octects that will be
-			//    added to an RTCP packet by srtp_protect_rtcp().
-			//    srtp.h: SRTP_MAX_TRAILER_LEN (SRTP_MAX_TAG_LEN + SRTP_MAX_MKI_LEN)
-			constexpr static size_t MaxSize{ RTC::MtuSize - 40u - 20u - 148u };
-
 		public:
 			CompoundPacket() = default;
 

package/worker/include/RTC/RtpPacket.hpp

@@ -16,12 +16,6 @@
 
 namespace RTC
 {
-	// Max MTU size.
-	constexpr size_t MtuSize{ 1500u };
-	// MID header extension max length (just used when setting/updating MID
-	// extension).
-	constexpr uint8_t MidMaxLength{ 8u };
-
 	class RtpPacket
 	{
 	public:

package/worker/src/RTC/Codecs/VP8.cpp

@@ -359,7 +359,7 @@ namespace RTC
 			// clang-format off
 			if (
 				this->payloadDescriptor->hasTlIndex &&
-				this->payloadDescriptor->tlIndex > context->GetCurrentTemporalLayer()
+				this->payloadDescriptor->tlIndex == context->GetTargetTemporalLayer()
 			)
 			// clang-format on
 			{
@@ -375,6 +375,12 @@ namespace RTC
 				context->SetCurrentTemporalLayer(context->GetTargetTemporalLayer());
 			}
 
+			// Do not send tlIndex higher than current one.
+			if (this->payloadDescriptor->tlIndex > context->GetCurrentTemporalLayer())
+			{
+				return false;
+			}
+
 			// clang-format off
 			if (
 				this->payloadDescriptor->hasPictureId &&

package/worker/src/RTC/DirectTransport.cpp

@@ -3,6 +3,7 @@
 
 #include "RTC/DirectTransport.hpp"
 #include "Logger.hpp"
+#include "RTC/Consts.hpp"
 
 namespace RTC
 {
@@ -102,7 +103,7 @@ namespace RTC
 				// Increase receive transmission.
 				RTC::Transport::DataReceived(len);
 
-				if (len > RTC::MtuSize + 100)
+				if (len > RTC::Consts::MtuSize + 100)
 				{
 					MS_WARN_TAG(rtp, "given RTCP packet exceeds maximum size [len:%i]", len);
 

package/worker/src/RTC/Producer.cpp

@@ -7,6 +7,7 @@
 #include "MediaSoupErrors.hpp"
 #include "Utils.hpp"
 #include "RTC/Codecs/Tools.hpp"
+#include "RTC/Consts.hpp"
 #include "RTC/RTCP/Feedback.hpp"
 #include "RTC/RTCP/XrReceiverReferenceTime.hpp"
 #include <absl/container/inlined_vector.h>
@@ -524,7 +525,7 @@ namespace RTC
 				// Increase receive transmission.
 				this->listener->OnProducerReceiveData(this, len);
 
-				if (len > RTC::MtuSize + 100)
+				if (len > RTC::Consts::MtuSize + 100)
 				{
 					MS_WARN_TAG(rtp, "given RTP packet exceeds maximum size [len:%i]", len);
 
@@ -535,7 +536,7 @@ namespace RTC
 				// receiving buffer now.
 				if (!Producer::buffer)
 				{
-					Producer::buffer = new uint8_t[RTC::MtuSize + 100];
+					Producer::buffer = new uint8_t[RTC::Consts::MtuSize + 100];
 				}
 
 				// Copy the received packet into this buffer so it can be expanded later.
@@ -1246,7 +1247,7 @@ namespace RTC
 
 			// Add urn:ietf:params:rtp-hdrext:sdes:mid.
 			{
-				extenLen = RTC::MidMaxLength;
+				extenLen = RTC::Consts::MidRtpExtensionMaxLength;
 
 				extensions.emplace_back(
 				  static_cast<uint8_t>(RTC::RtpHeaderExtensionUri::Type::MID), extenLen, bufferPtr);

package/worker/src/RTC/RTCP/CompoundPacket.cpp

@@ -3,6 +3,7 @@
 
 #include "RTC/RTCP/CompoundPacket.hpp"
 #include "Logger.hpp"
+#include "RTC/Consts.hpp"
 
 namespace RTC
 {
@@ -101,7 +102,7 @@ namespace RTC
 			}
 
 			// New items can hold in the packet, report it.
-			if (GetSize() <= MaxSize)
+			if (GetSize() <= RTC::Consts::RtcpPacketMaxSize)
 			{
 				return true;
 			}
@@ -160,7 +161,7 @@ namespace RTC
 			}
 
 			// New items can hold in the packet, report it.
-			if (GetSize() <= MaxSize)
+			if (GetSize() <= RTC::Consts::RtcpPacketMaxSize)
 			{
 				return true;
 			}
@@ -206,7 +207,7 @@ namespace RTC
 			}
 
 			// New items can hold in the packet, report it.
-			if (GetSize() <= MaxSize)
+			if (GetSize() <= RTC::Consts::RtcpPacketMaxSize)
 			{
 				return true;
 			}

package/worker/src/RTC/RtpPacket.cpp

@@ -4,6 +4,7 @@
 #include "RTC/RtpPacket.hpp"
 #include "DepLibUV.hpp"
 #include "Logger.hpp"
+#include "RTC/Consts.hpp"
 #include <cstring>  // std::memcpy(), std::memmove(), std::memset()
 #include <iterator> // std::ostream_iterator
 #include <sstream>  // std::ostringstream
@@ -580,13 +581,13 @@ namespace RTC
 
 		const size_t midLen = mid.length();
 
-		// Here we assume that there is MidMaxLength available bytes, even if now
-		// they are padding bytes.
-		if (midLen > RTC::MidMaxLength)
+		// Here we assume that there is MidRtpExtensionMaxLength available bytes,
+		// even if now they are padding bytes.
+		if (midLen > RTC::Consts::MidRtpExtensionMaxLength)
 		{
 			MS_ERROR(
 			  "no enough space for MID value [MidMaxLength:%" PRIu8 ", mid:'%s']",
-			  RTC::MidMaxLength,
+			  RTC::Consts::MidRtpExtensionMaxLength,
 			  mid.c_str());
 
 			return;
@@ -692,7 +693,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		auto* buffer = new uint8_t[MtuSize + 100];
+		auto* buffer = new uint8_t[RTC::Consts::MtuSize + 100];
 		auto* ptr    = const_cast<uint8_t*>(buffer);
 
 		size_t numBytes{ 0 };

package/worker/src/RTC/RtpStreamRecv.cpp

@@ -191,7 +191,7 @@ namespace RTC
 	RtpStreamRecv::RtpStreamRecv(
 	  RTC::RtpStreamRecv::Listener* listener,
 	  RTC::RtpStream::Params& params,
-	  unsigned int sendNackDelayMs,
+	  uint32_t sendNackDelayMs,
 	  bool useRtpInactivityCheck)
 	  : RTC::RtpStream::RtpStream(listener, params, 10), sendNackDelayMs(sendNackDelayMs),
 	    useRtpInactivityCheck(useRtpInactivityCheck),

package/worker/src/RTC/RtpStreamSend.cpp

@@ -7,6 +7,7 @@
 #endif
 #include "Logger.hpp"
 #include "Utils.hpp"
+#include "RTC/Consts.hpp"
 #include "RTC/RtpDictionaries.hpp"
 
 namespace RTC
@@ -374,7 +375,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		if (packet->GetSize() > RTC::MtuSize)
+		if (packet->GetSize() > RTC::Consts::MtuSize)
 		{
 			MS_WARN_TAG(
 			  rtp,
@@ -471,7 +472,7 @@ namespace RTC
 					MS_DEBUG_TAG(
 					  rtx,
 					  "ignoring retransmission for a packet already resent in the last RTT ms "
-					  "[seq:%" PRIu16 ", rtt:%" PRIu32 "]",
+					  "[seq:%" PRIu16 ", rtt:%" PRIu16 "]",
 					  packet->GetSequenceNumber(),
 					  rtt);
 				}

package/worker/src/RTC/Transport.cpp

@@ -11,6 +11,7 @@
 #include "Utils.hpp"
 #include "FBS/transport.h"
 #include "RTC/BweType.hpp"
+#include "RTC/Consts.hpp"
 #include "RTC/PipeConsumer.hpp"
 #include "RTC/RTCP/FeedbackPs.hpp"
 #include "RTC/RTCP/FeedbackPsAfb.hpp"
@@ -758,8 +759,8 @@ namespace RTC
 
 					if (createTccServer)
 					{
-						this->tccServer =
-						  std::make_shared<RTC::TransportCongestionControlServer>(this, bweType, RTC::MtuSize);
+						this->tccServer = std::make_shared<RTC::TransportCongestionControlServer>(
+						  this, bweType, RTC::Consts::RtcpPacketMaxSize);
 
 						if (this->maxIncomingBitrate != 0u)
 						{

package/worker/src/RTC/TransportCongestionControlServer.cpp

@@ -233,14 +233,20 @@ namespace RTC
 
 				case RTC::RTCP::FeedbackRtpTransportPacket::AddPacketResult::MAX_SIZE_EXCEEDED:
 				{
-					// This should not happen.
-					MS_WARN_TAG(rtcp, "transport-cc feedback packet is exceeded");
+					// Send ongoing feedback packet.
+					auto sent = SendTransportCcFeedback();
+
+					if (sent)
+					{
+						++this->transportCcFeedbackPacketCount;
+					}
 
 					// Create a new feedback packet.
-					// NOTE: Do not increment packet count it since the previous ongoing
-					// feedback packet was not sent.
 					ResetTransportCcFeedback(this->transportCcFeedbackPacketCount);
 
+					// Decrease iterator to add current packet again.
+					--it;
+
 					break;
 				}
 

package/worker/test/src/RTC/Codecs/TestVP8.cpp

@@ -322,4 +322,68 @@ SCENARIO("process VP8 payload descriptor", "[codecs][vp8]")
 		forwarded = ProcessPacket(context, 1, 0, 1);
 		REQUIRE_FALSE(forwarded);
 	}
+
+	SECTION("old packets with higher temporal layer than current are dropped")
+	{
+		RTC::Codecs::EncodingContext::Params params;
+		params.spatialLayers  = 0;
+		params.temporalLayers = 2;
+		Codecs::VP8::EncodingContext context(params);
+		context.SyncRequired();
+
+		context.SetCurrentTemporalLayer(0);
+		context.SetTargetTemporalLayer(0);
+
+		// Frame 1.
+		auto forwarded = ProcessPacket(context, 1, 0, 0);
+		REQUIRE(forwarded);
+		REQUIRE(forwarded->pictureId == 1);
+		REQUIRE(forwarded->tlIndex == 0);
+		REQUIRE(forwarded->tl0PictureIndex == 1);
+
+		// Frame 2.
+		forwarded = ProcessPacket(context, 2, 0, 0);
+		REQUIRE(forwarded);
+		REQUIRE(forwarded->pictureId == 2);
+		REQUIRE(forwarded->tlIndex == 0);
+		REQUIRE(forwarded->tl0PictureIndex == 1);
+
+		// Frame 3. Old packet with higher temporal layer than current.
+		forwarded = ProcessPacket(context, 0, 0, 1);
+		REQUIRE_FALSE(forwarded);
+		REQUIRE(context.GetCurrentTemporalLayer() == 0);
+	}
+
+	SECTION("packets with higher temporal layer than current are dropped")
+	{
+		RTC::Codecs::EncodingContext::Params params;
+		params.spatialLayers  = 0;
+		params.temporalLayers = 2;
+		Codecs::VP8::EncodingContext context(params);
+		context.SyncRequired();
+
+		context.SetCurrentTemporalLayer(0);
+		context.SetTargetTemporalLayer(0);
+
+		// Frame 1.
+		auto forwarded = ProcessPacket(context, 1, 0, 0);
+		REQUIRE(forwarded);
+		REQUIRE(forwarded->pictureId == 1);
+		REQUIRE(forwarded->tlIndex == 0);
+		REQUIRE(forwarded->tl0PictureIndex == 1);
+
+		// Frame 2.
+		forwarded = ProcessPacket(context, 2, 0, 0);
+		REQUIRE(forwarded);
+		REQUIRE(forwarded->pictureId == 2);
+		REQUIRE(forwarded->tlIndex == 0);
+		REQUIRE(forwarded->tl0PictureIndex == 1);
+
+		context.SetTargetTemporalLayer(2);
+
+		// Frame 3. Old packet with higher temporal layer than current.
+		forwarded = ProcessPacket(context, 3, 0, 1);
+		REQUIRE_FALSE(forwarded);
+		REQUIRE(context.GetCurrentTemporalLayer() == 0);
+	}
 }

package/worker/test/src/RTC/TestTransportCongestionControlServer.cpp

@@ -1,5 +1,6 @@
 #include "common.hpp"
 #include "DepLibUV.hpp"
+#include "RTC/Consts.hpp"
 #include "RTC/TransportCongestionControlServer.hpp"
 #include <catch2/catch_test_macros.hpp>
 
@@ -88,7 +89,7 @@ void validate(std::vector<TestTransportCongestionControlServerInput>& inputs, Te
 {
 	TestTransportCongestionControlServerListener listener;
 	auto tccServer =
-	  TransportCongestionControlServer(&listener, RTC::BweType::TRANSPORT_CC, RTC::MtuSize);
+	  TransportCongestionControlServer(&listener, RTC::BweType::TRANSPORT_CC, RTC::Consts::MtuSize);
 
 	tccServer.SetMaxIncomingBitrate(150000);
 	tccServer.TransportConnected();