mediasoup 3.19.19 → 3.19.21

package/worker/include/Utils.hpp

@@ -4,6 +4,7 @@
 #include "common.hpp"
 #include "RTC/Consts.hpp"
 #include <openssl/evp.h>
+#include <cassert>
 #include <cmath>
 #include <cstring> // std::memcmp(), std::memcpy()
 #include <limits>  // std::numeric_limits
@@ -283,15 +284,12 @@ namespace Utils
 		static uint8_t* Base64Decode(const std::string& str, size_t& outLen);
 	};
 
-	// T is the base type (uint16_t, uint32_t, ...).
-	// N is the max number of bits used in T.
-	template<typename T, uint8_t N = 0>
 	class Number
 	{
-	private:
-		static constexpr T MaxValue = (N == 0) ? std::numeric_limits<T>::max() : ((1 << N) - 1);
-
 	public:
+		// T is the base type (uint16_t, uint32_t, ...).
+		// N is the max number of bits used in T.
+		template<typename T, uint8_t N = 0>
 		static bool IsEqualThan(T lhs, T rhs)
 		{
 			static_assert(
@@ -299,12 +297,17 @@ namespace Utils
 			    std::is_same_v<T, uint64_t>,
 			  "T must be uint8_t, uint16_t, uint32_t or uint64_t");
 
+			constexpr T MaxValue = (N == 0) ? std::numeric_limits<T>::max() : ((1 << N) - 1);
+
 			lhs &= MaxValue;
 			rhs &= MaxValue;
 
 			return (lhs == rhs);
 		}
 
+		// T is the base type (uint16_t, uint32_t, ...).
+		// N is the max number of bits used in T.
+		template<typename T, uint8_t N = 0>
 		static bool IsHigherThan(T lhs, T rhs)
 		{
 			static_assert(
@@ -312,6 +315,8 @@ namespace Utils
 			    std::is_same_v<T, uint64_t>,
 			  "T must be uint8_t, uint16_t, uint32_t or uint64_t");
 
+			constexpr T MaxValue = (N == 0) ? std::numeric_limits<T>::max() : ((1 << N) - 1);
+
 			lhs &= MaxValue;
 			rhs &= MaxValue;
 
@@ -319,6 +324,9 @@ namespace Utils
 			       ((rhs > lhs) && (rhs - lhs > MaxValue / 2));
 		}
 
+		// T is the base type (uint16_t, uint32_t, ...).
+		// N is the max number of bits used in T.
+		template<typename T, uint8_t N = 0>
 		static bool IsLowerThan(T lhs, T rhs)
 		{
 			static_assert(
@@ -326,6 +334,8 @@ namespace Utils
 			    std::is_same_v<T, uint64_t>,
 			  "T must be uint8_t, uint16_t, uint32_t or uint64_t");
 
+			constexpr T MaxValue = (N == 0) ? std::numeric_limits<T>::max() : ((1 << N) - 1);
+
 			lhs &= MaxValue;
 			rhs &= MaxValue;
 
@@ -333,6 +343,9 @@ namespace Utils
 			       ((lhs > rhs) && (lhs - rhs > MaxValue / 2));
 		}
 
+		// T is the base type (uint16_t, uint32_t, ...).
+		// N is the max number of bits used in T.
+		template<typename T, uint8_t N = 0>
 		static bool IsHigherOrEqualThan(T lhs, T rhs)
 		{
 			static_assert(
@@ -340,6 +353,8 @@ namespace Utils
 			    std::is_same_v<T, uint64_t>,
 			  "T must be uint8_t, uint16_t, uint32_t or uint64_t");
 
+			constexpr T MaxValue = (N == 0) ? std::numeric_limits<T>::max() : ((1 << N) - 1);
+
 			lhs &= MaxValue;
 			rhs &= MaxValue;
 
@@ -347,6 +362,9 @@ namespace Utils
 			       ((rhs > lhs) && (rhs - lhs > MaxValue / 2));
 		}
 
+		// T is the base type (uint16_t, uint32_t, ...).
+		// N is the max number of bits used in T.
+		template<typename T, uint8_t N = 0>
 		static bool IsLowerOrEqualThan(T lhs, T rhs)
 		{
 			static_assert(
@@ -354,12 +372,118 @@ namespace Utils
 			    std::is_same_v<T, uint64_t>,
 			  "T must be uint8_t, uint16_t, uint32_t or uint64_t");
 
+			constexpr T MaxValue = (N == 0) ? std::numeric_limits<T>::max() : ((1 << N) - 1);
+
 			lhs &= MaxValue;
 			rhs &= MaxValue;
 
 			return (lhs == rhs) || ((rhs > lhs) && (rhs - lhs <= MaxValue / 2)) ||
 			       ((lhs > rhs) && (lhs - rhs > MaxValue / 2));
 		}
+
+		/**
+		 * Calculates the forward difference between two wrapping numbers.
+		 *
+		 * Example:
+		 * ```c++
+		 * uint8_t x = 253;
+		 * uint8_t y = 2;
+		 *
+		 * ForwardDiff(x, y) == 5
+		 * ```
+		 *
+		 *   252   253   254   255    0     1     2     3
+		 * #################################################
+		 * |     |  x  |     |     |     |     |  y  |     |
+		 * #################################################
+		 *          |----->----->----->----->----->
+		 *
+		 * ForwardDiff(y, x) == 251
+		 *
+		 *   252   253   254   255    0     1     2     3
+		 * #################################################
+		 * |     |  x  |     |     |     |     |  y  |     |
+		 * #################################################
+		 * -->----->                              |----->---
+		 *
+		 * If M > 0 then wrapping occurs at M, if M == 0 then wrapping occurs at the
+		 * largest value representable by T.
+		 */
+		template<typename T, T M>
+		static T ForwardDiff(T a, T b) requires(M > 0)
+		{
+			static_assert(std::is_unsigned<T>::value, "type must be an unsigned integer");
+
+			assert(a < M);
+			assert(b < M);
+
+			return a <= b ? b - a : M - (a - b);
+		}
+
+		template<typename T, T M>
+		static T ForwardDiff(T a, T b) requires(M == 0)
+		{
+			static_assert(std::is_unsigned<T>::value, "type must be an unsigned integer");
+
+			return b - a;
+		}
+
+		template<typename T>
+		static T ForwardDiff(T a, T b)
+		{
+			return ForwardDiff<T, 0>(a, b);
+		}
+
+		/**
+		 * Calculates the reverse difference between two wrapping numbers.
+		 *
+		 * Example:
+		 * ```c++
+		 * uint8_t x = 253;
+		 * uint8_t y = 2;
+		 *
+		 * ReverseDiff(y, x) == 5
+		 *
+		 *   252   253   254   255    0     1     2     3
+		 * #################################################
+		 * |     |  x  |     |     |     |     |  y  |     |
+		 * #################################################
+		 *          <-----<-----<-----<-----<-----|
+		 *
+		 * ReverseDiff(x, y) == 251
+		 *
+		 *   252   253   254   255    0     1     2     3
+		 * #################################################
+		 * |     |  x  |     |     |     |     |  y  |     |
+		 * #################################################
+		 * ---<-----|                             |<-----<--
+		 *
+		 * If M > 0 then wrapping occurs at M, if M == 0 then wrapping occurs at the
+		 * largest value representable by T.
+		 */
+		template<typename T, T M>
+		static T ReverseDiff(T a, T b) requires(M > 0)
+		{
+			static_assert(std::is_unsigned<T>::value, "type must be an unsigned integer");
+
+			assert(a < M);
+			assert(b < M);
+
+			return b <= a ? a - b : M - (b - a);
+		}
+
+		template<typename T, T M>
+		static T ReverseDiff(T a, T b) requires(M == 0)
+		{
+			static_assert(std::is_unsigned<T>::value, "type must be an unsigned integer");
+			return a - b;
+		}
+
+		template<typename T>
+		static T ReverseDiff(T a, T b)
+		{
+			return ReverseDiff<T, 0>(a, b);
+		}
 	};
 
 	class Time

