mediasoup 3.19.21 → 3.20.0

package/worker/src/RTC/TransportCongestionControlClient.cpp

@@ -3,7 +3,6 @@
 #define USE_TREND_CALCULATOR
 
 #include "RTC/TransportCongestionControlClient.hpp"
-#include "DepLibUV.hpp"
 #include "Logger.hpp"
 #include <libwebrtc/api/transport/network_types.h> // webrtc::TargetRateConstraints
 #include <limits>                                  // std::numeric_limits
@@ -24,11 +23,13 @@ namespace RTC
 
 	TransportCongestionControlClient::TransportCongestionControlClient(
 	  RTC::TransportCongestionControlClient::Listener* listener,
+	  SharedInterface* shared,
 	  RTC::BweType bweType,
 	  uint32_t initialAvailableBitrate,
 	  uint32_t maxOutgoingBitrate,
 	  uint32_t minOutgoingBitrate)
 	  : listener(listener),
+	    shared(shared),
 	    bweType(bweType),
 	    initialAvailableBitrate(
 	      std::max<uint32_t>(
@@ -75,7 +76,7 @@ namespace RTC
 		// videos are muted or using screensharing with still images)
 		this->rtpTransportControllerSend->EnablePeriodicAlrProbing(true);
 
-		this->processTimer = new TimerHandle(this);
+		this->processTimer = this->shared->CreateTimer(this);
 
 		this->processTimer->Start(
 		  std::min(
@@ -114,7 +115,7 @@ namespace RTC
 		MS_TRACE();
 
 #ifdef USE_TREND_CALCULATOR
-		auto nowMs = DepLibUV::GetTimeMsInt64();
+		const auto nowMs = this->shared->GetTimeMsInt64();
 #endif
 
 		this->bitrates.desiredBitrate          = 0u;
@@ -307,7 +308,7 @@ namespace RTC
 		MS_TRACE();
 
 #ifdef USE_TREND_CALCULATOR
-		auto nowMs = DepLibUV::GetTimeMsInt64();
+		const auto nowMs = this->shared->GetTimeMsInt64();
 #endif
 
 		// Manage it via trending and increase it a bit to avoid immediate oscillations.
@@ -409,7 +410,7 @@ namespace RTC
 
 		webrtc::TargetRateConstraints constraints;
 
-		constraints.at_time       = webrtc::Timestamp::ms(DepLibUV::GetTimeMs());
+		constraints.at_time       = webrtc::Timestamp::ms(this->shared->GetTimeMs());
 		constraints.min_data_rate = webrtc::DataRate::bps(this->bitrates.minBitrate);
 		constraints.max_data_rate = webrtc::DataRate::bps(this->bitrates.maxBitrate);
 		constraints.starting_rate = webrtc::DataRate::bps(this->bitrates.startBitrate);
@@ -435,14 +436,14 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		this->lastAvailableBitrateEventAtMs = DepLibUV::GetTimeMs();
+		this->lastAvailableBitrateEventAtMs = this->shared->GetTimeMs();
 	}
 
 	void TransportCongestionControlClient::MayEmitAvailableBitrateEvent(uint32_t previousAvailableBitrate)
 	{
 		MS_TRACE();
 
-		const uint64_t nowMs = DepLibUV::GetTimeMsInt64();
+		const uint64_t nowMs = this->shared->GetTimeMsInt64();
 		bool notify{ false };
 
 		// Ignore if first event.
@@ -552,7 +553,7 @@ namespace RTC
 		return this->probationGenerator->GetNextPacket(size);
 	}
 
-	void TransportCongestionControlClient::OnTimer(TimerHandle* timer)
+	void TransportCongestionControlClient::OnTimer(TimerHandleInterface* timer)
 	{
 		MS_TRACE();
 

package/worker/src/RTC/TransportCongestionControlServer.cpp

@@ -2,7 +2,6 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "RTC/TransportCongestionControlServer.hpp"
-#include "DepLibUV.hpp"
 #include "Logger.hpp"
 #include "RTC/RTCP/FeedbackPsRemb.hpp"
 
@@ -20,9 +19,10 @@ namespace RTC
 
 	TransportCongestionControlServer::TransportCongestionControlServer(
 	  RTC::TransportCongestionControlServer::Listener* listener,
+	  SharedInterface* shared,
 	  RTC::BweType bweType,
 	  size_t maxRtcpPacketLen)
-	  : listener(listener), bweType(bweType), maxRtcpPacketLen(maxRtcpPacketLen)
+	  : listener(listener), shared(shared), bweType(bweType), maxRtcpPacketLen(maxRtcpPacketLen)
 	{
 		MS_TRACE();
 
@@ -34,7 +34,7 @@ namespace RTC
 				ResetTransportCcFeedback(0u);
 
 				// Create the feedback send periodic timer.
-				this->transportCcFeedbackSendPeriodicTimer = new TimerHandle(this);
+				this->transportCcFeedbackSendPeriodicTimer = this->shared->CreateTimer(this);
 
 				break;
 			}
@@ -286,7 +286,7 @@ namespace RTC
 			// This is to ensure that we send N REMB packets with bitrate 0 (unlimited).
 			this->unlimitedRembCounter = UnlimitedRembNumPackets;
 
-			auto nowMs = DepLibUV::GetTimeMs();
+			auto nowMs = this->shared->GetTimeMs();
 
 			MaySendLimitationRembFeedback(nowMs);
 		}
@@ -468,7 +468,7 @@ namespace RTC
 		this->listener->OnTransportCongestionControlServerSendRtcpPacket(this, &packet);
 	}
 
-	void TransportCongestionControlServer::OnTimer(TimerHandle* timer)
+	void TransportCongestionControlServer::OnTimer(TimerHandleInterface* timer)
 	{
 		MS_TRACE();
 

package/worker/src/RTC/WebRtcServer.cpp

@@ -1,9 +1,10 @@
+#include "SharedInterface.hpp"
 #define MS_CLASS "RTC::WebRtcServer"
 // #define MS_LOG_DEV_LEVEL 3
 
-#include "RTC/WebRtcServer.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
+#include "RTC/WebRtcServer.hpp"
 #include "Settings.hpp"
 #include "Utils.hpp"
 #include <cmath> // std::pow()
@@ -53,7 +54,7 @@ namespace RTC
 	/* Instance methods. */
 
 	WebRtcServer::WebRtcServer(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  const flatbuffers::Vector<flatbuffers::Offset<FBS::Transport::ListenInfo>>* listenInfos)
 	  : id(id), shared(shared)
@@ -205,7 +206,7 @@ namespace RTC
 			}
 
 			// NOTE: This may throw.
-			this->shared->channelMessageRegistrator->RegisterHandler(
+			this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 			  this->id,
 			  /*channelRequestHandler*/ this,
 			  /*channelNotificationHandler*/ nullptr);
@@ -234,7 +235,7 @@ namespace RTC
 
 		this->closing = true;
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 
 		// NOTE: We need to close WebRtcTransports first since they may need to
 		// send DTLS Close Alert so UDP sockets and TCP connections must remain

package/worker/src/RTC/WebRtcTransport.cpp

@@ -2,11 +2,11 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "RTC/WebRtcTransport.hpp"
+#include "FBS/webRtcTransport.h"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
 #include "Settings.hpp"
 #include "Utils.hpp"
-#include "FBS/webRtcTransport.h"
 #include <cmath> // std::pow()
 
 namespace RTC
@@ -33,7 +33,7 @@ namespace RTC
 	 * This constructor is used when the WebRtcTransport doesn't use a WebRtcServer.
 	 */
 	WebRtcTransport::WebRtcTransport(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  RTC::Transport::Listener* listener,
 	  const FBS::WebRtcTransport::WebRtcTransportOptions* options)
@@ -226,13 +226,17 @@ namespace RTC
 
 			// Create a ICE server.
 			this->iceServer = new RTC::ICE::IceServer(
-			  this, Utils::Crypto::GetRandomString(32), Utils::Crypto::GetRandomString(32), iceConsentTimeout);
+			  this,
+			  this->shared,
+			  Utils::Crypto::GetRandomString(32),
+			  Utils::Crypto::GetRandomString(32),
+			  iceConsentTimeout);
 
 			// Create a DTLS transport.
-			this->dtlsTransport = new RTC::DtlsTransport(this);
+			this->dtlsTransport = new RTC::DtlsTransport(this, this->shared);
 
 			// NOTE: This may throw.
-			this->shared->channelMessageRegistrator->RegisterHandler(
+			this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 			  this->id,
 			  /*channelRequestHandler*/ this,
 			  /*channelNotificationHandler*/ this);
@@ -273,7 +277,7 @@ namespace RTC
 	 * This constructor is used when the WebRtcTransport uses a WebRtcServer.
 	 */
 	WebRtcTransport::WebRtcTransport(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  RTC::Transport::Listener* listener,
 	  WebRtcTransportListener* webRtcTransportListener,
@@ -296,16 +300,20 @@ namespace RTC
 
 			// Create a ICE server.
 			this->iceServer = new RTC::ICE::IceServer(
-			  this, Utils::Crypto::GetRandomString(32), Utils::Crypto::GetRandomString(32), iceConsentTimeout);
+			  this,
+			  this->shared,
+			  Utils::Crypto::GetRandomString(32),
+			  Utils::Crypto::GetRandomString(32),
+			  iceConsentTimeout);
 
 			// Create a DTLS transport.
-			this->dtlsTransport = new RTC::DtlsTransport(this);
+			this->dtlsTransport = new RTC::DtlsTransport(this, this->shared);
 
 			// Notify the webRtcTransportListener.
 			this->webRtcTransportListener->OnWebRtcTransportCreated(this);
 
 			// NOTE: This may throw.
-			this->shared->channelMessageRegistrator->RegisterHandler(
+			this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 			  this->id,
 			  /*channelRequestHandler*/ this,
 			  /*channelNotificationHandler*/ this);
@@ -331,9 +339,9 @@ namespace RTC
 		// We need to tell the Transport parent class that we are about to destroy
 		// the class instance. This is because child's destructor runs before
 		// parent's destructor. See comment in Transport::OnSctpAssociationSendData().
-		Destroying();
+		SetDestroying();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 
 		// Must delete the DTLS transport first since it will generate a DTLS alert
 		// to be sent.
@@ -852,22 +860,14 @@ namespace RTC
 	}
 
 	void WebRtcTransport::SendMessage(
-	  RTC::DataConsumer* dataConsumer, const uint8_t* msg, size_t len, uint32_t ppid, onQueuedCallback* cb)
+	  RTC::DataConsumer* dataConsumer, RTC::SCTP::Message message, onQueuedCallback* cb)
 	{
 		MS_TRACE();
 
-		if (Settings::configuration.useBuiltInSctpStack)
-		{
-			// TODO: SCTP
-		}
-		// TODO: Remove once we only use built-in SCTP stack.
-		else
-		{
-			this->oldSctpAssociation->SendSctpMessage(dataConsumer, msg, len, ppid, cb);
-		}
+		SendSctpMessage(dataConsumer, std::move(message), cb);
 	}
 
