npm - mediasoup - Versions diffs - 3.19.22 → 3.20.0 - Mend

mediasoup 3.19.22 → 3.20.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (623) hide show

package/worker/fuzzer/src/fuzzer.cpp CHANGED Viewed

@@ -5,11 +5,7 @@
 #include "DepLibUV.hpp"
 #include "DepLibWebRTC.hpp"
 #include "DepOpenSSL.hpp"
-// TODO: Remove once we only use built-in SCTP stack.
-#include "DepUsrSCTP.hpp"
 #include "FuzzerUtils.hpp"
-#include "Settings.hpp"
-#include "Utils.hpp"
 #include "RTC/DtlsTransport.hpp"
 #include "RTC/FuzzerDtlsTransport.hpp"
 #include "RTC/FuzzerRateCalculator.hpp"
@@ -29,6 +25,8 @@
 #include "RTC/RTP/FuzzerRtpStreamSend.hpp"
 #include "RTC/SCTP/FuzzerStateCookie.hpp"
 #include "RTC/SCTP/packet/FuzzerPacket.hpp"
+#include "Settings.hpp"
+#include "Utils.hpp"
 #include <cstdlib> // std::getenv()
 #include <iostream>
 #include <sstream> // std::istringstream()
@@ -146,11 +144,6 @@ namespace
 		DepLibUV::ClassInit();
 		DepOpenSSL::ClassInit();
 		DepLibSRTP::ClassInit();
-		// TODO: Remove once we only use built-in SCTP stack.
-		if (!Settings::configuration.useBuiltInSctpStack)
-		{
-			DepUsrSCTP::ClassInit();
-		}
 		DepLibWebRTC::ClassInit();
 		Utils::Crypto::ClassInit();
 		RTC::DtlsTransport::ClassInit();
@@ -163,7 +156,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t len)
 {
 	// Trick to initialize our stuff just once.
 	// NOLINTNEXTLINE(readability-identifier-naming)
-	thread_local const int unused = init();
+	static thread_local const int unused = init();
 	// Avoid [-Wunused-variable].
 	(void)unused;

package/worker/include/Channel/ChannelRequest.hpp CHANGED Viewed

@@ -21,7 +21,7 @@ namespace Channel
 		using Method = FBS::Request::Method;
 	public:
-		thread_local static flatbuffers::FlatBufferBuilder bufferBuilder;
+		static thread_local flatbuffers::FlatBufferBuilder bufferBuilder;
 		static const absl::flat_hash_map<FBS::Request::Method, const char*> Method2String;
 	public:

package/worker/include/DepLibUV.hpp CHANGED Viewed

@@ -41,7 +41,7 @@ public:
 	}
 private:
-	thread_local static uv_loop_t* loop;
+	static thread_local uv_loop_t* loop;
 };
 #endif

package/worker/include/DepLibUring.hpp CHANGED Viewed

@@ -1,8 +1,8 @@
 #ifndef MS_DEP_LIBURING_HPP
 #define MS_DEP_LIBURING_HPP
-#include "DepLibUV.hpp"
 #include "FBS/liburing.h"
+#include <uv.h>
 #include <functional>
 #include <liburing.h>
 #include <queue>
@@ -52,8 +52,8 @@ public:
 	class LibUring;
 	// Whether liburing is enabled or not after runtime checks.
-	thread_local static bool enabled;
-	thread_local static LibUring* liburing;
+	static thread_local bool enabled;
+	static thread_local LibUring* liburing;
 public:
 	// Singleton.

package/worker/include/Logger.hpp CHANGED Viewed

@@ -96,9 +96,9 @@
 #define MS_LOGGER_HPP
 #include "common.hpp"
+#include "Channel/ChannelSocket.hpp"
 #include "LogLevel.hpp"
 #include "Settings.hpp"
-#include "Channel/ChannelSocket.hpp"
 #include <cstdio>  // std::snprintf(), std::fprintf(), stdout, stderr
 #include <cstdlib> // std::abort()
 #include <cstring>
@@ -156,10 +156,10 @@ public:
 	static void ClassInit(Channel::ChannelSocket* channel);
 public:
