mediasoup 3.11.24 → 3.11.26

package/node/lib/Worker.js

@@ -90,7 +90,7 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         // options
         {
             env: {
-                MEDIASOUP_VERSION: '3.11.24',
+                MEDIASOUP_VERSION: '3.11.26',
                 // Let the worker process inherit all environment variables, useful
                 // if a custom and not in the path GCC is used so the user can set
                 // LD_LIBRARY_PATH environment variable for runtime.

package/node/lib/index.d.ts

@@ -10,7 +10,7 @@ export { types };
 /**
  * Expose mediasoup version.
  */
-export declare const version = "3.11.24";
+export declare const version = "3.11.26";
 /**
  * Expose parseScalabilityMode() function.
  */

package/node/lib/index.js

@@ -11,7 +11,7 @@ exports.types = types;
 /**
  * Expose mediasoup version.
  */
-exports.version = '3.11.24';
+exports.version = '3.11.26';
 /**
  * Expose parseScalabilityMode() function.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasoup",
-  "version": "3.11.24",
+  "version": "3.11.26",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -92,19 +92,19 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^29.5.1",
     "@types/node": "^18.15.11",
     "@types/uuid": "^9.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.0",
-    "@typescript-eslint/parser": "^5.59.0",
-    "eslint": "^8.38.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.6",
+    "@typescript-eslint/parser": "^5.59.6",
+    "eslint": "^8.40.0",
     "eslint-plugin-jest": "^27.2.1",
     "jest": "^29.5.0",
     "open-cli": "^7.2.0",
     "pick-port": "^1.0.1",
     "sctp": "^1.0.0",
     "ts-jest": "^29.1.0",
-    "tsc-watch": "^6.0.0",
+    "tsc-watch": "^6.0.4",
     "typescript": "^5.0.4"
   }
 }

package/worker/Makefile

@@ -20,7 +20,7 @@ PIP_DIR = $(MEDIASOUP_OUT_DIR)/pip
 INSTALL_DIR ?= $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)
 BUILD_DIR ?= $(INSTALL_DIR)/build
 MESON ?= $(PIP_DIR)/bin/meson
-MESON_VERSION ?= 0.61.5
+MESON_VERSION ?= 1.1.0
 # `MESON_ARGS` can be used to provide extra configuration parameters to Meson,
 # such as adding defines or changing optimization options. For instance, use
 # `MESON_ARGS="-Dms_log_trace=true -Dms_log_file_line=true" npm i` to compile

package/worker/deps/libwebrtc/libwebrtc/modules/congestion_controller/goog_cc/alr_detector.cc

@@ -116,11 +116,11 @@ absl::optional<int64_t> AlrDetector::GetApplicationLimitedRegionStartTime()
 
 absl::optional<int64_t> AlrDetector::GetApplicationLimitedRegionStartTime(
     int64_t at_time_ms) {
-  if (!alr_started_time_ms_ && *last_send_time_ms_) {
+  if (!alr_started_time_ms_ && last_send_time_ms_.has_value()) {
     int64_t delta_time_ms = at_time_ms - *last_send_time_ms_;
     // If ALR is stopped and we haven't sent any packets for a while, force start.
     if (delta_time_ms > alr_timeout_) {
-      MS_WARN_TAG(bwe, "large delta_time_ms: %ld, forcing alr state change",
+      MS_WARN_TAG(bwe, "large delta_time_ms: %" PRIi64 ", forcing alr state change",
         delta_time_ms);
       alr_started_time_ms_.emplace(at_time_ms);
     }

package/worker/include/RTC/RtpStream.hpp

@@ -214,8 +214,7 @@ namespace RTC
 		uint64_t lastSenderReportNtpMs{ 0u };
 		// RTP timestamp in last Sender Report.
 		uint32_t lastSenderReportTs{ 0u };
-		float rtt{ 0 };
-		bool hasRtt{ false };
+		float rtt{ 0.0f };
 		// Instance of RtxStream.
 		RTC::RtxStream* rtxStream{ nullptr };
 

package/worker/meson.build

@@ -3,10 +3,10 @@ project(
   ['c', 'cpp'],
   default_options : [
     'warning_level=1',
-    'cpp_std=c++11',
+    'cpp_std=c++17',
     'default_library=static',
   ],
-  meson_version: '>= 0.58',
+  meson_version: '>= 1.1.0',
 )
 
 cpp_args = [

package/worker/src/RTC/NackGenerator.cpp

@@ -51,14 +51,18 @@ namespace RTC
 			this->lastSeq = seq;
 
 			if (isKeyFrame)
+			{
 				this->keyFrameList.insert(seq);
+			}
 
 			return false;
 		}
 
 		// Obviously never nacked, so ignore.
 		if (seq == this->lastSeq)
+		{
 			return false;
+		}
 
 		// May be an out of order packet, or already handled retransmitted packet,
 		// or a retransmitted packet.
@@ -80,9 +84,13 @@ namespace RTC
 				this->nackList.erase(it);
 
 				if (retries != 0)
+				{
 					return true;
+				}
 				else
+				{
 					return false;
+				}
 			}
 
 			// Out of order packet or already handled NACKed packet.
@@ -101,14 +109,18 @@ namespace RTC
 		// newer than the latest seq seen.
 
 		if (isKeyFrame)
+		{
 			this->keyFrameList.insert(seq);
+		}
 
 		// Remove old keyframes.
 		{
 			auto it = this->keyFrameList.lower_bound(seq - MaxPacketAge);
 
 			if (it != this->keyFrameList.begin())
+			{
 				this->keyFrameList.erase(this->keyFrameList.begin(), it);
+			}
 		}
 
 		if (isRecovered)
@@ -119,7 +131,9 @@ namespace RTC
 			auto it = this->recoveredList.lower_bound(seq - MaxPacketAge);
 
 			if (it != this->recoveredList.begin())
+			{
 				this->recoveredList.erase(this->recoveredList.begin(), it);
+			}
 
 			// Do not let a packet pass if it's newer than last seen seq and came via
 			// RTX.
@@ -134,12 +148,16 @@ namespace RTC
 		std::vector<uint16_t> nackBatch = GetNackBatch(NackFilter::SEQ);
 
 		if (!nackBatch.empty())
+		{
 			this->listener->OnNackGeneratorNackRequired(nackBatch);
+		}
 
 		// This is important. Otherwise the running timer (filter:TIME) would be
 		// interrupted and NACKs would never been sent more than once for each seq.
 		if (!this->timer->IsActive())
+		{
 			MayRunTimer();
+		}
 
 		return false;
 	}
@@ -187,7 +205,9 @@ namespace RTC
 
 			// Do not send NACK for packets that are already recovered by RTX.
 			if (this->recoveredList.find(seq) != this->recoveredList.end())
+			{
 				continue;
+			}
 
 			this->nackList.emplace(std::make_pair(
 			  seq,
@@ -277,7 +297,10 @@ namespace RTC
 				continue;
 			}
 
-			if (filter == NackFilter::TIME && (nackInfo.sentAtMs == 0 || nowMs - nackInfo.sentAtMs >= this->rtt))
+			if (
+			  filter == NackFilter::TIME &&
+			  (nackInfo.sentAtMs == 0 ||
+			   nowMs - nackInfo.sentAtMs >= (this->rtt > 0u ? this->rtt : DefaultRtt)))
 			{
 				nackBatch.emplace_back(seq);
 				nackInfo.retries++;
@@ -313,9 +336,13 @@ namespace RTC
 			seqsStream << nackBatch.back();
 
 			if (filter == NackFilter::SEQ)
+			{
 				MS_DEBUG_DEV("[filter:SEQ, asking seqs:%s]", seqsStream.str().c_str());
+			}
 			else
+			{
 				MS_DEBUG_DEV("[filter:TIME, asking seqs:%s]", seqsStream.str().c_str());
+			}
 		}
 #endif
 
@@ -329,15 +356,20 @@ namespace RTC
 		this->nackList.clear();
 		this->keyFrameList.clear();
 		this->recoveredList.clear();
-
 		this->started = false;
 		this->lastSeq = 0u;
 	}
 
 	inline void NackGenerator::MayRunTimer() const
 	{
-		if (!this->nackList.empty())
+		if (this->nackList.empty())
+		{
+			this->timer->Stop();
+		}
+		else
+		{
 			this->timer->Start(TimerInterval);
+		}
 	}
 
 	inline void NackGenerator::OnTimer(Timer* /*timer*/)
@@ -347,7 +379,9 @@ namespace RTC
 		std::vector<uint16_t> nackBatch = GetNackBatch(NackFilter::TIME);
 
 		if (!nackBatch.empty())
+		{
 			this->listener->OnNackGeneratorNackRequired(nackBatch);
+		}
 
 		MayRunTimer();
 	}

