Skip to content

Commit 8fc59cd

Browse files
committed
scons fmt
1 parent 73448d9 commit 8fc59cd

File tree

9 files changed

+126
-103
lines changed

9 files changed

+126
-103
lines changed

src/internal_modules/roc_pipeline/receiver_session_group.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ ReceiverSessionGroup::create_control_pipeline(ReceiverEndpoint* control_endpoint
6969
// We pass this as implementation of rtcp::IParticipant.
7070
// rtcp::Communicator will call our methods right now (in constructor)
7171
// and later when we call generate_packets() or process_packets().
72-
rtcp_communicator_.reset(new(rtcp_communicator_) rtcp::Communicator(
73-
source_config_.common.rtcp, *this, *control_endpoint->outbound_writer(),
74-
*control_endpoint->outbound_composer(), packet_factory_, arena_, dumper_));
72+
rtcp_communicator_.reset(new (rtcp_communicator_) rtcp::Communicator(
73+
source_config_.common.rtcp, *this, *control_endpoint->outbound_writer(),
74+
*control_endpoint->outbound_composer(), packet_factory_, arena_, dumper_));
7575

7676
const status::StatusCode code = rtcp_communicator_->init_status();
7777
if (code != status::StatusOK) {

src/internal_modules/roc_pipeline/sender_session.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,9 @@ SenderSession::create_control_pipeline(SenderEndpoint* control_endpoint) {
233233

234234
rtcp_outbound_addr_ = control_endpoint->outbound_address();
235235

236-
rtcp_communicator_.reset(new(rtcp_communicator_) rtcp::Communicator(
237-
sink_config_.rtcp, *this, control_endpoint->outbound_writer(),
238-
control_endpoint->outbound_composer(), packet_factory_, arena_, dumper_));
236+
rtcp_communicator_.reset(new (rtcp_communicator_) rtcp::Communicator(
237+
sink_config_.rtcp, *this, control_endpoint->outbound_writer(),
238+
control_endpoint->outbound_composer(), packet_factory_, arena_, dumper_));
239239

240240
const status::StatusCode code = rtcp_communicator_->init_status();
241241
if (code != status::StatusOK) {

src/internal_modules/roc_rtcp/communicator.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,13 @@ const core::nanoseconds_t LogInterval = core::Second * 30;
2626

2727
} // namespace
2828

29-
Communicator::Communicator(const Config &config, IParticipant &participant, packet::IWriter &packet_writer,
30-
packet::IComposer &packet_composer, packet::PacketFactory &packet_factory,
31-
core::IArena &arena, dbgio::CsvDumper* dumper)
29+
Communicator::Communicator(const Config& config,
30+
IParticipant& participant,
31+
packet::IWriter& packet_writer,
32+
packet::IComposer& packet_composer,
33+
packet::PacketFactory& packet_factory,
34+
core::IArena& arena,
35+
dbgio::CsvDumper* dumper)
3236
: packet_factory_(packet_factory)
3337
, packet_writer_(packet_writer)
3438
, packet_composer_(packet_composer)
@@ -87,8 +91,8 @@ status::StatusCode Communicator::process_packet(const packet::PacketPtr& packet,
8791
return status::StatusOK;
8892
}
8993

90-
status::StatusCode status =
91-
reporter_.begin_processing(packet->udp()->src_addr, packet->udp()->receive_timestamp);
94+
status::StatusCode status = reporter_.begin_processing(
95+
packet->udp()->src_addr, packet->udp()->receive_timestamp);
9296
roc_log(LogTrace, "rtcp communicator: begin_processing(): status=%s",
9397
status::code_to_str(status));
9498

src/internal_modules/roc_rtcp/communicator.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,13 @@ namespace rtcp {
5757
class Communicator : public core::NonCopyable<> {
5858
public:
5959
//! Initialize.
60-
Communicator(const Config &config, IParticipant &participant, packet::IWriter &packet_writer,
61-
packet::IComposer &packet_composer, packet::PacketFactory &packet_factory,
62-
core::IArena &arena, dbgio::CsvDumper* dumper);
60+
Communicator(const Config& config,
61+
IParticipant& participant,
62+
packet::IWriter& packet_writer,
63+
packet::IComposer& packet_composer,
64+
packet::PacketFactory& packet_factory,
65+
core::IArena& arena,
66+
dbgio::CsvDumper* dumper);
6367

6468
//! Check if the object was successfully constructed.
6569
status::StatusCode init_status() const;

src/internal_modules/roc_rtcp/reporter.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121
namespace roc {
2222
namespace rtcp {
2323

24-
Reporter::Reporter(const Config &config, IParticipant &participant, core::IArena &arena, dbgio::CsvDumper *dumper)
24+
Reporter::Reporter(const Config& config,
25+
IParticipant& participant,
26+
core::IArena& arena,
27+
dbgio::CsvDumper* dumper)
2528
: arena_(arena)
2629
, participant_(participant)
2730
, local_source_id_(0)
@@ -1400,8 +1403,8 @@ Reporter::find_stream_(packet::stream_source_t source_id, CreateMode mode) {
14001403
roc_log(LogDebug, "rtcp reporter: creating stream: ssrc=%lu",
14011404
(unsigned long)source_id);
14021405

1403-
stream =
1404-
new(stream_pool_) Stream(arena_, stream_pool_, source_id, report_time_, config_.rtt, dumper_);
1406+
stream = new (stream_pool_)
1407+
Stream(arena_, stream_pool_, source_id, report_time_, config_.rtt, dumper_);
14051408
if (!stream) {
14061409
report_error_ = status::StatusNoMem;
14071410
return NULL;

src/internal_modules/roc_rtcp/reporter.h

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "roc_core/shared_ptr.h"
2323
#include "roc_core/slab_pool.h"
2424
#include "roc_core/time.h"
25+
#include "roc_dbgio/csv_dumper.h"
2526
#include "roc_packet/ntp.h"
2627
#include "roc_packet/units.h"
2728
#include "roc_rtcp/cname.h"
@@ -34,7 +35,6 @@
3435
#include "roc_rtcp/rtt_estimator.h"
3536
#include "roc_rtcp/sdes.h"
3637
#include "roc_status/status_code.h"
37-
#include "roc_dbgio/csv_dumper.h"
3838

3939
namespace roc {
4040
namespace rtcp {
@@ -91,7 +91,10 @@ namespace rtcp {
9191
class Reporter : public core::NonCopyable<> {
9292
public:
9393
//! Initialize.
94-
Reporter(const Config &config, IParticipant &participant, core::IArena &arena, dbgio::CsvDumper *dumper);
94+
Reporter(const Config& config,
95+
IParticipant& participant,
96+
core::IArena& arena,
97+
dbgio::CsvDumper* dumper);
9598
~Reporter();
9699

97100
//! Check if the object was successfully constructed.
@@ -262,9 +265,12 @@ class Reporter : public core::NonCopyable<> {
262265
struct Stream : core::RefCounted<Stream, core::PoolAllocation>,
263266
core::HashmapNode<>,
264267
core::ListNode<> {
265-
Stream(core::IArena &arena, core::IPool &pool, packet::stream_source_t source_id,
268+
Stream(core::IArena& arena,
269+
core::IPool& pool,
270+
packet::stream_source_t source_id,
266271
core::nanoseconds_t report_time,
267-
const RttConfig &rtt_config, dbgio::CsvDumper *dumper)
272+
const RttConfig& rtt_config,
273+
dbgio::CsvDumper* dumper)
268274
: core::RefCounted<Stream, core::PoolAllocation>(pool)
269275
, source_id(source_id)
270276
, has_remote_recv_report(false)

src/internal_modules/roc_rtcp/rtt_estimator.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
namespace roc {
1313
namespace rtcp {
1414

15-
RttEstimator::RttEstimator(core::IArena &arena, const RttConfig &config, dbgio::CsvDumper *dumper)
15+
RttEstimator::RttEstimator(core::IArena& arena,
16+
const RttConfig& config,
17+
dbgio::CsvDumper* dumper)
1618
: config_(config)
1719
, metrics_()
1820
, has_metrics_(false)
@@ -100,8 +102,10 @@ void RttEstimator::update(core::nanoseconds_t local_report_ts,
100102
}
101103
}
102104

103-
void RttEstimator::dump_(core::nanoseconds_t local_report_ts, core::nanoseconds_t remote_report_ts,
104-
core::nanoseconds_t remote_reply_ts, core::nanoseconds_t local_reply_ts) {
105+
void RttEstimator::dump_(core::nanoseconds_t local_report_ts,
106+
core::nanoseconds_t remote_report_ts,
107+
core::nanoseconds_t remote_reply_ts,
108+
core::nanoseconds_t local_reply_ts) {
105109
dbgio::CsvEntry e;
106110
e.type = 'r';
107111
e.n_fields = 7;

src/internal_modules/roc_rtcp/rtt_estimator.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#define ROC_RTCP_RTT_ESTIMATOR_H_
1414

1515
#include "roc_core/time.h"
16-
#include "roc_packet/units.h"
1716
#include "roc_dbgio/csv_dumper.h"
17+
#include "roc_packet/units.h"
1818
#include "roc_stat/mov_quantile.h"
1919

2020
namespace roc {
@@ -53,7 +53,7 @@ struct RttMetrics {
5353
class RttEstimator {
5454
public:
5555
//! Initialize.
56-
RttEstimator(core::IArena &arena, const RttConfig &config, dbgio::CsvDumper *dumper);
56+
RttEstimator(core::IArena& arena, const RttConfig& config, dbgio::CsvDumper* dumper);
5757

5858
//! Check whether metrics are already available.
5959
bool has_metrics() const;
@@ -73,8 +73,10 @@ class RttEstimator {
7373
core::nanoseconds_t local_reply_ts);
7474

7575
private:
76-
void dump_(core::nanoseconds_t local_report_ts, core::nanoseconds_t remote_report_ts,
77-
core::nanoseconds_t remote_reply_ts, core::nanoseconds_t local_reply_ts);
76+
void dump_(core::nanoseconds_t local_report_ts,
77+
core::nanoseconds_t remote_report_ts,
78+
core::nanoseconds_t remote_reply_ts,
79+
core::nanoseconds_t local_reply_ts);
7880

7981
const RttConfig config_;
8082
RttMetrics metrics_;
@@ -83,7 +85,7 @@ class RttEstimator {
8385
core::nanoseconds_t first_report_ts_;
8486
core::nanoseconds_t last_report_ts_;
8587

86-
dbgio::CsvDumper *dumper_;
88+
dbgio::CsvDumper* dumper_;
8789
stat::MovQuantile<core::nanoseconds_t> rtt_stats_;
8890
stat::MovQuantile<core::nanoseconds_t> clock_offset_stats_;
8991
};

0 commit comments

Comments
 (0)