mediasoup 3.19.21 → 3.19.22

package/worker/src/RTC/SCTP/tx/RetransmissionTimeout.cpp

@@ -56,7 +56,7 @@ namespace RTC
 			MS_DUMP_CLEAN(indentation, "</SCTP::RetransmissionTimeout>");
 		}
 
-		void RetransmissionTimeout::ObserveRtt(uint64_t rttMs)
+		void RetransmissionTimeout::ObserveRttMs(uint64_t rttMs)
 		{
 			MS_TRACE();
 

package/worker/src/RTC/SctpAssociation.cpp

@@ -120,7 +120,7 @@ namespace RTC
 	    os(os),
 	    mis(mis),
 	    maxSctpMessageSize(maxSctpMessageSize),
-	    sctpSendBufferSize(sctpSendBufferSize),
+	    sctpSendBufferSize(std::max(sctpSendBufferSize, maxSctpMessageSize)),
 	    isDataChannel(isDataChannel)
 	{
 		MS_TRACE();

package/worker/src/RTC/SimpleConsumer.cpp

@@ -22,7 +22,7 @@ namespace RTC
 	/* Instance methods. */
 
 	SimpleConsumer::SimpleConsumer(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  const std::string& producerId,
 	  RTC::Consumer::Listener* listener,
@@ -69,7 +69,7 @@ namespace RTC
 		}
 
 		// NOTE: This may throw.
-		this->shared->channelMessageRegistrator->RegisterHandler(
+		this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 		  this->id,
 		  /*channelRequestHandler*/ this,
 		  /*channelNotificationHandler*/ nullptr);
@@ -79,7 +79,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 
 		delete this->rtpStream;
 		this->targetLayerRetransmissionBuffer.clear();
@@ -780,7 +780,8 @@ namespace RTC
 			}
 		}
 
-		this->rtpStream = new RTC::RTP::RtpStreamSend(this, params, this->rtpParameters.mid);
+		this->rtpStream =
+		  new RTC::RTP::RtpStreamSend(this, this->shared, params, this->rtpParameters.mid);
 		this->rtpStreams.push_back(this->rtpStream);
 
 		// If the Consumer is paused, tell the RtpStreamSend.
@@ -848,12 +849,12 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		auto scoreOffset = FillBufferScore(this->shared->channelNotifier->GetBufferBuilder());
+		auto scoreOffset = FillBufferScore(this->shared->GetChannelNotifier()->GetBufferBuilder());
 
 		auto notificationOffset = FBS::Consumer::CreateScoreNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), scoreOffset);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), scoreOffset);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::CONSUMER_SCORE,
 		  FBS::Notification::Body::Consumer_ScoreNotification,

package/worker/src/RTC/SimulcastConsumer.cpp

@@ -25,7 +25,7 @@ namespace RTC
 	/* Instance methods. */
 
 	SimulcastConsumer::SimulcastConsumer(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  const std::string& producerId,
 	  RTC::Consumer::Listener* listener,
@@ -126,7 +126,7 @@ namespace RTC
 		CreateRtpStream();
 
 		// NOTE: This may throw.
-		this->shared->channelMessageRegistrator->RegisterHandler(
+		this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 		  this->id,
 		  /*channelRequestHandler*/ this,
 		  /*channelRequestHandler*/ nullptr);
@@ -136,7 +136,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 
 		delete this->rtpStream;
 		this->targetLayerRetransmissionBuffer.clear();
@@ -1462,7 +1462,8 @@ namespace RTC
 			}
 		}
 
-		this->rtpStream = new RTC::RTP::RtpStreamSend(this, params, this->rtpParameters.mid);
+		this->rtpStream =
+		  new RTC::RTP::RtpStreamSend(this, this->shared, params, this->rtpParameters.mid);
 		this->rtpStreams.push_back(this->rtpStream);
 
 		// If the Consumer is paused, tell the RtpStreamSend.
@@ -1773,12 +1774,12 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		auto scoreOffset = FillBufferScore(this->shared->channelNotifier->GetBufferBuilder());
+		auto scoreOffset = FillBufferScore(this->shared->GetChannelNotifier()->GetBufferBuilder());
 
 		auto notificationOffset = FBS::Consumer::CreateScoreNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), scoreOffset);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), scoreOffset);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::CONSUMER_SCORE,
 		  FBS::Notification::Body::Consumer_ScoreNotification,
@@ -1800,15 +1801,15 @@ namespace RTC
 		if (this->currentSpatialLayer >= 0)
 		{
 			layersOffset = FBS::Consumer::CreateConsumerLayers(
-			  this->shared->channelNotifier->GetBufferBuilder(),
+			  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 			  this->currentSpatialLayer,
 			  this->encodingContext->GetCurrentTemporalLayer());
 		}
 
 		auto notificationOffset = FBS::Consumer::CreateLayersChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), layersOffset);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), layersOffset);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::CONSUMER_LAYERS_CHANGE,
 		  FBS::Notification::Body::Consumer_LayersChangeNotification,

