mediasoup 3.26.0 → 3.27.0

package/worker/src/RTC/SvcProducerStreamManager.cpp

@@ -8,8 +8,8 @@ namespace RTC
 {
 	/* Static. */
 
-	static constexpr uint64_t BweDowngradeConservativeMs{ 10000u };
-	static constexpr uint64_t BweDowngradeMinActiveMs{ 8000u };
+	static constexpr int64_t BweDowngradeConservativeMs{ 10000 };
+	static constexpr int64_t BweDowngradeMinActiveMs{ 8000 };
 
 	/* Instance methods. */
 
@@ -122,23 +122,37 @@ namespace RTC
 		// Do nothing.
 	}
 
-	uint32_t SvcProducerStreamManager::IncreaseLayer(
-	  uint32_t bitrate, bool considerLoss, float lossPercentage, uint64_t nowMs)
+	void SvcProducerStreamManager::ProducerSpatialLayerActivityChanged(
+	  RTC::RTP::RtpStreamRecv* /*rtpStream*/, uint8_t /*spatialLayer*/, bool /*isActive*/)
 	{
 		MS_TRACE();
 
-		if (!this->producerRtpStream || this->producerRtpStream->GetScore() == 0u)
+		// All spatial layers share a single RTP stream, so neither its score nor its
+		// inactivity check can tell that just one of them started or stopped. This is
+		// the only chance to reconsider the target layers.
+		if (IsActive())
+		{
+			MayChangeLayers(/*force*/ false);
+		}
+	}
+
+	int64_t SvcProducerStreamManager::IncreaseLayer(
+	  int64_t bitrate, bool considerLoss, float lossPercentage, int64_t nowMs)
+	{
+		MS_TRACE();
+
+		if (!this->producerRtpStream || this->producerRtpStream->GetScore() == 0)
 		{
-			return 0u;
+			return 0;
 		}
 
 		// If already in the preferred layers, do nothing.
 		if (this->provisionalTargetLayers == this->preferredLayers)
 		{
-			return 0u;
+			return 0;
 		}
 
-		uint32_t virtualBitrate;
+		int64_t virtualBitrate;
 
 		if (considerLoss)
 		{
@@ -162,7 +176,7 @@ namespace RTC
 			virtualBitrate = bitrate;
 		}
 
-		uint32_t requiredBitrate{ 0u };
+		int64_t requiredBitrate{ 0 };
 		int16_t spatialLayer{ 0 };
 		int16_t temporalLayer{ 0 };
 
@@ -215,7 +229,7 @@ namespace RTC
 				// layer if the new layer is the temporal layer 0 of a higher spatial
 				// layer.
 				if (
-				  this->encodingContext->IsKSvc() && requiredBitrate && temporalLayer == 0 &&
+				  this->encodingContext->IsKSvc() && requiredBitrate > 0 && temporalLayer == 0 &&
 				  this->provisionalTargetLayers.spatial > -1 &&
 				  spatialLayer > this->provisionalTargetLayers.spatial)
 				{
@@ -228,13 +242,13 @@ namespace RTC
 					}
 					else
 					{
-						requiredBitrate = 1u; // Don't set 0 since it would be ignored.
+						requiredBitrate = 1; // Don't set 0 since it would be ignored.
 					}
 				}
 
 				MS_DEBUG_DEV(
-				  "testing layers %" PRIi16 ":%" PRIi16 " [virtual bitrate:%" PRIu32
-				  ", required bitrate:%" PRIu32 "]",
+				  "testing layers %" PRIi16 ":%" PRIi16 " [virtual bitrate:%" PRIi64
+				  ", required bitrate:%" PRIi64 "]",
 				  spatialLayer,
 				  temporalLayer,
 				  virtualBitrate,
@@ -242,7 +256,7 @@ namespace RTC
 
 				// If active layer, end iterations here. Otherwise move to next spatial
 				// layer.
-				if (requiredBitrate)
+				if (requiredBitrate > 0)
 				{
 					goto done;
 				}
@@ -263,15 +277,15 @@ namespace RTC
 	done:
 
 		// No higher active layers found.
-		if (!requiredBitrate)
+		if (requiredBitrate <= 0)
 		{
-			return 0u;
+			return 0;
 		}
 
 		// No luck.
 		if (requiredBitrate > virtualBitrate)
 		{
-			return 0u;
+			return 0;
 		}
 
 		// Set provisional layers.
@@ -279,8 +293,8 @@ namespace RTC
 		this->provisionalTargetLayers.temporal = temporalLayer;
 
 		MS_DEBUG_DEV(
-		  "upgrading to layers %" PRIi16 ":%" PRIi16 " [virtual bitrate:%" PRIu32
-		  ", required bitrate:%" PRIu32 "]",
+		  "upgrading to layers %" PRIi16 ":%" PRIi16 " [virtual bitrate:%" PRIi64
+		  ", required bitrate:%" PRIi64 "]",
 		  this->provisionalTargetLayers.spatial,
 		  this->provisionalTargetLayers.temporal,
 		  virtualBitrate,
@@ -300,7 +314,7 @@ namespace RTC
 		}
 	}
 
