mediasoup 3.11.8 → 3.11.9

package/node/lib/Worker.js

@@ -83,7 +83,7 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         // options
         {
             env: {
-                MEDIASOUP_VERSION: '3.11.8',
+                MEDIASOUP_VERSION: '3.11.9',
                 // Let the worker process inherit all environment variables, useful
                 // if a custom and not in the path GCC is used so the user can set
                 // LD_LIBRARY_PATH environment variable for runtime.

package/node/lib/index.d.ts

@@ -9,7 +9,7 @@ export { types };
 /**
  * Expose mediasoup version.
  */
-export declare const version = "3.11.8";
+export declare const version = "3.11.9";
 /**
  * Expose parseScalabilityMode() function.
  */

package/node/lib/index.js

@@ -11,7 +11,7 @@ exports.types = types;
 /**
  * Expose mediasoup version.
  */
-exports.version = '3.11.8';
+exports.version = '3.11.9';
 /**
  * Expose parseScalabilityMode() function.
  */

package/node/lib/ortc.js

@@ -726,7 +726,7 @@ function getConsumerRtpParameters(consumableParams, caps, pipe) {
         // If there is simulast, mangle spatial layers in scalabilityMode.
         if (consumableParams.encodings.length > 1) {
             const { temporalLayers } = (0, scalabilityModes_1.parse)(scalabilityMode);
-            scalabilityMode = `S${consumableParams.encodings.length}T${temporalLayers}`;
+            scalabilityMode = `L${consumableParams.encodings.length}T${temporalLayers}`;
         }
         if (scalabilityMode)
             consumerEncoding.scalabilityMode = scalabilityMode;

package/node/lib/tests/test-Consumer.js

@@ -591,7 +591,7 @@ test('consumer.dump() succeeds', async () => {
             rtx: {
                 ssrc: videoConsumer.rtpParameters.encodings?.[0].rtx?.ssrc
             },
-            scalabilityMode: 'S4T1'
+            scalabilityMode: 'L4T1'
         }
     ]);
     expect(Array.isArray(data.consumableRtpEncodings)).toBe(true);

package/node/lib/tests/test-ortc.js

@@ -388,7 +388,7 @@ test('getProducerRtpParametersMapping(), getConsumableRtpParameters(), getConsum
     expect(typeof consumerRtpParameters.encodings?.[0].ssrc).toBe('number');
     expect(typeof consumerRtpParameters.encodings?.[0].rtx).toBe('object');
     expect(typeof consumerRtpParameters.encodings?.[0].rtx?.ssrc).toBe('number');
-    expect(consumerRtpParameters.encodings?.[0].scalabilityMode).toBe('S3T3');
+    expect(consumerRtpParameters.encodings?.[0].scalabilityMode).toBe('L3T3');
     expect(consumerRtpParameters.encodings?.[0].maxBitrate).toBe(333333);
     expect(consumerRtpParameters.headerExtensions).toEqual([
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasoup",
-  "version": "3.11.8",
+  "version": "3.11.9",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -20,23 +20,23 @@
   "main": "node/lib/index.js",
   "types": "node/lib/index.d.ts",
   "files": [
-    "npm-scripts.js",
     "node/lib",
-    "worker/Makefile",
-    "worker/meson.build",
-    "worker/meson_options.txt",
-    "worker/src",
-    "worker/include",
-    "worker/test/src",
-    "worker/test/include",
-    "worker/fuzzer/src",
-    "worker/fuzzer/include",
-    "worker/subprojects/*.wrap",
     "worker/deps/libwebrtc",
+    "worker/fuzzer/include",
+    "worker/fuzzer/src",
+    "worker/include",
+    "worker/scripts/*.js",
+    "worker/scripts/*.json",
     "worker/scripts/*.py",
     "worker/scripts/*.sh",
-    "worker/scripts/*.js",
-    "worker/scripts/*.json"
+    "worker/src",
+    "worker/subprojects/*.wrap",
+    "worker/test/include",
+    "worker/test/src",
+    "worker/Makefile",
+    "worker/meson.build",
+    "worker/meson_options.txt",
+    "npm-scripts.js"
   ],
   "keywords": [
     "webrtc",
@@ -93,13 +93,13 @@
   "devDependencies": {
     "@types/debug": "^4.1.7",
     "@types/jest": "^29.4.0",
-    "@types/node": "^18.11.18",
+    "@types/node": "^18.13.0",
     "@types/uuid": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.50.0",
-    "@typescript-eslint/parser": "^5.50.0",
-    "eslint": "^8.33.0",
+    "@typescript-eslint/eslint-plugin": "^5.52.0",
+    "@typescript-eslint/parser": "^5.52.0",
+    "eslint": "^8.34.0",
     "eslint-plugin-jest": "^27.2.1",
-    "jest": "^29.4.1",
+    "jest": "^29.4.3",
     "open-cli": "^7.1.0",
     "pick-port": "^1.0.1",
     "sctp": "^1.0.0",

package/worker/Makefile

@@ -18,7 +18,7 @@ LCOV = ./deps/lcov/bin/lcov
 DOCKER ?= docker
 PIP_DIR = $(MEDIASOUP_OUT_DIR)/pip
 INSTALL_DIR ?= $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)
-BUILD_DIR ?= $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)/build
+BUILD_DIR ?= $(INSTALL_DIR)/build
 MESON ?= $(PIP_DIR)/bin/meson
 MESON_VERSION ?= 0.61.5
 # `MESON_ARGS` can be used to provide extra configuration parameters to Meson,

package/worker/src/DepLibSRTP.cpp

@@ -56,7 +56,7 @@ void DepLibSRTP::ClassInit()
 		{
 			MS_DEBUG_TAG(info, "libsrtp version: \"%s\"", srtp_get_version_string());
 
-			srtp_err_status_t err = srtp_init();
+			const srtp_err_status_t err = srtp_init();
 
 			if (DepLibSRTP::IsError(err))
 				MS_THROW_ERROR("srtp_init() failed: %s", DepLibSRTP::GetErrorString(err));

package/worker/src/DepLibUV.cpp

@@ -38,7 +38,7 @@ void DepLibUV::ClassInit()
 
 	DepLibUV::loop = new uv_loop_t;
 
-	int err = uv_loop_init(DepLibUV::loop);
+	const int err = uv_loop_init(DepLibUV::loop);
 
 	if (err != 0)
 		MS_ABORT("libuv loop initialization failed");
@@ -88,7 +88,7 @@ void DepLibUV::RunLoop()
 	// This should never happen.
 	MS_ASSERT(DepLibUV::loop != nullptr, "loop unset");
 
-	int ret = uv_run(DepLibUV::loop, UV_RUN_DEFAULT);
+	const int ret = uv_run(DepLibUV::loop, UV_RUN_DEFAULT);
 
 	MS_ASSERT(ret == 0, "uv_run() returned %s", uv_err_name(ret));
 }

package/worker/src/DepUsrSCTP.cpp

@@ -236,8 +236,8 @@ void DepUsrSCTP::Checker::OnTimer(Timer* /*timer*/)
 {
 	MS_TRACE();
 
-	auto nowMs    = DepLibUV::GetTimeMs();
-	int elapsedMs = this->lastCalledAtMs ? static_cast<int>(nowMs - this->lastCalledAtMs) : 0;
+	auto nowMs          = DepLibUV::GetTimeMs();
+	const int elapsedMs = this->lastCalledAtMs ? static_cast<int>(nowMs - this->lastCalledAtMs) : 0;
 
 	usrsctp_handle_timers(elapsedMs);
 

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

@@ -17,7 +17,9 @@ namespace RTC
 			MS_TRACE();
 
 			if (len < 2)
+			{
 				return nullptr;
+			}
 
 			std::unique_ptr<PayloadDescriptor> payloadDescriptor(new PayloadDescriptor());
 
@@ -48,7 +50,9 @@ namespace RTC
 
 				// Detect key frame.
 				if (frameMarking->start && frameMarking->independent)
+				{
 					payloadDescriptor->isKeyFrame = true;
+				}
 			}
 
 			// NOTE: Unfortunately libwebrtc produces wrong Frame-Marking (without i=1 in
@@ -59,7 +63,7 @@ namespace RTC
 			// there is no frame-marking or if there is but keyframe was not detected above.
 			if (!frameMarking || !payloadDescriptor->isKeyFrame)
 			{
-				uint8_t nal = *data & 0x1F;
+				const uint8_t nal = *data & 0x1F;
 
 				switch (nal)
 				{
@@ -83,8 +87,8 @@ namespace RTC
 						// Iterate NAL units.
 						while (len >= 3)
 						{
-							auto naluSize  = Utils::Byte::Get2Bytes(data, offset);
-							uint8_t subnal = *(data + offset + sizeof(naluSize)) & 0x1F;
+							auto naluSize        = Utils::Byte::Get2Bytes(data, offset);
+							const uint8_t subnal = *(data + offset + sizeof(naluSize)) & 0x1F;
 
 							if (subnal == 7)
 							{
@@ -95,7 +99,9 @@ namespace RTC
 
 							// Check if there is room for the indicated NAL unit size.
 							if (len < (naluSize + sizeof(naluSize)))
+							{
 								break;
+							}
 
 							offset += naluSize + sizeof(naluSize);
 							len -= naluSize + sizeof(naluSize);
@@ -109,11 +115,13 @@ namespace RTC
 					case 28:
 					case 29:
 					{
-						uint8_t subnal   = *(data + 1) & 0x1F;
-						uint8_t startBit = *(data + 1) & 0x80;
+						const uint8_t subnal   = *(data + 1) & 0x1F;
+						const uint8_t startBit = *(data + 1) & 0x80;
 
 						if (subnal == 7 && startBit == 128)
+						{
 							payloadDescriptor->isKeyFrame = true;
+						}
 
 						break;
 					}
@@ -138,7 +146,9 @@ namespace RTC
 			PayloadDescriptor* payloadDescriptor = H264::Parse(data, len, frameMarking, frameMarkingLen);
 
 			if (!payloadDescriptor)
+			{
 				return;
+			}
 
 			auto* payloadDescriptorHandler = new PayloadDescriptorHandler(payloadDescriptor);
 
@@ -231,7 +241,9 @@ namespace RTC
 			}
 
 			if (context->GetCurrentTemporalLayer() > context->GetTargetTemporalLayer())
+			{
 				context->SetCurrentTemporalLayer(context->GetTargetTemporalLayer());
+			}
 
 			return true;
 		}

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

@@ -58,7 +58,7 @@ namespace RTC
 			// there is no frame-marking or if there is but keyframe was not detected above.
 			if (!frameMarking || !payloadDescriptor->isKeyFrame)
 			{
-				uint8_t nal = *data & 0x1F;
+				const uint8_t nal = *data & 0x1F;
 
 				switch (nal)
 				{
@@ -121,7 +121,7 @@ namespace RTC
 					case 28:
 					case 29:
 					{
-						uint8_t startBit = *(data + 1) & 0x80;
+						const uint8_t startBit = *(data + 1) & 0x80;
 
 						if (startBit == 128)
 						{
@@ -145,7 +145,7 @@ namespace RTC
 		  std::unique_ptr<H264_SVC::PayloadDescriptor> payloadDescriptor,
 		  bool isStartBit)
 		{
-			uint8_t nal = *data & 0x1F;
+			const uint8_t nal = *data & 0x1F;
 
 			switch (nal)
 			{
@@ -286,7 +286,7 @@ namespace RTC
 			}
 
 			// clang-format off
-			bool isOldPacket = false;
+			const bool isOldPacket = false;
 
 			// Upgrade current spatial layer if needed.
 			if (context->GetTargetSpatialLayer() > context->GetCurrentSpatialLayer())

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

@@ -20,7 +20,9 @@ namespace RTC
 			MS_TRACE();
 
 			if (len < 1)
+			{
 				return nullptr;
+			}
 
 			std::unique_ptr<PayloadDescriptor> payloadDescriptor(new PayloadDescriptor());
 
@@ -39,7 +41,9 @@ namespace RTC
 			else
 			{
 				if (len < ++offset + 1)
+				{
 					return nullptr;
+				}
 
 				byte = data[offset];
 
@@ -52,14 +56,18 @@ namespace RTC
 			if (payloadDescriptor->i)
 			{
 				if (len < ++offset + 1)
+				{
 					return nullptr;
+				}
 
 				byte = data[offset];
 
 				if ((byte >> 7) & 0x01)
 				{
 					if (len < ++offset + 1)
+					{
 						return nullptr;
+					}
 
 					payloadDescriptor->hasTwoBytesPictureId = true;
 					payloadDescriptor->pictureId            = (byte & 0x7F) << 8;
@@ -77,7 +85,9 @@ namespace RTC
 			if (payloadDescriptor->l)
 			{
 				if (len < ++offset + 1)
+				{
 					return nullptr;
+				}
 
 				payloadDescriptor->hasTl0PictureIndex = true;
 				payloadDescriptor->tl0PictureIndex    = data[offset];
@@ -86,7 +96,9 @@ namespace RTC
 			if (payloadDescriptor->t || payloadDescriptor->k)
 			{
 				if (len < ++offset + 1)
+				{
 					return nullptr;
+				}
 
 				byte = data[offset];
 
@@ -126,7 +138,9 @@ namespace RTC
 			PayloadDescriptor* payloadDescriptor = VP8::Parse(data, len, frameMarking, frameMarkingLen);
 
 			if (!payloadDescriptor)
+			{
 				return;
+			}
 
 			auto* payloadDescriptorHandler = new PayloadDescriptorHandler(payloadDescriptor);
 
@@ -180,7 +194,9 @@ namespace RTC
 
 			// Nothing to do.
 			if (!this->extended)
+			{
 				return;
+			}
 
 			data += 2;
 
@@ -200,12 +216,16 @@ namespace RTC
 					data++;
 
 					if (pictureId > 127)
+					{
 						MS_DEBUG_TAG(rtp, "casting pictureId value to one byte");
+					}
 				}
 			}
 
 			if (this->l)
+			{
 				*data = tl0PictureIndex;
+			}
 		}
 
 		void VP8::PayloadDescriptor::Restore(uint8_t* data) const
@@ -337,7 +357,9 @@ namespace RTC
 			}
 
 			if (context->GetCurrentTemporalLayer() > context->GetTargetTemporalLayer())
+			{
 				context->SetCurrentTemporalLayer(context->GetTargetTemporalLayer());
+			}
 
 			// clang-format off
 			if (

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

@@ -19,7 +19,9 @@ namespace RTC
 			MS_TRACE();
 
 			if (len < 1)
+			{
 				return nullptr;
+			}
 
 			std::unique_ptr<PayloadDescriptor> payloadDescriptor(new PayloadDescriptor());
 
@@ -37,14 +39,18 @@ namespace RTC
 			if (payloadDescriptor->i)
 			{
 				if (len < ++offset + 1)
+				{
 					return nullptr;
+				}
 
 				byte = data[offset];
 
 				if (byte >> 7 & 0x01)
 				{
 					if (len < ++offset + 1)
+					{
 						return nullptr;
+					}
 
 					payloadDescriptor->pictureId = (byte & 0x7F) << 8;
 					payloadDescriptor->pictureId += data[offset];
@@ -62,7 +68,9 @@ namespace RTC
 			if (payloadDescriptor->l)
 			{
 				if (len < ++offset + 1)
+				{
 					return nullptr;
+				}
 
 				byte = data[offset];
 
@@ -74,7 +82,9 @@ namespace RTC
 				payloadDescriptor->hasTlIndex           = true;
 
 				if (len < ++offset + 1)
+				{
 					return nullptr;
+				}
 
 				// Read TL0PICIDX if flexible mode is unset.
 				if (!payloadDescriptor->f)
@@ -113,7 +123,9 @@ namespace RTC
 			PayloadDescriptor* payloadDescriptor = VP9::Parse(data, len, frameMarking, frameMarkingLen);
 
 			if (!payloadDescriptor)
+			{
 				return;
+			}
 
 			if (payloadDescriptor->isKeyFrame)
 			{
@@ -211,7 +223,7 @@ namespace RTC
 			}
 
 			// clang-format off
-			bool isOldPacket = (
+			const bool isOldPacket = (
 				this->payloadDescriptor->hasPictureId &&
 				RTC::SeqManager<uint16_t, 15>::IsSeqLowerThan(
 					this->payloadDescriptor->pictureId,
@@ -285,10 +297,15 @@ namespace RTC
 			// * higher than current one
 			// * different than the current one when KSVC is enabled and this is not a keyframe
 			// (interframe p bit = 1)
+			// clang-format off
 			if (
 			  !isOldPacket &&
-			  (packetSpatialLayer > tmpSpatialLayer ||
-			   (context->IsKSvc() && this->payloadDescriptor->p && packetSpatialLayer != tmpSpatialLayer)))
+			  (
+			  	packetSpatialLayer > tmpSpatialLayer ||
+			  	(context->IsKSvc() && this->payloadDescriptor->p && packetSpatialLayer != tmpSpatialLayer)
+			  )
+			)
+			// clang-format on
 			{
 				return false;
 			}
@@ -345,12 +362,16 @@ namespace RTC
 
 				// Filter temporal layers higher than current one.
 				if (packetTemporalLayer > tmpTemporalLayer)
+				{
 					return false;
+				}
 			}
 
 			// Set marker bit if needed.
 			if (packetSpatialLayer == tmpSpatialLayer && this->payloadDescriptor->e)
+			{
 				marker = true;
+			}
 
 			// Update the pictureId manager.
 			if (this->payloadDescriptor->hasPictureId)
@@ -362,11 +383,15 @@ namespace RTC
 
 			// Update current spatial layer if needed.
 			if (tmpSpatialLayer != context->GetCurrentSpatialLayer())
+			{
 				context->SetCurrentSpatialLayer(tmpSpatialLayer);
+			}
 
 			// Update current temporal layer if needed.
 			if (tmpTemporalLayer != context->GetCurrentTemporalLayer())
+			{
 				context->SetCurrentTemporalLayer(tmpTemporalLayer);
+			}
 
 			return true;
 		}

package/worker/src/RTC/Consumer.cpp

@@ -347,7 +347,7 @@ namespace RTC
 					if (!type.is_string())
 						MS_THROW_TYPE_ERROR("wrong type (not a string)");
 
-					std::string typeStr = type.get<std::string>();
+					const std::string typeStr = type.get<std::string>();
 
 					if (typeStr == "rtp")
 						newTraceEventTypes.rtp = true;

package/worker/src/RTC/DirectTransport.cpp

@@ -122,7 +122,7 @@ namespace RTC
 		}
 
 		const uint8_t* data = packet->GetData();
-		size_t len          = packet->GetSize();
+		const size_t len    = packet->GetSize();
 
 		// Notify the Node DirectTransport.
 		this->shared->payloadChannelNotifier->Emit(consumer->id, "rtp", data, len);
@@ -142,7 +142,7 @@ namespace RTC
 		MS_TRACE();
 
 		const uint8_t* data = packet->GetData();
-		size_t len          = packet->GetSize();
+		const size_t len    = packet->GetSize();
 
 		// Notify the Node DirectTransport.
 		this->shared->payloadChannelNotifier->Emit(this->id, "rtcp", data, len);
@@ -158,7 +158,7 @@ namespace RTC
 		packet->Serialize(RTC::RTCP::Buffer);
 
 		const uint8_t* data = packet->GetData();
-		size_t len          = packet->GetSize();
+		const size_t len    = packet->GetSize();
 
 		// Notify the Node DirectTransport.
 		this->shared->payloadChannelNotifier->Emit(this->id, "rtcp", data, len);

package/worker/src/RTC/PipeConsumer.cpp

@@ -25,8 +25,8 @@ namespace RTC
 		if (this->rtpParameters.encodings.size() != this->consumableRtpEncodings.size())
 			MS_THROW_TYPE_ERROR("number of rtpParameters.encodings and consumableRtpEncodings do not match");
 
-		auto& encoding   = this->rtpParameters.encodings[0];
-		auto* mediaCodec = this->rtpParameters.GetCodecForEncoding(encoding);
+		auto& encoding         = this->rtpParameters.encodings[0];
+		const auto* mediaCodec = this->rtpParameters.GetCodecForEncoding(encoding);
 
 		this->keyFrameSupported = RTC::Codecs::Tools::CanBeKeyFrame(mediaCodec->mimeType);
 
@@ -226,7 +226,7 @@ namespace RTC
 			return;
 
 		// Whether this is the first packet after re-sync.
-		bool isSyncPacket = syncRequired;
+		const bool isSyncPacket = syncRequired;
 
 		// Sync sequence number and timestamp if required.
 		if (isSyncPacket)

package/worker/src/RTC/PortManager.cpp

@@ -39,13 +39,13 @@ namespace RTC
 		Utils::IP::NormalizeIp(ip);
 
 		int err;
-		int family = Utils::IP::GetFamily(ip);
+		const int family = Utils::IP::GetFamily(ip);
 		struct sockaddr_storage bindAddr; // NOLINT(cppcoreguidelines-pro-type-member-init)
 		size_t portIdx;
 		int flags{ 0 };
 		std::vector<bool>& ports = PortManager::GetPorts(transport, ip);
 		size_t attempt{ 0u };
-		size_t numAttempts = ports.size();
+		const size_t numAttempts = ports.size();
 		uv_handle_t* uvHandle{ nullptr };
 		uint16_t port;
 		std::string transportStr;
@@ -322,7 +322,7 @@ namespace RTC
 		Utils::IP::NormalizeIp(ip);
 
 		int err;
-		int family = Utils::IP::GetFamily(ip);
+		const int family = Utils::IP::GetFamily(ip);
 		struct sockaddr_storage bindAddr; // NOLINT(cppcoreguidelines-pro-type-member-init)
 		int flags{ 0 };
 		uv_handle_t* uvHandle{ nullptr };