package/worker/src/RTC/RtpStream.cpp

@@ -76,7 +76,7 @@ namespace RTC
 		if (this->rtxStream)
 			jsonObject["rtxPacketsDiscarded"] = this->rtxStream->GetPacketsDiscarded();
 
-		if (this->hasRtt)
+		if (this->rtt > 0.0f)
 			jsonObject["roundTripTime"] = this->rtt;
 	}
 

package/worker/src/RTC/RtpStreamRecv.cpp

@@ -608,9 +608,10 @@ namespace RTC
 		this->rtt = static_cast<float>(rtt >> 16) * 1000;
 		this->rtt += (static_cast<float>(rtt & 0x0000FFFF) / 65536) * 1000;
 
-		if (this->rtt > 0.0f)
+		// Avoid negative RTT value since it doesn't make sense.
+		if (this->rtt <= 0.0f)
 		{
-			this->hasRtt = true;
+			this->rtt = 0.0f;
 		}
 
 		// Tell it to the NackGenerator.

package/worker/src/RTC/RtpStreamSend.cpp

@@ -223,9 +223,10 @@ namespace RTC
 		this->rtt = static_cast<float>(rtt >> 16) * 1000;
 		this->rtt += (static_cast<float>(rtt & 0x0000FFFF) / 65536) * 1000;
 