-	bool WebRtcTransport::SendSctpData(const uint8_t* data, size_t len)
+	bool WebRtcTransport::SendData(const uint8_t* data, size_t len)
 	{
 		MS_TRACE();
 
@@ -1221,12 +1221,12 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto tuple = this->iceServer->GetSelectedTuple()->FillBuffer(
-		  this->shared->channelNotifier->GetBufferBuilder());
+		  this->shared->GetChannelNotifier()->GetBufferBuilder());
 
 		auto notification = FBS::WebRtcTransport::CreateIceSelectedTupleChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), tuple);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), tuple);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_ICE_SELECTED_TUPLE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_IceSelectedTupleChangeNotification,
@@ -1241,9 +1241,10 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto iceStateChangeOffset = FBS::WebRtcTransport::CreateIceStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::WebRtcTransport::IceState::CONNECTED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::WebRtcTransport::IceState::CONNECTED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_ICE_STATE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_IceStateChangeNotification,
@@ -1267,9 +1268,10 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto iceStateChangeOffset = FBS::WebRtcTransport::CreateIceStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::WebRtcTransport::IceState::COMPLETED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::WebRtcTransport::IceState::COMPLETED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_ICE_STATE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_IceStateChangeNotification,
@@ -1293,10 +1295,10 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto iceStateChangeOffset = FBS::WebRtcTransport::CreateIceStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  FBS::WebRtcTransport::IceState::DISCONNECTED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_ICE_STATE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_IceStateChangeNotification,
@@ -1317,9 +1319,10 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto dtlsStateChangeOffset = FBS::WebRtcTransport::CreateDtlsStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::WebRtcTransport::DtlsState::CONNECTING);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::WebRtcTransport::DtlsState::CONNECTING);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_DTLS_STATE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_DtlsStateChangeNotification,
@@ -1363,11 +1366,11 @@ namespace RTC
 
 			// Notify the Node WebRtcTransport.
 			auto dtlsStateChangeOffset = FBS::WebRtcTransport::CreateDtlsStateChangeNotificationDirect(
-			  this->shared->channelNotifier->GetBufferBuilder(),
+			  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 			  FBS::WebRtcTransport::DtlsState::CONNECTED,
 			  remoteCert.c_str());
 
