mediasoup 3.26.0 → 3.27.1

package/worker/src/handles/TimerHandle.cpp

@@ -24,11 +24,27 @@ static void onCloseTimer(uv_handle_t* handle)
 
 /* Instance methods. */
 
-TimerHandle::TimerHandle(TimerHandleInterface::Listener* listener)
-  : listener(listener), uvHandle(new uv_timer_t)
+TimerHandle::TimerHandle(TimerHandleInterface::Listener* listener, std::string label)
+  : listener(listener), label(std::move(label)), uvHandle(new uv_timer_t)
 {
 	MS_TRACE();
 
+	if (!this->listener)
+	{
+		delete this->uvHandle;
+		this->uvHandle = nullptr;
+
+		MS_THROW_TYPE_ERROR("[%s] listener must be given", this->label.c_str());
+	}
+
+	if (this->label.empty())
+	{
+		delete this->uvHandle;
+		this->uvHandle = nullptr;
+
+		MS_THROW_TYPE_ERROR("label must be given");
+	}
+
 	this->uvHandle->data = static_cast<void*>(this);
 
 	const int err = uv_timer_init(DepLibUV::GetLoop(), this->uvHandle);
@@ -38,7 +54,7 @@ TimerHandle::TimerHandle(TimerHandleInterface::Listener* listener)
 		delete this->uvHandle;
 		this->uvHandle = nullptr;
 
-		MS_THROW_ERROR("uv_timer_init() failed: %s", uv_strerror(err));
+		MS_THROW_ERROR("[%s] uv_timer_init() failed: %s", this->label.c_str(), uv_strerror(err));
 	}
 }
 
@@ -52,17 +68,29 @@ TimerHandle::~TimerHandle()
 	}
 }
 
-void TimerHandle::Start(uint64_t timeout, uint64_t repeat)
+void TimerHandle::Start(int64_t timeoutMs, int64_t repeatMs)
 {
 	MS_TRACE();
 
 	if (this->closed)
 	{
-		MS_THROW_ERROR("closed");
+		MS_THROW_ERROR("[%s] closed", this->label.c_str());
 	}
 
-	this->timeout = timeout;
-	this->repeat  = repeat;
+	if (timeoutMs < 0)
+	{
+		MS_THROW_TYPE_ERROR(
+		  "[%s] timeoutMs (%" PRIi64 " ms) cannot be negative", this->label.c_str(), timeoutMs);
+	}
+
+	if (repeatMs < 0)
+	{
+		MS_THROW_TYPE_ERROR(
+		  "[%s] repeatMs (%" PRIi64 " ms) cannot be negative", this->label.c_str(), repeatMs);
+	}
+
+	this->timeoutMs = timeoutMs;
+	this->repeatMs  = repeatMs;
 
 	int err;
 
@@ -72,16 +100,19 @@ void TimerHandle::Start(uint64_t timeout, uint64_t repeat)
 
 		if (err != 0)
 		{
-			MS_THROW_ERROR("uv_timer_stop() failed: %s", uv_strerror(err));
+			MS_THROW_ERROR("[%s] uv_timer_stop() failed: %s", this->label.c_str(), uv_strerror(err));
 		}
 	}
 
-	err =
-	  uv_timer_start(this->uvHandle, static_cast<uv_timer_cb>(onTimer), this->timeout, this->repeat);
+	err = uv_timer_start(
+	  this->uvHandle,
+	  static_cast<uv_timer_cb>(onTimer),
+	  static_cast<uint64_t>(this->timeoutMs),
+	  static_cast<uint64_t>(this->repeatMs));
 
 	if (err != 0)
 	{
-		MS_THROW_ERROR("uv_timer_start() failed: %s", uv_strerror(err));
+		MS_THROW_ERROR("[%s] uv_timer_start() failed: %s", this->label.c_str(), uv_strerror(err));
 	}
 }
 
@@ -91,7 +122,7 @@ void TimerHandle::Stop()
 
 	if (this->closed)
 	{
-		MS_THROW_ERROR("closed");
+		MS_THROW_ERROR("[%s] closed", this->label.c_str());
 	}
 
 	const int err = uv_timer_stop(this->uvHandle);
@@ -108,7 +139,7 @@ void TimerHandle::Restart()
 
 	if (this->closed)
 	{
-		MS_THROW_ERROR("closed");
+		MS_THROW_ERROR("[%s] closed", this->label.c_str());
 	}
 
 	int err;
