worker: cleanup (#1495)

jmillan · web-flow · commit 01463062ebb9 · 2025-02-25T12:34:58.000+01:00
- Remove unused include statements
- Const correctness
- Remove protected virtual destructor (to prevent undefined behaviour)
diff --git a/worker/include/Channel/ChannelSocket.hpp b/worker/include/Channel/ChannelSocket.hpp
@@ -5,7 +5,6 @@
 #include "Channel/ChannelNotification.hpp"
 #include "Channel/ChannelRequest.hpp"
 #include "handles/UnixStreamSocketHandle.hpp"
-#include <string>
 
 namespace Channel
 {
diff --git a/worker/include/RTC/ActiveSpeakerObserver.hpp b/worker/include/RTC/ActiveSpeakerObserver.hpp
@@ -5,7 +5,6 @@
 #include "RTC/Shared.hpp"
 #include "handles/TimerHandle.hpp"
 #include <absl/container/flat_hash_map.h>
-#include <utility>
 #include <vector>
 
 // Implementation of Dominant Speaker Identification for Multipoint
diff --git a/worker/include/RTC/Consumer.hpp b/worker/include/RTC/Consumer.hpp
@@ -6,15 +6,11 @@
 #include "Channel/ChannelSocket.hpp"
 #include "FBS/consumer.h"
 #include "RTC/RTCP/CompoundPacket.hpp"
-#include "RTC/RTCP/FeedbackPs.hpp"
-#include "RTC/RTCP/FeedbackPsFir.hpp"
-#include "RTC/RTCP/FeedbackPsPli.hpp"
 #include "RTC/RTCP/FeedbackRtpNack.hpp"
 #include "RTC/RTCP/ReceiverReport.hpp"
 #include "RTC/RtpDictionaries.hpp"
 #include "RTC/RtpHeaderExtensionIds.hpp"
 #include "RTC/RtpPacket.hpp"
-#include "RTC/RtpStream.hpp"
 #include "RTC/RtpStreamRecv.hpp"
 #include "RTC/RtpStreamSend.hpp"
 #include "RTC/Shared.hpp"
diff --git a/worker/include/RTC/DataProducer.hpp b/worker/include/RTC/DataProducer.hpp
@@ -4,7 +4,6 @@
 #include "common.hpp"
 #include "Channel/ChannelRequest.hpp"
 #include "Channel/ChannelSocket.hpp"
-#include "RTC/RTCP/Packet.hpp"
 #include "RTC/SctpDictionaries.hpp"
 #include "RTC/Shared.hpp"
 #include <string>
diff --git a/worker/include/RTC/RTCP/Feedback.hpp b/worker/include/RTC/RTCP/Feedback.hpp
@@ -2,7 +2,6 @@
 #define MS_RTC_RTCP_FEEDBACK_HPP
 
 #include "common.hpp"
-#include "RTC/RTCP/FeedbackItem.hpp"
 #include "RTC/RTCP/Packet.hpp"
 #include <absl/container/flat_hash_map.h>
 
diff --git a/worker/include/RTC/RTCP/FeedbackItem.hpp b/worker/include/RTC/RTCP/FeedbackItem.hpp
@@ -31,7 +31,7 @@ namespace RTC
 				return this->isCorrect;
 			}
 
-		protected:
+		public:
 			virtual ~FeedbackItem()
 			{
 				delete[] this->raw;
diff --git a/worker/include/RTC/RTCP/FeedbackPs.hpp b/worker/include/RTC/RTCP/FeedbackPs.hpp
@@ -3,6 +3,7 @@
 
 #include "common.hpp"
 #include "RTC/RTCP/Feedback.hpp"
+#include "RTC/RTCP/FeedbackItem.hpp"
 #include <vector>
 
 namespace RTC
diff --git a/worker/include/RTC/RTCP/FeedbackRtp.hpp b/worker/include/RTC/RTCP/FeedbackRtp.hpp
@@ -3,6 +3,7 @@
 
 #include "common.hpp"
 #include "RTC/RTCP/Feedback.hpp"
+#include "RTC/RTCP/FeedbackItem.hpp"
 #include <vector>
 
 namespace RTC
diff --git a/worker/include/RTC/Router.hpp b/worker/include/RTC/Router.hpp
@@ -2,7 +2,6 @@
 #define MS_RTC_ROUTER_HPP
 
 #include "common.hpp"
-#include "Channel/ChannelNotification.hpp"
 #include "Channel/ChannelRequest.hpp"
 #include "RTC/Consumer.hpp"
 #include "RTC/DataConsumer.hpp"
diff --git a/worker/include/RTC/RtpDictionaries.hpp b/worker/include/RTC/RtpDictionaries.hpp
@@ -159,7 +159,7 @@ namespace RTC
 		  flatbuffers::FlatBufferBuilder& builder) const;
 
 	private:
-		void CheckCodec();
+		void CheckCodec() const;
 
 	public:
 		RtpCodecMimeType mimeType;
diff --git a/worker/include/RTC/Transport.hpp b/worker/include/RTC/Transport.hpp
@@ -14,7 +14,6 @@
 #include "RTC/Producer.hpp"
 #include "RTC/RTCP/CompoundPacket.hpp"
 #include "RTC/RTCP/Packet.hpp"
-#include "RTC/RTCP/ReceiverReport.hpp"
 #include "RTC/RateCalculator.hpp"
 #include "RTC/RtpHeaderExtensionIds.hpp"
 #include "RTC/RtpListener.hpp"
diff --git a/worker/src/RTC/RtpDictionaries/RtpCodecParameters.cpp b/worker/src/RTC/RtpDictionaries/RtpCodecParameters.cpp
@@ -75,7 +75,7 @@ namespace RTC
 		  &rtcpFeedback);
 	}
 