package/worker/meson.build

@@ -63,12 +63,6 @@ if get_option('ms_dump_rtp_shared_packet_memory_usage')
   ]
 endif
 
-if get_option('ms_sctp_stack')
-  cpp_args += [
-    '-DMS_SCTP_STACK',
-  ]
-endif
-
 cpp = meson.get_compiler('cpp')
 
 # This is a workaround to define FLATBUFFERS_LOCALE_INDEPENDENT=0 outside
@@ -87,6 +81,7 @@ common_sources = [
   'src/DepLibUV.cpp',
   'src/DepLibWebRTC.cpp',
   'src/DepOpenSSL.cpp',
+  # TODO: Remove once we only use built-in SCTP stack.
   'src/DepUsrSCTP.cpp',
   'src/Logger.cpp',
   'src/MediaSoupErrors.cpp',
@@ -128,6 +123,7 @@ common_sources = [
   'src/RTC/RtcLogger.cpp',
   'src/RTC/RtpListener.cpp',
   'src/RTC/RtpObserver.cpp',
+  # TODO: Remove once we only use built-in SCTP stack.
   'src/RTC/SctpAssociation.cpp',
   'src/RTC/SctpListener.cpp',
   'src/RTC/SenderBandwidthEstimator.cpp',
@@ -204,11 +200,13 @@ common_sources = [
   'src/RTC/RTCP/XrDelaySinceLastRr.cpp',
   'src/RTC/RTCP/XrReceiverReferenceTime.cpp',
   'src/RTC/SCTP/association/Association.cpp',
-  'src/RTC/SCTP/association/AssociationDeferredListener.cpp',
+  'src/RTC/SCTP/association/AssociationListenerDeferrer.cpp',
+  'src/RTC/SCTP/association/HeartbeatHandler.cpp',
   'src/RTC/SCTP/association/NegotiatedCapabilities.cpp',
   'src/RTC/SCTP/association/PacketSender.cpp',
-  'src/RTC/SCTP/association/TransmissionControlBlock.cpp',
   'src/RTC/SCTP/association/StateCookie.cpp',
+  'src/RTC/SCTP/association/StreamResetHandler.cpp',
+  'src/RTC/SCTP/association/TransmissionControlBlock.cpp',
   'src/RTC/SCTP/tx/RetransmissionErrorCounter.cpp',
   'src/RTC/SCTP/tx/RetransmissionTimeout.cpp',
   'src/RTC/SCTP/packet/Packet.cpp',
@@ -374,10 +372,10 @@ if host_machine.system() == 'linux' and not get_option('ms_disable_liburing')
       default_options: [
         'default_library=static',
         # NOTE: We need to add this to disable ASAN in liburing, otherwise when
-        # building `mediasoup-test-asan-undefined & -thread` binaries, liburing
-        # receives `use_ubsan: true` and tries to compile its `sanitize.c` file
+        # building `mediasoup-test-asan-undefined` binary, liburing receives
+        # `use_ubsan: true` and tries to compile its `sanitize.c` file
         # that contains references to `__asan_*` functions, but we don't enable
-        # ASAN (`-fsanitize=address) in those binaries so liburing fails to
+        # ASAN (`-fsanitize=address) in that binaries so liburing fails to
         # compile.
         'b_sanitize=none',
       ],
@@ -484,6 +482,7 @@ test_sources = [
   'test/src/RTC/SCTP/sctpCommon.cpp',
   'test/src/RTC/SCTP/association/TestStateCookie.cpp',
   'test/src/RTC/SCTP/association/TestNegotiatedCapabilities.cpp',
+  'test/src/RTC/SCTP/common/TestUnwrappedSequenceNumber.cpp',
   'test/src/RTC/SCTP/tx/TestRetransmissionErrorCounter.cpp',
   'test/src/RTC/SCTP/tx/TestRetransmissionTimeout.cpp',
   'test/src/RTC/SCTP/packet/TestPacket.cpp',
@@ -624,34 +623,6 @@ test(
   workdir: meson.project_source_root(),
 )
 
-mediasoup_worker_test_asan_thread = executable(
-  'mediasoup-worker-test-asan-thread',
-  build_by_default: false,
-  install: true,
-  install_tag: 'mediasoup-worker-test-asan-thread',
-  dependencies: dependencies,
-  sources: common_sources + test_sources,
-  include_directories: include_directories(
-    'include',
-    'test/include',
-  ),
-  cpp_args: cpp_args + [
-    '-g',
-    '-O3',
-    '-fno-omit-frame-pointer',
-    '-fsanitize=thread',
-  ],
-  link_args: [
-    '-fsanitize=thread',
-  ],
-)
-
-test(
-  'mediasoup-worker-test-asan-thread',
-  mediasoup_worker_test_asan_thread,
-  workdir: meson.project_source_root(),
-)
-
 fuzzer_sources = common_sources + [
   'fuzzer/src/fuzzer.cpp',
   'fuzzer/src/FuzzerUtils.cpp',

package/worker/meson_options.txt

@@ -5,4 +5,3 @@ option('ms_rtc_logger_rtp', type: 'boolean', value: false, description: 'Prints
 option('ms_dump_rtp_payload_descriptor', type: 'boolean', value: false, description: 'RTC::RTP::Packet::Dump() method also dumps payload descriptor details')
 option('ms_dump_rtp_shared_packet_memory_usage', type: 'boolean', value: false, description: 'prints information about total memory allocated by RTC::RTP::SharedPacket instances')
 option('ms_disable_liburing', type: 'boolean', value: false, description: 'When set to true, disables liburing integration despite current host supports it')
-option('ms_sctp_stack', type: 'boolean', value: false, description: 'When set to true, uses mediasoup SCTP stack instead of usrsctp library (not implemented yet)')

package/worker/scripts/package-lock.json

@@ -21,9 +21,9 @@
 			}
 		},
 		"node_modules/brace-expansion": {
-			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-			"integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+			"version": "5.0.5",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+			"integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
 			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^4.0.2"
@@ -105,9 +105,9 @@
 			"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="
 		},
 		"brace-expansion": {
-			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz",
-			"integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==",
+			"version": "5.0.5",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+			"integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
 			"requires": {
 				"balanced-match": "^4.0.2"
 			}

package/worker/src/DepLibUring.cpp

@@ -123,7 +123,7 @@ void DepLibUring::ClassInit()
 
 	MS_DEBUG_TAG(info, "io_uring version: \"%i.%i\"", mayor, minor);
 
-	if (Settings::configuration.liburingDisabled)
+	if (Settings::configuration.disableLiburing)
 	{
 		MS_DEBUG_TAG(info, "io_uring disabled by user settings");
 

package/worker/src/RTC/DataConsumer.cpp

@@ -5,9 +5,6 @@
 #include "DepLibUV.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
-#ifndef MS_SCTP_STACK
-#include "RTC/SctpAssociation.hpp"
-#endif
 
 namespace RTC
 {
@@ -17,18 +14,12 @@ namespace RTC
 	  RTC::Shared* shared,
 	  const std::string& id,
 	  const std::string& dataProducerId,
-#ifndef MS_SCTP_STACK
-	  RTC::SctpAssociation* sctpAssociation,
-#endif
 	  RTC::DataConsumer::Listener* listener,
 	  const FBS::Transport::ConsumeDataRequest* data,
 	  size_t maxMessageSize)
 	  : id(id),
 	    dataProducerId(dataProducerId),
 	    shared(shared),
-#ifndef MS_SCTP_STACK
-	    sctpAssociation(sctpAssociation),
-#endif
 	    listener(listener),
 	    maxMessageSize(maxMessageSize)
 	{
@@ -222,20 +213,14 @@ namespace RTC
 					MS_THROW_TYPE_ERROR("invalid DataConsumer type");
 				}
 
-#ifdef MS_SCTP_STACK
-				// TODO: SCTP
-#else
-				if (!this->sctpAssociation)
-				{
-					MS_THROW_ERROR("no SCTP association present");
-				}
+				uint32_t bufferedAmount{ 0 };
+
+				this->listener->OnDataConsumerNeedBufferedAmount(this, bufferedAmount);
 
-				// Create status response.
 				auto responseOffset = FBS::DataConsumer::CreateGetBufferedAmountResponse(
-				  request->GetBufferBuilder(), this->sctpAssociation->GetSctpBufferedAmount());
+				  request->GetBufferBuilder(), bufferedAmount);
 
 				request->Accept(FBS::Response::Body::DataConsumer_GetBufferedAmountResponse, responseOffset);
-#endif
 
 				break;
 			}
@@ -285,15 +270,6 @@ namespace RTC
 					MS_THROW_TYPE_ERROR("invalid DataConsumer type");
 				}
 
-#ifdef MS_SCTP_STACK
-				// TODO: SCTP
-#else
-				if (!this->sctpAssociation)
-				{
-					MS_THROW_ERROR("no SCTP association present");
-				}
-#endif
-
 				const auto* body    = request->data->body_as<FBS::DataConsumer::SendRequest>();
 				const uint8_t* data = body->data()->Data();
 				const size_t len    = body->data()->size();
@@ -480,7 +456,7 @@ namespace RTC
 		MS_DEBUG_DEV("SctpAssociation closed [dataConsumerId:%s]", this->id.c_str());
 	}
 
-	void DataConsumer::SctpAssociationBufferedAmount(uint32_t bufferedAmount)
+	void DataConsumer::SetSctpAssociationBufferedAmount(uint32_t bufferedAmount)
 	{
 		MS_TRACE();
 

package/worker/src/RTC/PipeTransport.cpp

@@ -6,9 +6,7 @@
 #include "MediaSoupErrors.hpp"
 #include "Settings.hpp"
 #include "Utils.hpp"
-#ifdef MS_SCTP_STACK
 #include "RTC/SCTP/packet/Packet.hpp"
-#endif
 #include <cstring> // std::memcpy()
 
 namespace RTC
@@ -585,11 +583,15 @@ namespace RTC
 	{
 		MS_TRACE();
 
-#ifdef MS_SCTP_STACK
-		// TODO: SCTP
-#else
-		this->sctpAssociation->SendSctpMessage(dataConsumer, msg, len, ppid, cb);
-#endif
+		if (Settings::configuration.useBuiltInSctpStack)
+		{
+			// TODO: SCTP
+		}
+		// TODO: Remove once we only use built-in SCTP stack.
+		else
+		{
+			this->oldSctpAssociation->SendSctpMessage(dataConsumer, msg, len, ppid, cb);
+		}
 	}
 
 	bool PipeTransport::SendSctpData(const uint8_t* data, size_t len)
@@ -648,11 +650,12 @@ namespace RTC
 			OnRtpDataReceived(tuple, data, len, bufferLen);
 		}
 		// Check if it's SCTP.
-#ifdef MS_SCTP_STACK
-		else if (RTC::SCTP::Packet::IsSctp(data, len))
-#else
-		else if (RTC::SctpAssociation::IsSctp(data, len))
-#endif
+		else if (Settings::configuration.useBuiltInSctpStack && RTC::SCTP::Packet::IsSctp(data, len))
+		{
+			OnSctpDataReceived(tuple, data, len);
+		}
+		// TODO: Remove once we only use built-in SCTP stack.
+		else if (!Settings::configuration.useBuiltInSctpStack && RTC::SctpAssociation::IsSctp(data, len))
 		{
 			OnSctpDataReceived(tuple, data, len);
 		}

package/worker/src/RTC/PlainTransport.cpp

@@ -6,9 +6,7 @@
 #include "MediaSoupErrors.hpp"
 #include "Settings.hpp"
 #include "Utils.hpp"
-#ifdef MS_SCTP_STACK
 #include "RTC/SCTP/packet/Packet.hpp"
-#endif
 #include <cstring> // std::memcpy()
 
 namespace RTC
@@ -905,11 +903,15 @@ namespace RTC
 	{
 		MS_TRACE();
 
-#ifdef MS_SCTP_STACK
-		// TODO: SCTP
-#else
-		this->sctpAssociation->SendSctpMessage(dataConsumer, msg, len, ppid, cb);
-#endif
+		if (Settings::configuration.useBuiltInSctpStack)
+		{
+			// TODO: SCTP
+		}
+		// TODO: Remove once we only use built-in SCTP stack.
+		else
+		{
+			this->oldSctpAssociation->SendSctpMessage(dataConsumer, msg, len, ppid, cb);
+		}
 	}
 
 	bool PlainTransport::SendSctpData(const uint8_t* data, size_t len)
@@ -970,11 +972,12 @@ namespace RTC
 			OnRtpDataReceived(tuple, data, len, bufferLen);
 		}
 		// Check if it's SCTP.
-#ifdef MS_SCTP_STACK
-		else if (RTC::SCTP::Packet::IsSctp(data, len))
-#else
-		else if (RTC::SctpAssociation::IsSctp(data, len))
-#endif
+		else if (Settings::configuration.useBuiltInSctpStack && RTC::SCTP::Packet::IsSctp(data, len))
+		{
+			OnSctpDataReceived(tuple, data, len);
+		}
+		// TODO: Remove once we only use built-in SCTP stack.
+		else if (!Settings::configuration.useBuiltInSctpStack && RTC::SctpAssociation::IsSctp(data, len))
 		{
 			OnSctpDataReceived(tuple, data, len);
 		}

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

@@ -142,7 +142,7 @@ namespace RTC
 			// buffer, however its timestamp is higher. If so, clear the whole buffer.
 			if (
 			  RTC::SeqManager<uint16_t>::IsSeqLowerThan(seq, newestItem->sequenceNumber) &&
-			  Utils::Number<uint32_t>::IsHigherThan(timestamp, newestItem->timestamp))
+			  Utils::Number::IsHigherThan<uint32_t>(timestamp, newestItem->timestamp))
 			{
 				MS_WARN_TAG(
 				  rtp,
@@ -166,7 +166,7 @@ namespace RTC
 			// packet loss, received packet has higher timestamp but "older" seq number
 			// than the newest packet in the buffer and, if so, use it to clear too old
 			// packets rather than the newest packet in the buffer.
-			auto newestTimestamp = Utils::Number<uint32_t>::IsHigherThan(timestamp, newestItem->timestamp)
+			auto newestTimestamp = Utils::Number::IsHigherThan<uint32_t>(timestamp, newestItem->timestamp)
 			                         ? timestamp
 			                         : newestItem->timestamp;
 
@@ -205,7 +205,7 @@ namespace RTC
 
 				// Ensure that the timestamp of the packet is equal or higher than the
 				// timestamp of the newest stored packet.
-				if (Utils::Number<uint32_t>::IsLowerThan(timestamp, newestItem->timestamp))
+				if (Utils::Number::IsLowerThan<uint32_t>(timestamp, newestItem->timestamp))
 				{
 					MS_WARN_TAG(
 					  rtp,
@@ -292,7 +292,7 @@ namespace RTC
 
 				// Ensure that the timestamp of the packet is equal or less than the
 				// timestamp of the oldest stored packet.
-				if (Utils::Number<uint32_t>::IsHigherThan(timestamp, oldestItem->timestamp))
+				if (Utils::Number::IsHigherThan<uint32_t>(timestamp, oldestItem->timestamp))
 				{
 					MS_WARN_TAG(
 					  rtp,
@@ -571,7 +571,7 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			if (Utils::Number<uint32_t>::IsHigherThan(timestamp, newestTimestamp))
+			if (Utils::Number::IsHigherThan<uint32_t>(timestamp, newestTimestamp))
 			{
 				return false;
 			}

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

@@ -149,7 +149,7 @@ namespace RTC
 			}
 
 			// Update highest seen RTP timestamp.
-			if (Utils::Number<uint32_t>::IsHigherThan(packet->GetTimestamp(), this->maxPacketTs))
+			if (Utils::Number::IsHigherThan<uint32_t>(packet->GetTimestamp(), this->maxPacketTs))
 			{
 				this->maxPacketTs = packet->GetTimestamp();
 				this->maxPacketMs = DepLibUV::GetTimeMs();
@@ -208,7 +208,7 @@ namespace RTC
 
 				// Timestamp moved backwards despite in-order sequence number. Likely
 				// caused by prolonged Producer inactivity (e.g., overnight pause).
-				if (Utils::Number<uint32_t>::IsLowerThan(packet->GetTimestamp(), this->maxPacketTs))
+				if (Utils::Number::IsLowerThan<uint32_t>(packet->GetTimestamp(), this->maxPacketTs))
 				{
 					MS_DEBUG_TAG(
 					  rtp,

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

@@ -73,7 +73,7 @@ namespace RTC
 			}
 
 			// Update highest seen RTP timestamp.
-			if (Utils::Number<uint32_t>::IsHigherThan(packet->GetTimestamp(), this->maxPacketTs))
+			if (Utils::Number::IsHigherThan<uint32_t>(packet->GetTimestamp(), this->maxPacketTs))
 			{
 				this->maxPacketTs = packet->GetTimestamp();
 				this->maxPacketMs = DepLibUV::GetTimeMs();

package/worker/src/RTC/RateCalculator.cpp

@@ -31,7 +31,7 @@ namespace RTC
 		MS_TRACE();
 
 		// Ignore too old data. Should never happen.
-		if (this->oldestItemStartTime.has_value() && Utils::Number<uint64_t>::IsLowerThan(nowMs, *this->oldestItemStartTime))
+		if (this->oldestItemStartTime.has_value() && Utils::Number::IsLowerThan<uint64_t>(nowMs, *this->oldestItemStartTime))
 		{
 			MS_WARN_DEV("nowMs < this->oldestItemStartTime, should never happen");
 
@@ -47,7 +47,7 @@ namespace RTC
 		// item size (in milliseconds), increase the item index.
 		if (
 		  this->newestItemIndex < 0 || !this->newestItemStartTime.has_value() ||
-		  Utils::Number<uint64_t>::IsHigherOrEqualThan(
+		  Utils::Number::IsHigherOrEqualThan<uint64_t>(
 		    nowMs - *this->newestItemStartTime, this->itemSizeMs))
 		{
 			this->newestItemIndex++;
@@ -165,7 +165,7 @@ namespace RTC
 		const uint64_t newOldestTime = nowMs - this->windowSizeMs;
 
 		// Oldest item already removed.
-		if (Utils::Number<uint64_t>::IsLowerThan(newOldestTime, *this->oldestItemStartTime))
+		if (Utils::Number::IsLowerThan<uint64_t>(newOldestTime, *this->oldestItemStartTime))
 		{
 			return;
 		}
@@ -173,7 +173,7 @@ namespace RTC
 		// A whole window size time has elapsed since last entry. Reset the buffer.
 		if (
 		  this->newestItemStartTime.has_value() &&
-		  Utils::Number<uint64_t>::IsHigherOrEqualThan(newOldestTime, *this->newestItemStartTime))
+		  Utils::Number::IsHigherOrEqualThan<uint64_t>(newOldestTime, *this->newestItemStartTime))
 		{
 			MS_DEBUG_DEV("newOldestTime >= this->newestItemStartTime, resetting the buffer");
 
@@ -182,7 +182,7 @@ namespace RTC
 			return;
 		}
 
-		while (Utils::Number<uint64_t>::IsHigherOrEqualThan(newOldestTime, *this->oldestItemStartTime))
+		while (Utils::Number::IsHigherOrEqualThan<uint64_t>(newOldestTime, *this->oldestItemStartTime))
 		{
 			BufferItem& oldestItem = this->buffer[this->oldestItemIndex];
 			this->totalCount -= oldestItem.count;