mediasoup 3.16.0 → 3.16.1

package/node/lib/fbs/consumer/degrade-request.d.ts

@@ -0,0 +1,30 @@
+import * as flatbuffers from 'flatbuffers';
+export declare class DegradeRequest implements flatbuffers.IUnpackableObject<DegradeRequestT> {
+    bb: flatbuffers.ByteBuffer | null;
+    bb_pos: number;
+    __init(i: number, bb: flatbuffers.ByteBuffer): DegradeRequest;
+    static getRootAsDegradeRequest(bb: flatbuffers.ByteBuffer, obj?: DegradeRequest): DegradeRequest;
+    static getSizePrefixedRootAsDegradeRequest(bb: flatbuffers.ByteBuffer, obj?: DegradeRequest): DegradeRequest;
+    durationMs(): number;
+    maxDelayMs(): number;
+    delayPercent(): number;
+    lossPercent(): number;
+    static startDegradeRequest(builder: flatbuffers.Builder): void;
+    static addDurationMs(builder: flatbuffers.Builder, durationMs: number): void;
+    static addMaxDelayMs(builder: flatbuffers.Builder, maxDelayMs: number): void;
+    static addDelayPercent(builder: flatbuffers.Builder, delayPercent: number): void;
+    static addLossPercent(builder: flatbuffers.Builder, lossPercent: number): void;
+    static endDegradeRequest(builder: flatbuffers.Builder): flatbuffers.Offset;
+    static createDegradeRequest(builder: flatbuffers.Builder, durationMs: number, maxDelayMs: number, delayPercent: number, lossPercent: number): flatbuffers.Offset;
+    unpack(): DegradeRequestT;
+    unpackTo(_o: DegradeRequestT): void;
+}
+export declare class DegradeRequestT implements flatbuffers.IGeneratedObject {
+    durationMs: number;
+    maxDelayMs: number;
+    delayPercent: number;
+    lossPercent: number;
+    constructor(durationMs?: number, maxDelayMs?: number, delayPercent?: number, lossPercent?: number);
+    pack(builder: flatbuffers.Builder): flatbuffers.Offset;
+}
+//# sourceMappingURL=degrade-request.d.ts.map

package/node/lib/fbs/consumer/degrade-request.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"degrade-request.d.ts","sourceRoot":"","sources":["../../../src/fbs/consumer/degrade-request.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,WAAW,MAAM,aAAa,CAAC;AAI3C,qBAAa,cAAe,YAAW,WAAW,CAAC,iBAAiB,CAAC,eAAe,CAAC;IACnF,EAAE,EAAE,WAAW,CAAC,UAAU,GAAC,IAAI,CAAQ;IACvC,MAAM,SAAK;IACX,MAAM,CAAC,CAAC,EAAC,MAAM,EAAE,EAAE,EAAC,WAAW,CAAC,UAAU,GAAE,cAAc;IAM5D,MAAM,CAAC,uBAAuB,CAAC,EAAE,EAAC,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,EAAC,cAAc,GAAE,cAAc;IAI7F,MAAM,CAAC,mCAAmC,CAAC,EAAE,EAAC,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,EAAC,cAAc,GAAE,cAAc;IAKzG,UAAU,IAAG,MAAM;IAKnB,UAAU,IAAG,MAAM;IAKnB,YAAY,IAAG,MAAM;IAKrB,WAAW,IAAG,MAAM;IAKpB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO;IAItD,MAAM,CAAC,aAAa,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO,EAAE,UAAU,EAAC,MAAM;IAInE,MAAM,CAAC,aAAa,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO,EAAE,UAAU,EAAC,MAAM;IAInE,MAAM,CAAC,eAAe,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO,EAAE,YAAY,EAAC,MAAM;IAIvE,MAAM,CAAC,cAAc,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO,EAAE,WAAW,EAAC,MAAM;IAIrE,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO,GAAE,WAAW,CAAC,MAAM;IAKxE,MAAM,CAAC,oBAAoB,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO,EAAE,UAAU,EAAC,MAAM,EAAE,UAAU,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,GAAE,WAAW,CAAC,MAAM;IAS1J,MAAM,IAAI,eAAe;IAUzB,QAAQ,CAAC,EAAE,EAAE,eAAe,GAAG,IAAI;CAMlC;AAED,qBAAa,eAAgB,YAAW,WAAW,CAAC,gBAAgB;IAE3D,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE,MAAM;IAClB,YAAY,EAAE,MAAM;IACpB,WAAW,EAAE,MAAM;gBAHnB,UAAU,GAAE,MAAU,EACtB,UAAU,GAAE,MAAU,EACtB,YAAY,GAAE,MAAU,EACxB,WAAW,GAAE,MAAU;IAIhC,IAAI,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,MAAM;CAQpD"}

