mediasoup 3.19.21 → 3.20.0

package/worker/src/RTC/AudioLevelObserver.cpp

@@ -13,7 +13,7 @@ namespace RTC
 	/* Instance methods. */
 
 	AudioLevelObserver::AudioLevelObserver(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  RTC::RtpObserver::Listener* listener,
 	  const FBS::AudioLevelObserver::AudioLevelObserverOptions* options)
@@ -39,12 +39,12 @@ namespace RTC
 			this->interval = 5000;
 		}
 
-		this->periodicTimer = new TimerHandle(this);
+		this->periodicTimer = this->shared->CreateTimer(this);
 
 		this->periodicTimer->Start(this->interval, this->interval);
 
 		// NOTE: This may throw.
-		this->shared->channelMessageRegistrator->RegisterHandler(
+		this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 		  this->id,
 		  /*channelRequestHandler*/ this,
 		  /*channelNotificationHandler*/ nullptr);
@@ -54,7 +54,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 
 		delete this->periodicTimer;
 	}
@@ -127,7 +127,7 @@ namespace RTC
 		{
 			this->silence = true;
 
-			this->shared->channelNotifier->Emit(
+			this->shared->GetChannelNotifier()->Emit(
 			  this->id, FBS::Notification::Event::AUDIOLEVELOBSERVER_SILENCE);
 		}
 	}
@@ -179,13 +179,15 @@ namespace RTC
 			{
 				volumes.emplace_back(
 				  FBS::AudioLevelObserver::CreateVolumeDirect(
-				    this->shared->channelNotifier->GetBufferBuilder(), rit->second->id.c_str(), rit->first));
+				    this->shared->GetChannelNotifier()->GetBufferBuilder(),
+				    rit->second->id.c_str(),
+				    rit->first));
 			}
 
 			auto notification = FBS::AudioLevelObserver::CreateVolumesNotificationDirect(
-			  this->shared->channelNotifier->GetBufferBuilder(), &volumes);
+			  this->shared->GetChannelNotifier()->GetBufferBuilder(), &volumes);
 
-			this->shared->channelNotifier->Emit(
+			this->shared->GetChannelNotifier()->Emit(
 			  this->id,
 			  FBS::Notification::Event::AUDIOLEVELOBSERVER_VOLUMES,
 			  FBS::Notification::Body::AudioLevelObserver_VolumesNotification,
@@ -195,7 +197,7 @@ namespace RTC
 		{
 			this->silence = true;
 
-			this->shared->channelNotifier->Emit(
+			this->shared->GetChannelNotifier()->Emit(
 			  this->id, FBS::Notification::Event::AUDIOLEVELOBSERVER_SILENCE);
 		}
 	}
@@ -213,7 +215,7 @@ namespace RTC
 		}
 	}
 
-	inline void AudioLevelObserver::OnTimer(TimerHandle* /*timer*/)
+	inline void AudioLevelObserver::OnTimer(TimerHandleInterface* /*timer*/)
 	{
 		MS_TRACE();
 

package/worker/src/RTC/Consumer.cpp

@@ -2,7 +2,6 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "RTC/Consumer.hpp"
-#include "DepLibUV.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
 
@@ -11,7 +10,7 @@ namespace RTC
 	/* Instance methods. */
 
 	Consumer::Consumer(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  const std::string& producerId,
 	  Listener* listener,
@@ -445,7 +444,8 @@ namespace RTC
 			UserOnPaused();
 		}
 
-		this->shared->channelNotifier->Emit(this->id, FBS::Notification::Event::CONSUMER_PRODUCER_PAUSE);
+		this->shared->GetChannelNotifier()->Emit(
+		  this->id, FBS::Notification::Event::CONSUMER_PRODUCER_PAUSE);
 	}
 
 	void Consumer::ProducerResumed()
@@ -466,7 +466,8 @@ namespace RTC
 			UserOnResumed();
 		}
 
-		this->shared->channelNotifier->Emit(this->id, FBS::Notification::Event::CONSUMER_PRODUCER_RESUME);
+		this->shared->GetChannelNotifier()->Emit(
+		  this->id, FBS::Notification::Event::CONSUMER_PRODUCER_RESUME);
 	}
 
 	void Consumer::ProducerRtpStreamScores(const std::vector<uint8_t>* scores)
@@ -487,7 +488,8 @@ namespace RTC
 
 		MS_DEBUG_DEV("Producer closed [consumerId:%s]", this->id.c_str());
 
