Skip to content

worker: cleanup #1495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmillan merged 2 commits into from
Feb 25, 2025
Merged

worker: cleanup #1495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3a7b3e
worker: cleanup
jmillan Feb 25, 2025
4156d8a
remove unneeded includes
jmillan Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion worker/include/Channel/ChannelSocket.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "Channel/ChannelNotification.hpp"
#include "Channel/ChannelRequest.hpp"
#include "handles/UnixStreamSocketHandle.hpp"
#include <string>

namespace Channel
{
Expand Down
1 change: 0 additions & 1 deletion worker/include/RTC/ActiveSpeakerObserver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions worker/include/RTC/Consumer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion worker/include/RTC/DataProducer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion worker/include/RTC/RTCP/Feedback.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion worker/include/RTC/RTCP/FeedbackItem.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace RTC
return this->isCorrect;
}

protected:
public:
virtual ~FeedbackItem()
{
delete[] this->raw;
Expand Down
1 change: 1 addition & 0 deletions worker/include/RTC/RTCP/FeedbackPs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "common.hpp"
#include "RTC/RTCP/Feedback.hpp"
#include "RTC/RTCP/FeedbackItem.hpp"
#include <vector>

namespace RTC
Expand Down
1 change: 1 addition & 0 deletions worker/include/RTC/RTCP/FeedbackRtp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "common.hpp"
#include "RTC/RTCP/Feedback.hpp"
#include "RTC/RTCP/FeedbackItem.hpp"
#include <vector>

namespace RTC
Expand Down
1 change: 0 additions & 1 deletion worker/include/RTC/Router.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion worker/include/RTC/RtpDictionaries.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ namespace RTC
flatbuffers::FlatBufferBuilder& builder) const;

private:
void CheckCodec();
void CheckCodec() const;

public:
RtpCodecMimeType mimeType;
Expand Down
1 change: 0 additions & 1 deletion worker/include/RTC/Transport.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion worker/src/RTC/RtpDictionaries/RtpCodecParameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ namespace RTC
&rtcpFeedback);
}

inline void RtpCodecParameters::CheckCodec()
inline void RtpCodecParameters::CheckCodec() const
{
MS_TRACE();

Expand Down
2 changes: 2 additions & 0 deletions worker/src/RTC/RtpPacket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 0 additions & 1 deletion worker/src/RTC/Transport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions worker/test/src/RTC/TestRtpStreamSend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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
Expand Down
Loading