mediasoup 3.27.0 → 3.28.0

package/worker/src/RTC/DtlsTransport.cpp

@@ -19,14 +19,14 @@
 	{ \
 		if (ERR_peek_error() == 0) \
 		{ \
-			MS_ERROR("OpenSSL error [desc:'%s']", desc); \
+			MS_WARN_TAG(dtls, "OpenSSL error [desc:'%s']", desc); \
 		} \
 		else \
 		{ \
 			int64_t err; \
 			while ((err = ERR_get_error()) != 0) \
 			{ \
-				MS_ERROR("OpenSSL error [desc:'%s', error:'%s']", desc, ERR_error_string(err, nullptr)); \
+				MS_WARN_TAG(dtls, "OpenSSL error [desc:'%s', error:'%s']", desc, ERR_error_string(err, nullptr)); \
 			} \
 			ERR_clear_error(); \
 		} \
@@ -225,7 +225,7 @@ namespace RTC
 				return DtlsTransport::Role::SERVER;
 			}
 
-				NO_DEFAULT_GCC();
+				NO_DEFAULT();
 		}
 	}
 
@@ -250,7 +250,7 @@ namespace RTC
 				return FBS::WebRtcTransport::DtlsRole::SERVER;
 			}
 
-				NO_DEFAULT_GCC();
+				NO_DEFAULT();
 		}
 	}
 
@@ -285,7 +285,7 @@ namespace RTC
 				return FBS::WebRtcTransport::DtlsState::CLOSED;
 			}
 
-				NO_DEFAULT_GCC();
+				NO_DEFAULT();
 		}
 	}
 
@@ -321,7 +321,7 @@ namespace RTC
 				return DtlsTransport::FingerprintAlgorithm::SHA512;
 			}
 
-				NO_DEFAULT_GCC();
+				NO_DEFAULT();
 		}
 	}
 
@@ -357,7 +357,7 @@ namespace RTC
 				return FBS::WebRtcTransport::FingerprintAlgorithm::SHA512;
 			}
 
-				NO_DEFAULT_GCC();
+				NO_DEFAULT();
 		}
 	}
 
@@ -1410,7 +1410,7 @@ namespace RTC
 				break;
 			}
 
-				NO_DEFAULT_GCC();
+				NO_DEFAULT();
 		}
 
 		// Compare the remote fingerprint with the value given via signaling.

package/worker/src/RTC/ICE/IceCandidate.cpp

@@ -22,7 +22,7 @@ namespace RTC
 					return IceCandidate::CandidateType::HOST;
 				}
 
-					NO_DEFAULT_GCC();
+					NO_DEFAULT();
 			}
 		}
 
@@ -38,7 +38,7 @@ namespace RTC
 					return FBS::WebRtcTransport::IceCandidateType::HOST;
 				}
 
-					NO_DEFAULT_GCC();
+					NO_DEFAULT();
 			}
 		}
 
@@ -54,7 +54,7 @@ namespace RTC
 					return IceCandidate::TcpCandidateType::PASSIVE;
 				}
 
-					NO_DEFAULT_GCC();
+					NO_DEFAULT();
 			}
 		}
 
@@ -70,7 +70,7 @@ namespace RTC
 					return FBS::WebRtcTransport::IceCandidateTcpType::PASSIVE;
 				}
 
-					NO_DEFAULT_GCC();
+					NO_DEFAULT();
 			}
 		}
 

package/worker/src/RTC/ICE/IceServer.cpp

@@ -64,7 +64,7 @@ namespace RTC
 					return FBS::WebRtcTransport::IceState::DISCONNECTED;
 				}
 
-					NO_DEFAULT_GCC();
+					NO_DEFAULT();
 			}
 		}
 

package/worker/src/RTC/PipeTransport.cpp

@@ -497,6 +497,13 @@ namespace RTC
 		return this->tuple ? true : false;
 	}
 