package/node/lib/fbs/consumer/degrade-request.js

@@ -0,0 +1,91 @@
+"use strict";
+// automatically generated by the FlatBuffers compiler, do not modify
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DegradeRequestT = exports.DegradeRequest = void 0;
+/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
+const flatbuffers = require("flatbuffers");
+class DegradeRequest {
+    bb = null;
+    bb_pos = 0;
+    __init(i, bb) {
+        this.bb_pos = i;
+        this.bb = bb;
+        return this;
+    }
+    static getRootAsDegradeRequest(bb, obj) {
+        return (obj || new DegradeRequest()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
+    }
+    static getSizePrefixedRootAsDegradeRequest(bb, obj) {
+        bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
+        return (obj || new DegradeRequest()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
+    }
+    durationMs() {
+        const offset = this.bb.__offset(this.bb_pos, 4);
+        return offset ? this.bb.readUint32(this.bb_pos + offset) : 0;
+    }
+    maxDelayMs() {
+        const offset = this.bb.__offset(this.bb_pos, 6);
+        return offset ? this.bb.readUint16(this.bb_pos + offset) : 0;
+    }
+    delayPercent() {
+        const offset = this.bb.__offset(this.bb_pos, 8);
+        return offset ? this.bb.readUint8(this.bb_pos + offset) : 0;
+    }
+    lossPercent() {
+        const offset = this.bb.__offset(this.bb_pos, 10);
+        return offset ? this.bb.readUint8(this.bb_pos + offset) : 0;
+    }
+    static startDegradeRequest(builder) {
+        builder.startObject(4);
+    }
+    static addDurationMs(builder, durationMs) {
+        builder.addFieldInt32(0, durationMs, 0);
+    }
+    static addMaxDelayMs(builder, maxDelayMs) {
+        builder.addFieldInt16(1, maxDelayMs, 0);
+    }
+    static addDelayPercent(builder, delayPercent) {
+        builder.addFieldInt8(2, delayPercent, 0);
+    }
+    static addLossPercent(builder, lossPercent) {
+        builder.addFieldInt8(3, lossPercent, 0);
+    }
+    static endDegradeRequest(builder) {
+        const offset = builder.endObject();
+        return offset;
+    }
+    static createDegradeRequest(builder, durationMs, maxDelayMs, delayPercent, lossPercent) {
+        DegradeRequest.startDegradeRequest(builder);
+        DegradeRequest.addDurationMs(builder, durationMs);
+        DegradeRequest.addMaxDelayMs(builder, maxDelayMs);
+        DegradeRequest.addDelayPercent(builder, delayPercent);
+        DegradeRequest.addLossPercent(builder, lossPercent);
+        return DegradeRequest.endDegradeRequest(builder);
+    }
+    unpack() {
+        return new DegradeRequestT(this.durationMs(), this.maxDelayMs(), this.delayPercent(), this.lossPercent());
+    }
+    unpackTo(_o) {
+        _o.durationMs = this.durationMs();
+        _o.maxDelayMs = this.maxDelayMs();
+        _o.delayPercent = this.delayPercent();
+        _o.lossPercent = this.lossPercent();
+    }
+}
+exports.DegradeRequest = DegradeRequest;
+class DegradeRequestT {
+    durationMs;
+    maxDelayMs;
+    delayPercent;
+    lossPercent;
+    constructor(durationMs = 0, maxDelayMs = 0, delayPercent = 0, lossPercent = 0) {
+        this.durationMs = durationMs;
+        this.maxDelayMs = maxDelayMs;
+        this.delayPercent = delayPercent;
+        this.lossPercent = lossPercent;
+    }
+    pack(builder) {
+        return DegradeRequest.createDegradeRequest(builder, this.durationMs, this.maxDelayMs, this.delayPercent, this.lossPercent);
+    }
+}
+exports.DegradeRequestT = DegradeRequestT;

package/node/lib/fbs/consumer/enable-delay-and-loss-request.d.ts

@@ -0,0 +1,24 @@
+import * as flatbuffers from 'flatbuffers';
+export declare class EnableDelayAndLossRequest implements flatbuffers.IUnpackableObject<EnableDelayAndLossRequestT> {
+    bb: flatbuffers.ByteBuffer | null;
+    bb_pos: number;
+    __init(i: number, bb: flatbuffers.ByteBuffer): EnableDelayAndLossRequest;
+    static getRootAsEnableDelayAndLossRequest(bb: flatbuffers.ByteBuffer, obj?: EnableDelayAndLossRequest): EnableDelayAndLossRequest;
+    static getSizePrefixedRootAsEnableDelayAndLossRequest(bb: flatbuffers.ByteBuffer, obj?: EnableDelayAndLossRequest): EnableDelayAndLossRequest;
+    delay(): boolean;
+    loss(): boolean;
+    static startEnableDelayAndLossRequest(builder: flatbuffers.Builder): void;
+    static addDelay(builder: flatbuffers.Builder, delay: boolean): void;
+    static addLoss(builder: flatbuffers.Builder, loss: boolean): void;
+    static endEnableDelayAndLossRequest(builder: flatbuffers.Builder): flatbuffers.Offset;
+    static createEnableDelayAndLossRequest(builder: flatbuffers.Builder, delay: boolean, loss: boolean): flatbuffers.Offset;
+    unpack(): EnableDelayAndLossRequestT;
+    unpackTo(_o: EnableDelayAndLossRequestT): void;
+}
+export declare class EnableDelayAndLossRequestT implements flatbuffers.IGeneratedObject {
+    delay: boolean;
+    loss: boolean;
+    constructor(delay?: boolean, loss?: boolean);
+    pack(builder: flatbuffers.Builder): flatbuffers.Offset;
+}
+//# sourceMappingURL=enable-delay-and-loss-request.d.ts.map

package/node/lib/fbs/consumer/enable-delay-and-loss-request.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"enable-delay-and-loss-request.d.ts","sourceRoot":"","sources":["../../../src/fbs/consumer/enable-delay-and-loss-request.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,WAAW,MAAM,aAAa,CAAC;AAI3C,qBAAa,yBAA0B,YAAW,WAAW,CAAC,iBAAiB,CAAC,0BAA0B,CAAC;IACzG,EAAE,EAAE,WAAW,CAAC,UAAU,GAAC,IAAI,CAAQ;IACvC,MAAM,SAAK;IACX,MAAM,CAAC,CAAC,EAAC,MAAM,EAAE,EAAE,EAAC,WAAW,CAAC,UAAU,GAAE,yBAAyB;IAMvE,MAAM,CAAC,kCAAkC,CAAC,EAAE,EAAC,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,EAAC,yBAAyB,GAAE,yBAAyB;IAI9H,MAAM,CAAC,8CAA8C,CAAC,EAAE,EAAC,WAAW,CAAC,UAAU,EAAE,GAAG,CAAC,EAAC,yBAAyB,GAAE,yBAAyB;IAK1I,KAAK,IAAG,OAAO;IAKf,IAAI,IAAG,OAAO;IAKd,MAAM,CAAC,8BAA8B,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO;IAIjE,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO,EAAE,KAAK,EAAC,OAAO;IAI1D,MAAM,CAAC,OAAO,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO,EAAE,IAAI,EAAC,OAAO;IAIxD,MAAM,CAAC,4BAA4B,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO,GAAE,WAAW,CAAC,MAAM;IAKnF,MAAM,CAAC,+BAA+B,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO,EAAE,KAAK,EAAC,OAAO,EAAE,IAAI,EAAC,OAAO,GAAE,WAAW,CAAC,MAAM;IAOnH,MAAM,IAAI,0BAA0B;IAQpC,QAAQ,CAAC,EAAE,EAAE,0BAA0B,GAAG,IAAI;CAI7C;AAED,qBAAa,0BAA2B,YAAW,WAAW,CAAC,gBAAgB;IAEtE,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,OAAO;gBADb,KAAK,GAAE,OAAe,EACtB,IAAI,GAAE,OAAe;IAI9B,IAAI,CAAC,OAAO,EAAC,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,MAAM;CAMpD"}

package/node/lib/fbs/consumer/enable-delay-and-loss-request.js

@@ -0,0 +1,69 @@
+"use strict";
+// automatically generated by the FlatBuffers compiler, do not modify
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnableDelayAndLossRequestT = exports.EnableDelayAndLossRequest = void 0;
+/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
+const flatbuffers = require("flatbuffers");
+class EnableDelayAndLossRequest {
+    bb = null;
+    bb_pos = 0;
+    __init(i, bb) {
+        this.bb_pos = i;
+        this.bb = bb;
+        return this;
+    }
+    static getRootAsEnableDelayAndLossRequest(bb, obj) {
+        return (obj || new EnableDelayAndLossRequest()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
+    }
+    static getSizePrefixedRootAsEnableDelayAndLossRequest(bb, obj) {
+        bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
+        return (obj || new EnableDelayAndLossRequest()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
+    }
+    delay() {
+        const offset = this.bb.__offset(this.bb_pos, 4);
+        return offset ? !!this.bb.readInt8(this.bb_pos + offset) : false;
+    }
+    loss() {
+        const offset = this.bb.__offset(this.bb_pos, 6);
+        return offset ? !!this.bb.readInt8(this.bb_pos + offset) : false;
+    }
+    static startEnableDelayAndLossRequest(builder) {
+        builder.startObject(2);
+    }
+    static addDelay(builder, delay) {
+        builder.addFieldInt8(0, +delay, +false);
+    }
+    static addLoss(builder, loss) {
+        builder.addFieldInt8(1, +loss, +false);
+    }
+    static endEnableDelayAndLossRequest(builder) {
+        const offset = builder.endObject();
+        return offset;
+    }
+    static createEnableDelayAndLossRequest(builder, delay, loss) {
+        EnableDelayAndLossRequest.startEnableDelayAndLossRequest(builder);
+        EnableDelayAndLossRequest.addDelay(builder, delay);
+        EnableDelayAndLossRequest.addLoss(builder, loss);
+        return EnableDelayAndLossRequest.endEnableDelayAndLossRequest(builder);
+    }
+    unpack() {
+        return new EnableDelayAndLossRequestT(this.delay(), this.loss());
+    }
+    unpackTo(_o) {
+        _o.delay = this.delay();
+        _o.loss = this.loss();
+    }
+}
+exports.EnableDelayAndLossRequest = EnableDelayAndLossRequest;
+class EnableDelayAndLossRequestT {
+    delay;
+    loss;
+    constructor(delay = false, loss = false) {
+        this.delay = delay;
+        this.loss = loss;
+    }
+    pack(builder) {
+        return EnableDelayAndLossRequest.createEnableDelayAndLossRequest(builder, this.delay, this.loss);
+    }
+}
+exports.EnableDelayAndLossRequestT = EnableDelayAndLossRequestT;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mediasoup",
-	"version": "3.16.0",
+	"version": "3.16.1",
 	"description": "Cutting Edge WebRTC Video Conferencing",
 	"contributors": [
 		"Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -100,24 +100,24 @@
 		"tar": "^7.4.3"
 	},
 	"devDependencies": {
-		"@eslint/js": "^9.27.0",
+		"@eslint/js": "^9.29.0",
 		"@octokit/rest": "^22.0.0",
 		"@types/debug": "^4.1.12",
-		"@types/jest": "^29.5.14",
-		"@types/node": "^22.15.21",
-		"eslint": "^9.27.0",
+		"@types/jest": "^30.0.0",
+		"@types/node": "^24.0.4",
+		"eslint": "^9.29.0",
 		"eslint-config-prettier": "^10.1.5",
-		"eslint-plugin-jest": "^28.11.0",
-		"eslint-plugin-prettier": "^5.4.0",
+		"eslint-plugin-jest": "^29.0.1",
+		"eslint-plugin-prettier": "^5.5.1",
 		"globals": "^16.2.0",
-		"jest": "^29.7.0",
+		"jest": "^30.0.3",
 		"marked": "^15.0.12",
 		"open-cli": "^8.0.0",
 		"pick-port": "^2.1.0",
-		"prettier": "^3.5.3",
+		"prettier": "^3.6.1",
 		"sctp": "^1.0.0",
-		"ts-jest": "^29.3.4",
+		"ts-jest": "^29.4.0",
 		"typescript": "^5.8.3",
-		"typescript-eslint": "^8.32.1"
+		"typescript-eslint": "^8.35.0"
 	}
 }

package/worker/include/Logger.hpp

@@ -460,6 +460,7 @@ public:
 	} \
 	while (false)
 
+#ifdef MS_EXECUTABLE
 #define MS_ABORT(desc, ...) \
 	do \
 	{ \
@@ -468,6 +469,18 @@ public:
 		std::abort(); \
 	} \
 	while (false)
+#else
+#define MS_ABORT(desc, ...) \
+	do \
+	{ \
+		std::fprintf(stderr, "(ABORT) " _MS_LOG_STR_DESC desc _MS_LOG_SEPARATOR_CHAR_STD, _MS_LOG_ARG, ##__VA_ARGS__); \
+		std::fflush(stderr); \
+		char abortMessage[Logger::BufferSize]; \
+		std::snprintf(abortMessage, Logger::BufferSize, "(ABORT) " _MS_LOG_STR_DESC desc _MS_LOG_SEPARATOR_CHAR_STD, _MS_LOG_ARG, ##__VA_ARGS__); \
+		throw std::runtime_error(abortMessage); \
+	} \
+	while (false)
+#endif
 
 #define MS_ASSERT(condition, desc, ...) \
 	if (!(condition)) \

package/worker/include/RTC/PipeConsumer.hpp

@@ -4,6 +4,7 @@
 #include "RTC/Consumer.hpp"
 #include "RTC/SeqManager.hpp"
 #include "RTC/Shared.hpp"
+#include <map>
 
 namespace RTC
 {
@@ -59,6 +60,11 @@ namespace RTC
 		void UserOnResumed() override;
 		void CreateRtpStreams();
 		void RequestKeyFrame();
+		void StorePacketInTargetLayerRetransmissionBuffer(
+		  std::map<uint16_t, std::shared_ptr<RTC::RtpPacket>, RTC::SeqManager<uint16_t>::SeqLowerThan>&
+		    targetLayerRetransmissionBuffer,
+		  RTC::RtpPacket* packet,
+		  std::shared_ptr<RTC::RtpPacket>& sharedPacket);
 
 		/* Pure virtual methods inherited from RtpStreamSend::Listener. */
 	public:
@@ -75,6 +81,12 @@ namespace RTC
 		absl::flat_hash_map<RTC::RtpStreamSend*, bool> mapRtpStreamSyncRequired;
 		absl::flat_hash_map<RTC::RtpStreamSend*, std::unique_ptr<RTC::SeqManager<uint16_t>>>
 		  mapRtpStreamRtpSeqManager;
+		// Buffers to store packets that arrive earlier than the first packet of the
+		// video key frame.
+		absl::flat_hash_map<
+		  RTC::RtpStreamSend*,
+		  std::map<uint16_t, std::shared_ptr<RTC::RtpPacket>, RTC::SeqManager<uint16_t>::SeqLowerThan>>
+		  mapRtpStreamTargetLayerRetransmissionBuffer;
 	};
 } // namespace RTC
 

package/worker/include/RTC/RtcLogger.hpp

@@ -11,7 +11,7 @@ namespace RTC
 		class RtpPacket
 		{
 		public:
-			enum class DropReason : uint8_t
+			enum class DiscardReason : uint8_t
 			{
 				NONE = 0,
 				PRODUCER_NOT_FOUND,
@@ -23,18 +23,18 @@ namespace RTC
 				NOT_A_KEYFRAME,
 				EMPTY_PAYLOAD,
 				SPATIAL_LAYER_MISMATCH,
-				TOO_HIGH_TIMESTAMP_EXTRA_NEEDED,
 				PACKET_PREVIOUS_TO_SPATIAL_LAYER_SWITCH,
 				DROPPED_BY_CODEC,
-				SEND_RTP_STREAM_DISCARDED,
+				TOO_HIGH_TIMESTAMP_EXTRA_NEEDED,
+				SEND_RTP_STREAM_DISCARDED
 			};
 
-			static absl::flat_hash_map<DropReason, std::string> dropReason2String;
+			static absl::flat_hash_map<DiscardReason, std::string> discardReason2String;
 
 			RtpPacket()  = default;
 			~RtpPacket() = default;
 			void Sent();
-			void Dropped(DropReason dropReason);
+			void Discarded(DiscardReason discardReason);
 
 		private:
 			void Log() const;
@@ -51,8 +51,8 @@ namespace RTC
 			uint32_t sendRtpTimestamp{};
 			uint16_t recvSeqNumber{};
 			uint16_t sendSeqNumber{};
-			bool dropped{};
-			DropReason dropReason{ DropReason::NONE };
+			bool discarded{};
+			DiscardReason discardReason{ DiscardReason::NONE };
 		};
 	}; // namespace RtcLogger
 } // namespace RTC

package/worker/include/RTC/SimpleConsumer.hpp

@@ -5,6 +5,7 @@
 #include "RTC/Consumer.hpp"
 #include "RTC/SeqManager.hpp"
 #include "RTC/Shared.hpp"
+#include <map>
 
 namespace RTC
 {
@@ -72,6 +73,8 @@ namespace RTC
 		void UserOnResumed() override;
 		void CreateRtpStream();
 		void RequestKeyFrame();
+		void StorePacketInTargetLayerRetransmissionBuffer(
+		  RTC::RtpPacket* packet, std::shared_ptr<RTC::RtpPacket>& sharedPacket);
 		void EmitScore() const;
 
 		/* Pure virtual methods inherited from RtpStreamSend::Listener. */
@@ -90,6 +93,10 @@ namespace RTC
 		std::unique_ptr<RTC::SeqManager<uint16_t>> rtpSeqManager;
 		bool managingBitrate{ false };
 		std::unique_ptr<RTC::Codecs::EncodingContext> encodingContext;
+		// Buffer to store packets that arrive earlier than the first packet of the
+		// video key frame.
+		std::map<uint16_t, std::shared_ptr<RTC::RtpPacket>, RTC::SeqManager<uint16_t>::SeqLowerThan>
+		  targetLayerRetransmissionBuffer;
 	};
 } // namespace RTC
 

