mediasoup 3.10.11 → 3.11.0

package/README.md

@@ -7,7 +7,6 @@
 [![][github-actions-shield-mediasoup-node]][github-actions-mediasoup-node]
 [![][github-actions-shield-mediasoup-worker]][github-actions-mediasoup-worker]
 [![][github-actions-shield-mediasoup-rust]][github-actions-mediasoup-rust]
-[![][codacy-grade-shield-mediasoup]][codacy-grade-mediasoup]
 [![][opencollective-shield-mediasoup]][opencollective-mediasoup]
 
 
@@ -101,8 +100,6 @@ You can support mediasoup by [sponsoring][sponsor] it. Thanks!
 [github-actions-mediasoup-worker]: https://github.com/versatica/mediasoup/actions/workflows/mediasoup-worker.yaml
 [github-actions-shield-mediasoup-rust]: https://github.com/versatica/mediasoup/actions/workflows/mediasoup-rust.yaml/badge.svg
 [github-actions-mediasoup-rust]: https://github.com/versatica/mediasoup/actions/workflows/mediasoup-rust.yaml
-[codacy-grade-shield-mediasoup]: https://img.shields.io/codacy/grade/3c8b9efc83674b6189707ab4188cfb2b.svg
-[codacy-grade-mediasoup]: https://www.codacy.com/app/versatica/mediasoup
 [opencollective-shield-mediasoup]: https://img.shields.io/opencollective/all/mediasoup.svg
 [opencollective-mediasoup]: https://opencollective.com/mediasoup/
 [sponsor]: https://mediasoup.org/sponsor/

package/node/lib/ActiveSpeakerObserver.d.ts