+	inline size_t PipeTransport::GetPacketOverhead() const
+	{
+		MS_TRACE();
+
+		return this->tuple ? this->tuple->GetPacketOverhead() : 0;
+	}
+
 	inline bool PipeTransport::HasSrtp() const
 	{
 		MS_TRACE();
@@ -505,7 +512,7 @@ namespace RTC
 	}
 
 	void PipeTransport::SendRtpPacket(
-	  RTC::Consumer* /*consumer*/, RTC::RTP::Packet* packet, RTC::Transport::onSendCallback* cb)
+	  RTC::Consumer* /*consumer*/, RTC::RTP::Packet* packet, onSendCallback cb)
 	{
 		MS_TRACE();
 
@@ -513,8 +520,7 @@ namespace RTC
 		{
 			if (cb)
 			{
-				(*cb)(false);
-				delete cb;
+				cb(false);
 			}
 
 			return;
@@ -527,14 +533,13 @@ namespace RTC
 		{
 			if (cb)
 			{
-				(*cb)(false);
-				delete cb;
+				cb(false);
 			}
 
 			return;
 		}
 
-		this->tuple->Send(data, len, cb);
+		this->tuple->Send(data, len, std::move(cb));
 
 		// Increase send transmission.
 		RTC::Transport::DataSent(len);
@@ -589,11 +594,11 @@ namespace RTC
 	}
 
 	void PipeTransport::SendMessage(
-	  RTC::DataConsumer* dataConsumer, RTC::SCTP::Message message, onQueuedCallback* cb)
+	  RTC::DataConsumer* dataConsumer, RTC::SCTP::Message message, onMessageQueuedCallback cb)
 	{
 		MS_TRACE();
 
-		SendSctpMessage(dataConsumer, std::move(message), cb);
+		SendSctpMessage(dataConsumer, std::move(message), std::move(cb));
 	}
 
 	bool PipeTransport::SendData(const uint8_t* data, size_t len)

package/worker/src/RTC/PlainTransport.cpp

@@ -804,6 +804,13 @@ namespace RTC
 		return this->tuple ? true : false;
 	}
 
+	inline size_t PlainTransport::GetPacketOverhead() const
+	{
+		MS_TRACE();
+
+		return this->tuple ? this->tuple->GetPacketOverhead() : 0;
+	}
+
 	inline bool PlainTransport::HasSrtp() const
 	{
 		MS_TRACE();
@@ -819,7 +826,7 @@ namespace RTC
 	}
 
 	void PlainTransport::SendRtpPacket(
-	  RTC::Consumer* /*consumer*/, RTC::RTP::Packet* packet, const RTC::Transport::onSendCallback* cb)
+	  RTC::Consumer* /*consumer*/, RTC::RTP::Packet* packet, onSendCallback cb)
 	{
 		MS_TRACE();
 
@@ -827,8 +834,7 @@ namespace RTC
 		{
 			if (cb)
 			{
-				(*cb)(false);
-				delete cb;
+				cb(false);
 			}
 
 			return;
@@ -841,14 +847,13 @@ namespace RTC
 		{
 			if (cb)
 			{
-				(*cb)(false);
-				delete cb;
+				cb(false);
 			}
 
 			return;
 		}
 
-		this->tuple->Send(data, len, cb);
+		this->tuple->Send(data, len, std::move(cb));
 
 		// Increase send transmission.
 		RTC::Transport::DataSent(len);
@@ -917,11 +922,11 @@ namespace RTC
 	}
 
 	void PlainTransport::SendMessage(
-	  RTC::DataConsumer* dataConsumer, RTC::SCTP::Message message, onQueuedCallback* cb)
+	  RTC::DataConsumer* dataConsumer, RTC::SCTP::Message message, onMessageQueuedCallback cb)
 	{
 		MS_TRACE();
 
-		SendSctpMessage(dataConsumer, std::move(message), cb);
+		SendSctpMessage(dataConsumer, std::move(message), std::move(cb));
 	}
 
 	bool PlainTransport::SendData(const uint8_t* data, size_t len)

package/worker/src/RTC/Producer.cpp

@@ -10,7 +10,7 @@
 #include "RTC/RTP/Codecs/Tools.hpp"
 #include "Utils.hpp"
 #ifdef MS_RTC_LOGGER_RTP
-#include "RTC/RtcLogger.hpp"
+#include "RTC/RtcLogger/RtpPacket.hpp"
 #endif
 #include <cstring> // std::memcpy()
 
@@ -83,18 +83,22 @@ namespace RTC
 			}
 
 			// rid is optional.
+			const bool hasRid =
+			  flatbuffers::IsFieldPresent(encoding, FBS::RtpParameters::EncodingMapping::VT_RID);
+
+			if (hasRid)
+			{
+				encodingMapping.rid = encoding->rid()->str();
+			}
+
 			// However ssrc or rid must be present (if more than 1 encoding).
-			if (
-			  encodings->size() > 1 && !encoding->ssrc().has_value() &&
-			  !flatbuffers::IsFieldPresent(encoding, FBS::RtpParameters::EncodingMapping::VT_RID))
+			if (encodings->size() > 1 && !encoding->ssrc().has_value() && !hasRid)
 			{
 				MS_THROW_TYPE_ERROR("wrong entry in rtpMapping.encodings (missing ssrc or rid)");
 			}
 
 			// If there is no mid and a single encoding, ssrc or rid must be present.