-	static const uint64_t pid;
-	thread_local static Channel::ChannelSocket* channel;
+	static const uint64_t Pid;
+	static thread_local Channel::ChannelSocket* channel;
 	static const size_t BufferSize {50000};
-	thread_local static char buffer[];
+	static thread_local char buffer[];
 };
 /* Logging macros. */

package/worker/include/MediaSoupErrors.hpp CHANGED Viewed

@@ -14,7 +14,7 @@ public:
 public:
 	static const size_t BufferSize{ 2000 };
-	thread_local static char buffer[];
+	static thread_local char buffer[];
 };
 class MediaSoupTypeError : public MediaSoupError

package/worker/include/RTC/ActiveSpeakerObserver.hpp CHANGED Viewed

@@ -1,9 +1,9 @@
 #ifndef MS_RTC_ACTIVE_SPEAKER_OBSERVER_HPP
 #define MS_RTC_ACTIVE_SPEAKER_OBSERVER_HPP
-#include "SharedInterface.hpp"
-#include "RTC/RtpObserver.hpp"
 #include "handles/TimerHandleInterface.hpp"
+#include "RTC/RtpObserver.hpp"
+#include "SharedInterface.hpp"
 #include <absl/container/flat_hash_map.h>
 #include <vector>
@@ -20,7 +20,9 @@ namespace RTC
 		class Speaker
 		{
 		public:
-			Speaker();
+			explicit Speaker(SharedInterface* shared);
+		public:
 			void EvalActivityScores();
 			double GetActivityScore(uint8_t interval) const;
 			void LevelChanged(uint32_t level, uint64_t now);
@@ -56,7 +58,7 @@ namespace RTC
 		class ProducerSpeaker
 		{
 		public:
-			explicit ProducerSpeaker(RTC::Producer* producer);
+			ProducerSpeaker(SharedInterface* shared, RTC::Producer* producer);
 			~ProducerSpeaker();
 		public:

package/worker/include/RTC/AudioLevelObserver.hpp CHANGED Viewed

@@ -1,9 +1,9 @@
 #ifndef MS_RTC_AUDIO_LEVEL_OBSERVER_HPP
 #define MS_RTC_AUDIO_LEVEL_OBSERVER_HPP
-#include "SharedInterface.hpp"
-#include "RTC/RtpObserver.hpp"
 #include "handles/TimerHandleInterface.hpp"
+#include "RTC/RtpObserver.hpp"
+#include "SharedInterface.hpp"
 #include <absl/container/flat_hash_map.h>
 namespace RTC

package/worker/include/RTC/Consumer.hpp CHANGED Viewed

@@ -2,7 +2,6 @@
 #define MS_RTC_CONSUMER_HPP
 #include "common.hpp"
-#include "SharedInterface.hpp"
 #include "Channel/ChannelRequest.hpp"
 #include "Channel/ChannelSocket.hpp"
 #include "FBS/consumer.h"
@@ -17,6 +16,7 @@
 #include "RTC/RTP/RtpStreamSend.hpp"
 #include "RTC/RTP/SharedPacket.hpp"
 #include "RTC/RtpDictionaries.hpp"
+#include "SharedInterface.hpp"
 #include <absl/container/flat_hash_set.h>
 #include <string>
 #include <vector>

package/worker/include/RTC/DataConsumer.hpp CHANGED Viewed

@@ -2,10 +2,11 @@
 #define MS_RTC_DATA_CONSUMER_HPP
 #include "common.hpp"
-#include "SharedInterface.hpp"
 #include "Channel/ChannelRequest.hpp"
 #include "Channel/ChannelSocket.hpp"
+#include "RTC/SCTP/public/Message.hpp"
 #include "RTC/SctpDictionaries.hpp"
+#include "SharedInterface.hpp"
 #include <absl/container/flat_hash_set.h>
 #include <string>
@@ -24,13 +25,13 @@ namespace RTC
 		public:
 			virtual void OnDataConsumerSendMessage(
-			  RTC::DataConsumer* dataConsumer,
-			  const uint8_t* msg,
-			  size_t len,
-			  uint32_t ppid,
-			  onQueuedCallback* cb) = 0;
+			  RTC::DataConsumer* dataConsumer, RTC::SCTP::Message message, onQueuedCallback* cb) = 0;
 			virtual void OnDataConsumerNeedBufferedAmount(
-			  RTC::DataConsumer* dataConsumer, uint32_t& bufferedAmount)                   = 0;
+			  const RTC::DataConsumer* dataConsumer, uint32_t& bufferedAmount) const = 0;
+			virtual void OnDataConsumerNeedBufferedAmountLowThreshold(
+			  const RTC::DataConsumer* dataConsumer, uint32_t& bufferedAmountLowThreshold) const = 0;
+			virtual void OnDataConsumerSetBufferedAmountLowThreshold(
+			  const RTC::DataConsumer* dataConsumer, uint32_t bytes) const                 = 0;
 			virtual void OnDataConsumerDataProducerClosed(RTC::DataConsumer* dataConsumer) = 0;
 		};
