mediasoup 3.19.21 → 3.20.0

package/worker/src/RTC/RTP/SharedPacket.cpp

@@ -17,7 +17,7 @@ namespace RTC
 		static constexpr size_t PacketBufferLengthIncrement{ 100 };
 		// Callback to pass to every cloned RTP Packet to deallocate its buffer once
 		// the Packet releases its buffer (for example when the Packet is destroyed).
-		thread_local Serializable::BufferReleasedListener PacketBufferReleasedListener =
+		static thread_local Serializable::BufferReleasedListener PacketBufferReleasedListener =
 		  // NOLINTNEXTLINE(misc-unused-parameters, readability-non-const-parameter)
 		  [](const Serializable* packet, uint8_t* buffer)
 		{
@@ -32,7 +32,7 @@ namespace RTC
 			  "[worker.pid:%" PRIu64
 			  "] [RTC::RTP::SharedPacket] memory deallocated [packet buffer:%zu, total allocated memory:%" PRIu64
 			  "]",
-			  Logger::pid,
+			  Logger::Pid,
 			  packet->GetBufferLength(),
 			  SharedPacket::allocatedMemory);
 #endif
@@ -170,7 +170,7 @@ namespace RTC
 			  "[worker.pid:%" PRIu64
 			  "] [RTC::RTP::SharedPacket] memory allocated [packet buffer:%zu, total allocated memory:%" PRIu64
 			  "]",
-			  Logger::pid,
+			  Logger::Pid,
 			  clonedPacket->GetBufferLength(),
 			  SharedPacket::allocatedMemory);
 #endif

package/worker/src/RTC/RateCalculator.cpp

@@ -2,7 +2,6 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "RTC/RateCalculator.hpp"
-#include "DepLibUV.hpp"
 #include "Logger.hpp"
 #include "Utils.hpp"
 #include <cmath>   // std::trunc()
@@ -205,7 +204,7 @@ namespace RTC
 
 		if (!this->ignorePaddingOnlyPackets || packet->GetPayloadLength() > 0)
 		{
-			const uint64_t nowMs = DepLibUV::GetTimeMs();
+			const uint64_t nowMs = this->shared->GetTimeMs();
 
 			this->rate.Update(packet->GetLength(), nowMs);
 		}

package/worker/src/RTC/Router.cpp

@@ -19,13 +19,13 @@ namespace RTC
 {
 	/* Instance methods. */
 
-	Router::Router(RTC::Shared* shared, const std::string& id, Listener* listener)
+	Router::Router(SharedInterface* shared, const std::string& id, Listener* listener)
 	  : id(id), shared(shared), listener(listener)
 	{
 		MS_TRACE();
 
 		// NOTE: This may throw.
-		this->shared->channelMessageRegistrator->RegisterHandler(
+		this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 		  this->id,
 		  /*channelRequestHandler*/ this,
 		  /*ChannelNotificationHandler*/ nullptr);
@@ -35,7 +35,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 
 		// Close all Transports.
 		for (auto& kv : this->mapTransports)
@@ -392,7 +392,7 @@ namespace RTC
 				auto transportId = body->transportId()->str();
 
 				// This may throw.
-				RTC::Transport* transport = GetTransportById(transportId);
+				RTC::Transport* transport = AssertAndGetTransportById(transportId);
 
 				// Tell the Transport to close all its Producers and Consumers so it will
 				// notify us about their closures.
@@ -417,7 +417,7 @@ namespace RTC
 				auto rtpObserverId = body->rtpObserverId()->str();
 
 				// This may throw.
-				RTC::RtpObserver* rtpObserver = GetRtpObserverById(rtpObserverId);
+				const RTC::RtpObserver* rtpObserver = AssertAndGetRtpObserverById(rtpObserverId);
 
 				// Remove it from the map.
 				this->mapRtpObservers.erase(rtpObserver->id);
@@ -463,7 +463,7 @@ namespace RTC
 		}
 	}
 
-	RTC::Transport* Router::GetTransportById(const std::string& transportId) const
+	RTC::Transport* Router::AssertAndGetTransportById(const std::string& transportId) const
 	{
 		MS_TRACE();
 
@@ -477,7 +477,7 @@ namespace RTC
 		return it->second;
 	}
 