-	inline void RtpCodecParameters::CheckCodec()
+	inline void RtpCodecParameters::CheckCodec() const
 	{
 		MS_TRACE();
 
diff --git a/worker/src/RTC/RtpPacket.cpp b/worker/src/RTC/RtpPacket.cpp
@@ -2,7 +2,9 @@
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "RTC/RtpPacket.hpp"
+#ifdef MS_RTC_LOGGER_RTP
 #include "DepLibUV.hpp"
+#endif
 #include "Logger.hpp"
 #include "RTC/Consts.hpp"
 #include <cstring>  // std::memcpy(), std::memmove(), std::memset()
diff --git a/worker/src/RTC/Transport.cpp b/worker/src/RTC/Transport.cpp
@@ -16,7 +16,6 @@
 #include "RTC/RTCP/FeedbackPs.hpp"
 #include "RTC/RTCP/FeedbackPsAfb.hpp"
 #include "RTC/RTCP/FeedbackPsRemb.hpp"
-#include "RTC/RTCP/FeedbackRtp.hpp"
 #include "RTC/RTCP/FeedbackRtpNack.hpp"
 #include "RTC/RTCP/FeedbackRtpTransport.hpp"
 #include "RTC/RTCP/XrDelaySinceLastRr.hpp"
diff --git a/worker/test/src/RTC/TestRtpStreamSend.cpp b/worker/test/src/RTC/TestRtpStreamSend.cpp
@@ -185,7 +185,7 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 
 		stream->ReceiveNack(&nackPacket);
 
-		REQUIRE(testRtpStreamListener.retransmittedPackets.size() == 0);
+		REQUIRE(testRtpStreamListener.retransmittedPackets.empty());
 
 		testRtpStreamListener.retransmittedPackets.clear();
 	}
@@ -236,7 +236,7 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 
 		stream->ReceiveNack(&nackPacket);
 
-		REQUIRE(testRtpStreamListener.retransmittedPackets.size() == 0);
+		REQUIRE(testRtpStreamListener.retransmittedPackets.empty());
 
 		testRtpStreamListener.retransmittedPackets.clear();
 	}
@@ -454,7 +454,7 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 		// Process the NACK packet on stream1.
 		stream->ReceiveNack(&nackPacket2);
 
-		REQUIRE(testRtpStreamListener.retransmittedPackets.size() == 0);
+		REQUIRE(testRtpStreamListener.retransmittedPackets.empty());
 	}
 
 #ifdef PERFORMANCE_TEST

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`#include "Channel/ChannelNotification.hpp"`
`6`	`6`	`#include "Channel/ChannelRequest.hpp"`
`7`	`7`	`#include "handles/UnixStreamSocketHandle.hpp"`
`8`		`-#include <string>`
`9`	`8`
`10`	`9`	`namespace Channel`
`11`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ namespace RTC`
`31`	`31`	`return this->isCorrect;`
`32`	`32`	`}`
`33`	`33`
`34`		`- protected:`
	`34`	`+ public:`
`35`	`35`	`virtual ~FeedbackItem()`
`36`	`36`	`{`
`37`	`37`	`delete[] this->raw;`