package/worker/include/RTC/SimulcastConsumer.hpp

@@ -6,6 +6,7 @@
 #include "RTC/Consumer.hpp"
 #include "RTC/SeqManager.hpp"
 #include "RTC/Shared.hpp"
+#include <map>
 
 namespace RTC
 {
@@ -95,6 +96,8 @@ namespace RTC
 		void UpdateTargetLayers(int16_t newTargetSpatialLayer, int16_t newTargetTemporalLayer);
 		bool CanSwitchToSpatialLayer(int16_t spatialLayer) const;
 		void EmitScore() const;
+		void StorePacketInTargetLayerRetransmissionBuffer(
+		  RTC::RtpPacket* packet, std::shared_ptr<RTC::RtpPacket>& sharedPacket);
 		void EmitLayersChange() const;
 		RTC::RtpStreamRecv* GetProducerCurrentRtpStream() const;
 		RTC::RtpStreamRecv* GetProducerTargetRtpStream() const;
@@ -129,7 +132,12 @@ namespace RTC
 		std::unique_ptr<RTC::Codecs::EncodingContext> encodingContext;
 		uint32_t tsOffset{ 0u }; // RTP Timestamp offset.
 		bool keyFrameForTsOffsetRequested{ false };
-		uint64_t lastBweDowngradeAtMs{ 0u }; // Last time we moved to lower spatial layer due to BWE.
+		// Last time we moved to lower spatial layer due to BWE.
+		uint64_t lastBweDowngradeAtMs{ 0u };
+		// Buffer to store packets that arrive earlier than the first packet of the
+		// video key frame.
+		std::map<uint16_t, std::shared_ptr<RTC::RtpPacket>, RTC::SeqManager<uint16_t>::SeqLowerThan>
+		  targetLayerRetransmissionBuffer;
 	};
 } // namespace RTC
 