-			this->shared->channelNotifier->Emit(
+			this->shared->GetChannelNotifier()->Emit(
 			  this->id,
 			  FBS::Notification::Event::WEBRTCTRANSPORT_DTLS_STATE_CHANGE,
 			  FBS::Notification::Body::WebRtcTransport_DtlsStateChangeNotification,
@@ -1393,9 +1396,10 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto dtlsStateChangeOffset = FBS::WebRtcTransport::CreateDtlsStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::WebRtcTransport::DtlsState::FAILED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::WebRtcTransport::DtlsState::FAILED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_DTLS_STATE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_DtlsStateChangeNotification,
@@ -1410,9 +1414,10 @@ namespace RTC
 
 		// Notify the Node WebRtcTransport.
 		auto dtlsStateChangeOffset = FBS::WebRtcTransport::CreateDtlsStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::WebRtcTransport::DtlsState::CLOSED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::WebRtcTransport::DtlsState::CLOSED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::WEBRTCTRANSPORT_DTLS_STATE_CHANGE,
 		  FBS::Notification::Body::WebRtcTransport_DtlsStateChangeNotification,

package/worker/src/Settings.cpp

@@ -52,16 +52,15 @@ void Settings::SetConfiguration(int argc, char* argv[])
 	// clang-format off
 	struct option options[] =
 	{
-		{ "logLevel",             optional_argument, nullptr, 'l' },
-		{ "logTags",              optional_argument, nullptr, 't' },
-		{ "rtcMinPort",           optional_argument, nullptr, 'm' },
-		{ "rtcMaxPort",           optional_argument, nullptr, 'M' },
-		{ "dtlsCertificateFile",  optional_argument, nullptr, 'c' },
-		{ "dtlsPrivateKeyFile",   optional_argument, nullptr, 'p' },
-		{ "libwebrtcFieldTrials", optional_argument, nullptr, 'W' },
-		{ "disableLiburing",      optional_argument, nullptr, 'd' },
-		{ "useBuiltInSctpStack",  optional_argument, nullptr, 's' },
-		{ nullptr,                0,                 nullptr,  0  }
+		{ .name="logLevel",             .has_arg=optional_argument, .flag=nullptr, .val='l' },
+		{ .name="logTags",              .has_arg=optional_argument, .flag=nullptr, .val='t' },
+		{ .name="rtcMinPort",           .has_arg=optional_argument, .flag=nullptr, .val='m' },
+		{ .name="rtcMaxPort",           .has_arg=optional_argument, .flag=nullptr, .val='M' },
+		{ .name="dtlsCertificateFile",  .has_arg=optional_argument, .flag=nullptr, .val='c' },
+		{ .name="dtlsPrivateKeyFile",   .has_arg=optional_argument, .flag=nullptr, .val='p' },
+		{ .name="libwebrtcFieldTrials", .has_arg=optional_argument, .flag=nullptr, .val='W' },
+		{ .name="disableLiburing",      .has_arg=optional_argument, .flag=nullptr, .val='d' },
+		{ .name=nullptr,                .has_arg=0,                 .flag=nullptr,  .val=0  }
 	};
 	// clang-format on
 	std::string stringValue;
@@ -172,22 +171,6 @@ void Settings::SetConfiguration(int argc, char* argv[])
 				break;
 			}
 
-			case 's':
-			{
-				stringValue = std::string(optarg);
-
-				if (stringValue == "true")
-				{
-					Settings::configuration.useBuiltInSctpStack = true;
-				}
-				else
-				{
-					Settings::configuration.useBuiltInSctpStack = false;
-				}
-
-				break;
-			}
-
 			// Invalid option.
 			case '?':
 			{
@@ -400,8 +383,6 @@ void Settings::PrintConfiguration()
 		  info, "  libwebrtcFieldTrials: %s", Settings::configuration.libwebrtcFieldTrials.c_str());
 	}
 	MS_DEBUG_TAG(info, "  disableLiburing: %s", Settings::configuration.disableLiburing ? "yes" : "no");