-		if (this->rtt > 0.0f)
+		// Avoid negative RTT value since it doesn't make sense.
+		if (this->rtt <= 0.0f)
 		{
-			this->hasRtt = true;
+			this->rtt = 0.0f;
 		}
 
 		this->packetsLost  = report->GetTotalLost();
@@ -399,7 +400,7 @@ namespace RTC
 
 		// Look for each requested packet.
 		const uint64_t nowMs = DepLibUV::GetTimeMs();
-		const uint16_t rtt   = (this->rtt != 0u ? this->rtt : DefaultRtt);
+		const uint16_t rtt   = (this->rtt > 0.0f ? this->rtt : DefaultRtt);
 		uint16_t currentSeq  = seq;
 		bool requested{ true };
 		size_t containerIdx{ 0 };

package/worker/subprojects/abseil-cpp.wrap

@@ -1,11 +1,12 @@
 [wrap-file]
-directory = abseil-cpp-20211102.0
-source_url = https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz
-source_filename = abseil-cpp-20211102.0.tar.gz
-source_hash = dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4
-patch_filename = abseil-cpp_20211102.0-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/abseil-cpp_20211102.0-2/get_patch
-patch_hash = 9463930367b0db984435350c7d7614e400faa8811a7e9a2def5a63ff39fdb325
+directory = abseil-cpp-20220623.0
+source_url = https://github.com/abseil/abseil-cpp/archive/20220623.0.tar.gz
+source_filename = abseil-cpp-20220623.0.tar.gz
+source_hash = 4208129b49006089ba1d6710845a45e31c59b0ab6bff9e5788a87f55c5abd602
+patch_filename = abseil-cpp_20220623.0-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/abseil-cpp_20220623.0-2/get_patch
+patch_hash = d19cb16610d9310658a815ebcd87a9e2966aafbd57964341c0d1a3a3778c03b6
+wrapdb_version = 20220623.0-2
 
 [provide]
 absl_base = absl_base_dep