@@ -92,13 +93,11 @@ namespace RTC
 		void DataProducerResumed();
 		void SctpAssociationConnected();
 		void SctpAssociationClosed();
-		void SetSctpAssociationBufferedAmount(uint32_t bufferedAmount);
-		void SctpAssociationSendBufferFull();
+		void SctpBufferedAmountLow(uint32_t bufferedAmount) const;
+		void SctpSendBufferFull() const;
 		void DataProducerClosed();
 		bool SendMessage(
-		  const uint8_t* msg,
-		  size_t len,
-		  uint32_t ppid,
+		  RTC::SCTP::Message message,
 		  std::vector<uint16_t>& subchannels,
 		  std::optional<uint16_t> requiredSubchannel,
 		  const onQueuedCallback* cb = nullptr);
@@ -130,9 +129,6 @@ namespace RTC
 		bool dataProducerClosed{ false };
 		size_t messagesSent{ 0u };
 		size_t bytesSent{ 0u };
-		uint32_t bufferedAmount{ 0u };
-		uint32_t bufferedAmountLowThreshold{ 0u };
-		bool forceTriggerBufferedAmountLow{ false };
 	};
 } // namespace RTC

package/worker/include/RTC/DataProducer.hpp CHANGED Viewed

@@ -2,10 +2,11 @@
 #define MS_RTC_DATA_PRODUCER_HPP
 #include "common.hpp"
-#include "SharedInterface.hpp"
 #include "Channel/ChannelRequest.hpp"
 #include "Channel/ChannelSocket.hpp"
+#include "RTC/SCTP/public/Message.hpp"
 #include "RTC/SctpDictionaries.hpp"
+#include "SharedInterface.hpp"
 #include <string>
 #include <vector>
@@ -24,9 +25,7 @@ namespace RTC
 			virtual void OnDataProducerReceiveData(RTC::DataProducer* producer, size_t len) = 0;
 			virtual void OnDataProducerMessageReceived(
 			  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)                       = 0;
 			virtual void OnDataProducerPaused(RTC::DataProducer* dataProducer)  = 0;
@@ -67,9 +66,7 @@ namespace RTC
 			return this->paused;
 		}
 		void ReceiveMessage(
-		  const uint8_t* msg,
-		  size_t len,
-		  uint32_t ppid,
+		  RTC::SCTP::Message message,
 		  std::vector<uint16_t>& subchannels,
 		  std::optional<uint16_t> requiredSubchannel);

package/worker/include/RTC/DirectTransport.hpp CHANGED Viewed

@@ -1,8 +1,8 @@
 #ifndef MS_RTC_DIRECT_TRANSPORT_HPP
 #define MS_RTC_DIRECT_TRANSPORT_HPP
-#include "SharedInterface.hpp"
 #include "RTC/Transport.hpp"
