Skip to content

Commit 4bb1739

Browse files
paullouisageneaupaullouisageneau
committed
Code formatting
1 parent 3765ff7 commit 4bb1739

33 files changed

+111
-114
lines changed

‎include/rtc/aacrtppacketizer.hpp

+6-7
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111

1212
#if RTC_ENABLE_MEDIA
1313

14-
#include "mediahandlerrootelement.hpp"
1514
#include "mediachainablehandler.hpp"
15+
#include "mediahandlerrootelement.hpp"
1616
#include "rtppacketizer.hpp"
1717

1818
namespace rtc {
1919

2020
/// RTP packetizer for aac
21-
class RTC_CPP_EXPORT AACRtpPacketizer final : public RtpPacketizer,
22-
public MediaHandlerRootElement {
21+
class RTC_CPP_EXPORT AACRtpPacketizer final : public RtpPacketizer, public MediaHandlerRootElement {
2322
public:
2423
/// default clock rate used in aac RTP communication
2524
inline static const uint32_t defaultClockRate = 48 * 1000;
@@ -48,10 +47,10 @@ class RTC_CPP_EXPORT AACRtpPacketizer final : public RtpPacketizer,
4847
class RTC_CPP_EXPORT AACPacketizationHandler final : public MediaChainableHandler {
4948

5049
public:
51-
/// Construct handler for aac packetization.
52-
/// @param packetizer RTP packetizer for aac
53-
AACPacketizationHandler(shared_ptr<AACRtpPacketizer> packetizer)
54-
: MediaChainableHandler(packetizer) {}
50+
/// Construct handler for aac packetization.
51+
/// @param packetizer RTP packetizer for aac
52+
AACPacketizationHandler(shared_ptr<AACRtpPacketizer> packetizer)
53+
: MediaChainableHandler(packetizer) {}
5554
};
5655

5756
} // namespace rtc

‎include/rtc/global.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include "common.hpp"
1313

1414
#include <chrono>
15-
#include <iostream>
1615
#include <future>
16+
#include <iostream>
1717

1818
namespace rtc {
1919

‎include/rtc/h264rtppacketizer.hpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@ class RTC_CPP_EXPORT H264RtpPacketizer final : public RtpPacketizer,
2323
shared_ptr<NalUnits> splitMessage(binary_ptr message);
2424
const uint16_t maximumFragmentSize;
2525

26-
using Separator=NalUnit::Separator;
26+
using Separator = NalUnit::Separator;
2727

2828
public:
2929
/// Default clock rate for H264 in RTP
3030
inline static const uint32_t defaultClockRate = 90 * 1000;
3131

32-
H264RtpPacketizer(Separator separator,
33-
shared_ptr<RtpPacketizationConfig> rtpConfig,
32+
H264RtpPacketizer(Separator separator, shared_ptr<RtpPacketizationConfig> rtpConfig,
3433
uint16_t maximumFragmentSize = NalUnits::defaultMaximumFragmentSize);
3534

3635
/// Constructs h264 payload packetizer with given RTP configuration.

‎include/rtc/h265nalunit.hpp

+34-27
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,42 @@ namespace rtc {
2323
#define H265_FU_HEADER_SIZE 1
2424
/// Nalu header
2525
struct RTC_CPP_EXPORT H265NalUnitHeader {
26-
/*
27-
* nal_unit_header( ) {
28-
* forbidden_zero_bit f(1)
29-
* nal_unit_type u(6)
30-
* nuh_layer_id u(6)
31-
* nuh_temporal_id_plus1 u(3)
32-
}
33-
*/
34-
uint8_t _first = 0; // high byte of header
26+
/*
27+
* nal_unit_header( ) {
28+
* forbidden_zero_bit f(1)
29+
* nal_unit_type u(6)
30+
* nuh_layer_id u(6)
31+
* nuh_temporal_id_plus1 u(3)
32+
}
33+
*/
34+
uint8_t _first = 0; // high byte of header
3535
uint8_t _second = 0; // low byte of header
3636

3737
bool forbiddenBit() const { return _first >> 7; }
3838
uint8_t unitType() const { return (_first & 0b0111'1110) >> 1; }
3939
uint8_t nuhLayerId() const { return ((_first & 0x1) << 5) | ((_second & 0b1111'1000) >> 3); }
40-
uint8_t nuhTempIdPlus1() const { return _second & 0b111;}
40+
uint8_t nuhTempIdPlus1() const { return _second & 0b111; }
4141

4242
void setForbiddenBit(bool isSet) { _first = (_first & 0x7F) | (isSet << 7); }
4343
void setUnitType(uint8_t type) { _first = (_first & 0b1000'0001) | ((type & 0b11'1111) << 1); }
44-
void setNuhLayerId(uint8_t nuhLayerId) {
45-
_first = (_first & 0b1111'1110) | ((nuhLayerId & 0b10'0000) >> 5);
46-
_second = (_second & 0b0000'0111) | ((nuhLayerId & 0b01'1111) << 3); }
47-
void setNuhTempIdPlus1(uint8_t nuhTempIdPlus1) { _second = (_second & 0b1111'1000) | (nuhTempIdPlus1 & 0b111); }
44+
void setNuhLayerId(uint8_t nuhLayerId) {
45+
_first = (_first & 0b1111'1110) | ((nuhLayerId & 0b10'0000) >> 5);
46+
_second = (_second & 0b0000'0111) | ((nuhLayerId & 0b01'1111) << 3);
47+
}
48+
void setNuhTempIdPlus1(uint8_t nuhTempIdPlus1) {
49+
_second = (_second & 0b1111'1000) | (nuhTempIdPlus1 & 0b111);
50+
}
4851
};
4952

5053
/// Nalu fragment header
5154
struct RTC_CPP_EXPORT H265NalUnitFragmentHeader {
5255
/*
53-
* +---------------+
54-
* |0|1|2|3|4|5|6|7|
55-
* +-+-+-+-+-+-+-+-+
56-
* |S|E| FuType |
57-
* +---------------+
58-
*/
56+
* +---------------+
57+
* |0|1|2|3|4|5|6|7|
58+
* +-+-+-+-+-+-+-+-+
59+
* |S|E| FuType |
60+
* +---------------+
61+
*/
5962
uint8_t _first = 0;
6063

6164
bool isStart() const { return _first >> 7; }
@@ -72,16 +75,18 @@ struct RTC_CPP_EXPORT H265NalUnitFragmentHeader {
7275
/// Nal unit
7376
struct RTC_CPP_EXPORT H265NalUnit : NalUnit {
7477
H265NalUnit(const H265NalUnit &unit) = default;
75-
H265NalUnit(size_t size, bool includingHeader = true) : NalUnit(size, includingHeader, NalUnit::Type::H265) {}
78+
H265NalUnit(size_t size, bool includingHeader = true)
79+
: NalUnit(size, includingHeader, NalUnit::Type::H265) {}
7680
H265NalUnit(binary &&data) : NalUnit(std::move(data)) {}
7781
H265NalUnit() : NalUnit(NalUnit::Type::H265) {}
7882

79-
template <typename Iterator> H265NalUnit(Iterator begin_, Iterator end_) : NalUnit(begin_, end_) {}
83+
template <typename Iterator>
84+
H265NalUnit(Iterator begin_, Iterator end_) : NalUnit(begin_, end_) {}
8085

8186
bool forbiddenBit() const { return header()->forbiddenBit(); }
8287
uint8_t unitType() const { return header()->unitType(); }
8388
uint8_t nuhLayerId() const { return header()->nuhLayerId(); }
84-
uint8_t nuhTempIdPlus1() const { return header()->nuhTempIdPlus1();}
89+
uint8_t nuhTempIdPlus1() const { return header()->nuhTempIdPlus1(); }
8590

8691
binary payload() const {
8792
assert(size() >= H265_NAL_HEADER_SIZE);
@@ -114,12 +119,12 @@ struct RTC_CPP_EXPORT H265NalUnit : NalUnit {
114119
/// Nal unit fragment A
115120
struct RTC_CPP_EXPORT H265NalUnitFragment : H265NalUnit {
116121
static std::vector<shared_ptr<H265NalUnitFragment>> fragmentsFrom(shared_ptr<H265NalUnit> nalu,
117-
uint16_t maximumFragmentSize);
122+
uint16_t maximumFragmentSize);
118123

119124
enum class FragmentType { Start, Middle, End };
120125

121126
H265NalUnitFragment(FragmentType type, bool forbiddenBit, uint8_t nuhLayerId,
122-
uint8_t nuhTempIdPlus1, uint8_t unitType, binary data);
127+
uint8_t nuhTempIdPlus1, uint8_t unitType, binary data);
123128

124129
uint8_t unitType() const { return fragmentHeader()->unitType(); }
125130

@@ -158,11 +163,13 @@ struct RTC_CPP_EXPORT H265NalUnitFragment : H265NalUnit {
158163
}
159164

160165
H265NalUnitFragmentHeader *fragmentHeader() {
161-
return reinterpret_cast<H265NalUnitFragmentHeader *>(fragmentIndicator() + H265_NAL_HEADER_SIZE);
166+
return reinterpret_cast<H265NalUnitFragmentHeader *>(fragmentIndicator() +
167+
H265_NAL_HEADER_SIZE);
162168
}
163169

164170
const H265NalUnitFragmentHeader *fragmentHeader() const {
165-
return reinterpret_cast<const H265NalUnitFragmentHeader *>(fragmentIndicator() + H265_NAL_HEADER_SIZE);
171+
return reinterpret_cast<const H265NalUnitFragmentHeader *>(fragmentIndicator() +
172+
H265_NAL_HEADER_SIZE);
166173
}
167174
};
168175

‎include/rtc/h265packetizationhandler.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
#if RTC_ENABLE_MEDIA
1313

14+
#include "h265nalunit.hpp"
1415
#include "h265rtppacketizer.hpp"
1516
#include "mediachainablehandler.hpp"
16-
#include "h265nalunit.hpp"
1717

1818
namespace rtc {
1919

‎include/rtc/h265rtppacketizer.hpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
#if RTC_ENABLE_MEDIA
1313

14-
#include "mediahandlerrootelement.hpp"
1514
#include "h265nalunit.hpp"
15+
#include "mediahandlerrootelement.hpp"
1616
#include "rtppacketizer.hpp"
1717

1818
namespace rtc {
@@ -27,8 +27,7 @@ class RTC_CPP_EXPORT H265RtpPacketizer final : public RtpPacketizer,
2727
/// Default clock rate for H265 in RTP
2828
inline static const uint32_t defaultClockRate = 90 * 1000;
2929

30-
H265RtpPacketizer(NalUnit::Separator separator,
31-
shared_ptr<RtpPacketizationConfig> rtpConfig,
30+
H265RtpPacketizer(NalUnit::Separator separator, shared_ptr<RtpPacketizationConfig> rtpConfig,
3231
uint16_t maximumFragmentSize = H265NalUnits::defaultMaximumFragmentSize);
3332

3433
/// Constructs h265 payload packetizer with given RTP configuration.

‎include/rtc/nalunit.hpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,16 @@ static const size_t H264_NAL_HEADER_SIZE = 1;
6262
static const size_t H265_NAL_HEADER_SIZE = 2;
6363
/// Nal unit
6464
struct RTC_CPP_EXPORT NalUnit : binary {
65-
typedef enum {
66-
H264,
67-
H265
68-
} Type;
65+
typedef enum { H264, H265 } Type;
6966

7067
NalUnit(const NalUnit &unit) = default;
7168
NalUnit(size_t size, bool includingHeader = true, Type type = H264)
72-
: binary(size + (includingHeader ? 0 : (type == H264? H264_NAL_HEADER_SIZE: H265_NAL_HEADER_SIZE))) {}
69+
: binary(size + (includingHeader
70+
? 0
71+
: (type == H264 ? H264_NAL_HEADER_SIZE : H265_NAL_HEADER_SIZE))) {}
7372
NalUnit(binary &&data) : binary(std::move(data)) {}
74-
NalUnit(Type type = H264) : binary( type == H264? H264_NAL_HEADER_SIZE: H265_NAL_HEADER_SIZE) {}
73+
NalUnit(Type type = H264)
74+
: binary(type == H264 ? H264_NAL_HEADER_SIZE : H265_NAL_HEADER_SIZE) {}
7575
template <typename Iterator> NalUnit(Iterator begin_, Iterator end_) : binary(begin_, end_) {}
7676

7777
bool forbiddenBit() const { return header()->forbiddenBit(); }
@@ -101,14 +101,14 @@ struct RTC_CPP_EXPORT NalUnit : binary {
101101
StartSequence = RTC_NAL_SEPARATOR_START_SEQUENCE, // LongStartSequence or ShortStartSequence
102102
};
103103

104-
static NalUnitStartSequenceMatch StartSequenceMatchSucc(NalUnitStartSequenceMatch match, std::byte _byte, Separator separator)
105-
{
104+
static NalUnitStartSequenceMatch StartSequenceMatchSucc(NalUnitStartSequenceMatch match,
105+
std::byte _byte, Separator separator) {
106106
assert(separator != Separator::Length);
107107
auto byte = (uint8_t)_byte;
108-
auto detectShort = separator == Separator::ShortStartSequence ||
109-
separator == Separator::StartSequence;
110-
auto detectLong = separator == Separator::LongStartSequence ||
111-
separator == Separator::StartSequence;
108+
auto detectShort =
109+
separator == Separator::ShortStartSequence || separator == Separator::StartSequence;
110+
auto detectLong =
111+
separator == Separator::LongStartSequence || separator == Separator::StartSequence;
112112
switch (match) {
113113
case NUSM_noMatch:
114114
if (byte == 0x00) {

‎include/rtc/peerconnection.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ class RTC_CPP_EXPORT PeerConnection final : CheshireCat<impl::PeerConnection> {
9696
void setMediaHandler(shared_ptr<MediaHandler> handler);
9797
shared_ptr<MediaHandler> getMediaHandler();
9898

99-
[[nodiscard]] shared_ptr<DataChannel> createDataChannel(string label, DataChannelInit init = {});
99+
[[nodiscard]] shared_ptr<DataChannel> createDataChannel(string label,
100+
DataChannelInit init = {});
100101
void onDataChannel(std::function<void(std::shared_ptr<DataChannel> dataChannel)> callback);
101102

102103
[[nodiscard]] shared_ptr<Track> addTrack(Description::Media description);

‎include/rtc/rtc.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
#include "rtcpsrreporter.hpp"
3535

3636
// Opus/AAC/h264/h265/AV1 streaming
37+
#include "aacrtppacketizer.hpp"
38+
#include "av1packetizationhandler.hpp"
3739
#include "h264packetizationhandler.hpp"
3840
#include "h265packetizationhandler.hpp"
39-
#include "av1packetizationhandler.hpp"
4041
#include "opuspacketizationhandler.hpp"
41-
#include "aacrtppacketizer.hpp"
4242

4343
#endif // RTC_ENABLE_MEDIA

‎include/rtc/rtppacketizationconfig.hpp

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ class RTC_CPP_EXPORT RtpPacketizationConfig {
5353
/// 3 - 270 degrees
5454
uint8_t videoOrientation = 0;
5555

56-
5756
// MID Extension Header
5857
uint8_t midId = 0;
5958
optional<std::string> mid;

‎include/rtc/websocket.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class RTC_CPP_EXPORT WebSocket final : private CheshireCat<impl::WebSocket>, pub
3737
optional<ProxyServer> proxyServer; // only non-authenticated http supported for now
3838
std::vector<string> protocols;
3939
optional<std::chrono::milliseconds> connectionTimeout; // zero to disable
40-
optional<std::chrono::milliseconds> pingInterval; // zero to disable
40+
optional<std::chrono::milliseconds> pingInterval; // zero to disable
4141
optional<int> maxOutstandingPings;
4242
};
4343

‎src/aacrtppacketizer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ binary_ptr AACRtpPacketizer::packetize(binary_ptr payload, [[maybe_unused]] bool
2424

2525
ChainedOutgoingProduct
2626
AACRtpPacketizer::processOutgoingBinaryMessage(ChainedMessagesProduct messages,
27-
message_ptr control) {
27+
message_ptr control) {
2828
ChainedMessagesProduct packets = make_chained_messages_product();
2929
packets->reserve(messages->size());
3030
for (auto message : *messages) {

‎src/capi.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -1079,8 +1079,10 @@ int rtcAddTrackEx(int pc, const rtcTrackInit *init) {
10791079
desc.addPCMACodec(init->payloadType);
10801080
break;
10811081
case RTC_CODEC_AAC:
1082-
desc.addAacCodec(init->payloadType, init->profile ? std::make_optional(string(init->profile)) : nullopt);
1083-
break;
1082+
desc.addAacCodec(init->payloadType, init->profile
1083+
? std::make_optional(string(init->profile))
1084+
: nullopt);
1085+
break;
10841086
default:
10851087
break;
10861088
}
@@ -1208,8 +1210,7 @@ int rtcSetH264PacketizationHandler(int tr, const rtcPacketizationHandlerInit *in
12081210
auto maxFragmentSize = init && init->maxFragmentSize ? init->maxFragmentSize
12091211
: RTC_DEFAULT_MAXIMUM_FRAGMENT_SIZE;
12101212
auto packetizer = std::make_shared<H264RtpPacketizer>(
1211-
static_cast<rtc::NalUnit::Separator>(nalSeparator), rtpConfig,
1212-
maxFragmentSize);
1213+
static_cast<rtc::NalUnit::Separator>(nalSeparator), rtpConfig, maxFragmentSize);
12131214
// create H264 handler
12141215
auto h264Handler = std::make_shared<H264PacketizationHandler>(packetizer);
12151216
emplaceMediaChainableHandler(h264Handler, tr);
@@ -1230,8 +1231,7 @@ int rtcSetH265PacketizationHandler(int tr, const rtcPacketizationHandlerInit *in
12301231
auto maxFragmentSize = init && init->maxFragmentSize ? init->maxFragmentSize
12311232
: RTC_DEFAULT_MAXIMUM_FRAGMENT_SIZE;
12321233
auto packetizer = std::make_shared<H265RtpPacketizer>(
1233-
static_cast<rtc::NalUnit::Separator>(nalSeparator), rtpConfig,
1234-
maxFragmentSize);
1234+
static_cast<rtc::NalUnit::Separator>(nalSeparator), rtpConfig, maxFragmentSize);
12351235
// create H265 handler
12361236
auto h265Handler = std::make_shared<H265PacketizationHandler>(packetizer);
12371237
emplaceMediaChainableHandler(h265Handler, tr);
@@ -1273,7 +1273,7 @@ int rtcSetAACPacketizationHandler(int tr, const rtcPacketizationHandlerInit *ini
12731273
// set handler
12741274
track->setMediaHandler(aacHandler);
12751275
return RTC_ERR_SUCCESS;
1276-
});
1276+
});
12771277
}
12781278

12791279
int rtcChainRtcpSrReporter(int tr) {

‎src/channel.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ void Channel::setBufferedAmountLowThreshold(size_t amount) {
4949
impl()->bufferedAmountLowThreshold = amount;
5050
}
5151

52-
void Channel::resetCallbacks() {
53-
impl()->resetCallbacks();
54-
}
52+
void Channel::resetCallbacks() { impl()->resetCallbacks(); }
5553

5654
optional<message_variant> Channel::receive() { return impl()->receive(); }
5755

‎src/configuration.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ IceServer::IceServer(const string &url) {
7070
password = utils::url_decode(opt[8].value_or(""));
7171

7272
hostname = opt[10].value();
73-
if(hostname.front() == '[' && hostname.back() == ']') {
73+
if (hostname.front() == '[' && hostname.back() == ']') {
7474
// IPv6 literal
7575
hostname.erase(hostname.begin());
7676
hostname.pop_back();

‎src/global.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ struct LogAppender : public plog::IAppender {
5454
auto formatted = plog::FuncMessageFormatter::format(record);
5555
formatted.pop_back(); // remove newline
5656

57-
const auto& converted = plog::UTF8Converter::convert(formatted); // does nothing on non-Windows systems
57+
const auto &converted =
58+
plog::UTF8Converter::convert(formatted); // does nothing on non-Windows systems
5859

5960
if (!callback(static_cast<LogLevel>(severity), converted))
6061
std::cout << plog::severityToString(severity) << " " << converted << std::endl;

0 commit comments

Comments
 (0)