mediasoup 3.20.5 → 3.20.7

package/worker/include/RTC/SvcProducerStreamManager.hpp

@@ -0,0 +1,72 @@
+#ifndef MS_RTC_SVC_CONSUMER_STREAM_HPP
+#define MS_RTC_SVC_CONSUMER_STREAM_HPP
+
+#include "RTC/ProducerStreamManager.hpp"
+
+namespace RTC
+{
+	class SvcProducerStreamManager : public ProducerStreamManager
+	{
+	public:
+		SvcProducerStreamManager(
+		  const std::vector<RTC::RtpEncodingParameters>& consumableRtpEncodings,
+		  const RTC::ConsumerTypes::VideoLayers& preferredLayers,
+		  std::unique_ptr<RTC::RTP::Codecs::EncodingContext> encodingContext,
+		  RTC::Media::Kind kind,
+		  bool keyFrameSupported,
+		  Listener* listener,
+		  SharedInterface* shared);
+
+	public:
+		RTC::ConsumerTypes::VideoLayers GetTargetLayers() const override
+		{
+			return this->encodingContext->GetTargetLayers();
+		}
+		int16_t GetCurrentSpatialLayer() const override
+		{
+			return this->encodingContext->GetCurrentSpatialLayer();
+		}
+		int16_t GetCurrentTemporalLayer() const override
+		{
+			return this->encodingContext->GetCurrentTemporalLayer();
+		}
+		RTC::RTP::RtpStreamRecv* GetProducerCurrentRtpStream() const override;
+		RTC::RTP::RtpStreamRecv* GetProducerTargetRtpStream() const override;
+		bool IsPacketForCurrentStream(const RTC::RTP::Packet* /*packet*/) const override
+		{
+			return true;
+		}
+		bool IsActive() const override;
+		void ProducerRtpStream(RTC::RTP::RtpStreamRecv* rtpStream, uint32_t mappedSsrc) override;
+		void ProducerNewRtpStream(RTC::RTP::RtpStreamRecv* rtpStream, uint32_t mappedSsrc) override;
+		void ProducerRtpStreamScore(
+		  RTC::RTP::RtpStreamRecv* rtpStream, uint8_t score, uint8_t previousScore) override;
+		void ProducerRtcpSenderReport(RTC::RTP::RtpStreamRecv* rtpStream, bool first) override;
+		uint32_t IncreaseLayer(
+		  uint32_t bitrate, bool considerLoss, float lossPercentage, uint64_t nowMs) override;
+		void ApplyLayers(uint64_t rtpStreamActiveMs) override;
+		uint32_t GetDesiredBitrate(uint64_t nowMs) const override;
+		RtpPacketProcessResult ProcessRtpPacket(
+		  RTC::RTP::Packet* packet,
+		  bool lastSentPacketHasMarker,
+		  uint32_t clockRate,
+		  uint32_t maxPacketTs) override;
+		void RequestKeyFrame() override;
+		void RequestKeyFrameForTargetSpatialLayer() override;
+		void RequestKeyFrameForCurrentSpatialLayer() override;
+		void UpdateTargetLayers(int16_t newTargetSpatialLayer, int16_t newTargetTemporalLayer) override;
+		bool RecalculateTargetLayers(RTC::ConsumerTypes::VideoLayers& newTargetLayers) const override;
+		void OnTransportConnected() override;
+		void OnTransportDisconnected() override;
+		void OnPaused() override;
+		void OnResumed() override;
+
+	private:
+		// Producer RTP stream (single stream for SVC).
+		RTC::RTP::RtpStreamRecv* producerRtpStream{ nullptr };
+		// BWE downgrade tracking.
+		uint64_t lastBweDowngradeAtMs{ 0u };
+	};
+} // namespace RTC
+
+#endif

package/worker/include/RTC/Transport.hpp

@@ -154,7 +154,13 @@ namespace RTC
 		  SharedInterface* shared,
 		  const std::string& id,
 		  RTC::Transport::Listener* listener,
-		  const FBS::Transport::Options* options);
+		  const FBS::Transport::Options* options,
+		  /**
+		   * Whether the SCTP association (if enabled) must authenticate received
+		   * State Cookies. This must be `true` for transports whose SCTP traffic
+		   * is not protected by DTLS (PlainTransport and PipeTransport).
+		   */
+		  bool requireSctpStateCookieAuthentication);
 		~Transport() override;
 
 	public:

package/worker/include/Settings.hpp

@@ -39,7 +39,6 @@ public:
 		std::string dtlsCertificateFile;
 		std::string dtlsPrivateKeyFile;
 		std::string libwebrtcFieldTrials{ "WebRTC-Bwe-AlrLimitedBackoff/Enabled/" };
-		bool disableLiburing{ false };
 	};
 
 public:

package/worker/include/handles/TcpConnectionHandle.hpp

@@ -143,10 +143,6 @@ private:
 	uv_tcp_t* uvHandle{ nullptr };
 	// Others.
 	struct sockaddr_storage* localAddr{ nullptr };
-#ifdef MS_LIBURING_SUPPORTED
-	// Local file descriptor for io_uring.
-	uv_os_fd_t fd{ 0u };
-#endif
 	bool closed{ false };
 	size_t recvBytes{ 0u };
 	size_t sentBytes{ 0u };

