mediasoup 3.19.21 → 3.20.0

package/worker/src/RTC/Producer.cpp

@@ -2,14 +2,13 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "RTC/Producer.hpp"
-#include "DepLibUV.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
-#include "Utils.hpp"
 #include "RTC/Consts.hpp"
 #include "RTC/RTCP/Feedback.hpp"
 #include "RTC/RTCP/XrReceiverReferenceTime.hpp"
 #include "RTC/RTP/Codecs/Tools.hpp"
+#include "Utils.hpp"
 #ifdef MS_RTC_LOGGER_RTP
 #include "RTC/RtcLogger.hpp"
 #endif
@@ -21,13 +20,13 @@ namespace RTC
 	/* Static */
 
 	static constexpr size_t ProducerSendBufferSize{ 65536 };
-	thread_local uint8_t ProducerSendBuffer[ProducerSendBufferSize];
+	static thread_local uint8_t ProducerSendBuffer[ProducerSendBufferSize];
 	static constexpr unsigned int SendNackDelay{ 10u }; // In ms.
 
 	/* Instance methods. */
 
 	Producer::Producer(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  RTC::Producer::Listener* listener,
 	  const FBS::Transport::ProduceRequest* data)
@@ -209,11 +208,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 +223,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 +1131,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;
@@ -1194,8 +1195,8 @@ namespace RTC
 
 		// Mangle RTP header extensions.
 		{
-			thread_local uint8_t buffer[4096];
-			thread_local std::vector<RTC::RTP::Packet::Extension> extensions;
+			static thread_local uint8_t buffer[4096];
+			static thread_local std::vector<RTC::RTP::Packet::Extension> extensions;
 
 			// This happens just once.
 			if (extensions.capacity() != 24)
@@ -1433,12 +1434,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 +1464,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 +1472,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,14 +1487,14 @@ 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(),
+			  this->shared->GetTimeMs(),
 			  FBS::Common::TraceDirection::DIRECTION_IN,
 			  FBS::Producer::TraceInfo::KeyFrameTraceInfo,
 			  traceInfo.Union());
@@ -1502,14 +1503,14 @@ 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(),
+			  this->shared->GetTimeMs(),
 			  FBS::Common::TraceDirection::DIRECTION_IN,
 			  FBS::Producer::TraceInfo::RtpTraceInfo,
 			  traceInfo.Union());
@@ -1527,13 +1528,13 @@ 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(),
+		  this->shared->GetTimeMs(),
 		  FBS::Common::TraceDirection::DIRECTION_OUT,
 		  FBS::Producer::TraceInfo::PliTraceInfo,
 		  traceInfo.Union());
@@ -1550,13 +1551,13 @@ 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(),
+		  this->shared->GetTimeMs(),
 		  FBS::Common::TraceDirection::DIRECTION_OUT,
 		  FBS::Producer::TraceInfo::FirTraceInfo,
 		  traceInfo.Union());
@@ -1574,9 +1575,9 @@ namespace RTC
 		}
 
 		auto notification = FBS::Producer::CreateTraceNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  FBS::Producer::TraceEventType::NACK,
-		  DepLibUV::GetTimeMs(),
+		  this->shared->GetTimeMs(),
 		  FBS::Common::TraceDirection::DIRECTION_OUT);
 
 		EmitTraceEvent(notification);
@@ -1592,7 +1593,7 @@ namespace RTC
 		}
 
 		auto traceInfo = FBS::Producer::CreateSrTraceInfo(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  report->GetSsrc(),
 		  report->GetNtpSec(),
 		  report->GetNtpFrac(),
@@ -1601,9 +1602,9 @@ namespace RTC
 		  report->GetOctetCount());
 
 		auto notification = FBS::Producer::CreateTraceNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  FBS::Producer::TraceEventType::SR,
-		  DepLibUV::GetTimeMs(),
+		  this->shared->GetTimeMs(),
 		  FBS::Common::TraceDirection::DIRECTION_IN,
 		  FBS::Producer::TraceInfo::SrTraceInfo,
 		  traceInfo.Union());