-			if (
-			  this->rtpParameters.mid.empty() && encodings->size() == 1 && !encoding->ssrc().has_value() &&
-			  !flatbuffers::IsFieldPresent(encoding, FBS::RtpParameters::EncodingMapping::VT_RID))
+			if (this->rtpParameters.mid.empty() && encodings->size() == 1 && !encoding->ssrc().has_value() && !hasRid)
 			{
 				MS_THROW_TYPE_ERROR(
 				  "wrong entry in rtpMapping.encodings (missing ssrc or rid, or rtpParameters.mid)");
@@ -171,11 +175,6 @@ namespace RTC
 				this->rtpHeaderExtensionIds.videoOrientation = exten.id;
 			}
 
-			if (this->rtpHeaderExtensionIds.timeOffset == 0u && exten.type == RTC::RtpHeaderExtensionUri::Type::TIME_OFFSET)
-			{
-				this->rtpHeaderExtensionIds.timeOffset = exten.id;
-			}
-
 			if (this->rtpHeaderExtensionIds.absCaptureTime == 0u && exten.type == RTC::RtpHeaderExtensionUri::Type::ABS_CAPTURE_TIME)
 			{
 				this->rtpHeaderExtensionIds.absCaptureTime = exten.id;
@@ -268,7 +267,7 @@ namespace RTC
 			encodings.emplace_back(
 			  FBS::RtpParameters::CreateEncodingMappingDirect(
 			    builder,
-			    encodingMapping.rid.c_str(),
+			    encodingMapping.rid.empty() ? nullptr : encodingMapping.rid.c_str(),
 			    encodingMapping.ssrc != 0u ? flatbuffers::Optional<uint32_t>(encodingMapping.ssrc)
 					                           : flatbuffers::nullopt,
 			    encodingMapping.mappedSsrc));
@@ -776,7 +775,7 @@ namespace RTC
 		// Add a receiver reference time report if no present in the packet.
 		if (!packet->HasReceiverReferenceTime())
 		{
-			auto ntp = Utils::Time::TimeUs2Ntp(nowUs + this->shared->GetNtpOffsetUs());
+			auto ntp = Utils::Time::TimeUsToNtp(nowUs + this->shared->GetNtpOffsetUs());
 
 			receiverReferenceTimeReport = new RTC::RTCP::ReceiverReferenceTime();
 
@@ -1259,7 +1258,7 @@ namespace RTC
 				// the most likely case rather than a wild guess.
 				const auto remoteClockOffsetUs = this->listener->OnProducerNeedRemoteClockOffsetUs(this);
 				const auto remoteClockOffsetQ32x32 =
-				  Utils::Time::TimeUs2Q32x32(remoteClockOffsetUs.value_or(0));
+				  Utils::Time::TimeUsToQ32x32(remoteClockOffsetUs.value_or(0));
 
 				// NOTE: An offset that does not fit in the extension means a sender whose clock
 				// is decades away from ours, and there is no value to write that would not be a
@@ -1402,22 +1401,6 @@ namespace RTC
 
 					bufferPtr += extenLen;
 				}
-
-				// Proxy urn:ietf:params:rtp-hdrext:toffset.
-				extenValue = packet->GetExtensionValue(this->rtpHeaderExtensionIds.timeOffset, extenLen);
-
-				if (extenValue)
-				{
-					std::memcpy(bufferPtr, extenValue, extenLen);
-
-					extensions.emplace_back(
-					  /*type*/ RTC::RtpHeaderExtensionUri::Type::TIME_OFFSET,
-					  /*id*/ static_cast<uint8_t>(RTC::RtpHeaderExtensionUri::Type::TIME_OFFSET),
-					  /*len*/ extenLen,
-					  /*value*/ bufferPtr);
-
-					bufferPtr += extenLen;
-				}
 			}
 
 			// Add urn:mediasoup:params:rtp-hdrext:packet-id.

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

@@ -77,7 +77,7 @@ namespace RTC
 			}
 
 			// 32 bits padding.
-			const size_t padding = (-offset) & 3;
+			const size_t padding = Utils::Byte::PadTo4Bytes(offset) - offset;
 
 			for (size_t i{ 0 }; i < padding; ++i)
 			{

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

@@ -115,6 +115,24 @@ namespace RTC
 			}
 		}
 
