mediasoup 3.23.2 → 3.24.0

package/worker/src/RTC/DataProducer.cpp

@@ -4,7 +4,6 @@
 #include "RTC/DataProducer.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
-#include "Settings.hpp"
 #include <vector>
 
 namespace RTC
@@ -229,6 +228,13 @@ namespace RTC
 					requiredSubchannel = body->requiredSubchannel();
 				}
 
+				std::optional<uint16_t> ignoredSubchannel{ std::nullopt };
+
+				if (body->ignoredSubchannel().has_value())
+				{
+					ignoredSubchannel = body->ignoredSubchannel();
+				}
+
 				const uint16_t streamId =
 				  this->type == DataProducer::Type::SCTP ? this->sctpStreamParameters.streamId : 0;
 
@@ -236,7 +242,7 @@ namespace RTC
 				// move the message and pass its ownership to the SCTP stack.
 				RTC::SCTP::Message message(streamId, body->ppid(), std::vector<uint8_t>(data, data + len));
 
-				ReceiveMessage(std::move(message), subchannels, requiredSubchannel);
+				ReceiveMessage(std::move(message), subchannels, requiredSubchannel, ignoredSubchannel);
 
 				// Increase receive transmission.
 				this->listener->OnDataProducerReceiveData(this, len);
@@ -254,7 +260,8 @@ namespace RTC
 	void DataProducer::ReceiveMessage(
 	  RTC::SCTP::Message message,
 	  std::vector<uint16_t>& subchannels,
-	  std::optional<uint16_t> requiredSubchannel)
+	  std::optional<uint16_t> requiredSubchannel,
+	  std::optional<uint16_t> ignoredSubchannel)
 	{
 		MS_TRACE();
 
@@ -268,6 +275,6 @@ namespace RTC
 		}
 
 		this->listener->OnDataProducerMessageReceived(
-		  this, std::move(message), subchannels, requiredSubchannel);
+		  this, std::move(message), subchannels, requiredSubchannel, ignoredSubchannel);
 	}
 } // namespace RTC

package/worker/src/RTC/DirectTransport.cpp