package/worker/include/RTC/SvcConsumer.hpp

@@ -86,6 +86,8 @@ namespace RTC
 		bool RecalculateTargetLayers(int16_t& newTargetSpatialLayer, int16_t& newTargetTemporalLayer) const;
 		void UpdateTargetLayers(int16_t newTargetSpatialLayer, int16_t newTargetTemporalLayer);
 		void EmitScore() const;
+		void StorePacketInTargetLayerRetransmissionBuffer(
+		  RTC::RtpPacket* packet, std::shared_ptr<RTC::RtpPacket>& sharedPacket);
 		void EmitLayersChange() const;
 
 		/* Pure virtual methods inherited from RtpStreamSend::Listener. */
@@ -106,7 +108,12 @@ namespace RTC
 		int16_t provisionalTargetSpatialLayer{ -1 };
 		int16_t provisionalTargetTemporalLayer{ -1 };
 		std::unique_ptr<RTC::Codecs::EncodingContext> encodingContext;
-		uint64_t lastBweDowngradeAtMs{ 0u }; // Last time we moved to lower spatial layer due to BWE.
+		// Last time we moved to lower spatial layer due to BWE.
+		uint64_t lastBweDowngradeAtMs{ 0u };
+		// Buffer to store packets that arrive earlier than the first packet of the
+		// video key frame.
+		std::map<uint16_t, std::shared_ptr<RTC::RtpPacket>, RTC::SeqManager<uint16_t>::SeqLowerThan>
+		  targetLayerRetransmissionBuffer;
 	};
 } // namespace RTC
 