+		void FeedbackPsRembPacket::SetSsrcs(const std::vector<uint32_t>& ssrcs)
+		{
+			MS_TRACE();
+
+			this->ssrcs = ssrcs;
+
+			if (this->ssrcs.size() > FeedbackPsRembPacket::MaxNumberOfSsrcs)
+			{
+				MS_WARN_TAG(
+				  rtcp,
+				  "resizing ssrcs because they don't fit in a REMB [ssrcs:%zu, max:%zu]",
+				  this->ssrcs.size(),
+				  FeedbackPsRembPacket::MaxNumberOfSsrcs);
+
+				this->ssrcs.resize(FeedbackPsRembPacket::MaxNumberOfSsrcs);
+			}
+		}
+
 		size_t FeedbackPsRembPacket::Serialize(uint8_t* buffer)
 		{
 			MS_TRACE();

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

@@ -3,6 +3,7 @@
 
 #include "RTC/RTCP/FeedbackPsRpsi.hpp"
 #include "Logger.hpp"
+#include "Utils.hpp"
 #include <cstring>
 
 namespace RTC
@@ -48,9 +49,8 @@ namespace RTC
 
 			this->header = reinterpret_cast<Header*>(this->raw);
 
-			// TODO: We should use Utils::Byte::PadTo4Bytes().
 			// 32 bits padding.
-			const uint8_t padding = (-length) & 3;
+			const auto padding = static_cast<uint8_t>(Utils::Byte::PadTo4Bytes(length) - length);
 
 			this->header->paddingBits = padding * 8;
 			this->header->zero        = 0;

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

@@ -3,6 +3,7 @@
 
 #include "RTC/RTCP/FeedbackPsVbcm.hpp"
 #include "Logger.hpp"
+#include "Utils.hpp"
 #include <cstring> // std::memcpy
 
 namespace RTC
@@ -38,7 +39,7 @@ namespace RTC
 
 			const size_t offset = 8 + GetLength();
 			// 32 bits padding.
-			const size_t padding = (-offset) & 3;
+			const size_t padding = Utils::Byte::PadTo4Bytes(offset) - offset;
 
 			for (size_t i{ 0 }; i < padding; ++i)
 			{

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

@@ -271,7 +271,7 @@ namespace RTC
 			}
 
 			// 32 bits padding.
-			const size_t padding = (-offset) & 3;
+			const size_t padding = Utils::Byte::PadTo4Bytes(offset) - offset;
 
 			for (size_t i{ 0u }; i < padding; ++i)
 			{
@@ -380,7 +380,7 @@ namespace RTC
 				size += 2u;
 
 				// 32 bits padding.
-				size += (-size) & 3;
+				size = Utils::Byte::PadTo4Bytes(size);
 
 				if (size > maxRtcpPacketLen)
 				{

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

@@ -226,7 +226,7 @@ namespace RTC
 			++offset;
 
 			// 32 bits padding.
-			const size_t padding = (-offset) & 3;
+			const size_t padding = Utils::Byte::PadTo4Bytes(offset) - offset;
 
 			for (size_t i{ 0u }; i < padding; ++i)
 			{

package/worker/src/RTC/RTP/Codecs/DependencyDescriptor.cpp

@@ -475,7 +475,8 @@ namespace RTC
 				WriteMandatoryDescriptorFields();
 				WriteExtendedDescriptorFields();
 
-				len = std::ceil((this->bitStream.GetOffset() + 7) >> 3);
+				// The written bits rounded up to whole bytes.
+				len = static_cast<uint8_t>((this->bitStream.GetOffset() + 7) >> 3);
 
 				return this->bitStream.GetData();
 			}

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

@@ -818,12 +818,6 @@ namespace RTC
 						break;
 					}
 
-					case RTC::RtpHeaderExtensionUri::Type::TIME_OFFSET:
-					{
-						this->headerExtensionIds.timeOffset = extension.id;
-						break;
-					}
-
 					case RTC::RtpHeaderExtensionUri::Type::ABS_CAPTURE_TIME:
 					{
 						this->headerExtensionIds.absCaptureTime = extension.id;
@@ -962,7 +956,7 @@ namespace RTC
 			return true;
 		}
 
-		bool Packet::UpdateAbsSendTime(int64_t sentAtUs) const
+		bool Packet::UpdateAbsSendTime(uint32_t absSendTime) const
 		{
 			MS_TRACE();
 
@@ -974,8 +968,6 @@ namespace RTC
 				return false;
 			}
 
-			auto absSendTime = Utils::Time::TimeUsToAbsSendTime(sentAtUs);
-
 			Utils::Byte::Set3Bytes(extenValue, 0, absSendTime);
 
 			return true;
@@ -1201,6 +1193,25 @@ namespace RTC
 			return true;
 		}
 
+		bool Packet::UpdateAbsCaptureTime(uint64_t absCaptureTimestamp) const
+		{
+			MS_TRACE();
+
+			uint8_t extenLen;
+			uint8_t* extenValue = GetExtensionValue(this->headerExtensionIds.absCaptureTime, extenLen);
+
+			// Extension value can be 8 or 16 bytes depending on whether it contains
+			// estimated capture clock offset or not.
+			if (!extenValue || (extenLen != 8u && extenLen != 16u))
+			{
+				return false;
+			}
+
+			Utils::Byte::Set8Bytes(extenValue, 0, absCaptureTimestamp);
+
+			return true;
+		}
+
 		bool Packet::ReadPlayoutDelay(uint16_t& minDelay, uint16_t& maxDelay) const
 		{
 			MS_TRACE();
@@ -1413,6 +1424,11 @@ namespace RTC
 				SetPaddingLength(0);
 			}
 
+			// NOTE: Get the payload length before increasing the packet length,
+			// otherwise the 2 bytes of the original sequence number would be
+			// counted as payload and moved beyond the new end of the packet.
+			const auto payloadLength = GetPayloadLength();
+
 			// Update packet length.
 			// NOTE: This throws if given length is higher than buffer length.
 			SetLength(GetLength() + 2);
@@ -1423,8 +1439,7 @@ namespace RTC
 			// Rewrite the SSRC.
 			SetSsrc(ssrc);
 
-			auto* payload            = GetPayloadPointer();
-			const auto payloadLength = GetPayloadLength();
+			auto* payload = GetPayloadPointer();
 
 			// Write the original sequence number at the begining of the payload.
 			std::memmove(payload + 2, payload, payloadLength);

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

@@ -3,6 +3,7 @@
 
 #include "RTC/RTP/ProbationGenerator.hpp"
 #include "Logger.hpp"
+#include "RTC/Consts.hpp"
 #include "RTC/RtpDictionaries.hpp"
 #include "Utils.hpp"
 #include <cstring> // std::memcpy(), std::memset()
@@ -18,8 +19,6 @@ namespace RTC
 		static constexpr size_t ProbationPacketExtensionsBufferLength{ 200 };
 		alignas(4) static thread_local uint8_t
 		  ProbationPacketExtensionsBuffer[ProbationPacketExtensionsBufferLength];
-		// 8 bytes, same as RTC::Consts::MidRtpExtensionMaxLength.
-		static const std::string MidValue{ "probator" };
 
 		/* Instance methods. */
 
@@ -42,10 +41,10 @@ namespace RTC
 			  RTP::Packet::Factory(ProbationPacketBuffer, sizeof(ProbationPacketBuffer)));
 
 			// Sex fixed codec payload type.
