From d6a5cbdf4c470f5a150f78baedbfba635beb2565 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Fri, 18 Aug 2017 09:40:25 -0700 Subject: [PATCH] Turn off clang-format for WEBRTC_RTCSTATS_IMPL macros. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Clang format wants to put all parameters to WEBRTC_RTCSTATS_IMPL on their own line, but we prefer to keep the header on the first line and put the variable arguments (the stats) on their own lines. Bug: None Change-Id: Ic53104b46fb3c91c134d524027a150ba10055ad5 Reviewed-on: https://chromium-review.googlesource.com/621409 Reviewed-by: Henrik Boström Commit-Queue: Steve Anton Cr-Commit-Position: refs/heads/master@{#19505} --- webrtc/stats/rtcstats_objects.cc | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/webrtc/stats/rtcstats_objects.cc b/webrtc/stats/rtcstats_objects.cc index f24fd66fcf..19e94b3c96 100644 --- a/webrtc/stats/rtcstats_objects.cc +++ b/webrtc/stats/rtcstats_objects.cc @@ -38,11 +38,13 @@ const char* const RTCDtlsTransportState::kFailed = "failed"; const char* const RTCMediaStreamTrackKind::kAudio = "audio"; const char* const RTCMediaStreamTrackKind::kVideo = "video"; +// clang-format off WEBRTC_RTCSTATS_IMPL(RTCCertificateStats, RTCStats, "certificate", &fingerprint, &fingerprint_algorithm, &base64_certificate, &issuer_certificate_id); +// clang-format on RTCCertificateStats::RTCCertificateStats( const std::string& id, int64_t timestamp_us) @@ -70,6 +72,7 @@ RTCCertificateStats::RTCCertificateStats( RTCCertificateStats::~RTCCertificateStats() { } +// clang-format off WEBRTC_RTCSTATS_IMPL(RTCCodecStats, RTCStats, "codec", &payload_type, &mime_type, @@ -77,6 +80,7 @@ WEBRTC_RTCSTATS_IMPL(RTCCodecStats, RTCStats, "codec", &channels, &sdp_fmtp_line, &implementation); +// clang-format on RTCCodecStats::RTCCodecStats( const std::string& id, int64_t timestamp_us) @@ -108,6 +112,7 @@ RTCCodecStats::RTCCodecStats( RTCCodecStats::~RTCCodecStats() { } +// clang-format off WEBRTC_RTCSTATS_IMPL(RTCDataChannelStats, RTCStats, "data-channel", &label, &protocol, @@ -117,6 +122,7 @@ WEBRTC_RTCSTATS_IMPL(RTCDataChannelStats, RTCStats, "data-channel", &bytes_sent, &messages_received, &bytes_received); +// clang-format on RTCDataChannelStats::RTCDataChannelStats( const std::string& id, int64_t timestamp_us) @@ -152,6 +158,7 @@ RTCDataChannelStats::RTCDataChannelStats( RTCDataChannelStats::~RTCDataChannelStats() { } +// clang-format off WEBRTC_RTCSTATS_IMPL(RTCIceCandidatePairStats, RTCStats, "candidate-pair", &transport_id, &local_candidate_id, @@ -177,6 +184,7 @@ WEBRTC_RTCSTATS_IMPL(RTCIceCandidatePairStats, RTCStats, "candidate-pair", &consent_requests_sent, &consent_responses_received, &consent_responses_sent); +// clang-format on RTCIceCandidatePairStats::RTCIceCandidatePairStats( const std::string& id, int64_t timestamp_us) @@ -244,6 +252,7 @@ RTCIceCandidatePairStats::RTCIceCandidatePairStats( RTCIceCandidatePairStats::~RTCIceCandidatePairStats() { } +// clang-format off WEBRTC_RTCSTATS_IMPL(RTCIceCandidateStats, RTCStats, "ice-candidate", &transport_id, &is_remote, @@ -254,6 +263,7 @@ WEBRTC_RTCSTATS_IMPL(RTCIceCandidateStats, RTCStats, "ice-candidate", &priority, &url, &deleted); +// clang-format on RTCIceCandidateStats::RTCIceCandidateStats( const std::string& id, int64_t timestamp_us, bool is_remote) @@ -322,9 +332,11 @@ const char* RTCRemoteIceCandidateStats::type() const { return kType; } +// clang-format off WEBRTC_RTCSTATS_IMPL(RTCMediaStreamStats, RTCStats, "stream", &stream_identifier, &track_ids); +// clang-format on RTCMediaStreamStats::RTCMediaStreamStats( const std::string& id, int64_t timestamp_us) @@ -348,6 +360,7 @@ RTCMediaStreamStats::RTCMediaStreamStats( RTCMediaStreamStats::~RTCMediaStreamStats() { } +// clang-format off WEBRTC_RTCSTATS_IMPL(RTCMediaStreamTrackStats, RTCStats, "track", &track_identifier, &remote_source, @@ -369,6 +382,7 @@ WEBRTC_RTCSTATS_IMPL(RTCMediaStreamTrackStats, RTCStats, "track", &total_samples_duration, &echo_return_loss, &echo_return_loss_enhancement); +// clang-format on RTCMediaStreamTrackStats::RTCMediaStreamTrackStats( const std::string& id, int64_t timestamp_us, const char* kind) @@ -430,9 +444,11 @@ RTCMediaStreamTrackStats::RTCMediaStreamTrackStats( RTCMediaStreamTrackStats::~RTCMediaStreamTrackStats() { } +// clang-format off WEBRTC_RTCSTATS_IMPL(RTCPeerConnectionStats, RTCStats, "peer-connection", &data_channels_opened, &data_channels_closed); +// clang-format on RTCPeerConnectionStats::RTCPeerConnectionStats( const std::string& id, int64_t timestamp_us) @@ -456,6 +472,7 @@ RTCPeerConnectionStats::RTCPeerConnectionStats( RTCPeerConnectionStats::~RTCPeerConnectionStats() { } +// clang-format off WEBRTC_RTCSTATS_IMPL(RTCRTPStreamStats, RTCStats, "rtp", &ssrc, &associate_stats_id, @@ -469,6 +486,7 @@ WEBRTC_RTCSTATS_IMPL(RTCRTPStreamStats, RTCStats, "rtp", &nack_count, &sli_count, &qp_sum); +// clang-format on RTCRTPStreamStats::RTCRTPStreamStats( const std::string& id, int64_t timestamp_us) @@ -512,6 +530,7 @@ RTCRTPStreamStats::RTCRTPStreamStats( RTCRTPStreamStats::~RTCRTPStreamStats() { } +// clang-format off WEBRTC_RTCSTATS_IMPL( RTCInboundRTPStreamStats, RTCRTPStreamStats, "inbound-rtp", &packets_received, @@ -531,6 +550,7 @@ WEBRTC_RTCSTATS_IMPL( &gap_loss_rate, &gap_discard_rate, &frames_decoded); +// clang-format on RTCInboundRTPStreamStats::RTCInboundRTPStreamStats( const std::string& id, int64_t timestamp_us) @@ -584,12 +604,14 @@ RTCInboundRTPStreamStats::RTCInboundRTPStreamStats( RTCInboundRTPStreamStats::~RTCInboundRTPStreamStats() { } +// clang-format off WEBRTC_RTCSTATS_IMPL( RTCOutboundRTPStreamStats, RTCRTPStreamStats, "outbound-rtp", &packets_sent, &bytes_sent, &target_bitrate, &frames_encoded); +// clang-format on RTCOutboundRTPStreamStats::RTCOutboundRTPStreamStats( const std::string& id, int64_t timestamp_us) @@ -617,6 +639,7 @@ RTCOutboundRTPStreamStats::RTCOutboundRTPStreamStats( RTCOutboundRTPStreamStats::~RTCOutboundRTPStreamStats() { } +// clang-format off WEBRTC_RTCSTATS_IMPL(RTCTransportStats, RTCStats, "transport", &bytes_sent, &bytes_received, @@ -625,6 +648,7 @@ WEBRTC_RTCSTATS_IMPL(RTCTransportStats, RTCStats, "transport", &selected_candidate_pair_id, &local_certificate_id, &remote_certificate_id); +// clang-format on RTCTransportStats::RTCTransportStats( const std::string& id, int64_t timestamp_us)