mediasoup 3.9.2 → 3.9.3

package/worker/src/RTC/Transport.cpp

@@ -2598,23 +2598,27 @@ namespace RTC
 			sentInfo.size        = packet->GetSize();
 			sentInfo.sendingAtMs = DepLibUV::GetTimeMs();
 
-			auto* cb = new onSendCallback([tccClient, &packetInfo, senderBwe, &sentInfo](bool sent) {
-				if (sent)
-				{
-					tccClient->PacketSent(packetInfo, DepLibUV::GetTimeMsInt64());
+			auto* cb = new onSendCallback(
+			  [tccClient, &packetInfo, senderBwe, &sentInfo](bool sent)
+			  {
+				  if (sent)
+				  {
+					  tccClient->PacketSent(packetInfo, DepLibUV::GetTimeMsInt64());
 
-					sentInfo.sentAtMs = DepLibUV::GetTimeMs();
+					  sentInfo.sentAtMs = DepLibUV::GetTimeMs();
 
-					senderBwe->RtpPacketSent(sentInfo);
-				}
-			});
+					  senderBwe->RtpPacketSent(sentInfo);
+				  }
+			  });
 
 			SendRtpPacket(consumer, packet, cb);
 #else
-			const auto* cb = new onSendCallback([tccClient, &packetInfo](bool sent) {
-				if (sent)
-					tccClient->PacketSent(packetInfo, DepLibUV::GetTimeMsInt64());
-			});
+			const auto* cb = new onSendCallback(
+			  [tccClient, &packetInfo](bool sent)
+			  {
+				  if (sent)
+					  tccClient->PacketSent(packetInfo, DepLibUV::GetTimeMsInt64());
+			  });
 
 			SendRtpPacket(consumer, packet, cb);
 #endif
@@ -2666,23 +2670,27 @@ namespace RTC
 			sentInfo.size        = packet->GetSize();
 			sentInfo.sendingAtMs = DepLibUV::GetTimeMs();
 
-			auto* cb = new onSendCallback([tccClient, &packetInfo, senderBwe, &sentInfo](bool sent) {
-				if (sent)
-				{
-					tccClient->PacketSent(packetInfo, DepLibUV::GetTimeMsInt64());
+			auto* cb = new onSendCallback(
+			  [tccClient, &packetInfo, senderBwe, &sentInfo](bool sent)
+			  {
+				  if (sent)
+				  {
+					  tccClient->PacketSent(packetInfo, DepLibUV::GetTimeMsInt64());
 
-					sentInfo.sentAtMs = DepLibUV::GetTimeMs();
+					  sentInfo.sentAtMs = DepLibUV::GetTimeMs();
 
-					senderBwe->RtpPacketSent(sentInfo);
-				}
-			});
+					  senderBwe->RtpPacketSent(sentInfo);
+				  }
+			  });
 
 			SendRtpPacket(consumer, packet, cb);
 #else
-			const auto* cb = new onSendCallback([tccClient, &packetInfo](bool sent) {
-				if (sent)
-					tccClient->PacketSent(packetInfo, DepLibUV::GetTimeMsInt64());
-			});
+			const auto* cb = new onSendCallback(
+			  [tccClient, &packetInfo](bool sent)
+			  {
+				  if (sent)
+					  tccClient->PacketSent(packetInfo, DepLibUV::GetTimeMsInt64());
+			  });
 
 			SendRtpPacket(consumer, packet, cb);
 #endif
@@ -3001,23 +3009,27 @@ namespace RTC
 			sentInfo.isProbation = true;
 			sentInfo.sendingAtMs = DepLibUV::GetTimeMs();
 
-			auto* cb = new onSendCallback([tccClient, &packetInfo, senderBwe, &sentInfo](bool sent) {
-				if (sent)
-				{
-					tccClient->PacketSent(packetInfo, DepLibUV::GetTimeMsInt64());
+			auto* cb = new onSendCallback(
+			  [tccClient, &packetInfo, senderBwe, &sentInfo](bool sent)
+			  {
+				  if (sent)
+				  {
+					  tccClient->PacketSent(packetInfo, DepLibUV::GetTimeMsInt64());
 
-					sentInfo.sentAtMs = DepLibUV::GetTimeMs();
+					  sentInfo.sentAtMs = DepLibUV::GetTimeMs();
 
-					senderBwe->RtpPacketSent(sentInfo);
-				}
-			});
+					  senderBwe->RtpPacketSent(sentInfo);
+				  }
+			  });
 
 			SendRtpPacket(nullptr, packet, cb);
 #else