-	MS_DEBUG_TAG(
-	  info, "  useBuiltInSctpStack: %s", Settings::configuration.useBuiltInSctpStack ? "yes" : "no");
 
 	MS_DEBUG_TAG(info, "</configuration>");
 }

package/worker/src/Shared.cpp

@@ -0,0 +1,35 @@
+#define MS_CLASS "Shared"
+// #define MS_LOG_DEV_LEVEL 3
+
+#include "Shared.hpp"
+#include "handles/BackoffTimerHandle.hpp"
+#include "handles/TimerHandle.hpp"
+#include "Logger.hpp"
+
+Shared::Shared(
+  Channel::ChannelMessageRegistrator* channelMessageRegistrator,
+  Channel::ChannelNotifier* channelNotifier)
+  : channelMessageRegistrator(channelMessageRegistrator), channelNotifier(channelNotifier)
+{
+	MS_TRACE();
+}
+
+Shared::~Shared()
+{
+	MS_TRACE();
+}
+
+TimerHandleInterface* Shared::CreateTimer(TimerHandleInterface::Listener* listener)
+{
+	MS_TRACE();
+
+	return new TimerHandle(listener);
+}
+
+BackoffTimerHandleInterface* Shared::CreateBackoffTimer(
+  const BackoffTimerHandleInterface::BackoffTimerHandleOptions& options)
+{
+	MS_TRACE();
+
+	return new BackoffTimerHandle(options);
+}

package/worker/src/Utils/Crypto.cpp

@@ -8,7 +8,7 @@
 
 namespace Utils
 {
-	/* Static variables. */
+	/* Class variables. */
 
 	thread_local std::mt19937_64 Crypto::rng;
 	thread_local EVP_MAC* Crypto::mac{ nullptr };

package/worker/src/Utils/String.cpp

@@ -19,7 +19,7 @@
 /* Static. */
 
 static constexpr size_t BufferOutSize{ 65536 };
-thread_local uint8_t BufferOut[BufferOutSize];
+static thread_local uint8_t BufferOut[BufferOutSize];
 static const uint8_t Base64Table[65] =
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";