+#include "SharedInterface.hpp"
 namespace RTC
 {
@@ -32,11 +32,9 @@ namespace RTC
 		void SendRtcpCompoundPacket(RTC::RTCP::CompoundPacket* packet) override;
 		void SendMessage(
 		  RTC::DataConsumer* dataConsumer,
-		  const uint8_t* msg,
-		  size_t len,
-		  uint32_t ppid,
+		  RTC::SCTP::Message message,
 		  onQueuedCallback* cb = nullptr) override;
-		bool SendSctpData(const uint8_t* data, size_t len) override;
+		bool SendData(const uint8_t* data, size_t len) override;
 		void RecvStreamClosed(uint32_t ssrc) override;
 		void SendStreamClosed(uint32_t ssrc) override;

package/worker/include/RTC/DtlsTransport.hpp CHANGED Viewed

@@ -2,10 +2,10 @@
 #define MS_RTC_DTLS_TRANSPORT_HPP
 #include "common.hpp"
-#include "SharedInterface.hpp"
 #include "FBS/webRtcTransport.h"
-#include "RTC/SrtpSession.hpp"
 #include "handles/TimerHandleInterface.hpp"
+#include "RTC/SrtpSession.hpp"
+#include "SharedInterface.hpp"
 #include <openssl/bio.h>
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
@@ -125,14 +125,14 @@ namespace RTC
 		static void GenerateFingerprints();
 	private:
-		thread_local static X509* certificate;
-		thread_local static EVP_PKEY* privateKey;
-		thread_local static SSL_CTX* sslCtx;
-		thread_local static uint8_t sslReadBuffer[];
+		static thread_local X509* certificate;
+		static thread_local EVP_PKEY* privateKey;
+		static thread_local SSL_CTX* sslCtx;
+		static thread_local uint8_t sslReadBuffer[];
 		static const absl::flat_hash_map<std::string, Role> String2Role;
 		static const absl::flat_hash_map<std::string, FingerprintAlgorithm> String2FingerprintAlgorithm;
 		static const absl::flat_hash_map<FingerprintAlgorithm, std::string> FingerprintAlgorithm2String;
-		thread_local static std::vector<Fingerprint> localFingerprints;
+		static thread_local std::vector<Fingerprint> localFingerprints;
 		static const std::vector<SrtpCryptoSuiteMapEntry> SrtpCryptoSuites;
 	public:

package/worker/include/RTC/ICE/IceServer.hpp CHANGED Viewed

@@ -2,11 +2,11 @@
 #define MS_RTC_ICE_ICE_SERVER_HPP
 #include "common.hpp"
-#include "SharedInterface.hpp"
 #include "FBS/webRtcTransport.h"
+#include "handles/TimerHandleInterface.hpp"
 #include "RTC/ICE/StunPacket.hpp"
 #include "RTC/TransportTuple.hpp"
-#include "handles/TimerHandleInterface.hpp"
+#include "SharedInterface.hpp"
 #include <list>
 #include <string>
 #include <unordered_map>

package/worker/include/RTC/ICE/StunPacket.hpp CHANGED Viewed

@@ -2,8 +2,8 @@
 #define MS_RTC_ICE_STUN_PACKET_HPP
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/Serializable.hpp"
+#include "Utils.hpp"
 #include <string_view>
 #include <unordered_map>

package/worker/include/RTC/KeyFrameRequestManager.hpp CHANGED Viewed

@@ -1,8 +1,8 @@
 #ifndef MS_KEY_FRAME_REQUEST_MANAGER_HPP
 #define MS_KEY_FRAME_REQUEST_MANAGER_HPP
-#include "SharedInterface.hpp"
 #include "handles/TimerHandleInterface.hpp"
+#include "SharedInterface.hpp"
 #include <absl/container/flat_hash_map.h>
 namespace RTC

package/worker/include/RTC/NackGenerator.hpp CHANGED Viewed

@@ -2,10 +2,10 @@
 #define MS_RTC_NACK_GENERATOR_HPP
 #include "common.hpp"
-#include "SharedInterface.hpp"
+#include "handles/TimerHandleInterface.hpp"
 #include "RTC/RTP/Packet.hpp"
 #include "RTC/SeqManager.hpp"
-#include "handles/TimerHandleInterface.hpp"
+#include "SharedInterface.hpp"
 #include <map>
 #include <set>
 #include <vector>
@@ -75,6 +75,7 @@ namespace RTC
 	private:
 		// Passed by argument.
 		Listener* listener{ nullptr };
+		SharedInterface* shared{ nullptr };
 		unsigned int sendNackDelayMs{ 0u };
 		// Allocated by this.
 		TimerHandleInterface* timer{ nullptr };

package/worker/include/RTC/PipeTransport.hpp CHANGED Viewed

@@ -1,12 +1,12 @@
 #ifndef MS_RTC_PIPE_TRANSPORT_HPP
 #define MS_RTC_PIPE_TRANSPORT_HPP
-#include "SharedInterface.hpp"
 #include "FBS/pipeTransport.h"
 #include "RTC/SrtpSession.hpp"
 #include "RTC/Transport.hpp"
 #include "RTC/TransportTuple.hpp"
 #include "RTC/UdpSocket.hpp"
+#include "SharedInterface.hpp"
 namespace RTC
 {
@@ -50,11 +50,9 @@ namespace RTC
 		void SendRtcpCompoundPacket(RTC::RTCP::CompoundPacket* packet) override;
 		void SendMessage(
 		  RTC::DataConsumer* dataConsumer,
-		  const uint8_t* msg,
-		  size_t len,
-		  uint32_t ppid,
+		  RTC::SCTP::Message message,
 		  onQueuedCallback* cb = nullptr) override;
-		bool SendSctpData(const uint8_t* data, size_t len) override;
+		bool SendData(const uint8_t* data, size_t len) override;
 		void RecvStreamClosed(uint32_t ssrc) override;
 		void SendStreamClosed(uint32_t ssrc) override;
 		void OnPacketReceived(RTC::TransportTuple* tuple, const uint8_t* data, size_t len, size_t bufferLen);

package/worker/include/RTC/PlainTransport.hpp CHANGED Viewed

@@ -1,12 +1,12 @@
 #ifndef MS_RTC_PLAIN_TRANSPORT_HPP
 #define MS_RTC_PLAIN_TRANSPORT_HPP
-#include "SharedInterface.hpp"
 #include "FBS/plainTransport.h"
 #include "RTC/SrtpSession.hpp"
 #include "RTC/Transport.hpp"
 #include "RTC/TransportTuple.hpp"
 #include "RTC/UdpSocket.hpp"
+#include "SharedInterface.hpp"
 #include <absl/container/flat_hash_map.h>
 namespace RTC
@@ -44,11 +44,9 @@ namespace RTC
 		void SendRtcpCompoundPacket(RTC::RTCP::CompoundPacket* packet) override;
 		void SendMessage(
 		  RTC::DataConsumer* dataConsumer,
-		  const uint8_t* msg,
-		  size_t len,
-		  uint32_t ppid,
+		  RTC::SCTP::Message message,
 		  onQueuedCallback* cb = nullptr) override;
-		bool SendSctpData(const uint8_t* data, size_t len) override;
+		bool SendData(const uint8_t* data, size_t len) override;
 		void RecvStreamClosed(uint32_t ssrc) override;
 		void SendStreamClosed(uint32_t ssrc) override;
 		void OnPacketReceived(RTC::TransportTuple* tuple, const uint8_t* data, size_t len, size_t bufferLen);

package/worker/include/RTC/PortManager.hpp CHANGED Viewed

@@ -78,7 +78,7 @@ namespace RTC
 		static uint8_t ConvertSocketFlags(RTC::Transport::SocketFlags& flags, Protocol protocol, int family);
 	private:
-		thread_local static absl::flat_hash_map<uint64_t, PortRange> mapPortRanges;
+		static thread_local absl::flat_hash_map<uint64_t, PortRange> mapPortRanges;
 	};
 } // namespace RTC