-		this->shared->channelNotifier->Emit(this->id, FBS::Notification::Event::CONSUMER_PRODUCER_CLOSE);
+		this->shared->GetChannelNotifier()->Emit(
+		  this->id, FBS::Notification::Event::CONSUMER_PRODUCER_CLOSE);
 
 		this->listener->OnConsumerProducerClosed(this);
 	}
@@ -498,14 +500,14 @@ namespace RTC
 
 		if (this->traceEventTypes.keyframe && packet->IsKeyFrame())
 		{
-			auto rtpPacketDump = packet->FillBuffer(this->shared->channelNotifier->GetBufferBuilder());
-			auto traceInfo     = FBS::Consumer::CreateKeyFrameTraceInfo(
-			  this->shared->channelNotifier->GetBufferBuilder(), rtpPacketDump, isRtx);
+			auto rtpPacketDump = packet->FillBuffer(this->shared->GetChannelNotifier()->GetBufferBuilder());
+			auto traceInfo = FBS::Consumer::CreateKeyFrameTraceInfo(
+			  this->shared->GetChannelNotifier()->GetBufferBuilder(), rtpPacketDump, isRtx);
 
 			auto notification = FBS::Consumer::CreateTraceNotification(
-			  this->shared->channelNotifier->GetBufferBuilder(),
+			  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 			  FBS::Consumer::TraceEventType::KEYFRAME,
-			  DepLibUV::GetTimeMs(),
+			  this->shared->GetTimeMs(),
 			  FBS::Common::TraceDirection::DIRECTION_OUT,
 			  FBS::Consumer::TraceInfo::KeyFrameTraceInfo,
 			  traceInfo.Union());
@@ -514,14 +516,14 @@ namespace RTC
 		}
 		else if (this->traceEventTypes.rtp)
 		{
-			auto rtpPacketDump = packet->FillBuffer(this->shared->channelNotifier->GetBufferBuilder());
-			auto traceInfo     = FBS::Consumer::CreateRtpTraceInfo(
-			  this->shared->channelNotifier->GetBufferBuilder(), rtpPacketDump, isRtx);
+			auto rtpPacketDump = packet->FillBuffer(this->shared->GetChannelNotifier()->GetBufferBuilder());
+			auto traceInfo = FBS::Consumer::CreateRtpTraceInfo(
+			  this->shared->GetChannelNotifier()->GetBufferBuilder(), rtpPacketDump, isRtx);
 
 			auto notification = FBS::Consumer::CreateTraceNotification(
-			  this->shared->channelNotifier->GetBufferBuilder(),
+			  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 			  FBS::Consumer::TraceEventType::RTP,
-			  DepLibUV::GetTimeMs(),
+			  this->shared->GetTimeMs(),
 			  FBS::Common::TraceDirection::DIRECTION_OUT,
 			  FBS::Consumer::TraceInfo::RtpTraceInfo,
 			  traceInfo.Union());
@@ -539,13 +541,13 @@ namespace RTC
 			return;
 		}
 
-		auto traceInfo =
-		  FBS::Consumer::CreatePliTraceInfo(this->shared->channelNotifier->GetBufferBuilder(), ssrc);
+		auto traceInfo = FBS::Consumer::CreatePliTraceInfo(
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), ssrc);
 
 		auto notification = FBS::Consumer::CreateTraceNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  FBS::Consumer::TraceEventType::PLI,
-		  DepLibUV::GetTimeMs(),
+		  this->shared->GetTimeMs(),
 		  FBS::Common::TraceDirection::DIRECTION_IN,
 		  FBS::Consumer::TraceInfo::PliTraceInfo,
 		  traceInfo.Union());
@@ -562,13 +564,13 @@ namespace RTC
 			return;
 		}
 
-		auto traceInfo =
-		  FBS::Consumer::CreateFirTraceInfo(this->shared->channelNotifier->GetBufferBuilder(), ssrc);
+		auto traceInfo = FBS::Consumer::CreateFirTraceInfo(
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), ssrc);
 
 		auto notification = FBS::Consumer::CreateTraceNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  FBS::Consumer::TraceEventType::FIR,
-		  DepLibUV::GetTimeMs(),
+		  this->shared->GetTimeMs(),
 		  FBS::Common::TraceDirection::DIRECTION_IN,
 		  FBS::Consumer::TraceInfo::FirTraceInfo,
 		  traceInfo.Union());
@@ -586,9 +588,9 @@ namespace RTC
 		}
 
 		auto notification = FBS::Consumer::CreateTraceNotification(
-		  this->shared->channelNotifier->GetBufferBuilder(),
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(),
 		  FBS::Consumer::TraceEventType::NACK,
-		  DepLibUV::GetTimeMs(),
+		  this->shared->GetTimeMs(),
 		  FBS::Common::TraceDirection::DIRECTION_IN);
 
 		EmitTraceEvent(notification);