package/worker/meson.build

@@ -259,8 +259,8 @@ libuv_proj = subproject(
   ],
 )
 
-libsrtp2_proj = subproject(
-  'libsrtp2',
+libsrtp3_proj = subproject(
+  'libsrtp3',
   default_options: [
     'warning_level=0',
     'crypto-library=openssl',
@@ -310,7 +310,7 @@ dependencies = [
   abseil_cpp_proj.get_variable('absl_container_dep'),
   openssl_proj.get_variable('openssl_dep'),
   libuv_proj.get_variable('libuv_dep'),
-  libsrtp2_proj.get_variable('libsrtp2_dep'),
+  libsrtp3_proj.get_variable('libsrtp3_dep'),
   usrsctp_proj.get_variable('usrsctp_dep'),
   flatbuffers_proj.get_variable('flatbuffers_dep'),
   flatbuffers_generator_dep,
@@ -322,7 +322,7 @@ link_whole = [
   openssl_proj.get_variable('libcrypto_lib'),
   openssl_proj.get_variable('libssl_lib'),
   libuv_proj.get_variable('libuv'),
-  libsrtp2_proj.get_variable('libsrtp2'),
+  libsrtp3_proj.get_variable('libsrtp3'),
   usrsctp_proj.get_variable('usrsctp'),
   flatbuffers_proj.get_variable('flatbuffers_lib'),
   libwebrtc,

package/worker/meson_options.txt

@@ -1,5 +1,5 @@
 option('ms_log_trace', type : 'boolean', value : false, description : 'When set to true, logs the current method/function if current log level is "debug"')
 option('ms_log_file_line', type : 'boolean', value : false, description : 'When set to true, all the logging macros print more verbose information, including current file and line')
-option('ms_rtc_logger_rtp', type : 'boolean', value : false, description : 'When set to true, prints a line with information for each RTP packet')
+option('ms_rtc_logger_rtp', type : 'boolean', value : false, description : 'When set to true, prints a line with information for each processed RTP packet')
 option('ms_disable_liburing', type : 'boolean', value : false, description : 'When set to true, disables liburing integration despite current host supports it')
 option('ms_sctp_stack', type : 'boolean', value : false, description : 'When set to true, uses mediasoup SCTP stack instead of usrsctp library')

package/worker/scripts/package-lock.json

@@ -121,9 +121,10 @@
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
 		},
 		"node_modules/brace-expansion": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^1.0.0"
 			}
@@ -144,9 +145,10 @@
 			}
 		},
 		"node_modules/clang-format/node_modules/brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+			"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^1.0.0",
 				"concat-map": "0.0.1"
@@ -674,9 +676,9 @@
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
 		},
 		"brace-expansion": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
 			"requires": {
 				"balanced-match": "^1.0.0"
 			}
@@ -692,9 +694,9 @@
 			},
 			"dependencies": {
 				"brace-expansion": {
-					"version": "1.1.11",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-					"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+					"version": "1.1.12",
+					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+					"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
 					"requires": {
 						"balanced-match": "^1.0.0",
 						"concat-map": "0.0.1"