package/worker/include/RTC/Producer.hpp CHANGED Viewed

@@ -2,7 +2,6 @@
 #define MS_RTC_PRODUCER_HPP
 #include "common.hpp"
-#include "SharedInterface.hpp"
 #include "Channel/ChannelRequest.hpp"
 #include "Channel/ChannelSocket.hpp"
 #include "RTC/KeyFrameRequestManager.hpp"
@@ -14,6 +13,7 @@
 #include "RTC/RTP/Packet.hpp"
 #include "RTC/RTP/RtpStreamRecv.hpp"
 #include "RTC/RtpDictionaries.hpp"
+#include "SharedInterface.hpp"
 #include <string>
 #include <vector>

package/worker/include/RTC/RTCP/FeedbackPs.hpp CHANGED Viewed

@@ -3,7 +3,7 @@
 #include "common.hpp"
 #include "RTC/RTCP/Feedback.hpp"
-#include "RTC/RTCP/FeedbackItem.hpp" // IWYU pragma: keep
+#include "RTC/RTCP/FeedbackItem.hpp"
 #include <vector>
 namespace RTC

package/worker/include/RTC/RTCP/FeedbackRtp.hpp CHANGED Viewed

@@ -3,7 +3,7 @@
 #include "common.hpp"
 #include "RTC/RTCP/Feedback.hpp"