-			const auto* cb = new onSendCallback([tccClient, &packetInfo](bool sent) {
-				if (sent)
-					tccClient->PacketSent(packetInfo, DepLibUV::GetTimeMsInt64());
-			});
+			const auto* cb = new onSendCallback(
+			  [tccClient, &packetInfo](bool sent)
+			  {
+				  if (sent)
+					  tccClient->PacketSent(packetInfo, DepLibUV::GetTimeMsInt64());
+			  });
 
 			SendRtpPacket(nullptr, packet, cb);
 #endif

package/worker/src/Worker.cpp

@@ -37,7 +37,7 @@ Worker::Worker(::Channel::ChannelSocket* channel, PayloadChannel::PayloadChannel
 	DepUsrSCTP::CreateChecker();
 
 	// Tell the Node process that we are running.
-	Channel::ChannelNotifier::Emit(std::to_string(Logger::pid), "running");
+	Channel::ChannelNotifier::Emit(Logger::pid, "running");
 
 	MS_DEBUG_DEV("starting libuv loop");
 	DepLibUV::RunLoop();

package/worker/src/lib.cpp

@@ -28,14 +28,22 @@
 
 void IgnoreSignals();
 
-extern "C" int run_worker(
+extern "C" int mediasoup_worker_run(
   int argc,
   char* argv[],
   const char* version,
   int consumerChannelFd,
   int producerChannelFd,
   int payloadConsumeChannelFd,
-  int payloadProduceChannelFd)
+  int payloadProduceChannelFd,
+  ChannelReadFn channelReadFn,
+  ChannelReadCtx channelReadCtx,
+  ChannelWriteFn channelWriteFn,
+  ChannelWriteCtx channelWriteCtx,
+  PayloadChannelReadFn payloadChannelReadFn,
+  PayloadChannelReadCtx payloadChannelReadCtx,
+  PayloadChannelWriteFn payloadChannelWriteFn,
+  PayloadChannelWriteCtx payloadChannelWriteCtx)
 {
 	// Initialize libuv stuff (we need it for the Channel).
 	DepLibUV::ClassInit();
@@ -52,7 +60,15 @@ extern "C" int run_worker(
 
 	try
 	{
-		channel.reset(new Channel::ChannelSocket(consumerChannelFd, producerChannelFd));
+		if (channelReadFn)
+		{
+			channel.reset(
+			  new Channel::ChannelSocket(channelReadFn, channelReadCtx, channelWriteFn, channelWriteCtx));
+		}
+		else
+		{
+			channel.reset(new Channel::ChannelSocket(consumerChannelFd, producerChannelFd));
+		}
 	}
 	catch (const MediaSoupError& error)
 	{
@@ -66,8 +82,16 @@ extern "C" int run_worker(
 
 	try
 	{
-		payloadChannel.reset(
-		  new PayloadChannel::PayloadChannelSocket(payloadConsumeChannelFd, payloadProduceChannelFd));
+		if (payloadChannelReadFn)
+		{
+			payloadChannel.reset(new PayloadChannel::PayloadChannelSocket(
+			  payloadChannelReadFn, payloadChannelReadCtx, payloadChannelWriteFn, payloadChannelWriteCtx));
+		}
+		else
+		{
+			payloadChannel.reset(
+			  new PayloadChannel::PayloadChannelSocket(payloadConsumeChannelFd, payloadProduceChannelFd));
+		}
 	}
 	catch (const MediaSoupError& error)
 	{

package/worker/src/lib.rs

@@ -1,8 +1,78 @@
-use std::os::raw::{c_char, c_int};
+use std::os::raw::{c_char, c_int, c_void};
+
+#[repr(transparent)]
+#[derive(Copy, Clone)]
+pub struct UvAsyncT(pub *const c_void);
+
+unsafe impl Send for UvAsyncT {}
+
+#[repr(transparent)]
+pub struct ChannelReadCtx(pub *const c_void);
+pub type ChannelReadFreeFn = Option<
+    unsafe extern "C" fn(
+        /* message: */ *mut u8,
+        /* message_len: */ u32,
+        /* message_ctx: */ usize,
+    ),
+>;
+pub type ChannelReadFn = unsafe extern "C" fn(
+    /* message: */ *mut *mut u8,
+    /* message_len: */ *mut u32,
+    /* message_ctx: */ *mut usize,
+    // This is `uv_async_t` handle that can be called later with `uv_async_send()` when there is
+    // more data to read
+    /* handle */
+    UvAsyncT,
+    /* ctx: */ ChannelReadCtx,
+) -> ChannelReadFreeFn;
+
+#[repr(transparent)]
+pub struct ChannelWriteCtx(pub *const c_void);
+pub type ChannelWriteFn = unsafe extern "C" fn(
+    /* message: */ *const u8,
+    /* message_len: */ u32,
+    /* ctx: */ ChannelWriteCtx,
+);
+
+#[repr(transparent)]
+pub struct PayloadChannelReadCtx(pub *const c_void);
+pub type PayloadChannelReadFreeFn = Option<
+    unsafe extern "C" fn(
+        /* message: */ *mut u8,
+        /* message_len: */ u32,
+        /* message_ctx: */ usize,
+    ),
+>;
+pub type PayloadChannelReadFn = unsafe extern "C" fn(
+    /* message: */ *mut *mut u8,
+    /* message_len: */ *mut u32,
+    /* message_ctx: */ *mut usize,
+    /* payload: */ *mut *mut u8,
+    /* payload_len: */ *mut u32,
+    /* payload_capacity: */ *mut usize,
+    // This is `uv_async_t` handle that can be called later with `uv_async_send()` when there is
+    // more data to read
+    /* handle */
+    UvAsyncT,
+    /* ctx: */ PayloadChannelReadCtx,
+) -> PayloadChannelReadFreeFn;
+
+#[repr(transparent)]
+pub struct PayloadChannelWriteCtx(pub *const c_void);
+pub type PayloadChannelWriteFn = unsafe extern "C" fn(
+    /* message: */ *const u8,
+    /* message_len: */ u32,
+    /* payload: */ *const u8,
+    /* payload_len: */ u32,
+    /* ctx: */ PayloadChannelWriteCtx,
+);
 
 #[link(name = "mediasoup-worker", kind = "static")]
 extern "C" {
-    pub fn run_worker(
+    /// Returns `0` on success, or an error code `< 0` on failure
+    pub fn uv_async_send(handle: UvAsyncT) -> c_int;
+
+    pub fn mediasoup_worker_run(
         argc: c_int,
         argv: *const *const c_char,
         version: *const c_char,
@@ -10,5 +80,13 @@ extern "C" {
         producer_channel_fd: c_int,
         payload_consumer_channel_fd: c_int,
         payload_producer_channel_fd: c_int,
+        channel_read_fn: ChannelReadFn,
+        channel_read_ctx: ChannelReadCtx,
+        channel_write_fn: ChannelWriteFn,
+        channel_write_ctx: ChannelWriteCtx,
+        payload_channel_read_fn: PayloadChannelReadFn,
+        payload_channel_read_ctx: PayloadChannelReadCtx,
+        payload_channel_write_fn: PayloadChannelWriteFn,
+        payload_channel_write_ctx: PayloadChannelWriteCtx,
     ) -> c_int;
 }

package/worker/src/main.cpp

@@ -23,14 +23,22 @@ int main(int argc, char* argv[])
 
 	std::string version = std::getenv("MEDIASOUP_VERSION");
 
-	auto statusCode = run_worker(
+	auto statusCode = mediasoup_worker_run(
 	  argc,
 	  argv,
 	  version.c_str(),
 	  ConsumerChannelFd,
 	  ProducerChannelFd,
 	  PayloadConsumerChannelFd,
-	  PayloadProducerChannelFd);
+	  PayloadProducerChannelFd,
+	  nullptr,
+	  nullptr,
+	  nullptr,
+	  nullptr,
+	  nullptr,
+	  nullptr,
+	  nullptr,
+	  nullptr);
 
 	switch (statusCode)
 	{