mediasoup 3.9.12 → 3.9.13

package/node/lib/Worker.js

@@ -81,7 +81,7 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         // options
         {
             env: {
-                MEDIASOUP_VERSION: '3.9.12',
+                MEDIASOUP_VERSION: '3.9.13',
                 // 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.9.12";
+export declare const version = "3.9.13";
 /**
  * Expose parseScalabilityMode() function.
  */

package/node/lib/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasoup",
-  "version": "3.9.12",
+  "version": "3.9.13",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -77,9 +77,9 @@
   "devDependencies": {
     "@types/debug": "^4.1.7",
     "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^5.22.0",
-    "@typescript-eslint/parser": "^5.22.0",
-    "eslint": "^8.14.0",
+    "@typescript-eslint/eslint-plugin": "^5.23.0",
+    "@typescript-eslint/parser": "^5.23.0",
+    "eslint": "^8.15.0",
     "eslint-plugin-jest": "^26.1.5",
     "jest": "^27.5.1",
     "jest-tobetype": "^1.2.3",

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

@@ -267,7 +267,11 @@ namespace RTC
 				if (this->payloadDescriptor->tlIndex > context->GetTargetTemporalLayer())
 				{
 					context->pictureIdManager.Drop(this->payloadDescriptor->pictureId);
-					context->tl0PictureIndexManager.Drop(this->payloadDescriptor->tl0PictureIndex);
+
+					if (this->payloadDescriptor->tlIndex == 0)
+					{
+						context->tl0PictureIndexManager.Drop(this->payloadDescriptor->tl0PictureIndex);
+					}
 
 					return false;
 				}
@@ -280,7 +284,11 @@ namespace RTC
 				// clang-format on
 				{
 					context->pictureIdManager.Drop(this->payloadDescriptor->pictureId);
-					context->tl0PictureIndexManager.Drop(this->payloadDescriptor->tl0PictureIndex);
+
+					if (this->payloadDescriptor->tlIndex == 0)
+					{
+						context->tl0PictureIndexManager.Drop(this->payloadDescriptor->tl0PictureIndex);
+					}
 
 					return false;
 				}

package/worker/src/RTC/SimulcastConsumer.cpp

@@ -1256,7 +1256,6 @@ namespace RTC
 		newTargetSpatialLayer  = -1;
 		newTargetTemporalLayer = -1;
 
-		uint8_t maxProducerScore{ 0u };
 		auto nowMs = DepLibUV::GetTimeMs();
 
 		for (size_t sIdx{ 0u }; sIdx < this->producerRtpStreams.size(); ++sIdx)
@@ -1297,7 +1296,6 @@ namespace RTC
 				continue;
 
 			newTargetSpatialLayer = spatialLayer;
-			maxProducerScore      = producerScore;
 
 			// If this is the preferred or higher spatial layer take it and exit.
 			if (spatialLayer >= this->preferredSpatialLayer)

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

@@ -210,3 +210,86 @@ SCENARIO("parse VP8 payload descriptor", "[codecs][vp8]")
 		REQUIRE_FALSE(payloadDescriptor);
 	}
 }
+
+Codecs::VP8::PayloadDescriptor* CreatePacket(
+  uint8_t* buffer,
+  size_t bufferLen,
+  uint16_t pictureId,
+  uint8_t tl0PictureIndex,
+  uint8_t tlIndex,
+  bool layerSync = true)
+{
+	uint16_t netPictureId = htons(pictureId);
+	std::memcpy(buffer + 2, &netPictureId, 2);
+	buffer[2] |= 0x80;
+	buffer[4] = tl0PictureIndex;
+	buffer[5] = tlIndex << 6;
+
+	if (layerSync)
+		buffer[5] |= 0x20; // y bit
+
+	auto* payloadDescriptor = Codecs::VP8::Parse(buffer, bufferLen);
+
+	REQUIRE(payloadDescriptor);
+
+	return payloadDescriptor;
+}
+
+std::unique_ptr<Codecs::VP8::PayloadDescriptor> ProcessPacket(
+  Codecs::VP8::EncodingContext& context,
+  uint16_t pictureId,
+  uint8_t tl0PictureIndex,
+  uint8_t tlIndex,
+  bool layerSync = true)
+{
+	// clang-format off
+	uint8_t buffer[] =
+	{
+		0x90, 0xe0, 0x80, 0x00, 0x00, 0x00
+	};
+	// clang-format on
+	bool marker;
+	auto* payloadDescriptor =
+	  CreatePacket(buffer, sizeof(buffer), pictureId, tl0PictureIndex, tlIndex, layerSync);
+	std::unique_ptr<Codecs::VP8::PayloadDescriptorHandler> payloadDescriptorHandler(
+	  new Codecs::VP8::PayloadDescriptorHandler(payloadDescriptor));
+
+	if (payloadDescriptorHandler->Process(&context, buffer, marker))
+	{
+		return std::unique_ptr<Codecs::VP8::PayloadDescriptor>(Codecs::VP8::Parse(buffer, sizeof(buffer)));
+	}
+
+	return nullptr;
+}
+
+SCENARIO("process VP8 payload descriptor", "[codecs][vp8]")
+{
+	SECTION("do not drop TL0PICIDX from temporal layers higher than 0")
+	{
+		RTC::Codecs::EncodingContext::Params params;
+		params.spatialLayers  = 0;
+		params.temporalLayers = 2;
+		Codecs::VP8::EncodingContext context(params);
+
+		context.SetCurrentTemporalLayer(0);
+		context.SetTargetTemporalLayer(0);
+
+		// Frame 1
+		auto forwarded = ProcessPacket(context, 0, 0, 0);
+		REQUIRE(forwarded);
+		REQUIRE(forwarded->pictureId == 0);
+		REQUIRE(forwarded->tl0PictureIndex == 0);
+
+		// Frame 2 gets lost
+
+		// Frame 3
+		forwarded = ProcessPacket(context, 2, 1, 1);
+		REQUIRE_FALSE(forwarded);
+
+		// Frame 2 retransmitted
+		forwarded = ProcessPacket(context, 1, 1, 0);
+		REQUIRE(forwarded);
+		REQUIRE(forwarded->pictureId == 1);
+		REQUIRE(forwarded->tl0PictureIndex == 1);
+	}
+}