@@ -1616,7 +1617,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/FeedbackPsAfb.cpp

@@ -3,8 +3,8 @@
 
 #include "RTC/RTCP/FeedbackPsAfb.hpp"
 #include "Logger.hpp"
-#include "Utils.hpp"
 #include "RTC/RTCP/FeedbackPsRemb.hpp"
+#include "Utils.hpp"
 #include <cstring>
 
 namespace RTC

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/RTCP/FeedbackRtpTransport.cpp

@@ -3,8 +3,8 @@
 
 #include "RTC/RTCP/FeedbackRtpTransport.hpp"
 #include "Logger.hpp"
-#include "Utils.hpp"
 #include "RTC/SeqManager.hpp"
+#include "Utils.hpp"
 #include <sstream> // std::ostringstream
 
 namespace RTC

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

@@ -2,9 +2,9 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "Logger.hpp"
-#include "Utils.hpp"
 #include "RTC/RTCP/XrDelaySinceLastRr.hpp"
 #include "RTC/RTCP/XrReceiverReferenceTime.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {

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

@@ -3,8 +3,8 @@
 
 #include "RTC/RTP/Packet.hpp"
 #ifdef MS_RTC_LOGGER_RTP
-#include "DepLibUV.hpp"
 #endif
+#include "DepLibUV.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
 #include "RTC/Consts.hpp"
@@ -136,6 +136,8 @@ namespace RTC
 
 #ifdef MS_RTC_LOGGER_RTP
 			// Initialize logger.
+			// NOTE: Here we use DepLibUV directly since `this->logger` doesn't
+			// have any purpose during tests.
 			this->logger.timestamp        = DepLibUV::GetTimeMs();
 			this->logger.recvRtpTimestamp = GetTimestamp();
 			this->logger.recvSeqNumber    = GetSequenceNumber();

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

@@ -3,8 +3,8 @@
 
 #include "RTC/RTP/ProbationGenerator.hpp"
 #include "Logger.hpp"
-#include "Utils.hpp"
 #include "RTC/RtpDictionaries.hpp"
+#include "Utils.hpp"
 #include <cstring> // std::memcpy(), std::memset()
 #include <vector>
 
@@ -14,9 +14,9 @@ namespace RTC
 	{
 		/* Static. */
 
-		thread_local uint8_t ProbationPacketBuffer[ProbationGenerator::ProbationPacketMaxLength];
+		static thread_local uint8_t ProbationPacketBuffer[ProbationGenerator::ProbationPacketMaxLength];
 		static constexpr size_t ProbationPacketExtensionsBufferLength{ 200 };
-		alignas(4) thread_local uint8_t
+		alignas(4) static thread_local uint8_t
 		  ProbationPacketExtensionsBuffer[ProbationPacketExtensionsBufferLength];
 		// 8 bytes, same as RTC::Consts::MidRtpExtensionMaxLength.
 		static const std::string MidValue{ "probator" };
@@ -28,7 +28,7 @@ namespace RTC
 			MS_TRACE();
 
 			// Trick to only fill the padding with zeroes once.
-			thread_local bool mustInitializePayload{ true };
+			static thread_local bool mustInitializePayload{ true };
 
 			if (mustInitializePayload)
 			{

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

@@ -3,8 +3,8 @@
 
 #include "RTC/RTP/RetransmissionBuffer.hpp"
 #include "Logger.hpp"
-#include "Utils.hpp"
 #include "RTC/SeqManager.hpp"
+#include "Utils.hpp"
 
 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(this->shared->GetTimeMs())
 		{
 			MS_TRACE();
 		}
@@ -57,7 +64,7 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			const uint64_t nowMs = DepLibUV::GetTimeMs();
+			const uint64_t nowMs = this->shared->GetTimeMs();
 			const auto mediaKind = this->params.mimeType.type == RTC::RtpCodecMimeType::Type::AUDIO
 			                         ? FBS::RtpParameters::MediaKind::AUDIO
 			                         : FBS::RtpParameters::MediaKind::VIDEO;
@@ -116,7 +123,7 @@ namespace RTC
 			// Tell the RtpCodecMimeType to update its string based on current type and subtype.
 			params.mimeType.UpdateMimeType();
 
-			this->rtxStream = new RTP::RtxStream(params);
+			this->rtxStream = new RTP::RtxStream(this->shared, params);
 		}
 
 		bool RtpStream::ReceiveStreamPacket(const RTP::Packet* packet)
@@ -133,7 +140,7 @@ namespace RTC
 				this->started     = true;
 				this->maxSeq      = seq - 1;
 				this->maxPacketTs = packet->GetTimestamp();
-				this->maxPacketMs = DepLibUV::GetTimeMs();
+				this->maxPacketMs = this->shared->GetTimeMs();
 			}
 
 			// If not a valid packet ignore it.