-	void SvcProducerStreamManager::ApplyLayers(uint64_t rtpStreamActiveMs)
+	void SvcProducerStreamManager::ApplyLayers(int64_t rtpStreamActiveMs)
 	{
 		MS_TRACE();
 
@@ -332,16 +346,16 @@ namespace RTC
 		}
 	}
 
-	uint32_t SvcProducerStreamManager::GetDesiredBitrate(uint64_t nowMs) const
+	int64_t SvcProducerStreamManager::GetDesiredBitrate(int64_t nowMs) const
 	{
 		MS_TRACE();
 
-		if (!this->producerRtpStream || this->producerRtpStream->GetScore() == 0u)
+		if (!this->producerRtpStream || this->producerRtpStream->GetScore() == 0)
 		{
-			return 0u;
+			return 0;
 		}
 
-		uint32_t desiredBitrate{ 0u };
+		int64_t desiredBitrate{ 0 };
 
 		// When using K-SVC each spatial layer is independent of the others.
 		if (this->encodingContext->IsKSvc())
@@ -564,7 +578,7 @@ namespace RTC
 		// Start with no layers.
 		newTargetLayers.Reset();
 
-		auto nowMs = this->shared->GetTimeMs();
+		const int64_t nowMs = this->shared->GetTimeMs();
 		int16_t spatialLayer{ 0 };
 
 		if (!this->producerRtpStream)

package/worker/src/RTC/TcpConnection.cpp

@@ -19,8 +19,8 @@ namespace RTC
 
 	/* Instance methods. */
 
-	TcpConnection::TcpConnection(Listener* listener, size_t bufferSize)
-	  : ::TcpConnectionHandle::TcpConnectionHandle(bufferSize), listener(listener)
+	TcpConnection::TcpConnection(Listener* listener, SharedInterface* shared, size_t bufferSize)
+	  : ::TcpConnectionHandle::TcpConnectionHandle(bufferSize), listener(listener), shared(shared)
 	{
 		MS_TRACE();
 	}
@@ -34,6 +34,11 @@ namespace RTC
 	{
 		MS_TRACE();
 
+		// NOTE: Take the arrival time before anything else is done with the read
+		// data, so that it doesn't include the cost of processing it. All the frames
+		// found within this read share it, since they all arrived in it.
+		const int64_t receivedAtUs = this->shared->GetTimeUs();
+
 		MS_DEBUG_DEV(
 		  "data received [local:%s :%" PRIu16 ", remote:%s :%" PRIu16 "]",
 		  GetLocalIp().c_str(),
@@ -88,7 +93,8 @@ namespace RTC
 					// later.
 					std::memcpy(ReadBuffer, packet, packetLen);
 
-					this->listener->OnTcpConnectionPacketReceived(this, ReadBuffer, packetLen, ReadBufferSize);
+					this->listener->OnTcpConnectionPacketReceived(
+					  this, ReadBuffer, packetLen, ReadBufferSize, receivedAtUs);
 				}
 
 				// If there is no more space available in the buffer and that is because

package/worker/src/RTC/TcpServer.cpp

@@ -17,6 +17,7 @@ namespace RTC
 	TcpServer::TcpServer(
 	  Listener* listener,
 	  RTC::TcpConnection::Listener* connListener,
+	  SharedInterface* shared,
 	  std::string& ip,
 	  uint16_t port,
 	  RTC::Transport::SocketFlags& flags)
@@ -24,6 +25,7 @@ namespace RTC
 	    ::TcpServerHandle::TcpServerHandle(RTC::PortManager::BindTcp(ip, port, flags)),
 	    listener(listener),
 	    connListener(connListener),
+	    shared(shared),
 	    fixedPort(true)
 	{
 		MS_TRACE();
@@ -32,6 +34,7 @@ namespace RTC
 	TcpServer::TcpServer(
 	  Listener* listener,
 	  RTC::TcpConnection::Listener* connListener,
+	  SharedInterface* shared,
 	  std::string& ip,
 	  uint16_t minPort,
 	  uint16_t maxPort,
@@ -41,7 +44,8 @@ namespace RTC
 	    ::TcpServerHandle::TcpServerHandle(
 	      RTC::PortManager::BindTcp(ip, minPort, maxPort, flags, portRangeKey)),
 	    listener(listener),
-	    connListener(connListener)
+	    connListener(connListener),
+	    shared(shared)
 	{
 		MS_TRACE();
 
@@ -63,7 +67,8 @@ namespace RTC
 		MS_TRACE();
 
 		// Allocate a new RTC::TcpConnection for the TcpServer to handle it.
-		auto* connection = new RTC::TcpConnection(this->connListener, TcpConnectionBufferSize);
+		auto* connection =
+		  new RTC::TcpConnection(this->connListener, this->shared, TcpConnectionBufferSize);
 
 		// Accept it.
 		AcceptTcpConnection(connection);