@@ -598,7 +600,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id,
 		  FBS::Notification::Event::CONSUMER_TRACE,
 		  FBS::Notification::Body::Consumer_TraceNotification,

package/worker/src/RTC/DataConsumer.cpp

@@ -2,7 +2,6 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "RTC/DataConsumer.hpp"
-#include "DepLibUV.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
 
@@ -11,7 +10,7 @@ namespace RTC
 	/* Instance methods. */
 
 	DataConsumer::DataConsumer(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  const std::string& dataProducerId,
 	  RTC::DataConsumer::Listener* listener,
@@ -27,13 +26,13 @@ namespace RTC
 
 		switch (data->type())
 		{
-			case FBS::DataProducer::Type::SCTP:
+			case FBS::DataConsumer::Type::SCTP:
 			{
 				this->type = DataConsumer::Type::SCTP;
 
 				break;
 			}
-			case FBS::DataProducer::Type::DIRECT:
+			case FBS::DataConsumer::Type::DIRECT:
 			{
 				this->type = DataConsumer::Type::DIRECT;
 
@@ -75,7 +74,7 @@ namespace RTC
 		}
 
 		// NOTE: This may throw.
-		this->shared->channelMessageRegistrator->RegisterHandler(
+		this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 		  this->id,
 		  /*channelRequestHandler*/ this,
 		  /*channelNotificationHandler*/ nullptr);
@@ -85,7 +84,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 	}
 
 	flatbuffers::Offset<FBS::DataConsumer::DumpResponse> DataConsumer::FillBuffer(
@@ -110,16 +109,28 @@ namespace RTC
 			subchannels.emplace_back(subchannel);
 		}
 
+		uint32_t bufferedAmount{ 0 };
+
+		this->listener->OnDataConsumerNeedBufferedAmount(this, bufferedAmount);
+
+		uint32_t bufferedAmountLowThreshold{ 0 };
+
+		if (this->type == DataConsumer::Type::SCTP)
+		{
+			this->listener->OnDataConsumerNeedBufferedAmountLowThreshold(this, bufferedAmountLowThreshold);
+		}
+
 		return FBS::DataConsumer::CreateDumpResponseDirect(
 		  builder,
 		  this->id.c_str(),
 		  this->dataProducerId.c_str(),
-		  this->type == DataConsumer::Type::SCTP ? FBS::DataProducer::Type::SCTP
-		                                         : FBS::DataProducer::Type::DIRECT,
+		  this->type == DataConsumer::Type::SCTP ? FBS::DataConsumer::Type::SCTP
+		                                         : FBS::DataConsumer::Type::DIRECT,
 		  sctpStreamParameters,
 		  this->label.c_str(),
 		  this->protocol.c_str(),
-		  this->bufferedAmountLowThreshold,
+		  bufferedAmount,
+		  bufferedAmountLowThreshold,
 		  this->paused,
 		  this->dataProducerPaused,
 		  std::addressof(subchannels));
@@ -130,10 +141,14 @@ namespace RTC
 	{
 		MS_TRACE();
 
+		uint32_t bufferedAmount{ 0 };
+
+		this->listener->OnDataConsumerNeedBufferedAmount(this, bufferedAmount);
+
 		return FBS::DataConsumer::CreateGetStatsResponseDirect(
 		  builder,
 		  // timestamp.
-		  DepLibUV::GetTimeMs(),
+		  this->shared->GetTimeMs(),
 		  // label.
 		  this->label.c_str(),
 		  // protocol.
@@ -143,7 +158,7 @@ namespace RTC
 		  // bytesSent.
 		  this->bytesSent,
 		  // bufferedAmount.
-		  this->bufferedAmount);
+		  bufferedAmount);
 	}
 
 	void DataConsumer::HandleRequest(Channel::ChannelRequest* request)
@@ -234,32 +249,12 @@ namespace RTC
 
 				const auto* body =
 				  request->data->body_as<FBS::DataConsumer::SetBufferedAmountLowThresholdRequest>();
+				const auto bufferedAmountLowThreshold = static_cast<size_t>(body->threshold());
 
-				this->bufferedAmountLowThreshold = body->threshold();
+				this->listener->OnDataConsumerSetBufferedAmountLowThreshold(this, bufferedAmountLowThreshold);
 
 				request->Accept();
 
