mediasoup 3.19.21 → 3.19.22

package/worker/src/RTC/Producer.cpp

@@ -27,7 +27,7 @@ namespace RTC
 	/* Instance methods. */
 
 	Producer::Producer(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  RTC::Producer::Listener* listener,
 	  const FBS::Transport::ProduceRequest* data)
@@ -209,11 +209,12 @@ namespace RTC
 		{
 			auto keyFrameRequestDelay = data->keyFrameRequestDelay();
 
-			this->keyFrameRequestManager = new RTC::KeyFrameRequestManager(this, keyFrameRequestDelay);
+			this->keyFrameRequestManager =
+			  new RTC::KeyFrameRequestManager(this, this->shared, keyFrameRequestDelay);
 		}
 
 		// NOTE: This may throw.
-		this->shared->channelMessageRegistrator->RegisterHandler(
+		this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 		  this->id,
 		  /*channelRequestHandler*/ this,
 		  /*channelNotificationHandler*/ this);
@@ -223,7 +224,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 
 		// Delete all streams.
 		for (auto& kv : this->mapSsrcRtpStream)
@@ -1131,7 +1132,8 @@ namespace RTC
 		  this->type == RtpParameters::Type::SIMULCAST && this->rtpMapping.encodings.size() > 1;
 
 		// Create a RtpStreamRecv for receiving a media stream.
-		auto* rtpStream = new RTC::RTP::RtpStreamRecv(this, params, SendNackDelay, useRtpInactivityCheck);
+		auto* rtpStream =
+		  new RTC::RTP::RtpStreamRecv(this, this->shared, params, SendNackDelay, useRtpInactivityCheck);
 
 		// Insert into the maps.
 		this->mapSsrcRtpStream[ssrc]              = rtpStream;
@@ -1433,12 +1435,12 @@ namespace RTC
 					this->videoOrientation.rotation = rotation;
 
 					auto notification = FBS::Producer::CreateVideoOrientationChangeNotification(
-					  this->shared->channelNotifier->GetBufferBuilder(),
+					  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 					  this->videoOrientation.camera,
 					  this->videoOrientation.flip,
 					  this->videoOrientation.rotation);
 
-					this->shared->channelNotifier->Emit(
+					this->shared->GetChannelNotifier()->Emit(
 					  this->id,
 					  FBS::Notification::Event::PRODUCER_VIDEO_ORIENTATION_CHANGE,
 					  FBS::Notification::Body::Producer_VideoOrientationChangeNotification,
@@ -1463,7 +1465,7 @@ namespace RTC
 
 			scores.emplace_back(
 			  FBS::Producer::CreateScoreDirect(
-			    this->shared->channelNotifier->GetBufferBuilder(),
+			    this->shared->GetChannelNotifier()->GetBufferBuilder(),
 			    rtpStream->GetEncodingIdx(),
 			    rtpStream->GetSsrc(),
 			    !rtpStream->GetRid().empty() ? rtpStream->GetRid().c_str() : nullptr,
@@ -1471,9 +1473,9 @@ namespace RTC
 		}
 
 		auto notification = FBS::Producer::CreateScoreNotificationDirect(
-		  this->shared->channelNotifier->GetBufferBuilder(), &scores);
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), &scores);
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::PRODUCER_SCORE,
 		  FBS::Notification::Body::Producer_ScoreNotification,
@@ -1486,12 +1488,12 @@ namespace RTC
 
 		if (this->traceEventTypes.keyframe && packet->IsKeyFrame())
 		{
-			auto rtpPacketDump = packet->FillBuffer(this->shared->channelNotifier->GetBufferBuilder());
-			auto traceInfo     = FBS::Producer::CreateKeyFrameTraceInfo(
-			  this->shared->channelNotifier->GetBufferBuilder(), rtpPacketDump, isRtx);
+			auto rtpPacketDump = packet->FillBuffer(this->shared->GetChannelNotifier()->GetBufferBuilder());
+			auto traceInfo = FBS::Producer::CreateKeyFrameTraceInfo(
+			  this->shared->GetChannelNotifier()->GetBufferBuilder(), rtpPacketDump, isRtx);
 
 			auto notification = FBS::Producer::CreateTraceNotification(
-			  this->shared->channelNotifier->GetBufferBuilder(),
+			  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 			  FBS::Producer::TraceEventType::KEYFRAME,
 			  DepLibUV::GetTimeMs(),
 			  FBS::Common::TraceDirection::DIRECTION_IN,
@@ -1502,12 +1504,12 @@ namespace RTC
 		}
 		else if (this->traceEventTypes.rtp)
 		{
-			auto rtpPacketDump = packet->FillBuffer(this->shared->channelNotifier->GetBufferBuilder());
-			auto traceInfo     = FBS::Producer::CreateRtpTraceInfo(
-			  this->shared->channelNotifier->GetBufferBuilder(), rtpPacketDump, isRtx);
+			auto rtpPacketDump = packet->FillBuffer(this->shared->GetChannelNotifier()->GetBufferBuilder());
+			auto traceInfo = FBS::Producer::CreateRtpTraceInfo(
+			  this->shared->GetChannelNotifier()->GetBufferBuilder(), rtpPacketDump, isRtx);
 
 			auto notification = FBS::Producer::CreateTraceNotification(
-			  this->shared->channelNotifier->GetBufferBuilder(),
+			  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 			  FBS::Producer::TraceEventType::RTP,
 			  DepLibUV::GetTimeMs(),
 			  FBS::Common::TraceDirection::DIRECTION_IN,
@@ -1527,11 +1529,11 @@ namespace RTC
 			return;
 		}
 
-		auto traceInfo =
-		  FBS::Producer::CreatePliTraceInfo(this->shared->channelNotifier->GetBufferBuilder(), ssrc);
+		auto traceInfo = FBS::Producer::CreatePliTraceInfo(
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), ssrc);
 
 		auto notification = FBS::Producer::CreateTraceNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  FBS::Producer::TraceEventType::PLI,
 		  DepLibUV::GetTimeMs(),
 		  FBS::Common::TraceDirection::DIRECTION_OUT,
@@ -1550,11 +1552,11 @@ namespace RTC
 			return;
 		}
 
-		auto traceInfo =
-		  FBS::Producer::CreateFirTraceInfo(this->shared->channelNotifier->GetBufferBuilder(), ssrc);
+		auto traceInfo = FBS::Producer::CreateFirTraceInfo(
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), ssrc);
 
 		auto notification = FBS::Producer::CreateTraceNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  FBS::Producer::TraceEventType::FIR,
 		  DepLibUV::GetTimeMs(),
 		  FBS::Common::TraceDirection::DIRECTION_OUT,