@@ -15,14 +15,10 @@ export interface ActiveSpeakerObserverActivity {
     producer: Producer;
 }
 export declare type ActiveSpeakerObserverEvents = RtpObserverEvents & {
-    dominantspeaker: [{
-        producer: Producer;
-    }];
+    dominantspeaker: [Producer];
 };
 export declare type ActiveSpeakerObserverObserverEvents = RtpObserverObserverEvents & {
-    dominantspeaker: [{
-        producer: Producer;
-    }];
+    dominantspeaker: [Producer];
 };
 declare type RtpObserverObserverConstructorOptions = RtpObserverConstructorOptions;
 export declare class ActiveSpeakerObserver extends RtpObserver<ActiveSpeakerObserverEvents> {

package/node/lib/ActiveSpeakerObserver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ActiveSpeakerObserver.d.ts","sourceRoot":"","sources":["../src/ActiveSpeakerObserver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EACN,WAAW,EACX,iBAAiB,EACjB,yBAAyB,EACzB,6BAA6B,EAC7B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,WAAW,4BAA4B;IAE5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,6BAA6B;IAE7C;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC;CACnB;AAED,oBAAY,2BAA2B,GAAG,iBAAiB,GAC3D;IACC,eAAe,EAAE,CAAC;QAAE,QAAQ,EAAE,QAAQ,CAAA;KAAE,CAAC,CAAC;CAC1C,CAAC;AAEF,oBAAY,mCAAmC,GAAG,yBAAyB,GAC3E;IACC,eAAe,EAAE,CAAC;QAAE,QAAQ,EAAE,QAAQ,CAAA;KAAE,CAAC,CAAC;CAC1C,CAAC;AAEF,aAAK,qCAAqC,GAAG,6BAA6B,CAAC;AAI3E,qBAAa,qBAAsB,SAAQ,WAAW,CAAC,2BAA2B,CAAC;IAElF;;OAEG;gBACS,OAAO,EAAE,qCAAqC;IAO1D;;OAEG;IACH,IAAI,QAAQ,IAAI,oBAAoB,CAAC,mCAAmC,CAAC,CAGxE;IAED,OAAO,CAAC,yBAAyB;CA4BjC"}
+{"version":3,"file":"ActiveSpeakerObserver.d.ts","sourceRoot":"","sources":["../src/ActiveSpeakerObserver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EACN,WAAW,EACX,iBAAiB,EACjB,yBAAyB,EACzB,6BAA6B,EAC7B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,WAAW,4BAA4B;IAE5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,6BAA6B;IAE7C;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC;CACnB;AAED,oBAAY,2BAA2B,GAAG,iBAAiB,GAC3D;IACC,eAAe,EAAE,CAAC,QAAQ,CAAC,CAAC;CAC5B,CAAC;AAEF,oBAAY,mCAAmC,GAAG,yBAAyB,GAC3E;IACC,eAAe,EAAE,CAAC,QAAQ,CAAC,CAAC;CAC5B,CAAC;AAEF,aAAK,qCAAqC,GAAG,6BAA6B,CAAC;AAI3E,qBAAa,qBAAsB,SAAQ,WAAW,CAAC,2BAA2B,CAAC;IAElF;;OAEG;gBACS,OAAO,EAAE,qCAAqC;IAO1D;;OAEG;IACH,IAAI,QAAQ,IAAI,oBAAoB,CAAC,mCAAmC,CAAC,CAGxE;IAED,OAAO,CAAC,yBAAyB;CA0BjC"}

package/node/lib/ActiveSpeakerObserver.js

@@ -26,9 +26,8 @@ class ActiveSpeakerObserver extends RtpObserver_1.RtpObserver {
                         const producer = this.getProducerById(data.producerId);
                         if (!producer)
                             break;
-                        const dominantSpeaker = { producer };
-                        this.safeEmit('dominantspeaker', dominantSpeaker);
-                        this.observer.safeEmit('dominantspeaker', dominantSpeaker);
+                        this.safeEmit('dominantspeaker', producer);
+                        this.observer.safeEmit('dominantspeaker', producer);
                         break;
                     }
                 default:

package/node/lib/Worker.js

@@ -81,7 +81,7 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         // options
         {
             env: {
-                MEDIASOUP_VERSION: '3.10.11',
+                MEDIASOUP_VERSION: '3.11.0',
                 // 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

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

package/node/lib/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasoup",
-  "version": "3.10.11",
+  "version": "3.11.0",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -69,20 +69,20 @@
     "testRegex": "node/tests/test.*\\.js"
   },
   "dependencies": {
-    "@types/node": "^16.11.10",
+    "@types/node": "^18.11.9",
     "debug": "^4.3.4",
     "h264-profile-level-id": "^1.0.1",
     "supports-color": "^9.2.3",
-    "uuid": "^8.3.2"
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
     "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^5.40.1",
-    "@typescript-eslint/parser": "^5.40.1",
-    "eslint": "^8.25.0",
+    "@typescript-eslint/eslint-plugin": "^5.42.0",
+    "@typescript-eslint/parser": "^5.42.0",
+    "eslint": "^8.26.0",
     "eslint-plugin-jest": "^27.1.3",
-    "jest": "^29.2.1",
+    "jest": "^29.2.2",
     "jest-tobetype": "^1.2.3",
     "open-cli": "^7.1.0",
     "pick-port": "^1.0.1",

package/worker/Makefile

@@ -7,11 +7,11 @@ PYTHON ?= $(shell command -v python3 2> /dev/null || echo python)
 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 CORES ?= $(shell ${ROOT_DIR}/scripts/cpu_cores.sh || echo 4)
 MEDIASOUP_OUT_DIR ?= $(shell pwd)/out
-# Controls build types, `Release` and `Debug` are presets optimized for those use cases.
-# Other build types are possible too, but they are not presets and will require `MESON_ARGS` use to customize build
-# configuration.
-# Check the meaning of useful macros in the `worker/include/Logger.hpp` header file if you want to enable tracing or
-# other debug information.
+# Controls build types, `Release` and `Debug` are presets optimized for those
+# use cases. Other build types are possible too, but they are not presets and
+# will require `MESON_ARGS` use to customize build configuration.
+# Check the meaning of useful macros in the `worker/include/Logger.hpp` header
+# file if you want to enable tracing or other debug information.
 MEDIASOUP_BUILDTYPE ?= Release
 GULP = ./scripts/node_modules/.bin/gulp
 LCOV = ./deps/lcov/bin/lcov
@@ -21,11 +21,13 @@ INSTALL_DIR ?= $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)
 BUILD_DIR ?= $(MEDIASOUP_OUT_DIR)/$(MEDIASOUP_BUILDTYPE)/build
 MESON ?= $(PIP_DIR)/bin/meson
 MESON_VERSION ?= 0.61.5
-# `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 worker with
-# tracing and enabled.
+# `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
+# worker with tracing and enabled.
 #
-# NOTE: On Windows make sure to add `--vsenv` or have MSVS environment already active if you override this parameter.
+# NOTE: On Windows make sure to add `--vsenv` or have MSVS environment already
+# active if you override this parameter.
 MESON_ARGS ?= ""
 # Workaround for NixOS and Guix that don't work with pre-built binaries, see:
 # https://github.com/NixOS/nixpkgs/issues/142383.
@@ -43,7 +45,8 @@ endif
 
 # Instruct Python where to look for modules it needs, such that `meson` actually
 # runs from installed location.
-# For some reason on Windows adding `:${PYTHONPATH}` breaks things.
+#
+# NOTE: For some reason on Windows adding `:${PYTHONPATH}` breaks things.
 ifeq ($(OS),Windows_NT)
 	export PYTHONPATH := $(PIP_DIR)
 else
@@ -58,18 +61,35 @@ endif
 endif
 
 .PHONY:	\
-	default meson-ninja setup clean clean-pip clean-subprojects clean-all mediasoup-worker xcode lint format test tidy \
-	fuzzer fuzzer-run-all docker-build docker-run libmediasoup-worker
+	default \
+	meson-ninja \
+	setup \
+	clean \
+	clean-build \
+	clean-pip \
+	clean-subprojects \
+	clean-all \
+	update-wrap-file \
+	mediasoup-worker \
+	libmediasoup-worker \
+	xcode \
+	lint \
+	format \
+	test \
+	tidy \
+	fuzzer \
+	fuzzer-run-all \
+	docker-build \
+	docker-run
 
 default: mediasoup-worker
 
 meson-ninja:
 ifeq ($(wildcard $(PIP_DIR)),)
-	# Updated pip and setuptools are needed for meson
+	# Updated pip and setuptools are needed for meson.
 	# `--system` is not present everywhere and is only needed as workaround for
-	# Debian-specific issue (copied from
-	# https://github.com/gluster/gstatus/pull/33), fallback to command without
-	# `--system` if the first one fails.
+	# Debian-specific issue (copied from https://github.com/gluster/gstatus/pull/33),
+	# fallback to command without `--system` if the first one fails.
 	$(PYTHON) -m pip install --system --target=$(PIP_DIR) pip setuptools || \
 		$(PYTHON) -m pip install --target=$(PIP_DIR) pip setuptools || \
 		echo "Installation failed, likely because PIP is unavailable, if you are on Debian/Ubuntu or derivative please install the python3-pip package"
@@ -164,12 +184,21 @@ clean-subprojects: meson-ninja
 clean-all: clean-subprojects
 	$(RM) -rf $(MEDIASOUP_OUT_DIR)
 
+# Update the wrap file of a subproject. Usage example:
+# make update-wrap-file SUBPROJECT=openssl
+update-wrap-file: meson-ninja
+	$(MESON) subprojects update --reset $(SUBPROJECT)
+
 mediasoup-worker: setup
 ifeq ($(MEDIASOUP_WORKER_BIN),)
 	$(MESON) compile -C $(BUILD_DIR) -j $(CORES) mediasoup-worker
 	$(MESON) install -C $(BUILD_DIR) --no-rebuild --tags mediasoup-worker
 endif
 
+libmediasoup-worker: setup
+	$(MESON) compile -C $(BUILD_DIR) -j $(CORES) libmediasoup-worker
+	$(MESON) install -C $(BUILD_DIR) --no-rebuild --tags libmediasoup-worker
+
 xcode: setup
 	$(MESON) setup --buildtype debug --backend xcode $(MEDIASOUP_OUT_DIR)/xcode
 
@@ -222,7 +251,3 @@ docker-run:
 		--cap-add SYS_PTRACE \
 		-v $(shell pwd)/../:/mediasoup \
 		mediasoup/docker:latest
-
-libmediasoup-worker: setup
-	$(MESON) compile -C $(BUILD_DIR) -j $(CORES) libmediasoup-worker
-	$(MESON) install -C $(BUILD_DIR) --no-rebuild --tags libmediasoup-worker

package/worker/deps/libwebrtc/libwebrtc/modules/bitrate_controller/send_side_bandwidth_estimation.cc

@@ -382,26 +382,29 @@ void SendSideBandwidthEstimation::UpdatePacketsLost(int packets_lost,
 
   // Check sequence number diff and weight loss report
   if (number_of_packets > 0) {
-    // Accumulate reports.
-    lost_packets_since_last_loss_update_ += packets_lost;
-    expected_packets_since_last_loss_update_ += number_of_packets;
+    int64_t expected =
+      expected_packets_since_last_loss_update_ + number_of_packets;
 
     // Don't generate a loss rate until it can be based on enough packets.
-    if (expected_packets_since_last_loss_update_ < kLimitNumPackets)
+    if (expected < kLimitNumPackets) {
+      // Accumulate reports.
+      expected_packets_since_last_loss_update_ = expected;
+      lost_packets_since_last_loss_update_ += packets_lost;
       return;
+    }
 
     has_decreased_since_last_fraction_loss_ = false;
-    int64_t lost_q8 = lost_packets_since_last_loss_update_ << 8;
-    int64_t expected = expected_packets_since_last_loss_update_;
+    int64_t lost_q8 =
+      std::max<int64_t>(lost_packets_since_last_loss_update_ + packets_lost, 0) << 8;
     last_fraction_loss_ = std::min<int>(lost_q8 / expected, 255);
 
     // Reset accumulators.
-
     lost_packets_since_last_loss_update_ = 0;
     expected_packets_since_last_loss_update_ = 0;
     last_loss_packet_report_ = at_time;
     UpdateEstimate(at_time);
   }
+
   UpdateUmaStatsPacketsLost(at_time, packets_lost);
 }
 

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

@@ -431,7 +431,7 @@ NetworkControlUpdate GoogCcNetworkController::OnTransportPacketsFeedback(
   for (const auto& feedback : feedbacks) {
     TimeDelta feedback_rtt =
         report.feedback_time - feedback.sent_packet.send_time;
-    TimeDelta min_pending_time = feedback.receive_time - max_recv_time;
+    TimeDelta min_pending_time = max_recv_time - feedback.receive_time;
     TimeDelta propagation_rtt = feedback_rtt - min_pending_time;
     max_feedback_rtt = std::max(max_feedback_rtt, feedback_rtt);
     min_propagation_rtt = std::min(min_propagation_rtt, propagation_rtt);

package/worker/include/RTC/ActiveSpeakerObserver.hpp

@@ -9,10 +9,9 @@
 #include <vector>
 
 // Implementation of Dominant Speaker Identification for Multipoint
-// Videoconferencing by Ilana Volfin and Israel Cohen. This
-// implementation uses the RTP Audio Level extension from RFC-6464
-// for the input signal.
-// This has been ported from DominantSpeakerIdentification.java in Jitsi.
+// Videoconferencing by Ilana Volfin and Israel Cohen. This implementation uses
+// the RTP Audio Level extension from RFC-6464 for the input signal. This has
+// been ported from DominantSpeakerIdentification.java in Jitsi:
 // https://github.com/jitsi/jitsi-utils/blob/master/src/main/java/org/jitsi/utils/dsi/DominantSpeakerIdentification.java
 namespace RTC
 {
@@ -24,7 +23,7 @@ namespace RTC
 		public:
 			Speaker();
 			void EvalActivityScores();
-			double GetActivityScore(int32_t interval);
+			double GetActivityScore(uint8_t interval);
 			void LevelChanged(uint32_t level, uint64_t now);
 			void LevelTimedOut(uint64_t now);
 
@@ -39,28 +38,36 @@ namespace RTC
 
 		public:
 			bool paused{ false };
-			double immediateActivityScore;
-			double mediumActivityScore;
-			double longActivityScore;
+			double immediateActivityScore{ 0 };
+			double mediumActivityScore{ 0 };
+			double longActivityScore{ 0 };
 			uint64_t lastLevelChangeTime{ 0 };
 
 		private:
-			uint8_t minLevel;
-			uint8_t nextMinLevel;
-			uint32_t nextMinLevelWindowLen{ 0 };
+			uint8_t minLevel{ 0u };
+			uint8_t nextMinLevel{ 0u };
+			uint32_t nextMinLevelWindowLen{ 0u };
 			std::vector<uint8_t> immediates;
 			std::vector<uint8_t> mediums;
 			std::vector<uint8_t> longs;
 			std::vector<uint8_t> levels;
-			size_t nextLevelIndex;
+			size_t nextLevelIndex{ 0u };
 		};
 
-		struct ProducerSpeaker
+		class ProducerSpeaker
 		{
+		public:
+			explicit ProducerSpeaker(RTC::Producer* producer);
+			~ProducerSpeaker();
+
+		public:
 			RTC::Producer* producer;
 			Speaker* speaker;
 		};
 
+	private:
+		static const size_t RelativeSpeachActivitiesLen{ 3u };
+
 	public:
 		ActiveSpeakerObserver(const std::string& id, RTC::RtpObserver::Listener* listener, json& data);
 		~ActiveSpeakerObserver() override;
@@ -84,13 +91,13 @@ namespace RTC
 		void OnTimer(Timer* timer) override;
 
 	private:
-		static constexpr int relativeSpeachActivitiesLen{ 3 };
-		double relativeSpeachActivities[relativeSpeachActivitiesLen];
-		std::string dominantId{ "" };
+		double relativeSpeachActivities[RelativeSpeachActivitiesLen];
+		std::string dominantId;
 		Timer* periodicTimer{ nullptr };
 		uint16_t interval{ 300u };
-		absl::flat_hash_map<std::string, struct ProducerSpeaker> mapProducerSpeaker;
-		uint64_t lastLevelIdleTime{ 0 };
+		// Map of ProducerSpeakers indexed by Producer id.
+		absl::flat_hash_map<std::string, ProducerSpeaker*> mapProducerSpeakers;
+		uint64_t lastLevelIdleTime{ 0u };
 	};
 } // namespace RTC
 

package/worker/include/RTC/RTCP/CompoundPacket.hpp

@@ -17,11 +17,14 @@ namespace RTC
 		class CompoundPacket
 		{
 		public:
-			// Maximum size for a CompundPacket, leaving free space for encryption.
-			// SRTP_MAX_TRAILER_LEN+4 is the maximum number of octects that will be
-			// added to an RTCP packet by srtp_protect_rtcp().
-			// srtp.h: SRTP_MAX_TRAILER_LEN (SRTP_MAX_TAG_LEN + SRTP_MAX_MKI_LEN)
-			constexpr static size_t MaxSize{ RTC::MtuSize - 148u };
+			// Maximum size for a CompundPacket.
+			// * IPv4|Ipv6 header size: 20|40 bytes. IPv6 considered.
+			// * UDP|TCP header size:   8|20  bytes. TCP considered.
+			// * SRTP Encryption: 148 bytes.
+			//    SRTP_MAX_TRAILER_LEN+4 is the maximum number of octects that will be
+			//    added to an RTCP packet by srtp_protect_rtcp().
+			//    srtp.h: SRTP_MAX_TRAILER_LEN (SRTP_MAX_TAG_LEN + SRTP_MAX_MKI_LEN)
+			constexpr static size_t MaxSize{ RTC::MtuSize - 40u - 20u - 148u };
 
 		public:
 			CompoundPacket() = default;