@@ -20,4 +21,3 @@ absl_strings = absl_strings_dep
 absl_synchronization = absl_synchronization_dep
 absl_time = absl_time_dep
 absl_types = absl_types_dep
-

package/worker/subprojects/libuv.wrap

@@ -3,10 +3,11 @@ directory = libuv-v1.44.2
 source_url = https://dist.libuv.org/dist/v1.44.2/libuv-v1.44.2.tar.gz
 source_filename = libuv-v1.44.2.tar.gz
 source_hash = ccfcdc968c55673c6526d8270a9c8655a806ea92468afcbcabc2b16040f03cb4
-patch_filename = libuv_1.44.2-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/libuv_1.44.2-1/get_patch
-patch_hash = c77f6104cffd53f697c3030fccbfd5cc684b59772e8f24529b01908ee27bd751
-wrapdb_version = 1.44.2-1
+patch_filename = libuv_1.44.2-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/libuv_1.44.2-2/get_patch
+patch_hash = 12a0850e1c925811f54bb022339d3105afaed8bc006b197351006c9c841f06ce
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libuv_1.44.2-2/libuv-v1.44.2.tar.gz
+wrapdb_version = 1.44.2-2
 
 [provide]
 libuv = libuv_dep

package/worker/subprojects/openssl.wrap

@@ -1,12 +1,13 @@
 [wrap-file]
-directory = openssl-3.0.7
-source_url = https://www.openssl.org/source/openssl-3.0.7.tar.gz
-source_filename = openssl-3.0.72.tar.gz
-source_hash = 83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e
-patch_filename = openssl_3.0.7-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/openssl_3.0.7-1/get_patch
-patch_hash = 8f04d911dc22d1dddc6a192ab27d6d8275976a252bd9c73e09f95f1f927e42b5
-wrapdb_version = 3.0.7-1
+directory = openssl-3.0.8
+source_url = https://www.openssl.org/source/openssl-3.0.8.tar.gz
+source_filename = openssl-3.0.8.tar.gz
+source_hash = 6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e
+patch_filename = openssl_3.0.8-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/openssl_3.0.8-1/get_patch
+patch_hash = 12d9c884174a91ccd1aa9230e9567c019f8a582ce46c98736f99a5200b4f2514
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/openssl_3.0.8-1/openssl-3.0.8.tar.gz
+wrapdb_version = 3.0.8-1
 
 [provide]
 libcrypto = libcrypto_dep

package/worker/include/FBS/activeSpeakerObserver_generated.h

@@ -1,157 +0,0 @@
-// automatically generated by the FlatBuffers compiler, do not modify
-
-
-#ifndef FLATBUFFERS_GENERATED_ACTIVESPEAKEROBSERVER_FBS_ACTIVESPEAKEROBSERVER_H_
-#define FLATBUFFERS_GENERATED_ACTIVESPEAKEROBSERVER_FBS_ACTIVESPEAKEROBSERVER_H_
-
-#include "flatbuffers/flatbuffers.h"
-
-// Ensure the included flatbuffers.h is the same version as when this file was
-// generated, otherwise it may not be compatible.
-static_assert(FLATBUFFERS_VERSION_MAJOR == 23 &&
-              FLATBUFFERS_VERSION_MINOR == 3 &&
-              FLATBUFFERS_VERSION_REVISION == 3,
-             "Non-compatible flatbuffers version included");
-
-namespace FBS {
-namespace ActiveSpeakerObserver {
-
-struct ActiveSpeakerObserverOptions;
-struct ActiveSpeakerObserverOptionsBuilder;
-
-struct DominantSpeakerNotification;
-struct DominantSpeakerNotificationBuilder;
-
-inline const ::flatbuffers::TypeTable *ActiveSpeakerObserverOptionsTypeTable();
-
-inline const ::flatbuffers::TypeTable *DominantSpeakerNotificationTypeTable();
-
-struct ActiveSpeakerObserverOptions FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef ActiveSpeakerObserverOptionsBuilder Builder;
-  static const ::flatbuffers::TypeTable *MiniReflectTypeTable() {
-    return ActiveSpeakerObserverOptionsTypeTable();
-  }
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_INTERVAL = 4
-  };
-  uint16_t interval() const {
-    return GetField<uint16_t>(VT_INTERVAL, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint16_t>(verifier, VT_INTERVAL, 2) &&
-           verifier.EndTable();
-  }
-};
-
-struct ActiveSpeakerObserverOptionsBuilder {
-  typedef ActiveSpeakerObserverOptions Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_interval(uint16_t interval) {
-    fbb_.AddElement<uint16_t>(ActiveSpeakerObserverOptions::VT_INTERVAL, interval, 0);
-  }
-  explicit ActiveSpeakerObserverOptionsBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<ActiveSpeakerObserverOptions> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<ActiveSpeakerObserverOptions>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<ActiveSpeakerObserverOptions> CreateActiveSpeakerObserverOptions(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    uint16_t interval = 0) {
-  ActiveSpeakerObserverOptionsBuilder builder_(_fbb);
-  builder_.add_interval(interval);
-  return builder_.Finish();
-}
-
-struct DominantSpeakerNotification FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef DominantSpeakerNotificationBuilder Builder;
-  static const ::flatbuffers::TypeTable *MiniReflectTypeTable() {
-    return DominantSpeakerNotificationTypeTable();
-  }
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_PRODUCERID = 4
-  };
-  const ::flatbuffers::String *producerId() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_PRODUCERID);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffsetRequired(verifier, VT_PRODUCERID) &&
-           verifier.VerifyString(producerId()) &&
-           verifier.EndTable();
-  }
-};
-
-struct DominantSpeakerNotificationBuilder {
-  typedef DominantSpeakerNotification Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_producerId(::flatbuffers::Offset<::flatbuffers::String> producerId) {
-    fbb_.AddOffset(DominantSpeakerNotification::VT_PRODUCERID, producerId);
-  }
-  explicit DominantSpeakerNotificationBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<DominantSpeakerNotification> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<DominantSpeakerNotification>(end);
-    fbb_.Required(o, DominantSpeakerNotification::VT_PRODUCERID);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<DominantSpeakerNotification> CreateDominantSpeakerNotification(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::String> producerId = 0) {
-  DominantSpeakerNotificationBuilder builder_(_fbb);
-  builder_.add_producerId(producerId);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<DominantSpeakerNotification> CreateDominantSpeakerNotificationDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const char *producerId = nullptr) {
-  auto producerId__ = producerId ? _fbb.CreateString(producerId) : 0;
-  return FBS::ActiveSpeakerObserver::CreateDominantSpeakerNotification(
-      _fbb,
-      producerId__);
-}
-
-inline const ::flatbuffers::TypeTable *ActiveSpeakerObserverOptionsTypeTable() {
-  static const ::flatbuffers::TypeCode type_codes[] = {
-    { ::flatbuffers::ET_USHORT, 0, -1 }
-  };
-  static const char * const names[] = {
-    "interval"
-  };
-  static const ::flatbuffers::TypeTable tt = {
-    ::flatbuffers::ST_TABLE, 1, type_codes, nullptr, nullptr, nullptr, names
-  };
-  return &tt;
-}
-
-inline const ::flatbuffers::TypeTable *DominantSpeakerNotificationTypeTable() {
-  static const ::flatbuffers::TypeCode type_codes[] = {
-    { ::flatbuffers::ET_STRING, 0, -1 }
-  };
-  static const char * const names[] = {
-    "producerId"
-  };
-  static const ::flatbuffers::TypeTable tt = {
-    ::flatbuffers::ST_TABLE, 1, type_codes, nullptr, nullptr, nullptr, names
-  };
-  return &tt;
-}
-
-}  // namespace ActiveSpeakerObserver
-}  // namespace FBS
-
-#endif  // FLATBUFFERS_GENERATED_ACTIVESPEAKEROBSERVER_FBS_ACTIVESPEAKEROBSERVER_H_