package/worker/src/RTC/SvcConsumer.cpp

@@ -23,7 +23,7 @@ namespace RTC
 	/* Instance methods. */
 
 	SvcConsumer::SvcConsumer(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  const std::string& producerId,
 	  RTC::Consumer::Listener* listener,
@@ -107,7 +107,7 @@ namespace RTC
 		CreateRtpStream();
 
 		// NOTE: This may throw.
-		this->shared->channelMessageRegistrator->RegisterHandler(
+		this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 		  this->id,
 		  /*channelRequestHandler*/ this,
 		  /*channelNotificationHandler*/ nullptr);
@@ -117,7 +117,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 
 		delete this->rtpStream;
 		this->targetLayerRetransmissionBuffer.clear();
@@ -1090,7 +1090,8 @@ namespace RTC
 			}
 		}
 
-		this->rtpStream = new RTC::RTP::RtpStreamSend(this, params, this->rtpParameters.mid);
+		this->rtpStream =
+		  new RTC::RTP::RtpStreamSend(this, this->shared, params, this->rtpParameters.mid);
 		this->rtpStreams.push_back(this->rtpStream);
 
 		// If the Consumer is paused, tell the RtpStreamSend.
@@ -1305,12 +1306,12 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		auto scoreOffset = FillBufferScore(this->shared->channelNotifier->GetBufferBuilder());
+		auto scoreOffset = FillBufferScore(this->shared->GetChannelNotifier()->GetBufferBuilder());
 
 		auto notificationOffset = FBS::Consumer::CreateScoreNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), scoreOffset);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), scoreOffset);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::CONSUMER_SCORE,
 		  FBS::Notification::Body::Consumer_ScoreNotification,
@@ -1332,15 +1333,15 @@ namespace RTC
 		if (this->encodingContext->GetCurrentSpatialLayer() >= 0)
 		{
 			layersOffset = FBS::Consumer::CreateConsumerLayers(
-			  this->shared->channelNotifier->GetBufferBuilder(),
+			  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 			  this->encodingContext->GetCurrentSpatialLayer(),
 			  this->encodingContext->GetCurrentTemporalLayer());
 		}
 
 		auto notificationOffset = FBS::Consumer::CreateLayersChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), layersOffset);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), layersOffset);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::CONSUMER_LAYERS_CHANGE,
 		  FBS::Notification::Body::Consumer_LayersChangeNotification,

package/worker/src/RTC/Transport.cpp

@@ -40,7 +40,7 @@ namespace RTC
 	/* Instance methods. */
 
 	Transport::Transport(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  RTC::Transport::Listener* listener,
 	  const FBS::Transport::Options* options)
@@ -120,7 +120,8 @@ namespace RTC
 					                                           .maxSendBufferSize  = sctpSendBufferSize
 				};
 
-				this->sctpAssociation = std::make_unique<RTC::SCTP::Association>(sctpOptions, this);
+				this->sctpAssociation =
+				  std::make_unique<RTC::SCTP::Association>(sctpOptions, this, this->shared);
 			}
 			// TODO: Remove once we only use built-in SCTP stack.
 			else
@@ -137,7 +138,7 @@ namespace RTC
 		}
 
 		// Create the RTCP timer.
-		this->rtcpTimer = new TimerHandle(this);
+		this->rtcpTimer = this->shared->CreateTimer(this);
 	}
 
 	Transport::~Transport()
@@ -880,7 +881,7 @@ namespace RTC
 					if (createTccServer)
 					{
 						this->tccServer = std::make_shared<RTC::TransportCongestionControlServer>(
-						  this, bweType, RTC::Consts::RtcpPacketMaxSize);
+						  this, this->shared, bweType, RTC::Consts::RtcpPacketMaxSize);
 
 						if (this->maxIncomingBitrate != 0u)
 						{
@@ -1073,6 +1074,7 @@ namespace RTC
 
 						this->tccClient = std::make_shared<RTC::TransportCongestionControlClient>(
 						  this,
+						  this->shared,
 						  bweType,
 						  this->initialAvailableOutgoingBitrate,
 						  this->maxOutgoingBitrate,
@@ -2553,12 +2555,12 @@ namespace RTC
 
 		// TODO: Missing trace info (RTP packet dump).
 		auto notification = FBS::Transport::CreateTraceNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  FBS::Transport::TraceEventType::PROBATION,
 		  DepLibUV::GetTimeMs(),
 		  FBS::Common::TraceDirection::DIRECTION_OUT);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::TRANSPORT_TRACE,
 		  FBS::Notification::Body::Transport_TraceNotification,
@@ -2576,7 +2578,7 @@ namespace RTC
 		}
 
 		auto traceInfo = FBS::Transport::CreateBweTraceInfo(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  this->tccClient->GetBweType() == RTC::BweType::TRANSPORT_CC
 		    ? FBS::Transport::BweType::TRANSPORT_CC
 		    : FBS::Transport::BweType::REMB,
@@ -2589,14 +2591,14 @@ namespace RTC
 		  bitrates.availableBitrate);
 
 		auto notification = FBS::Transport::CreateTraceNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  FBS::Transport::TraceEventType::BWE,
 		  DepLibUV::GetTimeMs(),
 		  FBS::Common::TraceDirection::DIRECTION_OUT,
 		  FBS::Transport::TraceInfo::BweTraceInfo,
 		  traceInfo.Union());
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::TRANSPORT_TRACE,
 		  FBS::Notification::Body::Transport_TraceNotification,