-	RTC::RtpObserver* Router::GetRtpObserverById(const std::string& rtpObserverId) const
+	RTC::RtpObserver* Router::AssertAndGetRtpObserverById(const std::string& rtpObserverId) const
 	{
 		MS_TRACE();
 
@@ -491,7 +491,7 @@ namespace RTC
 		return it->second;
 	}
 
-	inline void Router::OnTransportNewProducer(RTC::Transport* /*transport*/, RTC::Producer* producer)
+	void Router::OnTransportNewProducer(RTC::Transport* /*transport*/, RTC::Producer* producer)
 	{
 		MS_TRACE();
 
@@ -510,7 +510,7 @@ namespace RTC
 		this->mapProducerRtpObservers[producer];
 	}
 
-	inline void Router::OnTransportProducerClosed(RTC::Transport* /*transport*/, RTC::Producer* producer)
+	void Router::OnTransportProducerClosed(RTC::Transport* /*transport*/, RTC::Producer* producer)
 	{
 		MS_TRACE();
 
@@ -555,7 +555,7 @@ namespace RTC
 		this->mapProducerRtpObservers.erase(mapProducerRtpObserversIt);
 	}
 
-	inline void Router::OnTransportProducerPaused(RTC::Transport* /*transport*/, RTC::Producer* producer)
+	void Router::OnTransportProducerPaused(RTC::Transport* /*transport*/, RTC::Producer* producer)
 	{
 		MS_TRACE();
 
@@ -579,7 +579,7 @@ namespace RTC
 		}
 	}
 
-	inline void Router::OnTransportProducerResumed(RTC::Transport* /*transport*/, RTC::Producer* producer)
+	void Router::OnTransportProducerResumed(RTC::Transport* /*transport*/, RTC::Producer* producer)
 	{
 		MS_TRACE();
 
@@ -603,7 +603,7 @@ namespace RTC
 		}
 	}
 
-	inline void Router::OnTransportProducerNewRtpStream(
+	void Router::OnTransportProducerNewRtpStream(
 	  RTC::Transport* /*transport*/,
 	  RTC::Producer* producer,
 	  RTC::RTP::RtpStreamRecv* rtpStream,
@@ -619,7 +619,7 @@ namespace RTC
 		}
 	}
 
-	inline void Router::OnTransportProducerRtpStreamScore(
+	void Router::OnTransportProducerRtpStreamScore(
 	  RTC::Transport* /*transport*/,
 	  RTC::Producer* producer,
 	  RTC::RTP::RtpStreamRecv* rtpStream,
@@ -636,7 +636,7 @@ namespace RTC
 		}
 	}
 
-	inline void Router::OnTransportProducerRtcpSenderReport(
+	void Router::OnTransportProducerRtcpSenderReport(
 	  RTC::Transport* /*transport*/, RTC::Producer* producer, RTC::RTP::RtpStreamRecv* rtpStream, bool first)
 	{
 		MS_TRACE();
@@ -649,7 +649,7 @@ namespace RTC
 		}
 	}
 
-	inline void Router::OnTransportProducerRtpPacketReceived(
+	void Router::OnTransportProducerRtpPacketReceived(
 	  RTC::Transport* /*transport*/, RTC::Producer* producer, RTC::RTP::Packet* packet)
 	{
 		MS_TRACE();
@@ -717,7 +717,7 @@ namespace RTC
 		}
 	}
 
-	inline void Router::OnTransportNeedWorstRemoteFractionLost(
+	void Router::OnTransportNeedWorstRemoteFractionLost(
 	  RTC::Transport* /*transport*/,
 	  RTC::Producer* producer,
 	  uint32_t mappedSsrc,
@@ -733,7 +733,7 @@ namespace RTC
 		}
 	}
 