@@ -1574,7 +1576,7 @@ namespace RTC
 		}
 
 		auto notification = FBS::Producer::CreateTraceNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  FBS::Producer::TraceEventType::NACK,
 		  DepLibUV::GetTimeMs(),
 		  FBS::Common::TraceDirection::DIRECTION_OUT);
@@ -1592,7 +1594,7 @@ namespace RTC
 		}
 
 		auto traceInfo = FBS::Producer::CreateSrTraceInfo(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  report->GetSsrc(),
 		  report->GetNtpSec(),
 		  report->GetNtpFrac(),
@@ -1601,7 +1603,7 @@ namespace RTC
 		  report->GetOctetCount());
 
 		auto notification = FBS::Producer::CreateTraceNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  FBS::Producer::TraceEventType::SR,
 		  DepLibUV::GetTimeMs(),
 		  FBS::Common::TraceDirection::DIRECTION_IN,
@@ -1616,7 +1618,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::PRODUCER_TRACE,
 		  FBS::Notification::Body::Producer_TraceNotification,

package/worker/src/RTC/RTCP/FeedbackPsRpsi.cpp

@@ -1,9 +1,8 @@
-#include <cstdint>
 #define MS_CLASS "RTC::RTCP::FeedbackPsRpsi"
 // #define MS_LOG_DEV_LEVEL 3
 
-#include "Logger.hpp"
 #include "RTC/RTCP/FeedbackPsRpsi.hpp"
+#include "Logger.hpp"
 #include <cstring>
 
 namespace RTC

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

@@ -19,8 +19,15 @@ namespace RTC
 		/* Instance methods. */
 
 		RtpStream::RtpStream(
-		  RTP::RtpStream::Listener* listener, RTP::RtpStream::Params& params, uint8_t initialScore)
-		  : listener(listener), params(params), score(initialScore), activeSinceMs(DepLibUV::GetTimeMs())
+		  RTP::RtpStream::Listener* listener,
+		  SharedInterface* shared,
+		  RTP::RtpStream::Params& params,
+		  uint8_t initialScore)
+		  : listener(listener),
+		    shared(shared),
+		    params(params),
+		    score(initialScore),
+		    activeSinceMs(DepLibUV::GetTimeMs())
 		{
 			MS_TRACE();
 		}

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

@@ -183,10 +183,11 @@ namespace RTC
 
 		RtpStreamRecv::RtpStreamRecv(
 		  RTP::RtpStreamRecv::Listener* listener,
+		  SharedInterface* shared,
 		  RTP::RtpStream::Params& params,
 		  uint32_t sendNackDelayMs,
 		  bool useRtpInactivityCheck)
-		  : RTP::RtpStream::RtpStream(listener, params, 10),
+		  : RTP::RtpStream::RtpStream(listener, shared, params, 10),
 		    sendNackDelayMs(sendNackDelayMs),
 		    useRtpInactivityCheck(useRtpInactivityCheck),
 		    transmissionCounter(
@@ -197,7 +198,7 @@ namespace RTC
 
 			if (this->params.useNack)
 			{
-				this->nackGenerator.reset(new RTC::NackGenerator(this, this->sendNackDelayMs));
+				this->nackGenerator.reset(new RTC::NackGenerator(this, this->shared, this->sendNackDelayMs));
 			}
 
 			this->inactive = false;
@@ -206,7 +207,7 @@ namespace RTC
 			{
 				// Run the RTP inactivity periodic timer (use a different timeout if DTX is
 				// enabled).
-				this->inactivityCheckPeriodicTimer = new TimerHandle(this);
+				this->inactivityCheckPeriodicTimer = this->shared->CreateTimer(this);
 
 				this->inactivityCheckPeriodicTimer->Start(
 				  this->params.useDtx ? InactivityCheckIntervalWithDtx : InactivityCheckInterval);
@@ -858,7 +859,7 @@ namespace RTC
 			// Nothing to do.
 		}
 
-		inline void RtpStreamRecv::OnTimer(TimerHandle* timer)
+		inline void RtpStreamRecv::OnTimer(TimerHandleInterface* timer)
 		{
 			MS_TRACE();
 

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

@@ -33,8 +33,11 @@ namespace RTC
 		/* Instance methods. */
 
 		RtpStreamSend::RtpStreamSend(
-		  RTP::RtpStreamSend::Listener* listener, RTP::RtpStream::Params& params, std::string& mid)
-		  : RTP::RtpStream::RtpStream(listener, params, 10),
+		  RTP::RtpStreamSend::Listener* listener,
+		  SharedInterface* shared,
+		  RTP::RtpStream::Params& params,
+		  std::string& mid)
+		  : RTP::RtpStream::RtpStream(listener, shared, params, 10),
 		    mid(mid),
 		    transmissionCounter(/*ignorePaddingOnlyPackets*/ true)
 		{

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)

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();