-				// There is less or same buffered data than the given threshold.
-				// Trigger 'bufferedamountlow' now.
-				if (this->bufferedAmount <= this->bufferedAmountLowThreshold)
-				{
-					// Notify the Node DataConsumer.
-					auto bufferedAmountLowOffset = FBS::DataConsumer::CreateBufferedAmountLowNotification(
-					  this->shared->channelNotifier->GetBufferBuilder(), this->bufferedAmount);
-
-					this->shared->channelNotifier->Emit(
-					  this->id,
-					  FBS::Notification::Event::DATACONSUMER_BUFFERED_AMOUNT_LOW,
-					  FBS::Notification::Body::DataConsumer_BufferedAmountLowNotification,
-					  bufferedAmountLowOffset);
-				}
-				// Force the trigger of 'bufferedamountlow' once there is less or same
-				// buffered data than the given threshold.
-				else
-				{
-					this->forceTriggerBufferedAmountLow = true;
-				}
-
 				break;
 			}
 
@@ -295,9 +290,16 @@ namespace RTC
 					  }
 				  });
 
-				static std::vector<uint16_t> emptySubchannels;
+				static thread_local std::vector<uint16_t> emptySubchannels;
+
+				const uint16_t streamId =
+				  this->type == DataConsumer::Type::SCTP ? this->sctpStreamParameters.streamId : 0;
 
-				SendMessage(data, len, body->ppid(), emptySubchannels, std::nullopt, cb);
+				// NOTE: We are creating a copy of the data here, otherwise we cannot
+				// 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));
+
+				SendMessage(std::move(message), emptySubchannels, std::nullopt, cb);
 
 				break;
 			}
@@ -415,9 +417,9 @@ namespace RTC
 
 		this->dataProducerPaused = true;
 
-		MS_DEBUG_DEV("DataProducer paused [dataConsumerId:%s]", this->id.c_str());
+		MS_DEBUG_DEV("DataConsumer paused [dataConsumerId:%s]", this->id.c_str());
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id, FBS::Notification::Event::DATACONSUMER_DATAPRODUCER_PAUSE);
 	}
 
@@ -432,9 +434,9 @@ namespace RTC
 
 		this->dataProducerPaused = false;
 
-		MS_DEBUG_DEV("DataProducer resumed [dataConsumerId:%s]", this->id.c_str());
+		MS_DEBUG_DEV("DataConsumer resumed [dataConsumerId:%s]", this->id.c_str());
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id, FBS::Notification::Event::DATACONSUMER_DATAPRODUCER_RESUME);
 	}
 
@@ -456,38 +458,26 @@ namespace RTC
 		MS_DEBUG_DEV("SctpAssociation closed [dataConsumerId:%s]", this->id.c_str());
 	}
 
-	void DataConsumer::SetSctpAssociationBufferedAmount(uint32_t bufferedAmount)
+	void DataConsumer::SctpBufferedAmountLow(uint32_t bufferedAmount) const
 	{
 		MS_TRACE();
 
-		auto previousBufferedAmount = this->bufferedAmount;
-
-		this->bufferedAmount = bufferedAmount;
-
-		if (
-		  (this->forceTriggerBufferedAmountLow ||
-		   previousBufferedAmount > this->bufferedAmountLowThreshold) &&
-		  this->bufferedAmount <= this->bufferedAmountLowThreshold)
-		{
-			this->forceTriggerBufferedAmountLow = false;
-
-			// Notify the Node DataConsumer.
-			auto bufferedAmountLowOffset = FBS::DataConsumer::CreateBufferedAmountLowNotification(
-			  this->shared->channelNotifier->GetBufferBuilder(), this->bufferedAmount);
+		// Notify the Node DataConsumer.
+		auto bufferedAmountLowOffset = FBS::DataConsumer::CreateBufferedAmountLowNotification(
+		  this->shared->GetChannelNotifier()->GetBufferBuilder(), bufferedAmount);
 
-			this->shared->channelNotifier->Emit(
-			  this->id,
-			  FBS::Notification::Event::DATACONSUMER_BUFFERED_AMOUNT_LOW,
-			  FBS::Notification::Body::DataConsumer_BufferedAmountLowNotification,
-			  bufferedAmountLowOffset);
-		}
+		this->shared->GetChannelNotifier()->Emit(
+		  this->id,
+		  FBS::Notification::Event::DATACONSUMER_BUFFERED_AMOUNT_LOW,
+		  FBS::Notification::Body::DataConsumer_BufferedAmountLowNotification,
+		  bufferedAmountLowOffset);
 	}
 