@@ -43,6 +43,8 @@ namespace RTC
 	flatbuffers::Offset<FBS::DirectTransport::DumpResponse> DirectTransport::FillBuffer(
 	  flatbuffers::FlatBufferBuilder& builder) const
 	{
+		MS_TRACE();
+
 		// Add base transport dump.
 		auto base = Transport::FillBuffer(builder);
 
@@ -138,6 +140,8 @@ namespace RTC
 
 	inline bool DirectTransport::IsConnected() const
 	{
+		MS_TRACE();
+
 		return true;
 	}
 

package/worker/src/RTC/DtlsTransport.cpp

@@ -45,6 +45,8 @@ inline static int onSslCertificateVerify(int /*preverifyOk*/, X509_STORE_CTX* /*
 
 inline static void onSslInfo(const SSL* ssl, int where, int ret)
 {
+	MS_TRACE();
+
 	static_cast<RTC::DtlsTransport*>(SSL_get_ex_data(ssl, 0))->OnSslInfo(where, ret);
 }
 
@@ -66,6 +68,8 @@ inline static long onSslBioOut(
   int ret,
   size_t* /*processed*/)
 {
+	MS_TRACE();
+
 	const long resultOfcallback = (operationType == BIO_CB_RETURN) ? static_cast<long>(ret) : 1;
 
 	// This callback is called twice for write operations:
@@ -84,6 +88,8 @@ inline static long onSslBioOut(
 
 inline static unsigned int onSslDtlsTimer(SSL* /*ssl*/, unsigned int timerUs)
 {
+	MS_TRACE();
+
 	if (timerUs == 0u)
 	{
 		return 100000u;
@@ -200,6 +206,8 @@ namespace RTC
 
 	DtlsTransport::Role DtlsTransport::RoleFromFbs(FBS::WebRtcTransport::DtlsRole role)
 	{
+		MS_TRACE();
+
 		switch (role)
 		{
 			case FBS::WebRtcTransport::DtlsRole::AUTO:
@@ -223,6 +231,8 @@ namespace RTC
 
 	FBS::WebRtcTransport::DtlsRole DtlsTransport::RoleToFbs(DtlsTransport::Role role)
 	{
+		MS_TRACE();
+
 		switch (role)
 		{
 			case DtlsTransport::Role::AUTO:
@@ -246,6 +256,8 @@ namespace RTC
 
 	FBS::WebRtcTransport::DtlsState DtlsTransport::StateToFbs(DtlsTransport::DtlsState state)
 	{
+		MS_TRACE();
+
 		switch (state)
 		{
 			case DtlsTransport::DtlsState::NEW:
@@ -280,6 +292,8 @@ namespace RTC
 	DtlsTransport::FingerprintAlgorithm DtlsTransport::AlgorithmFromFbs(
 	  FBS::WebRtcTransport::FingerprintAlgorithm algorithm)
 	{
+		MS_TRACE();
+
 		switch (algorithm)
 		{
 			case FBS::WebRtcTransport::FingerprintAlgorithm::SHA1:
@@ -314,6 +328,8 @@ namespace RTC
 	FBS::WebRtcTransport::FingerprintAlgorithm DtlsTransport::AlgorithmToFbs(
 	  DtlsTransport::FingerprintAlgorithm algorithm)
 	{
+		MS_TRACE();
+
 		switch (algorithm)
 		{
 			case DtlsTransport::FingerprintAlgorithm::SHA1:

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

@@ -13,6 +13,8 @@ namespace RTC
 		IceCandidate::CandidateType IceCandidate::CandidateTypeFromFbs(
 		  FBS::WebRtcTransport::IceCandidateType type)
 		{
+			MS_TRACE();
+
 			switch (type)
 			{
 				case FBS::WebRtcTransport::IceCandidateType::HOST:
@@ -27,6 +29,8 @@ namespace RTC
 		FBS::WebRtcTransport::IceCandidateType IceCandidate::CandidateTypeToFbs(
 		  IceCandidate::CandidateType type)
 		{
+			MS_TRACE();
+
 			switch (type)
 			{
 				case IceCandidate::CandidateType::HOST:
@@ -41,6 +45,8 @@ namespace RTC
 		IceCandidate::TcpCandidateType IceCandidate::TcpCandidateTypeFromFbs(
 		  FBS::WebRtcTransport::IceCandidateTcpType type)
 		{
+			MS_TRACE();
+
 			switch (type)
 			{
 				case FBS::WebRtcTransport::IceCandidateTcpType::PASSIVE:
@@ -55,6 +61,8 @@ namespace RTC
 		FBS::WebRtcTransport::IceCandidateTcpType IceCandidate::TcpCandidateTypeToFbs(
 		  IceCandidate::TcpCandidateType type)
 		{
+			MS_TRACE();
+
 			switch (type)
 			{
 				case IceCandidate::TcpCandidateType::PASSIVE:

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

@@ -26,6 +26,8 @@ namespace RTC
 
 		bool StunPacket::IsStun(const uint8_t* buffer, size_t bufferLength)
 		{
+			MS_TRACE();
+
 			return (
 			  // STUN headers are 20 bytes.
 			  (bufferLength >= StunPacket::FixedHeaderLength) &&

package/worker/src/RTC/NackGenerator.cpp

@@ -355,6 +355,8 @@ namespace RTC
 
 	inline void NackGenerator::MayRunTimer() const
 	{
+		MS_TRACE();
+
 		if (this->nackList.empty())
 		{
 			this->timer->Stop();

package/worker/src/RTC/PipeTransport.cpp

@@ -490,11 +490,15 @@ namespace RTC
 
 	inline bool PipeTransport::IsConnected() const
 	{
+		MS_TRACE();
+
 		return this->tuple ? true : false;
 	}
 
 	inline bool PipeTransport::HasSrtp() const
 	{
+		MS_TRACE();
+
 		return !this->srtpKey.empty();
 	}
 

package/worker/src/RTC/PlainTransport.cpp

@@ -791,16 +791,22 @@ namespace RTC
 
 	inline bool PlainTransport::IsConnected() const
 	{
+		MS_TRACE();
+
 		return this->tuple ? true : false;
 	}
 
 	inline bool PlainTransport::HasSrtp() const
 	{
+		MS_TRACE();
+
 		return !this->srtpKey.empty();
 	}
 
 	inline bool PlainTransport::IsSrtpReady() const
 	{
+		MS_TRACE();
+
 		return HasSrtp() && this->srtpSendSession && this->srtpRecvSession;
 	}
 
@@ -1222,6 +1228,8 @@ namespace RTC
 
 	inline void PlainTransport::EmitTuple() const
 	{
+		MS_TRACE();
+
 		auto tuple = this->tuple->FillBuffer(this->shared->GetChannelNotifier()->GetBufferBuilder());
 		auto notification = FBS::PlainTransport::CreateTupleNotification(
 		  this->shared->GetChannelNotifier()->GetBufferBuilder(), tuple);
@@ -1235,6 +1243,8 @@ namespace RTC
 
 	inline void PlainTransport::EmitRtcpTuple() const
 	{
+		MS_TRACE();
+
 		auto rtcpTuple =
 		  this->rtcpTuple->FillBuffer(this->shared->GetChannelNotifier()->GetBufferBuilder());
 		auto notification = FBS::PlainTransport::CreateRtcpTupleNotification(

package/worker/src/RTC/PortManager.cpp

@@ -15,16 +15,22 @@
 // ensuring that we call `delete xxx` with same type as `new xxx` before.
 static inline void onCloseUdp(uv_handle_t* handle)
 {
+	MS_TRACE();
+
 	delete reinterpret_cast<uv_udp_t*>(handle);
 }
 
 static inline void onCloseTcp(uv_handle_t* handle)
 {
+	MS_TRACE();
+
 	delete reinterpret_cast<uv_tcp_t*>(handle);
 }
 
 inline static void onFakeConnection(uv_stream_t* /*handle*/, int /*status*/)
 {
+	MS_TRACE();
+
 	// Do nothing.
 }
 
@@ -641,6 +647,8 @@ namespace RTC
 
 	void PortManager::Dump(int indentation) const
 	{
+		MS_TRACE();
+
 		MS_DUMP_CLEAN(indentation, "<PortManager>");
 
 		for (const auto& kv : PortManager::mapPortRanges)

package/worker/src/RTC/Producer.cpp

@@ -1642,6 +1642,8 @@ namespace RTC
 	inline void Producer::OnRtpStreamSendRtcpPacket(
 	  RTC::RTP::RtpStreamRecv* /*rtpStream*/, RTC::RTCP::Packet* packet)
 	{
+		MS_TRACE();
+
 		switch (packet->GetType())
 		{
 			case RTC::RTCP::Type::PSFB:
@@ -1698,6 +1700,8 @@ namespace RTC
 	inline void Producer::OnRtpStreamNeedWorstRemoteFractionLost(
 	  RTC::RTP::RtpStreamRecv* rtpStream, uint8_t& worstRemoteFractionLost)
 	{
+		MS_TRACE();
+
 		auto mappedSsrc = this->mapRtpStreamMappedSsrc.at(rtpStream);
 
 		// Notify the listener.

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

@@ -13,6 +13,8 @@ namespace RTC
 
 		size_t CompoundPacket::GetSize()
 		{
+			MS_TRACE();
+
 			size_t size{ 0 };
 
 			if (this->senderReportPacket.GetCount() > 0u)
@@ -77,6 +79,8 @@ namespace RTC
 		  SdesChunk* sdesChunk,
 		  DelaySinceLastRr::SsrcInfo* delaySinceLastRrSsrcInfo)
 		{
+			MS_TRACE();
+
 			// Add the items into the packet.
 
 			if (senderReport)
@@ -136,6 +140,8 @@ namespace RTC
 		  std::vector<SdesChunk*>& sdesChunks,
 		  std::vector<DelaySinceLastRr::SsrcInfo*>& delaySinceLastRrSsrcInfos)
 		{
+			MS_TRACE();
+
 			// Add the items into the packet.
 
 			for (auto* report : senderReports)
@@ -194,6 +200,8 @@ namespace RTC
 		  std::vector<ReceiverReport*>& receiverReports,
 		  ReceiverReferenceTime* receiverReferenceTimeReport)
 		{
+			MS_TRACE();
+
 			// Add the items into the packet.
 
 			for (auto* report : receiverReports)

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

@@ -28,6 +28,8 @@ namespace RTC
 		template<typename T>
 		const std::string& FeedbackPacket<T>::MessageTypeToString(typename T::MessageType type)
 		{
+			MS_TRACE();
+
 			static const std::string Unknown("UNKNOWN");
 
 			auto it = FeedbackPacket<T>::MessageType2String.find(type);
@@ -46,6 +48,8 @@ namespace RTC
 		FeedbackPacket<T>::FeedbackPacket(CommonHeader* commonHeader)
 		  : Packet(commonHeader), messageType(typename T::MessageType(commonHeader->count))
 		{
+			MS_TRACE();
+
 			this->header = reinterpret_cast<Header*>(
 			  reinterpret_cast<uint8_t*>(commonHeader) + Packet::CommonHeaderSize);
 		}
@@ -55,6 +59,8 @@ namespace RTC
 		  typename T::MessageType messageType, uint32_t senderSsrc, uint32_t mediaSsrc)
 		  : Packet(rtcpType), messageType(messageType)
 		{
+			MS_TRACE();
+
 			this->raw                = new uint8_t[HeaderSize];
 			this->header             = reinterpret_cast<Header*>(this->raw);
 			this->header->senderSsrc = htonl(senderSsrc);
@@ -64,6 +70,8 @@ namespace RTC
 		template<typename T>
 		FeedbackPacket<T>::~FeedbackPacket()
 		{
+			MS_TRACE();
+
 			delete[] this->raw;
 		}
 

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

@@ -42,6 +42,8 @@ namespace RTC
 		FeedbackPsRembPacket::FeedbackPsRembPacket(CommonHeader* commonHeader, size_t availableLen)
 		  : FeedbackPsAfbPacket(commonHeader, FeedbackPsAfbPacket::Application::REMB)
 		{
+			MS_TRACE();
+
 			const size_t len = static_cast<size_t>(ntohs(commonHeader->length) + 1) * 4;
 
 			if (len > availableLen)

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

@@ -25,6 +25,8 @@ namespace RTC
 
 		size_t FeedbackPsSliItem::Serialize(uint8_t* buffer)
 		{
+			MS_TRACE();
+
 			const uint32_t compact = (this->first << 19) | (this->number << 6) | this->pictureId;
 			auto* header           = reinterpret_cast<Header*>(buffer);
 

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

@@ -13,6 +13,8 @@ namespace RTC
 		FeedbackPsVbcmItem::FeedbackPsVbcmItem(
 		  uint32_t ssrc, uint8_t sequenceNumber, uint8_t payloadType, uint16_t length, uint8_t* value)
 		{
+			MS_TRACE();
+
 			this->raw    = new uint8_t[8 + length];
 			this->header = reinterpret_cast<Header*>(this->raw);
 

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

@@ -14,6 +14,8 @@ namespace RTC
 		/* Instance methods. */
 		FeedbackRtpNackItem::FeedbackRtpNackItem(uint16_t packetId, uint16_t lostPacketBitmask)
 		{
+			MS_TRACE();
+
 			this->raw    = new uint8_t[HeaderSize];
 			this->header = reinterpret_cast<Header*>(this->raw);
 

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

@@ -12,6 +12,8 @@ namespace RTC
 		/* Instance methods. */
 		FeedbackRtpTlleiItem::FeedbackRtpTlleiItem(uint16_t packetId, uint16_t lostPacketBitmask)
 		{
+			MS_TRACE();
+
 			this->raw    = new uint8_t[HeaderSize];
 			this->header = reinterpret_cast<Header*>(this->raw);
 

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

@@ -14,11 +14,14 @@ namespace RTC
 		FeedbackRtpTmmbItem<T>::FeedbackRtpTmmbItem(const Header* header)
 		  : FeedbackRtpTmmbItem<T>(reinterpret_cast<const uint8_t*>(header))
 		{
+			MS_TRACE();
 		}
 
 		template<typename T>
 		FeedbackRtpTmmbItem<T>::FeedbackRtpTmmbItem(const uint8_t* data)
 		{
+			MS_TRACE();
+
 			this->ssrc = Utils::Byte::Get4Bytes(data, 0);
 
 			// Read the 4 bytes block.
@@ -42,6 +45,8 @@ namespace RTC
 		template<typename T>
 		size_t FeedbackRtpTmmbItem<T>::Serialize(uint8_t* buffer)
 		{
+			MS_TRACE();
+
 			static constexpr uint32_t MaxMantissa{ 0x1ffff }; // 17 bits.
 
 			uint64_t mantissa = this->bitrate;

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

@@ -556,6 +556,8 @@ namespace RTC
 
 		void FeedbackRtpTransportPacket::CreateRunLengthChunk(Status status, uint16_t count)
 		{
+			MS_TRACE();
+
 			auto* chunk = new RunLengthChunk(status, count);
 
 			this->chunks.push_back(chunk);
@@ -565,6 +567,8 @@ namespace RTC
 
 		void FeedbackRtpTransportPacket::CreateOneBitVectorChunk(std::vector<Status>& statuses)
 		{
+			MS_TRACE();
+
 			auto* chunk = new OneBitVectorChunk(statuses);
 
 			this->chunks.push_back(chunk);
@@ -574,6 +578,8 @@ namespace RTC
 
 		void FeedbackRtpTransportPacket::CreateTwoBitVectorChunk(std::vector<Status>& statuses)
 		{
+			MS_TRACE();
+
 			auto* chunk = new TwoBitVectorChunk(statuses);
 
 			this->chunks.push_back(chunk);
@@ -583,6 +589,8 @@ namespace RTC
 
 		void FeedbackRtpTransportPacket::AddPendingChunks()
 		{
+			MS_TRACE();
+
 			// No pending status packets.
 			if (this->context.statuses.empty())
 			{

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

@@ -56,6 +56,8 @@ namespace RTC
 
 		const std::string& SdesItem::TypeToString(SdesItem::Type type)
 		{
+			MS_TRACE();
+
 			static const std::string Unknown("UNKNOWN");
 
 			auto it = SdesItem::Type2String.find(type);

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

@@ -110,6 +110,8 @@ namespace RTC
 
 			void AV1::PayloadDescriptor::Encoder::Encode(PayloadDescriptor* payloadDescriptor) const
 			{
+				MS_TRACE();
+
 				payloadDescriptor->UpdateActiveDecodeTargets(
 				  this->encodingData.maxSpatialLayer, this->encodingData.maxTemporalLayer);
 			}

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

@@ -100,11 +100,15 @@ namespace RTC
 
 			uint8_t DependencyDescriptor::GetSpatialLayer() const
 			{
+				MS_TRACE();
+
 				return this->templateDependencyStructure->templateLayers[this->templateId].spatialLayer;
 			}
 
 			uint8_t DependencyDescriptor::GetTemporalLayer() const
 			{
+				MS_TRACE();
+
 				return this->templateDependencyStructure->templateLayers[this->templateId].temporalLayer;
 			}
 
@@ -188,6 +192,8 @@ namespace RTC
 
 			void DependencyDescriptor::UpdateListener(DependencyDescriptor::Listener* listener)
 			{
+				MS_TRACE();
+
 				this->listener = listener;
 			}
 

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

@@ -264,6 +264,8 @@ namespace RTC
 			void VP8::PayloadDescriptor::Encoder::Encode(
 			  uint8_t* data, const PayloadDescriptor* payloadDescriptor) const
 			{
+				MS_TRACE();
+
 				payloadDescriptor->Encode(
 				  data, this->encodingData.pictureId, this->encodingData.tl0PictureIndex);
 			}