@@ -152,7 +159,7 @@ namespace RTC
 			if (Utils::Number::IsHigherThan<uint32_t>(packet->GetTimestamp(), this->maxPacketTs))
 			{
 				this->maxPacketTs = packet->GetTimestamp();
-				this->maxPacketMs = DepLibUV::GetTimeMs();
+				this->maxPacketMs = this->shared->GetTimeMs();
 			}
 
 			return true;
@@ -173,7 +180,7 @@ namespace RTC
 				// If previous score was 0 (and new one is not 0) then update activeSinceMs.
 				if (previousScore == 0u)
 				{
-					this->activeSinceMs = DepLibUV::GetTimeMs();
+					this->activeSinceMs = this->shared->GetTimeMs();
 				}
 
 				// Notify the listener.
@@ -220,7 +227,7 @@ namespace RTC
 					  packet->GetTimestamp());
 
 					this->maxPacketTs = packet->GetTimestamp();
-					this->maxPacketMs = DepLibUV::GetTimeMs();
+					this->maxPacketMs = this->shared->GetTimeMs();
 				}
 			}
 			// Too old packet received (older than the allowed misorder).
@@ -242,7 +249,7 @@ namespace RTC
 					InitSeq(seq);
 
 					this->maxPacketTs = packet->GetTimestamp();
-					this->maxPacketMs = DepLibUV::GetTimeMs();
+					this->maxPacketMs = this->shared->GetTimeMs();
 
 					// Notify the subclass about it.
 					UserOnSequenceNumberReset();
@@ -329,7 +336,7 @@ namespace RTC
 				// If previous score was 0 (and new one is not 0) then update activeSinceMs.
 				if (previousScore == 0u)
 				{
-					this->activeSinceMs = DepLibUV::GetTimeMs();
+					this->activeSinceMs = this->shared->GetTimeMs();
 				}
 
 				this->listener->OnRtpStreamScore(this, this->score, previousScore);

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

@@ -3,8 +3,8 @@
 
 #include "RTC/RTP/RtpStreamRecv.hpp"
 #include "Logger.hpp"
-#include "Utils.hpp"
 #include "RTC/RTP/Codecs/Tools.hpp"
+#include "Utils.hpp"
 
 namespace RTC
 {
@@ -18,7 +18,7 @@ namespace RTC
 		/* TransmissionCounter methods. */
 
 		RtpStreamRecv::TransmissionCounter::TransmissionCounter(
-		  uint8_t spatialLayers, uint8_t temporalLayers, size_t windowSize)
+		  SharedInterface* shared, uint8_t spatialLayers, uint8_t temporalLayers, size_t windowSize)
 		{
 			MS_TRACE();
 
@@ -29,7 +29,7 @@ namespace RTC
 			{
 				for (uint8_t tIdx{ 0u }; tIdx < temporalLayers; ++tIdx)
 				{
-					spatialLayerCounter.emplace_back(/*ignorePaddingOnlyPackets*/ true, windowSize);
+					spatialLayerCounter.emplace_back(shared, /*ignorePaddingOnlyPackets*/ true, windowSize);
 				}
 			}
 		}