@@ -119,30 +150,45 @@ void TimerHandle::Restart()
 
 		if (err != 0)
 		{
-			MS_THROW_ERROR("uv_timer_stop() failed: %s", uv_strerror(err));
+			MS_THROW_ERROR("[%s] uv_timer_stop() failed: %s", this->label.c_str(), uv_strerror(err));
 		}
 	}
 
-	err =
-	  uv_timer_start(this->uvHandle, static_cast<uv_timer_cb>(onTimer), this->timeout, this->repeat);
+	err = uv_timer_start(
+	  this->uvHandle,
+	  static_cast<uv_timer_cb>(onTimer),
+	  static_cast<uint64_t>(this->timeoutMs),
+	  static_cast<uint64_t>(this->repeatMs));
 
 	if (err != 0)
 	{
-		MS_THROW_ERROR("uv_timer_start() failed: %s", uv_strerror(err));
+		MS_THROW_ERROR("[%s] uv_timer_start() failed: %s", this->label.c_str(), uv_strerror(err));
 	}
 }
 
-void TimerHandle::Restart(uint64_t timeout, uint64_t repeat)
+void TimerHandle::Restart(int64_t timeoutMs, int64_t repeatMs)
 {
 	MS_TRACE();
 
 	if (this->closed)
 	{
-		MS_THROW_ERROR("closed");
+		MS_THROW_ERROR("[%s] closed", this->label.c_str());
+	}
+
+	if (timeoutMs < 0)
+	{
+		MS_THROW_TYPE_ERROR(
+		  "[%s] timeoutMs (%" PRIi64 " ms) cannot be negative", this->label.c_str(), timeoutMs);
+	}
+
+	if (repeatMs < 0)
+	{
+		MS_THROW_TYPE_ERROR(
+		  "[%s] repeatMs (%" PRIi64 " ms) cannot be negative", this->label.c_str(), repeatMs);
 	}
 
-	this->timeout = timeout;
-	this->repeat  = repeat;
+	this->timeoutMs = timeoutMs;
+	this->repeatMs  = repeatMs;
 
 	int err;
 
@@ -152,16 +198,19 @@ void TimerHandle::Restart(uint64_t timeout, uint64_t repeat)
 
 		if (err != 0)
 		{
-			MS_THROW_ERROR("uv_timer_stop() failed: %s", uv_strerror(err));
+			MS_THROW_ERROR("[%s] uv_timer_stop() failed: %s", this->label.c_str(), uv_strerror(err));
 		}
 	}
 
-	err =
-	  uv_timer_start(this->uvHandle, static_cast<uv_timer_cb>(onTimer), this->timeout, this->repeat);
+	err = uv_timer_start(
+	  this->uvHandle,
+	  static_cast<uv_timer_cb>(onTimer),
+	  static_cast<uint64_t>(this->timeoutMs),
+	  static_cast<uint64_t>(this->repeatMs));
 
 	if (err != 0)
 	{
-		MS_THROW_ERROR("uv_timer_start() failed: %s", uv_strerror(err));
+		MS_THROW_ERROR("[%s] uv_timer_start() failed: %s", this->label.c_str(), uv_strerror(err));
 	}
 }
 

package/worker/src/lib.cpp

@@ -8,7 +8,9 @@
 #include "Channel/ChannelSocket.hpp"
 #include "DepLibSRTP.hpp"
 #include "DepLibUV.hpp"
+#ifndef MS_USE_BUILTIN_BWE
 #include "DepLibWebRTC.hpp"
+#endif
 #include "DepOpenSSL.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
@@ -150,7 +152,9 @@ extern "C" int mediasoup_worker_run(
 		// Initialize static stuff.
 		DepOpenSSL::ClassInit();
 		DepLibSRTP::ClassInit();
+#ifndef MS_USE_BUILTIN_BWE
 		DepLibWebRTC::ClassInit();
+#endif
 		Utils::Crypto::ClassInit();
 		RTC::DtlsTransport::ClassInit();
 		RTC::SrtpSession::ClassInit();
@@ -168,7 +172,9 @@ extern "C" int mediasoup_worker_run(
 		// Free static stuff.
 		DepLibSRTP::ClassDestroy();
 		Utils::Crypto::ClassDestroy();
+#ifndef MS_USE_BUILTIN_BWE
 		DepLibWebRTC::ClassDestroy();
+#endif
 		RTC::DtlsTransport::ClassDestroy();
 		DepLibUV::ClassDestroy();