@@ -3032,9 +3034,10 @@ namespace RTC
 
 		// Notify the Node Transport.
 		auto sctpStateChangeOffset = FBS::Transport::CreateSctpStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::SctpAssociation::SctpState::CONNECTING);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::SctpAssociation::SctpState::CONNECTING);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::TRANSPORT_SCTP_STATE_CHANGE,
 		  FBS::Notification::Body::Transport_SctpStateChangeNotification,
@@ -3058,9 +3061,10 @@ namespace RTC
 
 		// Notify the Node Transport.
 		auto sctpStateChangeOffset = FBS::Transport::CreateSctpStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::SctpAssociation::SctpState::CONNECTED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::SctpAssociation::SctpState::CONNECTED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::TRANSPORT_SCTP_STATE_CHANGE,
 		  FBS::Notification::Body::Transport_SctpStateChangeNotification,
@@ -3089,9 +3093,10 @@ namespace RTC
 
 		// Notify the Node Transport.
 		auto sctpStateChangeOffset = FBS::Transport::CreateSctpStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::SctpAssociation::SctpState::FAILED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::SctpAssociation::SctpState::FAILED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::TRANSPORT_SCTP_STATE_CHANGE,
 		  FBS::Notification::Body::Transport_SctpStateChangeNotification,
@@ -3116,9 +3121,10 @@ namespace RTC
 
 		// Notify the Node Transport.
 		auto sctpStateChangeOffset = FBS::Transport::CreateSctpStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::SctpAssociation::SctpState::CLOSED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::SctpAssociation::SctpState::CLOSED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::TRANSPORT_SCTP_STATE_CHANGE,
 		  FBS::Notification::Body::Transport_SctpStateChangeNotification,
@@ -3213,9 +3219,10 @@ namespace RTC
 
 		// Notify the Node Transport.
 		auto sctpStateChangeOffset = FBS::Transport::CreateSctpStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::SctpAssociation::SctpState::CONNECTING);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::SctpAssociation::SctpState::CONNECTING);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::TRANSPORT_SCTP_STATE_CHANGE,
 		  FBS::Notification::Body::Transport_SctpStateChangeNotification,
@@ -3239,9 +3246,10 @@ namespace RTC
 
 		// Notify the Node Transport.
 		auto sctpStateChangeOffset = FBS::Transport::CreateSctpStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::SctpAssociation::SctpState::CONNECTED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::SctpAssociation::SctpState::CONNECTED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::TRANSPORT_SCTP_STATE_CHANGE,
 		  FBS::Notification::Body::Transport_SctpStateChangeNotification,
@@ -3265,9 +3273,10 @@ namespace RTC
 
 		// Notify the Node Transport.
 		auto sctpStateChangeOffset = FBS::Transport::CreateSctpStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::SctpAssociation::SctpState::FAILED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::SctpAssociation::SctpState::FAILED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::TRANSPORT_SCTP_STATE_CHANGE,
 		  FBS::Notification::Body::Transport_SctpStateChangeNotification,
@@ -3291,9 +3300,10 @@ namespace RTC
 
 		// Notify the Node Transport.
 		auto sctpStateChangeOffset = FBS::Transport::CreateSctpStateChangeNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(), FBS::SctpAssociation::SctpState::CLOSED);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
+		  FBS::SctpAssociation::SctpState::CLOSED);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::TRANSPORT_SCTP_STATE_CHANGE,
 		  FBS::Notification::Body::Transport_SctpStateChangeNotification,
@@ -3518,7 +3528,7 @@ namespace RTC
 	}
 #endif
 
-	void Transport::OnTimer(TimerHandle* timer)
+	void Transport::OnTimer(TimerHandleInterface* timer)
 	{
 		MS_TRACE();
 

package/worker/src/RTC/TransportCongestionControlClient.cpp

@@ -24,11 +24,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 +77,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(
@@ -552,7 +554,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

@@ -20,9 +20,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 +35,7 @@ namespace RTC
 				ResetTransportCcFeedback(0u);
 
 				// Create the feedback send periodic timer.
-				this->transportCcFeedbackSendPeriodicTimer = new TimerHandle(this);
+				this->transportCcFeedbackSendPeriodicTimer = this->shared->CreateTimer(this);
 
 				break;
 			}
@@ -468,7 +469,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,11 +1,12 @@
+#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 "Settings.hpp"
 #include "Utils.hpp"
+#include "RTC/WebRtcServer.hpp"
 #include <cmath> // std::pow()
 
 namespace RTC
@@ -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