-#include "RTC/RTCP/FeedbackItem.hpp" // IWYU pragma: keep
+#include "RTC/RTCP/FeedbackItem.hpp"
 #include <vector>
 namespace RTC

package/worker/include/RTC/RTCP/FeedbackRtpNack.hpp CHANGED Viewed

@@ -2,8 +2,8 @@
 #define MS_RTC_RTCP_FEEDBACK_RTP_NACK_HPP
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/RTCP/FeedbackRtp.hpp"
+#include "Utils.hpp"
 /* RFC 4585
  * Generic NACK message (NACK)

package/worker/include/RTC/RTCP/ReceiverReport.hpp CHANGED Viewed

@@ -2,8 +2,8 @@
 #define MS_RTC_RTCP_RECEIVER_REPORT_HPP
 #include "common.hpp"
-#include "Utils.hpp"
 #include "RTC/RTCP/Packet.hpp"
+#include "Utils.hpp"
 #include <vector>
 namespace RTC

package/worker/include/RTC/RTP/Packet.hpp CHANGED Viewed

@@ -2,13 +2,13 @@
 #define MS_RTC_RTP_PACKET_HPP
 #include "common.hpp"
-#include "Utils.hpp"
 #include "FBS/rtpPacket.h"
 #include "RTC/RTP/Codecs/DependencyDescriptor.hpp"
 #include "RTC/RTP/Codecs/PayloadDescriptorHandler.hpp"
 #include "RTC/RTP/HeaderExtensionIds.hpp"
 #include "RTC/RtpDictionaries.hpp"
 #include "RTC/Serializable.hpp"
+#include "Utils.hpp"
 #ifdef MS_RTC_LOGGER_RTP
 #include "RTC/RtcLogger.hpp"
 #endif
@@ -229,7 +229,7 @@ namespace RTC
 			static uint32_t GetNextMediasoupPacketId();
 		private:
-			thread_local static uint32_t nextMediasoupPacketId;
+			static thread_local uint32_t nextMediasoupPacketId;
 		private:
 			/**

package/worker/include/RTC/RTP/RtpStream.hpp CHANGED Viewed

@@ -2,21 +2,20 @@
 #define MS_RTC_RTP_RTP_STREAM_HPP
 #include "common.hpp"
-#include "DepLibUV.hpp"
-#include "SharedInterface.hpp"
 #include "FBS/rtpStream.h"
-#include "RTC/RTCP/FeedbackPsFir.hpp"           // IWYU pragma: export
-#include "RTC/RTCP/FeedbackPsPli.hpp"           // IWYU pragma: export
-#include "RTC/RTCP/FeedbackRtpNack.hpp"         // IWYU pragma: export
-#include "RTC/RTCP/Packet.hpp"                  // IWYU pragma: export
-#include "RTC/RTCP/ReceiverReport.hpp"          // IWYU pragma: export
-#include "RTC/RTCP/Sdes.hpp"                    // IWYU pragma: export
-#include "RTC/RTCP/SenderReport.hpp"            // IWYU pragma: export
-#include "RTC/RTCP/XrDelaySinceLastRr.hpp"      // IWYU pragma: export
-#include "RTC/RTCP/XrReceiverReferenceTime.hpp" // IWYU pragma: export
+#include "RTC/RTCP/FeedbackPsFir.hpp"
+#include "RTC/RTCP/FeedbackPsPli.hpp"
+#include "RTC/RTCP/FeedbackRtpNack.hpp"
+#include "RTC/RTCP/Packet.hpp"
+#include "RTC/RTCP/ReceiverReport.hpp"
+#include "RTC/RTCP/Sdes.hpp"
+#include "RTC/RTCP/SenderReport.hpp"
+#include "RTC/RTCP/XrDelaySinceLastRr.hpp"
+#include "RTC/RTCP/XrReceiverReferenceTime.hpp"
 #include "RTC/RTP/Packet.hpp"
 #include "RTC/RTP/RtxStream.hpp"
 #include "RTC/RtpDictionaries.hpp"
+#include "SharedInterface.hpp"
 #include <string>
 #include <vector>
@@ -167,7 +166,7 @@ namespace RTC
 			}
 			uint64_t GetActiveMs() const
 			{
-				return DepLibUV::GetTimeMs() - this->activeSinceMs;
+				return this->shared->GetTimeMs() - this->activeSinceMs;
 			}
 		protected:

package/worker/include/RTC/RTP/RtpStreamRecv.hpp CHANGED Viewed

@@ -1,11 +1,11 @@
 #ifndef MS_RTC_RTP_RTP_STREAM_RECV_HPP
 #define MS_RTC_RTP_RTP_STREAM_RECV_HPP
+#include "handles/TimerHandleInterface.hpp"
 #include "RTC/NackGenerator.hpp"
 #include "RTC/RTCP/XrDelaySinceLastRr.hpp"
 #include "RTC/RTP/RtpStream.hpp"
 #include "RTC/RateCalculator.hpp"
-#include "handles/TimerHandleInterface.hpp"
 #include <vector>
 namespace RTC
@@ -30,7 +30,8 @@ namespace RTC
 			class TransmissionCounter
 			{
 			public:
-				TransmissionCounter(uint8_t spatialLayers, uint8_t temporalLayers, size_t windowSize);
+				TransmissionCounter(
+				  SharedInterface* shared, uint8_t spatialLayers, uint8_t temporalLayers, size_t windowSize);
 				void Update(const RTP::Packet* packet);
 				uint32_t GetBitrate(uint64_t nowMs);
 				uint32_t GetBitrate(uint64_t nowMs, uint8_t spatialLayer, uint8_t temporalLayer);

package/worker/include/RTC/RTP/RtxStream.hpp CHANGED Viewed

@@ -7,6 +7,7 @@
 #include "RTC/RTCP/SenderReport.hpp"
 #include "RTC/RTP/Packet.hpp"
 #include "RTC/RtpDictionaries.hpp"
+#include "SharedInterface.hpp"
 #include <string>
 namespace RTC
@@ -30,7 +31,7 @@ namespace RTC
 			};
 		public:
-			explicit RtxStream(RTP::RtxStream::Params& params);
+			explicit RtxStream(SharedInterface* shared, RTP::RtxStream::Params& params);
 			virtual ~RtxStream();
 			flatbuffers::Offset<FBS::RtxStream::RtxDump> FillBuffer(
@@ -87,6 +88,7 @@ namespace RTC
 		protected:
 			// Given as argument.
+			SharedInterface* shared{ nullptr };
 			Params params;
 			// Others.
 			//   https://tools.ietf.org/html/rfc3550#appendix-A.1 stuff.

package/worker/include/RTC/RTP/SharedPacket.hpp CHANGED Viewed

@@ -12,7 +12,7 @@ namespace RTC
 		{
 		public:
 #ifdef MS_DUMP_RTP_SHARED_PACKET_MEMORY_USAGE
-			thread_local static uint64_t allocatedMemory;
+			static thread_local uint64_t allocatedMemory;
 #endif
 		public: