mediasoup 3.19.21 → 3.20.0

package/worker/include/RTC/DataConsumer.hpp

@@ -4,8 +4,9 @@
 #include "common.hpp"
 #include "Channel/ChannelRequest.hpp"
 #include "Channel/ChannelSocket.hpp"
+#include "RTC/SCTP/public/Message.hpp"
 #include "RTC/SctpDictionaries.hpp"
-#include "RTC/Shared.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;
 		};
 
@@ -43,7 +44,7 @@ namespace RTC
 
 	public:
 		DataConsumer(
-		  RTC::Shared* shared,
+		  SharedInterface* shared,
 		  const std::string& id,
 		  const std::string& dataProducerId,
 		  RTC::DataConsumer::Listener* listener,
@@ -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);
@@ -114,7 +113,7 @@ namespace RTC
 
 	private:
 		// Passed by argument.
-		RTC::Shared* shared{ nullptr };
+		SharedInterface* shared{ nullptr };
 		RTC::DataConsumer::Listener* listener{ nullptr };
 		size_t maxMessageSize{ 0u };
 		// Others.
@@ -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

@@ -4,8 +4,9 @@
 #include "common.hpp"
 #include "Channel/ChannelRequest.hpp"
 #include "Channel/ChannelSocket.hpp"
+#include "RTC/SCTP/public/Message.hpp"
 #include "RTC/SctpDictionaries.hpp"
-#include "RTC/Shared.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;
@@ -42,7 +41,7 @@ namespace RTC
 
 	public:
 		DataProducer(
-		  RTC::Shared* shared,
+		  SharedInterface* shared,
 		  const std::string& id,
 		  size_t maxMessageSize,
 		  RTC::DataProducer::Listener* listener,
@@ -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);
 
@@ -87,7 +84,7 @@ namespace RTC
 
 	private:
 		// Passed by argument.
-		RTC::Shared* shared{ nullptr };
+		SharedInterface* shared{ nullptr };
 		size_t maxMessageSize{ 0u };
 		RTC::DataProducer::Listener* listener{ nullptr };
 		// Others.

package/worker/include/RTC/DirectTransport.hpp

@@ -1,8 +1,8 @@
 #ifndef MS_RTC_DIRECT_TRANSPORT_HPP
 #define MS_RTC_DIRECT_TRANSPORT_HPP
 
-#include "RTC/Shared.hpp"
 #include "RTC/Transport.hpp"