-	inline void Router::OnTransportNewConsumer(
+	void Router::OnTransportNewConsumer(
 	  RTC::Transport* /*transport*/, RTC::Consumer* consumer, const std::string& producerId)
 	{
 		MS_TRACE();
@@ -780,7 +780,7 @@ namespace RTC
 		consumer->ProducerRtpStreamScores(producer->GetRtpStreamScores());
 	}
 
-	inline void Router::OnTransportConsumerClosed(RTC::Transport* /*transport*/, RTC::Consumer* consumer)
+	void Router::OnTransportConsumerClosed(RTC::Transport* /*transport*/, RTC::Consumer* consumer)
 	{
 		MS_TRACE();
 
@@ -811,8 +811,7 @@ namespace RTC
 		this->mapConsumerProducer.erase(mapConsumerProducerIt);
 	}
 
-	inline void Router::OnTransportConsumerProducerClosed(
-	  RTC::Transport* /*transport*/, RTC::Consumer* consumer)
+	void Router::OnTransportConsumerProducerClosed(RTC::Transport* /*transport*/, RTC::Consumer* consumer)
 	{
 		MS_TRACE();
 
@@ -831,7 +830,7 @@ namespace RTC
 		this->mapConsumerProducer.erase(mapConsumerProducerIt);
 	}
 
-	inline void Router::OnTransportConsumerKeyFrameRequested(
+	void Router::OnTransportConsumerKeyFrameRequested(
 	  RTC::Transport* /*transport*/, RTC::Consumer* consumer, uint32_t mappedSsrc)
 	{
 		MS_TRACE();
@@ -841,8 +840,7 @@ namespace RTC
 		producer->RequestKeyFrame(mappedSsrc);
 	}
 
-	inline void Router::OnTransportNewDataProducer(
-	  RTC::Transport* /*transport*/, RTC::DataProducer* dataProducer)
+	void Router::OnTransportNewDataProducer(RTC::Transport* /*transport*/, RTC::DataProducer* dataProducer)
 	{
 		MS_TRACE();
 
@@ -863,8 +861,7 @@ namespace RTC
 		this->mapDataProducerDataConsumers[dataProducer];
 	}
 
-	inline void Router::OnTransportDataProducerClosed(
-	  RTC::Transport* /*transport*/, RTC::DataProducer* dataProducer)
+	void Router::OnTransportDataProducerClosed(RTC::Transport* /*transport*/, RTC::DataProducer* dataProducer)
 	{
 		MS_TRACE();
 
@@ -899,8 +896,7 @@ namespace RTC
 		this->mapDataProducerDataConsumers.erase(mapDataProducerDataConsumersIt);
 	}
 
-	inline void Router::OnTransportDataProducerPaused(
-	  RTC::Transport* /*transport*/, RTC::DataProducer* dataProducer)
+	void Router::OnTransportDataProducerPaused(RTC::Transport* /*transport*/, RTC::DataProducer* dataProducer)
 	{
 		MS_TRACE();
 
@@ -912,7 +908,7 @@ namespace RTC
 		}
 	}
 
-	inline void Router::OnTransportDataProducerResumed(
+	void Router::OnTransportDataProducerResumed(
 	  RTC::Transport* /*transport*/, RTC::DataProducer* dataProducer)
 	{
 		MS_TRACE();
@@ -925,12 +921,10 @@ namespace RTC
 		}
 	}
 
-	inline void Router::OnTransportDataProducerMessageReceived(
+	void Router::OnTransportDataProducerMessageReceived(
 	  RTC::Transport* /*transport*/,
 	  RTC::DataProducer* dataProducer,
-	  const uint8_t* msg,
-	  size_t len,
-	  uint32_t ppid,
+	  RTC::SCTP::Message message,
 	  std::vector<uint16_t>& subchannels,
 	  std::optional<uint16_t> requiredSubchannel)
 	{
@@ -950,9 +944,39 @@ namespace RTC
 			}
 #endif
 
+			const auto numDataConsumers = dataConsumers.size();
+
 			for (auto* dataConsumer : dataConsumers)
 			{
-				dataConsumer->SendMessage(msg, len, ppid, subchannels, requiredSubchannel);
+				const uint16_t streamId =
+				  (dataConsumer->GetType() == DataConsumer::Type::SCTP
+				     ? dataConsumer->GetSctpStreamParameters().streamId
+				     : 0);
+
+				if (numDataConsumers == 1)
+				{
+					// We must update the Message`s `streamId` for each destination
+					// DataConsumer.
+					// NOTE: clang-tidy doesn't understand that we are only doing this
+					// once in the original `message`.
+					// NOLINTNEXTLINE(clang-analyzer-cplusplus.Move, bugprone-use-after-move, hicpp-invalid-access-moved)
+					message.SetStreamId(streamId);
+
+					dataConsumer->SendMessage(std::move(message), subchannels, requiredSubchannel);
+				}
+				// NOTE: Here we are cloning the Message before passing it to each
+				// DataConsumer because each DataConsumer will pass std::move(message)
+				// internally to its SCTP Association.
+				else
+				{
+					auto clonedMessage = message.Clone();
+
+					// We must update the Message`s `streamId` for each destination
+					// DataConsumer.
+					clonedMessage.SetStreamId(streamId);
+
+					dataConsumer->SendMessage(std::move(clonedMessage), subchannels, requiredSubchannel);
+				}
 			}
 
 #ifdef MS_LIBURING_SUPPORTED
@@ -965,7 +989,7 @@ namespace RTC
 		}
 	}
 