package/worker/include/handles/UdpSocketHandle.hpp

@@ -102,10 +102,6 @@ private:
 	// Allocated by this (may be passed by argument).
 	uv_udp_t* uvHandle{ nullptr };
 	// Others.
-#ifdef MS_LIBURING_SUPPORTED
-	// Local file descriptor for io_uring.
-	uv_os_fd_t fd{ 0u };
-#endif
 	bool closed{ false };
 	size_t recvBytes{ 0u };
 	size_t sentBytes{ 0u };

package/worker/meson.build

@@ -119,7 +119,6 @@ common_sources = [
   'src/RTC/DtlsTransport.cpp',
   'src/RTC/KeyFrameRequestManager.cpp',
   'src/RTC/NackGenerator.cpp',
-  'src/RTC/PipeConsumer.cpp',
   'src/RTC/PipeTransport.cpp',
   'src/RTC/PlainTransport.cpp',
   'src/RTC/PortManager.cpp',
@@ -133,10 +132,11 @@ common_sources = [
   'src/RTC/SenderBandwidthEstimator.cpp',
   'src/RTC/SeqManager.cpp',
   'src/RTC/Serializable.cpp',
-  'src/RTC/SimpleConsumer.cpp',
-  'src/RTC/SimulcastConsumer.cpp',
+  'src/RTC/PipeProducerStreamManager.cpp',
+  'src/RTC/SimpleProducerStreamManager.cpp',
+  'src/RTC/SimulcastProducerStreamManager.cpp',
   'src/RTC/SrtpSession.cpp',
-  'src/RTC/SvcConsumer.cpp',
+  'src/RTC/SvcProducerStreamManager.cpp',
   'src/RTC/TcpConnection.cpp',
   'src/RTC/TcpServer.cpp',
   'src/RTC/Transport.cpp',
@@ -368,40 +368,6 @@ if host_machine.system() == 'windows'
   ]
 endif
 
-if host_machine.system() == 'linux' and not get_option('ms_disable_liburing')
-  kernel_version = run_command('uname', '-r', check: true).stdout().strip()
-
-  # Enable liburing for kernel versions greather than or equal to 6.
-  if kernel_version[0].to_int() >= 6
-    liburing_proj = subproject(
-      'liburing',
-      default_options: [
-        'default_library=static',
-        # NOTE: We need to add this to disable ASAN in liburing, otherwise when
-        # building `mediasoup-test-asan-undefined` binary, liburing receives
-        # `use_ubsan: true` and tries to compile its `sanitize.c` file
-        # that contains references to `__asan_*` functions, but we don't enable
-        # ASAN (`-fsanitize=address) in that binaries so liburing fails to
-        # compile.
-        'b_sanitize=none',
-      ],
-    )
-
-    dependencies += [
-      liburing_proj.get_variable('uring'),
-    ]
-    link_whole += [
-      liburing_proj.get_variable('liburing')
-    ]
-    common_sources += [
-      'src/DepLibUring.cpp',
-    ]
-    cpp_args += [
-      '-DMS_LIBURING_SUPPORTED',
-    ]
-  endif
-endif
-
 if get_option('ms_build_tests')
   catch2_proj = subproject(
     'catch2',
@@ -449,13 +415,17 @@ mock_sources = [
 test_sources = [
   'test/src/tests.cpp',
   'test/src/testHelpers.cpp',
+  'test/src/RTC/TestConsumer.cpp',
+  'test/src/RTC/TestPipeProducerStreamManager.cpp',
+  'test/src/RTC/TestSimpleProducerStreamManager.cpp',
+  'test/src/RTC/TestSimulcastProducerStreamManager.cpp',
+  'test/src/RTC/TestSvcProducerStreamManager.cpp',
   'test/src/RTC/TestKeyFrameRequestManager.cpp',
   'test/src/RTC/TestNackGenerator.cpp',
   'test/src/RTC/TestPortManager.cpp',
   'test/src/RTC/TestRateCalculator.cpp',
   'test/src/RTC/TestRtpEncodingParameters.cpp',
   'test/src/RTC/TestSeqManager.cpp',
-  'test/src/RTC/TestSimpleConsumer.cpp',
   'test/src/RTC/TestTransportCongestionControlServer.cpp',
   'test/src/RTC/TestTransportTuple.cpp',
   'test/src/RTC/TestTrendCalculator.cpp',

package/worker/meson_options.txt

@@ -3,6 +3,5 @@ option('ms_log_file_line', type: 'boolean', value: false, description: 'Logging
 option('ms_rtc_logger_rtp', type: 'boolean', value: false, description: 'Prints a line with information for each processed RTP packet')
 option('ms_dump_rtp_payload_descriptor', type: 'boolean', value: false, description: 'RTC::RTP::Packet::Dump() method also dumps payload descriptor details')
 option('ms_dump_rtp_shared_packet_memory_usage', type: 'boolean', value: false, description: 'prints information about total memory allocated by RTC::RTP::SharedPacket instances')
-option('ms_disable_liburing', type: 'boolean', value: false, description: 'When set to true, disables liburing integration despite current host supports it')
 option('ms_build_tests', type: 'boolean', value: false, description: 'Must be enabled when building mediasoup worker tests')
 option('ms_build_fuzzer', type: 'boolean', value: false, description: 'Must be enabled when building mediasoup worker fuzzer')