-			this->probationPacket->SetPayloadType(ProbationGenerator::PayloadType);
+			this->probationPacket->SetPayloadType(RTC::Consts::BweProbeRtpPayloadType);
 
 			// Set fixed SSRC.
-			this->probationPacket->SetSsrc(ProbationGenerator::Ssrc);
+			this->probationPacket->SetSsrc(RTC::Consts::BweProbeRtpSsrc);
 
 			// Set random initial RTP seq number.
 			this->probationPacket->SetSequenceNumber(Utils::Crypto::GetRandomUInt<uint16_t>(0, 65535));
@@ -60,7 +59,7 @@ namespace RTC
 
 			// Add urn:ietf:params:rtp-hdrext:sdes:mid.
 			{
-				extenLen = MidValue.size();
+				extenLen = RTC::Consts::BweProbeRtpMid.size();
 
 				extensions.emplace_back(
 				  /*type*/ RTC::RtpHeaderExtensionUri::Type::MID,
@@ -68,7 +67,7 @@ namespace RTC
 				  /*len*/ extenLen,
 				  /*value*/ bufferPtr);
 
-				std::memcpy(bufferPtr, MidValue.c_str(), extenLen);
+				std::memcpy(bufferPtr, RTC::Consts::BweProbeRtpMid.data(), extenLen);
 
 				bufferPtr += extenLen;
 			}

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

@@ -77,7 +77,7 @@ namespace RTC
 			  this->params.mimeType.ToString().c_str(),
 			  this->packetsLost,
 			  this->fractionLost,
-			  this->jitter,
+			  static_cast<uint32_t>(this->jitter),
 			  this->packetsDiscarded,
 			  this->packetsRetransmitted,
 			  this->packetsRepaired,