-	void DataConsumer::SctpAssociationSendBufferFull()
+	void DataConsumer::SctpSendBufferFull() const
 	{
 		MS_TRACE();
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id, FBS::Notification::Event::DATACONSUMER_SCTP_SENDBUFFER_FULL);
 	}
 
@@ -499,18 +489,16 @@ namespace RTC
 
 		this->dataProducerClosed = true;
 
-		MS_DEBUG_DEV("DataProducer closed [dataConsumerId:%s]", this->id.c_str());
+		MS_DEBUG_DEV("DataConsumer closed [dataConsumerId:%s]", this->id.c_str());
 
-		this->shared->channelNotifier->Emit(
+		this->shared->GetChannelNotifier()->Emit(
 		  this->id, FBS::Notification::Event::DATACONSUMER_DATAPRODUCER_CLOSE);
 
 		this->listener->OnDataConsumerDataProducerClosed(this);
 	}
 
 	bool DataConsumer::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)
@@ -571,12 +559,14 @@ namespace RTC
 			}
 		}
 
-		if (len > this->maxMessageSize)
+		const size_t messageLen = message.GetPayloadLength();
+
+		if (messageLen > this->maxMessageSize)
 		{
 			MS_WARN_TAG(
 			  message,
 			  "given message exceeds maxMessageSize value [maxMessageSize:%zu, len:%zu]",
-			  len,
+			  messageLen,
 			  this->maxMessageSize);
 
 			if (cb)
@@ -589,9 +579,9 @@ namespace RTC
 		}
 
 		this->messagesSent++;
-		this->bytesSent += len;
+		this->bytesSent += messageLen;
 
-		this->listener->OnDataConsumerSendMessage(this, msg, len, ppid, cb);
+		this->listener->OnDataConsumerSendMessage(this, std::move(message), cb);
 
 		return true;
 	}

package/worker/src/RTC/DataProducer.cpp

@@ -2,9 +2,9 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "RTC/DataProducer.hpp"
-#include "DepLibUV.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
+#include "Settings.hpp"
 #include <vector>
 
 namespace RTC
@@ -12,7 +12,7 @@ namespace RTC
 	/* Instance methods. */
 
 	DataProducer::DataProducer(
-	  RTC::Shared* shared,
+	  SharedInterface* shared,
 	  const std::string& id,
 	  size_t maxMessageSize,
 	  RTC::DataProducer::Listener* listener,
@@ -63,7 +63,7 @@ namespace RTC
 		this->paused = data->paused();
 
 		// NOTE: This may throw.
-		this->shared->channelMessageRegistrator->RegisterHandler(
+		this->shared->GetChannelMessageRegistrator()->RegisterHandler(
 		  this->id,
 		  /*channelRequestHandler*/ this,
 		  /*channelNotificationHandler*/ this);
@@ -73,7 +73,7 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		this->shared->channelMessageRegistrator->UnregisterHandler(this->id);
+		this->shared->GetChannelMessageRegistrator()->UnregisterHandler(this->id);
 	}
 
 	flatbuffers::Offset<FBS::DataProducer::DumpResponse> DataProducer::FillBuffer(
@@ -108,7 +108,7 @@ namespace RTC
 		return FBS::DataProducer::CreateGetStatsResponseDirect(
 		  builder,
 		  // timestamp.
-		  DepLibUV::GetTimeMs(),
+		  this->shared->GetTimeMs(),
 		  // label.
 		  this->label.c_str(),
 		  // protocol.
@@ -229,7 +229,14 @@ namespace RTC
 					requiredSubchannel = body->requiredSubchannel();
 				}
 
-				ReceiveMessage(data, len, body->ppid(), subchannels, requiredSubchannel);
+				const uint16_t streamId =
+				  this->type == DataProducer::Type::SCTP ? this->sctpStreamParameters.streamId : 0;
+
+				// NOTE: We are creating a copy of the data here, otherwise we cannot
+				// 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);
 
 				// Increase receive transmission.
 				this->listener->OnDataProducerReceiveData(this, len);
@@ -245,16 +252,14 @@ namespace RTC
 	}
 
 	void DataProducer::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)
 	{
 		MS_TRACE();
 
 		this->messagesReceived++;
-		this->bytesReceived += len;
+		this->bytesReceived += message.GetPayloadLength();
 
 		// If paused stop here.
 		if (this->paused)
@@ -263,6 +268,6 @@ namespace RTC
 		}
 
 		this->listener->OnDataProducerMessageReceived(
-		  this, msg, len, ppid, subchannels, requiredSubchannel);
+		  this, std::move(message), subchannels, requiredSubchannel);
 	}
 } // namespace RTC