Little optimizations and modernization (#916)

Little optimizations and modernization

worker/fuzzer/src/RTC/FuzzerRtpStreamSend.cpp

@@ -43,7 +43,7 @@ void Fuzzer::RTC::RtpStreamSend::Fuzz(const uint8_t* data, size_t len)
 	packet->SetSsrc(params.ssrc);
 
 	std::string mid;
-	::RTC::RtpStreamSend* stream = new ::RTC::RtpStreamSend(&testRtpStreamListener, params, mid);
+	auto* stream = new ::RTC::RtpStreamSend(&testRtpStreamListener, params, mid);
 
 	while (len >= 4u)
 	{

worker/include/RTC/DtlsTransport.hpp

@@ -161,7 +161,7 @@ namespace RTC
 		{
 			return DtlsTransport::localFingerprints;
 		}
-		bool SetRemoteFingerprint(Fingerprint fingerprint);
+		bool SetRemoteFingerprint(const Fingerprint& fingerprint);
 		void ProcessDtlsData(const uint8_t* data, size_t len);
 		DtlsState GetState() const
 		{

worker/src/RTC/ActiveSpeakerObserver.cpp

@@ -308,10 +308,10 @@ namespace RTC
 			dominantSpeaker->EvalActivityScores();
 			double newDominantC2 = C2;
 
-			for (auto it = this->mapProducerSpeaker.begin(); it != this->mapProducerSpeaker.end(); ++it)
+			for (const auto& it : this->mapProducerSpeaker)
 			{
-				Speaker* speaker      = it->second.speaker;
-				const std::string& id = it->second.producer->id;
+				Speaker* speaker      = it.second.speaker;
+				const std::string& id = it.second.producer->id;
 
 				if (id == this->dominantId || speaker->paused)
 				{
@@ -351,10 +351,10 @@ namespace RTC
 	{
 		MS_TRACE();
 
-		for (auto it = this->mapProducerSpeaker.begin(); it != this->mapProducerSpeaker.end(); ++it)
+		for (const auto& it : this->mapProducerSpeaker)
 		{
-			Speaker* speaker      = it->second.speaker;
-			const std::string& id = it->second.producer->id;
+			Speaker* speaker      = it.second.speaker;
+			const std::string& id = it.second.producer->id;
 			uint64_t idle         = now - speaker->lastLevelChangeTime;
 
 			if (SpeakerIdleTimeout < idle && (this->dominantId.empty() || id != this->dominantId))

worker/src/RTC/DataConsumer.cpp

@@ -209,7 +209,7 @@ namespace RTC
 				// Trigger 'bufferedamountlow' now.
 				if (this->bufferedAmount <= this->bufferedAmountLowThreshold)
 				{
-					std::string data("{\"bufferedAmount\":\"");
+					std::string data(R"({"bufferedAmount":")");
 
 					data.append(std::to_string(this->bufferedAmount));
 					data.append("\"}");
@@ -350,7 +350,7 @@ namespace RTC
 			this->forceTriggerBufferedAmountLow = false;
 
 			// Notify the Node DataConsumer.
-			std::string data("{\"bufferedAmount\":\"");
+			std::string data(R"({"bufferedAmount":")");
 
 			data.append(std::to_string(this->bufferedAmount));
 			data.append("\"}");

worker/src/RTC/DtlsTransport.cpp

@@ -702,7 +702,7 @@ namespace RTC
 		}
 	}
 
-	bool DtlsTransport::SetRemoteFingerprint(Fingerprint fingerprint)
+	bool DtlsTransport::SetRemoteFingerprint(const Fingerprint& fingerprint)
 	{
 		MS_TRACE();
 

worker/src/RTC/RTCP/FeedbackRtpTransport.cpp

@@ -392,7 +392,7 @@ namespace RTC
 			}
 
 			size_t deltaIdx{ 0u };
-			int64_t currentReceivedAtMs = static_cast<int64_t>(this->referenceTime * 64);
+			auto currentReceivedAtMs = static_cast<int64_t>(this->referenceTime * 64);
 
 			for (size_t idx{ 0u }; idx < packetResults.size(); ++idx)
 			{

worker/src/RTC/RtpPacket.cpp

@@ -837,7 +837,7 @@ namespace RTC
 			MS_ASSERT(shift <= (this->payloadLength - payloadOffset), "shift too big");
 
 		uint8_t* payloadOffsetPtr = this->payload + payloadOffset;
-		size_t shiftedLen;
+		size_t shiftedLen{ 0 };
 
 		if (expand)
 		{

worker/src/RTC/SimulcastConsumer.cpp

@@ -627,7 +627,7 @@ namespace RTC
 		auto nowMs = DepLibUV::GetTimeMs();
 		uint32_t desiredBitrate{ 0u };
 
-		for (int sIdx{ static_cast<int>(this->producerRtpStreams.size()) - 1 }; sIdx >= 0; --sIdx)
+		for (size_t sIdx{ this->producerRtpStreams.size() - 1 }; sIdx >= 0; --sIdx)
 		{
 			auto* producerRtpStream = this->producerRtpStreams.at(sIdx);
 

worker/src/RTC/TcpServer.cpp

@@ -13,7 +13,7 @@ namespace RTC
 	TcpServer::TcpServer(Listener* listener, RTC::TcpConnection::Listener* connListener, std::string& ip)
 	  : // This may throw.
 	    ::TcpServerHandler::TcpServerHandler(RTC::PortManager::BindTcp(ip)), listener(listener),
-	    connListener(connListener), fixedPort(false)
+	    connListener(connListener)
 	{
 		MS_TRACE();
 	}

worker/src/RTC/UdpSocket.cpp

@@ -12,8 +12,7 @@ namespace RTC
 
 	UdpSocket::UdpSocket(Listener* listener, std::string& ip)
 	  : // This may throw.
-	    ::UdpSocketHandler::UdpSocketHandler(PortManager::BindUdp(ip)), listener(listener),
-	    fixedPort(false)
+	    ::UdpSocketHandler::UdpSocketHandler(PortManager::BindUdp(ip)), listener(listener)
 	{
 		MS_TRACE();
 	}

worker/src/RTC/WebRtcServer.cpp

@@ -347,7 +347,7 @@ namespace RTC
 		// before the ":" symbol.
 
 		auto& username  = packet->GetUsername();
-		size_t colonPos = username.find(":");
+		size_t colonPos = username.find(':');
 
 		// If no colon is found just return the whole USERNAME attribute anyway.
 		if (colonPos == std::string::npos)

worker/test/src/RTC/RTCP/TestBye.cpp

@@ -31,7 +31,7 @@ namespace TestBye
 	{
 		REQUIRE(packet->GetReason() == reason);
 
-		ByePacket::Iterator it = packet->Begin();
+		auto it = packet->Begin();
 
 		REQUIRE(*it == ssrc1);
 

worker/test/src/RTC/RTCP/TestFeedbackPsFir.cpp

@@ -69,7 +69,7 @@ SCENARIO("RTCP Feedback PS FIR parsing", "[parser][rtcp][feedback-ps][fir]")
 	{
 		FeedbackPsFirPacket packet(senderSsrc, mediaSsrc);
 
-		FeedbackPsFirItem* item = new FeedbackPsFirItem(ssrc, seq);
+		auto* item = new FeedbackPsFirItem(ssrc, seq);
 
 		packet.AddItem(item);
 

worker/test/src/RTC/RTCP/TestFeedbackPsLei.cpp

@@ -66,7 +66,7 @@ SCENARIO("RTCP Feedback PS LEI parsing", "[parser][rtcp][feedback-ps][lei]")
 	{
 		FeedbackPsLeiPacket packet(senderSsrc, mediaSsrc);
 
-		FeedbackPsLeiItem* item = new FeedbackPsLeiItem(ssrc);
+		auto* item = new FeedbackPsLeiItem(ssrc);
 
 		packet.AddItem(item);
 

worker/test/src/RTC/RTCP/TestFeedbackPsTst.cpp

@@ -71,7 +71,7 @@ SCENARIO("RTCP Feedback PS TSTN parsing", "[parser][rtcp][feedback-ps][tstn]")
 	{
 		FeedbackPsTstnPacket packet(senderSsrc, mediaSsrc);
 
-		FeedbackPsTstnItem* item = new FeedbackPsTstnItem(ssrc, seq, TestFeedbackPsTstn::index);
+		auto* item = new FeedbackPsTstnItem(ssrc, seq, TestFeedbackPsTstn::index);
 
 		packet.AddItem(item);
 

worker/test/src/RTC/RTCP/TestFeedbackRtpNack.cpp

@@ -69,7 +69,7 @@ SCENARIO("RTCP Feeback RTP NACK parsing", "[parser][rtcp][feedback-rtp][nack]")
 	SECTION("create FeedbackRtpNackPacket")
 	{
 		FeedbackRtpNackPacket packet(senderSsrc, mediaSsrc);
-		FeedbackRtpNackItem* item = new FeedbackRtpNackItem(pid, lostPacketBitmask);
+		auto* item = new FeedbackRtpNackItem(pid, lostPacketBitmask);
 
 		packet.AddItem(item);
 

worker/test/src/RTC/RTCP/TestFeedbackRtpTmmb.cpp

@@ -78,7 +78,7 @@ SCENARIO("RTCP Feeback RTP TMMBR parsing", "[parser][rtcp][feedback-rtp][tmmb]")
 	SECTION("create FeedbackRtpTmmbrPacket")
 	{
 		FeedbackRtpTmmbrPacket packet(senderSsrc, mediaSsrc);
-		FeedbackRtpTmmbrItem* item = new FeedbackRtpTmmbrItem();
+		auto* item = new FeedbackRtpTmmbrItem();
 
 		item->SetSsrc(ssrc);
 		item->SetBitrate(bitrate);

worker/test/src/RTC/RTCP/TestFeedbackRtpTransport.cpp

@@ -558,9 +558,6 @@ SCENARIO("RTCP Feeback RTP transport", "[parser][rtcp][feedback-rtp][transport]"
 		  FeedbackRtpTransportPacket::TimeWrapPeriod +
 		    static_cast<int64_t>(12408746) * FeedbackRtpTransportPacket::BaseTimeTick);
 
-		// Let's also test the reference time reported by Wireshark.
-		int32_t wiresharkValue{ 12408746 };
-
 		REQUIRE(packet->GetFeedbackPacketCount() == 0);
 
 		SECTION("serialize packet")
@@ -577,15 +574,15 @@ SCENARIO("RTCP Feeback RTP transport", "[parser][rtcp][feedback-rtp][transport]"
 
 	SECTION("parse FeedbackRtpTransportPacket generated by Chrome with libwebrtc as a reference")
 	{
-		typedef struct
+		using FeedbackPacketsMeta = struct
 		{
 			uint32_t baseTimeRaw;
 			uint64_t baseTimeMs;
 			uint16_t baseSequence;
 			size_t packetStatusCount;
 			std::vector<int16_t> deltas;
 			std::vector<uint8_t> buffer;
-		} FeedbackPacketsMeta;
+		};
 
 		// Metadata collected by parsing buffers with libwebrtc, buffers itself.
 		// were generated by chrome in direction of mediasoup.

worker/test/src/RTC/RTCP/TestSdes.cpp

@@ -72,7 +72,7 @@ SCENARIO("RTCP SDES parsing", "[parser][rtcp][sdes]")
 
 	SECTION("create SdesChunk")
 	{
-		SdesItem* item = new SdesItem(type, length, value.c_str());
+		auto* item = new SdesItem(type, length, value.c_str());
 
 		// Create sdes chunk.
 		SdesChunk chunk(ssrc);

worker/test/src/RTC/TestNackGenerator.cpp

@@ -37,28 +37,28 @@ class TestPayloadDescriptorHandler : public Codecs::PayloadDescriptorHandler
 {
 public:
 	explicit TestPayloadDescriptorHandler(bool isKeyFrame) : isKeyFrame(isKeyFrame){};
-	~TestPayloadDescriptorHandler() = default;
-	void Dump() const
+	~TestPayloadDescriptorHandler() override = default;
+	void Dump() const override
 	{
 		return;
 	};
-	bool Process(Codecs::EncodingContext* /*context*/, uint8_t* /*data*/, bool& /*marker*/)
+	bool Process(Codecs::EncodingContext* /*context*/, uint8_t* /*data*/, bool& /*marker*/) override
 	{
 		return true;
 	};
-	void Restore(uint8_t* /*data*/)
+	void Restore(uint8_t* /*data*/) override
 	{
 		return;
 	};
-	uint8_t GetSpatialLayer() const
+	uint8_t GetSpatialLayer() const override
 	{
 		return 0;
 	};
-	uint8_t GetTemporalLayer() const
+	uint8_t GetTemporalLayer() const override
 	{
 		return 0;
 	};
-	bool IsKeyFrame() const
+	bool IsKeyFrame() const override
 	{
 		return this->isKeyFrame;
 	};
@@ -129,7 +129,7 @@ void validate(std::vector<TestNackGeneratorInput>& inputs)
 	{
 		listener.Reset(input);
 
-		TestPayloadDescriptorHandler* tpdh = new TestPayloadDescriptorHandler(input.isKeyFrame);
+		auto* tpdh = new TestPayloadDescriptorHandler(input.isKeyFrame);
 
 		packet->SetPayloadDescriptorHandler(tpdh);
 		packet->SetSequenceNumber(input.seq);

worker/test/src/RTC/TestRateCalculator.cpp

@@ -15,11 +15,10 @@ struct data
 
 void validate(RateCalculator& rate, uint64_t timeBase, std::vector<data>& input)
 {
-	for (auto it = input.begin(); it != input.end(); ++it)
+	for (auto& item : input)
 	{
-		auto& item = *it;
-
 		rate.Update(item.size, timeBase + item.offset);
+
 		REQUIRE(rate.GetRate(timeBase + item.offset) == item.rate);
 	}
 }

worker/test/src/RTC/TestRtpStreamSend.cpp

@@ -99,7 +99,7 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 		params.mimeType.type = RTC::RtpCodecMimeType::Type::VIDEO;
 
 		std::string mid;
-		RtpStreamSend* stream = new RtpStreamSend(&testRtpStreamListener, params, mid);
+		auto* stream = new RtpStreamSend(&testRtpStreamListener, params, mid);
 
 		// Receive all the packets (some of them not in order and/or duplicated).
 		SendRtpPacket({ { stream, params.ssrc } }, packet1);
@@ -164,7 +164,7 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 		params.mimeType.type = RTC::RtpCodecMimeType::Type::VIDEO;
 
 		std::string mid;
-		RtpStreamSend* stream = new RtpStreamSend(&testRtpStreamListener, params, mid);
+		auto* stream = new RtpStreamSend(&testRtpStreamListener, params, mid);
 
 		// Receive all the packets (some of them not in order and/or duplicated).
 		SendRtpPacket({ { stream, params.ssrc } }, packet1);
@@ -217,7 +217,7 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 		params.mimeType.type = RTC::RtpCodecMimeType::Type::AUDIO;
 
 		std::string mid;
-		RtpStreamSend* stream = new RtpStreamSend(&testRtpStreamListener, params, mid);
+		auto* stream = new RtpStreamSend(&testRtpStreamListener, params, mid);
 
 		// Receive all the packets (some of them not in order and/or duplicated).
 		SendRtpPacket({ { stream, params.ssrc } }, packet1);
@@ -265,7 +265,7 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 		params1.mimeType.type = RTC::RtpCodecMimeType::Type::VIDEO;
 
 		std::string mid;
-		RtpStreamSend* stream1 = new RtpStreamSend(&testRtpStreamListener1, params1, mid);
+		auto* stream1 = new RtpStreamSend(&testRtpStreamListener1, params1, mid);
 
 		RtpStream::Params params2;
 
@@ -274,7 +274,7 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 		params2.useNack       = true;
 		params2.mimeType.type = RTC::RtpCodecMimeType::Type::VIDEO;
 
-		RtpStreamSend* stream2 = new RtpStreamSend(&testRtpStreamListener2, params2, mid);
+		auto* stream2 = new RtpStreamSend(&testRtpStreamListener2, params2, mid);
 
 		// Receive all the packets in both streams.
 		SendRtpPacket({ { stream1, params1.ssrc }, { stream2, params2.ssrc } }, packet1);
@@ -340,7 +340,7 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 		params1.mimeType.type = RTC::RtpCodecMimeType::Type::VIDEO;
 
 		std::string mid;
-		RtpStreamSend* stream = new RtpStreamSend(&testRtpStreamListener1, params1, mid);
+		auto* stream = new RtpStreamSend(&testRtpStreamListener1, params1, mid);
 
 		// Receive all the packets.
 		SendRtpPacket({ { stream, params1.ssrc } }, packet1);
@@ -392,7 +392,7 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 		params1.mimeType.type = RTC::RtpCodecMimeType::Type::VIDEO;
 
 		std::string mid;
-		RtpStreamSend* stream = new RtpStreamSend(&testRtpStreamListener1, params1, mid);
+		auto* stream = new RtpStreamSend(&testRtpStreamListener1, params1, mid);
 
 		// Receive all the packets.
 		SendRtpPacket({ { stream, params1.ssrc } }, packet1);
@@ -435,7 +435,7 @@ SCENARIO("NACK and RTP packets retransmission", "[rtp][rtcp][nack]")
 		params.mimeType.type = RTC::RtpCodecMimeType::Type::VIDEO;
 
 		std::string mid;
-		RtpStreamSend* stream = new RtpStreamSend(&testRtpStreamListener, params, mid);
+		auto* stream = new RtpStreamSend(&testRtpStreamListener, params, mid);
 
 		size_t iterations = 10000000;