@@ -183,21 +183,22 @@ 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(
-		      params.spatialLayers, params.temporalLayers, this->params.useDtx ? 6000 : 2500),
-		    mediaTransmissionCounter(/*ignorePaddingOnlyPackets*/ true)
+		      shared, params.spatialLayers, params.temporalLayers, this->params.useDtx ? 6000 : 2500),
+		    mediaTransmissionCounter(shared, /*ignorePaddingOnlyPackets*/ true)
 		{
 			MS_TRACE();
 
 			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);
@@ -227,7 +228,7 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			const uint64_t nowMs = DepLibUV::GetTimeMs();
+			const uint64_t nowMs = this->shared->GetTimeMs();
 
 			auto baseStats = RTP::RtpStream::FillBufferStats(builder);
 
@@ -530,7 +531,7 @@ namespace RTC
 			if (this->lastSrReceived != 0)
 			{
 				// Get delay in milliseconds.
-				auto delayMs = static_cast<uint32_t>(DepLibUV::GetTimeMs() - this->lastSrReceived);
+				auto delayMs = static_cast<uint32_t>(this->shared->GetTimeMs() - this->lastSrReceived);
 				// Express delay in units of 1/65536 seconds.
 				uint32_t dlsr = (delayMs / 1000) << 16;
 
@@ -564,7 +565,7 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			this->lastSrReceived  = DepLibUV::GetTimeMs();
+			this->lastSrReceived  = this->shared->GetTimeMs();
 			this->lastSrTimestamp = report->GetNtpSec() << 16;
 			this->lastSrTimestamp += report->GetNtpFrac() >> 16;
 
@@ -598,7 +599,7 @@ namespace RTC
 			/* Calculate RTT. */
 
 			// Get the NTP representation of the current timestamp.
-			const uint64_t nowMs = DepLibUV::GetTimeMs();
+			const uint64_t nowMs = this->shared->GetTimeMs();
 			auto ntp             = Utils::Time::TimeMs2Ntp(nowMs);
 
 			// Get the compact NTP representation of the current timestamp.
@@ -712,7 +713,8 @@ namespace RTC
 			}
 
 			// NOTE: Based on https://github.com/versatica/mediasoup/issues/1018.
-			auto transit = static_cast<int>((DepLibUV::GetTimeMs() * GetClockRate() / 1000) - rtpTimestamp);
+			auto transit =
+			  static_cast<int>((this->shared->GetTimeMs() * GetClockRate() / 1000) - rtpTimestamp);
 			int d = transit - this->transit;
 
 			// First transit calculation, save and return.
@@ -858,7 +860,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

@@ -6,9 +6,9 @@
 #include "DepLibUring.hpp"
 #endif
 #include "Logger.hpp"
-#include "Utils.hpp"
 #include "RTC/Consts.hpp"
 #include "RTC/RtpDictionaries.hpp"
+#include "Utils.hpp"
 #include <vector>
 
 namespace RTC
@@ -21,7 +21,7 @@ namespace RTC
 		static constexpr size_t RetransmissionBufferMaxItems{ 2500u };
 		// 17: 16 bit mask + the initial sequence number.
 		static constexpr size_t MaxRequestedPackets{ 17u };
-		thread_local std::vector<RTP::RetransmissionBuffer::Item*> RetransmissionContainer(
+		static thread_local std::vector<RTP::RetransmissionBuffer::Item*> RetransmissionContainer(
 		  MaxRequestedPackets + 1);
 		static constexpr uint32_t DefaultRtt{ 100u };
 
@@ -33,10 +33,13 @@ 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)
+		    transmissionCounter(shared, /*ignorePaddingOnlyPackets*/ true)
 		{
 			MS_TRACE();
 
@@ -80,7 +83,7 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			const uint64_t nowMs = DepLibUV::GetTimeMs();
+			const uint64_t nowMs = this->shared->GetTimeMs();
 
 			auto baseStats = RTP::RtpStream::FillBufferStats(builder);
 			auto stats     = FBS::RtpStream::CreateSendStats(
@@ -299,7 +302,7 @@ namespace RTC
 			/* Calculate RTT. */
 
 			// Get the NTP representation of the current timestamp.
-			const uint64_t nowMs = DepLibUV::GetTimeMs();
+			const uint64_t nowMs = this->shared->GetTimeMs();
 			auto ntp             = Utils::Time::TimeMs2Ntp(nowMs);
 
 			// Get the compact NTP representation of the current timestamp.
@@ -339,7 +342,7 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			this->lastRrReceivedMs = DepLibUV::GetTimeMs();
+			this->lastRrReceivedMs = this->shared->GetTimeMs();
 			this->lastRrTimestamp  = report->GetNtpSec() << 16;
 			this->lastRrTimestamp += report->GetNtpFrac() >> 16;
 		}
@@ -482,7 +485,7 @@ namespace RTC
 			}
 
 			// Look for each requested packet.
-			const uint64_t nowMs = DepLibUV::GetTimeMs();
+			const uint64_t nowMs = this->shared->GetTimeMs();
 			const uint16_t rtt   = (this->rtt > 0.0f ? this->rtt : DefaultRtt);
 			uint16_t currentSeq  = seq;
 			bool requested{ true };

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

@@ -2,7 +2,6 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "RTC/RTP/RtxStream.hpp"
-#include "DepLibUV.hpp"
 #include "Logger.hpp"
 #include "Utils.hpp"
 
@@ -18,7 +17,8 @@ namespace RTC
 
 		/* Instance methods. */
 
-		RtxStream::RtxStream(RTP::RtxStream::Params& params) : params(params)
+		RtxStream::RtxStream(SharedInterface* shared, RTP::RtxStream::Params& params)
+		  : shared(shared), params(params)
 		{
 			MS_TRACE();
 
@@ -57,7 +57,7 @@ namespace RTC
 				this->started     = true;
 				this->maxSeq      = seq - 1;
 				this->maxPacketTs = packet->GetTimestamp();
-				this->maxPacketMs = DepLibUV::GetTimeMs();
+				this->maxPacketMs = this->shared->GetTimeMs();
 			}
 
 			// If not a valid packet ignore it.
@@ -76,7 +76,7 @@ namespace RTC
 			if (Utils::Number::IsHigherThan<uint32_t>(packet->GetTimestamp(), this->maxPacketTs))
 			{
 				this->maxPacketTs = packet->GetTimestamp();
-				this->maxPacketMs = DepLibUV::GetTimeMs();
+				this->maxPacketMs = this->shared->GetTimeMs();
 			}
 
 			// Increase packet count.
@@ -141,7 +141,7 @@ namespace RTC
 			if (this->lastSrReceived != 0)
 			{
 				// Get delay in milliseconds.
-				const uint32_t delayMs = DepLibUV::GetTimeMs() - this->lastSrReceived;
+				const uint32_t delayMs = this->shared->GetTimeMs() - this->lastSrReceived;
 				// Express delay in units of 1/65536 seconds.
 				uint32_t dlsr = (delayMs / 1000) << 16;
 
@@ -163,7 +163,7 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			this->lastSrReceived  = DepLibUV::GetTimeMs();
+			this->lastSrReceived  = this->shared->GetTimeMs();
 			this->lastSrTimestamp = report->GetNtpSec() << 16;
 			this->lastSrTimestamp += report->GetNtpFrac() >> 16;
 		}
@@ -209,7 +209,7 @@ namespace RTC
 					InitSeq(seq);
 
 					this->maxPacketTs = packet->GetTimestamp();
-					this->maxPacketMs = DepLibUV::GetTimeMs();
+					this->maxPacketMs = this->shared->GetTimeMs();
 				}
 				else
 				{