-	inline void Router::OnTransportNewDataConsumer(
+	void Router::OnTransportNewDataConsumer(
 	  RTC::Transport* /*transport*/, RTC::DataConsumer* dataConsumer, std::string& dataProducerId)
 	{
 		MS_TRACE();
@@ -1000,8 +1024,7 @@ namespace RTC
 		this->mapDataConsumerDataProducer[dataConsumer] = dataProducer;
 	}
 
-	inline void Router::OnTransportDataConsumerClosed(
-	  RTC::Transport* /*transport*/, RTC::DataConsumer* dataConsumer)
+	void Router::OnTransportDataConsumerClosed(RTC::Transport* /*transport*/, RTC::DataConsumer* dataConsumer)
 	{
 		MS_TRACE();
 
@@ -1033,7 +1056,7 @@ namespace RTC
 		this->mapDataConsumerDataProducer.erase(mapDataConsumerDataProducerIt);
 	}
 
-	inline void Router::OnTransportDataConsumerDataProducerClosed(
+	void Router::OnTransportDataConsumerDataProducerClosed(
 	  RTC::Transport* /*transport*/, RTC::DataConsumer* dataConsumer)
 	{
 		MS_TRACE();
@@ -1053,7 +1076,7 @@ namespace RTC
 		this->mapDataConsumerDataProducer.erase(mapDataConsumerDataProducerIt);
 	}
 
-	inline void Router::OnTransportListenServerClosed(RTC::Transport* transport)
+	void Router::OnTransportListenServerClosed(RTC::Transport* transport)
 	{
 		MS_TRACE();
 

package/worker/src/RTC/RtpDictionaries/RtpCodecMimeType.cpp

@@ -3,8 +3,8 @@
 
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
-#include "Utils.hpp"
 #include "RTC/RtpDictionaries.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

package/worker/src/RTC/RtpObserver.cpp

@@ -9,7 +9,8 @@ namespace RTC
 {
 	/* Instance methods. */
 
-	RtpObserver::RtpObserver(RTC::Shared* shared, const std::string& id, RTC::RtpObserver::Listener* listener)
+	RtpObserver::RtpObserver(
+	  SharedInterface* shared, const std::string& id, RTC::RtpObserver::Listener* listener)
 	  : id(id), shared(shared), listener(listener)
 	{
 		MS_TRACE();

package/worker/src/RTC/SCTP/LICENSE

@@ -0,0 +1,44 @@
+The SCTP packet and chunk parsers, factories, and several additional
+classes, as well as other components of the mediasoup SCTP stack, have
+been implemented from scratch. However, most of the core SCTP protocol
+logic is derived from the dcsctp component of the WebRTC project.
+
+The SCTP source code in mediasoup is distributed under the copyright
+and license terms specified in the LICENSE file located in the
+mediasoup root directory.
+
+To acknowledge and preserve the copyright notices and licensing terms
+of dcsctp and the WebRTC project, the corresponding license text is
+reproduced below.
+
+----
+
+Copyright (c) 2011, The WebRTC project authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.