+#include "SharedInterface.hpp"
 
 namespace RTC
 {
@@ -10,7 +10,7 @@ namespace RTC
 	{
 	public:
 		DirectTransport(
-		  RTC::Shared* shared,
+		  SharedInterface* shared,
 		  const std::string& id,
 		  RTC::Transport::Listener* listener,
 		  const FBS::DirectTransport::DirectTransportOptions* options);
@@ -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

@@ -3,8 +3,9 @@
 
 #include "common.hpp"
 #include "FBS/webRtcTransport.h"
+#include "handles/TimerHandleInterface.hpp"
 #include "RTC/SrtpSession.hpp"
-#include "handles/TimerHandle.hpp"
+#include "SharedInterface.hpp"
 #include <openssl/bio.h>
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
@@ -14,7 +15,7 @@
 
 namespace RTC
 {
-	class DtlsTransport : public TimerHandle::Listener
+	class DtlsTransport : public TimerHandleInterface::Listener
 	{
 	public:
 		enum class DtlsState : uint8_t
@@ -124,18 +125,18 @@ 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:
-		explicit DtlsTransport(Listener* listener);
+		explicit DtlsTransport(Listener* listener, SharedInterface* shared);
 		~DtlsTransport() override;
 
 	public:
@@ -195,18 +196,19 @@ namespace RTC
 	public:
 		void OnSslInfo(int where, int ret);
 
-		/* Pure virtual methods inherited from TimerHandle::Listener. */
+		/* Pure virtual methods inherited from TimerHandleInterface::Listener. */
 	public:
-		void OnTimer(TimerHandle* timer) override;
+		void OnTimer(TimerHandleInterface* timer) override;
 
 	private:
 		// Passed by argument.
 		Listener* listener{ nullptr };
+		SharedInterface* shared{ nullptr };
 		// Allocated by this.
 		SSL* ssl{ nullptr };
 		BIO* sslBioFromNetwork{ nullptr }; // The BIO from which ssl reads.
 		BIO* sslBioToNetwork{ nullptr };   // The BIO in which ssl writes.
-		TimerHandle* timer{ nullptr };
+		TimerHandleInterface* timer{ nullptr };
 		// Others.
 		DtlsState state{ DtlsState::NEW };
 		std::optional<Role> localRole;

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

@@ -3,9 +3,10 @@
 
 #include "common.hpp"
 #include "FBS/webRtcTransport.h"
+#include "handles/TimerHandleInterface.hpp"
 #include "RTC/ICE/StunPacket.hpp"
 #include "RTC/TransportTuple.hpp"
-#include "handles/TimerHandle.hpp"
+#include "SharedInterface.hpp"
 #include <list>
 #include <string>
 #include <unordered_map>
@@ -14,7 +15,7 @@ namespace RTC
 {
 	namespace ICE
 	{
-		class IceServer : public TimerHandle::Listener
+		class IceServer : public TimerHandleInterface::Listener
 		{
 		public:
 			enum class IceState : uint8_t
@@ -65,6 +66,7 @@ namespace RTC
 		public:
 			IceServer(
 			  Listener* listener,
+			  SharedInterface* shared,
 			  const std::string& usernameFragment,
 			  const std::string& password,
 			  uint8_t consentTimeoutSec);
@@ -129,13 +131,14 @@ namespace RTC
 			void RestartConsentCheck();
 			void StopConsentCheck();
 
-			/* Pure virtual methods inherited from TimerHandle::Listener. */
+			/* Pure virtual methods inherited from TimerHandleInterface::Listener. */
 		public:
-			void OnTimer(TimerHandle* timer) override;
+			void OnTimer(TimerHandleInterface* timer) override;
 
 		private:
 			// Passed by argument.
 			Listener* listener{ nullptr };
+			SharedInterface* shared{ nullptr };
 			std::string usernameFragment;
 			std::string password;
 			uint16_t consentTimeoutMs{ 30000u };
@@ -146,7 +149,7 @@ namespace RTC
 			uint32_t remoteNomination{ 0u };
 			std::list<RTC::TransportTuple> tuples;
 			RTC::TransportTuple* selectedTuple{ nullptr };
-			TimerHandle* consentCheckTimer{ nullptr };
+			TimerHandleInterface* consentCheckTimer{ nullptr };
 			bool isRemovingTuples{ false };
 		};
 	} // namespace ICE

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

@@ -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

@@ -1,12 +1,13 @@
 #ifndef MS_KEY_FRAME_REQUEST_MANAGER_HPP
 #define MS_KEY_FRAME_REQUEST_MANAGER_HPP
 
-#include "handles/TimerHandle.hpp"
+#include "handles/TimerHandleInterface.hpp"
+#include "SharedInterface.hpp"
 #include <absl/container/flat_hash_map.h>
 
 namespace RTC
 {
-	class PendingKeyFrameInfo : public TimerHandle::Listener
+	class PendingKeyFrameInfo : public TimerHandleInterface::Listener
 	{
 	public:
 		class Listener
@@ -19,7 +20,7 @@ namespace RTC
 		};
 
 	public:
-		PendingKeyFrameInfo(Listener* listener, uint32_t ssrc);
+		PendingKeyFrameInfo(Listener* listener, SharedInterface* shared, uint32_t ssrc);
 		~PendingKeyFrameInfo() override;
 
 		uint32_t GetSsrc() const
@@ -39,18 +40,18 @@ namespace RTC
 			this->timer->Restart();
 		}
 
-		/* Pure virtual methods inherited from TimerHandle::Listener. */
+		/* Pure virtual methods inherited from TimerHandleInterface::Listener. */
 	public:
-		void OnTimer(TimerHandle* timer) override;
+		void OnTimer(TimerHandleInterface* timer) override;
 
 	private:
 		Listener* listener{ nullptr };
 		uint32_t ssrc;
-		TimerHandle* timer{ nullptr };
+		TimerHandleInterface* timer{ nullptr };
 		bool retryOnTimeout{ true };
 	};
 
-	class KeyFrameRequestDelayer : public TimerHandle::Listener
+	class KeyFrameRequestDelayer : public TimerHandleInterface::Listener
 	{
 	public:
 		class Listener
@@ -63,7 +64,7 @@ namespace RTC
 		};
 
 	public:
-		KeyFrameRequestDelayer(Listener* listener, uint32_t ssrc, uint32_t delay);
+		KeyFrameRequestDelayer(Listener* listener, SharedInterface* shared, uint32_t ssrc, uint32_t delay);
 		~KeyFrameRequestDelayer() override;
 
 		uint32_t GetSsrc() const
@@ -79,14 +80,14 @@ namespace RTC
 			this->keyFrameRequested = flag;
 		}
 
-		/* Pure virtual methods inherited from TimerHandle::Listener. */
+		/* Pure virtual methods inherited from TimerHandleInterface::Listener. */
 	public:
-		void OnTimer(TimerHandle* timer) override;
+		void OnTimer(TimerHandleInterface* timer) override;
 
 	private:
 		Listener* listener{ nullptr };
 		uint32_t ssrc;
-		TimerHandle* timer{ nullptr };
+		TimerHandleInterface* timer{ nullptr };
 		bool keyFrameRequested{ false };
 	};
 
@@ -104,7 +105,8 @@ namespace RTC
 		};
 
 	public:
-		explicit KeyFrameRequestManager(Listener* listener, uint32_t keyFrameRequestDelay);
+		explicit KeyFrameRequestManager(
+		  Listener* listener, SharedInterface* shared, uint32_t keyFrameRequestDelay);
 		~KeyFrameRequestManager() override;
 
 		void KeyFrameNeeded(uint32_t ssrc);
@@ -121,6 +123,7 @@ namespace RTC
 
 	private:
 		Listener* listener{ nullptr };
+		SharedInterface* shared{ nullptr };
 		uint32_t keyFrameRequestDelay{ 0u }; // 0 means disabled.
 		absl::flat_hash_map<uint32_t, PendingKeyFrameInfo*> mapSsrcPendingKeyFrameInfo;
 		absl::flat_hash_map<uint32_t, KeyFrameRequestDelayer*> mapSsrcKeyFrameRequestDelayer;

package/worker/include/RTC/NackGenerator.hpp

@@ -2,16 +2,17 @@
 #define MS_RTC_NACK_GENERATOR_HPP
 
 #include "common.hpp"
+#include "handles/TimerHandleInterface.hpp"
 #include "RTC/RTP/Packet.hpp"
 #include "RTC/SeqManager.hpp"
-#include "handles/TimerHandle.hpp"
+#include "SharedInterface.hpp"
 #include <map>
 #include <set>
 #include <vector>
 
 namespace RTC
 {
-	class NackGenerator : public TimerHandle::Listener
+	class NackGenerator : public TimerHandleInterface::Listener
 	{
 	public:
 		class Listener
@@ -47,7 +48,7 @@ namespace RTC
 		};
 
 	public:
-		explicit NackGenerator(Listener* listener, unsigned int sendNackDelayMs);
+		explicit NackGenerator(Listener* listener, SharedInterface* shared, unsigned int sendNackDelayMs);
 		~NackGenerator() override;
 
 		bool ReceivePacket(const RTC::RTP::Packet* packet, bool isRecovered);
@@ -67,16 +68,17 @@ namespace RTC
 		std::vector<uint16_t> GetNackBatch(NackFilter filter);
 		void MayRunTimer() const;
 
-		/* Pure virtual methods inherited from TimerHandle::Listener. */
+		/* Pure virtual methods inherited from TimerHandleInterface::Listener. */
 	public:
-		void OnTimer(TimerHandle* timer) override;
+		void OnTimer(TimerHandleInterface* timer) override;
 
 	private:
 		// Passed by argument.
 		Listener* listener{ nullptr };
+		SharedInterface* shared{ nullptr };
 		unsigned int sendNackDelayMs{ 0u };
 		// Allocated by this.
-		TimerHandle* timer{ nullptr };
+		TimerHandleInterface* timer{ nullptr };
 		// Others.
 		std::map<uint16_t, NackInfo, RTC::SeqManager<uint16_t>::SeqLowerThan> nackList;
 		std::set<uint16_t, RTC::SeqManager<uint16_t>::SeqLowerThan> keyFrameList;

package/worker/include/RTC/PipeConsumer.hpp

@@ -3,7 +3,6 @@
 
 #include "RTC/Consumer.hpp"
 #include "RTC/SeqManager.hpp"
-#include "RTC/Shared.hpp"
 #include <map>
 
 namespace RTC
@@ -19,7 +18,7 @@ namespace RTC
 
 	public:
 		PipeConsumer(
-		  RTC::Shared* shared,
+		  SharedInterface* shared,
 		  const std::string& id,
 		  const std::string& producerId,
 		  RTC::Consumer::Listener* listener,

package/worker/include/RTC/PipeTransport.hpp

@@ -2,11 +2,11 @@
 #define MS_RTC_PIPE_TRANSPORT_HPP
 
 #include "FBS/pipeTransport.h"
-#include "RTC/Shared.hpp"
 #include "RTC/SrtpSession.hpp"
 #include "RTC/Transport.hpp"
 #include "RTC/TransportTuple.hpp"
 #include "RTC/UdpSocket.hpp"
+#include "SharedInterface.hpp"
 
 namespace RTC
 {
@@ -19,7 +19,7 @@ namespace RTC
 
 	public:
 		PipeTransport(
-		  RTC::Shared* shared,
+		  SharedInterface* shared,
 		  const std::string& id,
 		  RTC::Transport::Listener* listener,
 		  const FBS::PipeTransport::PipeTransportOptions* options);
@@ -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

@@ -2,11 +2,11 @@
 #define MS_RTC_PLAIN_TRANSPORT_HPP
 
 #include "FBS/plainTransport.h"
-#include "RTC/Shared.hpp"
 #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
@@ -15,7 +15,7 @@ namespace RTC
 	{
 	public:
 		PlainTransport(
-		  RTC::Shared* shared,
+		  SharedInterface* shared,
 		  const std::string& id,
 		  RTC::Transport::Listener* listener,
 		  const FBS::PlainTransport::PlainTransportOptions* options);
@@ -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

@@ -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

@@ -13,7 +13,7 @@
 #include "RTC/RTP/Packet.hpp"
 #include "RTC/RTP/RtpStreamRecv.hpp"
 #include "RTC/RtpDictionaries.hpp"
-#include "RTC/Shared.hpp"
+#include "SharedInterface.hpp"
 #include <string>
 #include <vector>
 
@@ -94,7 +94,7 @@ namespace RTC
 
 	public:
 		Producer(
-		  RTC::Shared* shared,
+		  SharedInterface* shared,
 		  const std::string& id,
 		  RTC::Producer::Listener* listener,
 		  const FBS::Transport::ProduceRequest* data);
@@ -179,7 +179,7 @@ namespace RTC
 
 	private:
 		// Passed by argument.
-		RTC::Shared* shared{ nullptr };
+		SharedInterface* shared{ nullptr };
 		RTC::Producer::Listener* listener{ nullptr };
 		// Allocated by this.
 		absl::flat_hash_map<uint32_t, RTC::RTP::RtpStreamRecv*> mapSsrcRtpStream;

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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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:
 			/**