From 22f9925b3eea255ea61edae6bd364249db2fc574 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Wed, 20 Feb 2019 10:13:16 -0500 Subject: [PATCH] webrtc: Remove semicolons. Bug: chromium:926235 Change-Id: I66c10ab3df38adf87152d1f18cc8162afedca7e4 Reviewed-on: https://webrtc-review.googlesource.com/c/123560 Commit-Queue: Tommi Reviewed-by: Tommi Cr-Commit-Position: refs/heads/master@{#26780} --- api/peer_connection_factory_proxy.h | 8 +++--- api/rtp_receiver_interface.h | 10 +++---- api/rtp_sender_interface.h | 8 +++--- api/stats/rtc_stats.h | 12 ++++---- common_audio/audio_converter.cc | 10 +++---- media/base/media_engine.cc | 2 +- .../audio_network_adaptor_impl.cc | 2 +- .../codecs/opus/audio_encoder_opus.h | 6 ++-- modules/audio_processing/aec3/aec_state.h | 4 +-- modules/audio_processing/agc2/agc2_common.cc | 2 +- modules/audio_processing/agc2/gain_applier.h | 2 +- .../logging/apm_data_dumper.cc | 2 +- modules/desktop_capture/desktop_geometry.h | 2 +- modules/video_capture/video_capture.h | 2 +- modules/video_capture/video_capture_defines.h | 2 +- .../codecs/vp8/libvpx_interface.cc | 8 +++--- p2p/base/port.h | 2 +- pc/rtp_transceiver.h | 24 ++++++++-------- rtc_base/async_packet_socket.cc | 2 +- rtc_base/async_resolver_interface.cc | 2 +- rtc_base/crypt_string.cc | 2 +- stats/rtc_stats.cc | 28 +++++++++---------- stats/rtcstats_objects.cc | 24 ++++++++-------- stats/test/rtc_test_stats.cc | 2 +- system_wrappers/include/clock.h | 2 +- system_wrappers/source/clock.cc | 2 +- test/fake_encoder.cc | 2 +- 27 files changed, 86 insertions(+), 88 deletions(-) diff --git a/api/peer_connection_factory_proxy.h b/api/peer_connection_factory_proxy.h index a4527e90e8..620f1ca172 100644 --- a/api/peer_connection_factory_proxy.h +++ b/api/peer_connection_factory_proxy.h @@ -31,17 +31,17 @@ PROXY_METHOD4(rtc::scoped_refptr, const PeerConnectionInterface::RTCConfiguration&, std::unique_ptr, std::unique_ptr, - PeerConnectionObserver*); + PeerConnectionObserver*) PROXY_METHOD2(rtc::scoped_refptr, CreatePeerConnection, const PeerConnectionInterface::RTCConfiguration&, - PeerConnectionDependencies); + PeerConnectionDependencies) PROXY_CONSTMETHOD1(webrtc::RtpCapabilities, GetRtpSenderCapabilities, - cricket::MediaType); + cricket::MediaType) PROXY_CONSTMETHOD1(webrtc::RtpCapabilities, GetRtpReceiverCapabilities, - cricket::MediaType); + cricket::MediaType) PROXY_METHOD1(rtc::scoped_refptr, CreateLocalMediaStream, const std::string&) diff --git a/api/rtp_receiver_interface.h b/api/rtp_receiver_interface.h index bc3256665e..7d9870b8f1 100644 --- a/api/rtp_receiver_interface.h +++ b/api/rtp_receiver_interface.h @@ -160,15 +160,15 @@ PROXY_CONSTMETHOD0(std::vector>, streams) PROXY_CONSTMETHOD0(cricket::MediaType, media_type) PROXY_CONSTMETHOD0(std::string, id) -PROXY_CONSTMETHOD0(RtpParameters, GetParameters); +PROXY_CONSTMETHOD0(RtpParameters, GetParameters) PROXY_METHOD1(bool, SetParameters, const RtpParameters&) -PROXY_METHOD1(void, SetObserver, RtpReceiverObserverInterface*); -PROXY_CONSTMETHOD0(std::vector, GetSources); +PROXY_METHOD1(void, SetObserver, RtpReceiverObserverInterface*) +PROXY_CONSTMETHOD0(std::vector, GetSources) PROXY_METHOD1(void, SetFrameDecryptor, - rtc::scoped_refptr); + rtc::scoped_refptr) PROXY_CONSTMETHOD0(rtc::scoped_refptr, - GetFrameDecryptor); + GetFrameDecryptor) END_PROXY_MAP() } // namespace webrtc diff --git a/api/rtp_sender_interface.h b/api/rtp_sender_interface.h index 83cbe7a9da..f8a97575fb 100644 --- a/api/rtp_sender_interface.h +++ b/api/rtp_sender_interface.h @@ -106,14 +106,14 @@ PROXY_CONSTMETHOD0(cricket::MediaType, media_type) PROXY_CONSTMETHOD0(std::string, id) PROXY_CONSTMETHOD0(std::vector, stream_ids) PROXY_CONSTMETHOD0(std::vector, init_send_encodings) -PROXY_CONSTMETHOD0(RtpParameters, GetParameters); +PROXY_CONSTMETHOD0(RtpParameters, GetParameters) PROXY_METHOD1(RTCError, SetParameters, const RtpParameters&) -PROXY_CONSTMETHOD0(rtc::scoped_refptr, GetDtmfSender); +PROXY_CONSTMETHOD0(rtc::scoped_refptr, GetDtmfSender) PROXY_METHOD1(void, SetFrameEncryptor, - rtc::scoped_refptr); + rtc::scoped_refptr) PROXY_CONSTMETHOD0(rtc::scoped_refptr, - GetFrameEncryptor); + GetFrameEncryptor) END_PROXY_MAP() } // namespace webrtc diff --git a/api/stats/rtc_stats.h b/api/stats/rtc_stats.h index 049b74f584..2407ce004c 100644 --- a/api/stats/rtc_stats.h +++ b/api/stats/rtc_stats.h @@ -140,18 +140,16 @@ class RTC_EXPORT RTCStats { // } // #define WEBRTC_RTCSTATS_DECL() \ - public: \ - static const char kType[]; \ - \ - std::unique_ptr copy() const override; \ - const char* type() const override; \ - \ protected: \ std::vector \ MembersOfThisObjectAndAncestors(size_t local_var_additional_capacity) \ const override; \ \ - public: + public: \ + static const char kType[]; \ + \ + std::unique_ptr copy() const override; \ + const char* type() const override #define WEBRTC_RTCSTATS_IMPL(this_class, parent_class, type_str, ...) \ const char this_class::kType[] = type_str; \ diff --git a/common_audio/audio_converter.cc b/common_audio/audio_converter.cc index 0f97abb86a..c560346e99 100644 --- a/common_audio/audio_converter.cc +++ b/common_audio/audio_converter.cc @@ -31,7 +31,7 @@ class CopyConverter : public AudioConverter { size_t dst_channels, size_t dst_frames) : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {} - ~CopyConverter() override{}; + ~CopyConverter() override {} void Convert(const float* const* src, size_t src_size, @@ -52,7 +52,7 @@ class UpmixConverter : public AudioConverter { size_t dst_channels, size_t dst_frames) : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {} - ~UpmixConverter() override{}; + ~UpmixConverter() override {} void Convert(const float* const* src, size_t src_size, @@ -74,7 +74,7 @@ class DownmixConverter : public AudioConverter { size_t dst_channels, size_t dst_frames) : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {} - ~DownmixConverter() override{}; + ~DownmixConverter() override {} void Convert(const float* const* src, size_t src_size, @@ -103,7 +103,7 @@ class ResampleConverter : public AudioConverter { resamplers_.push_back(std::unique_ptr( new PushSincResampler(src_frames, dst_frames))); } - ~ResampleConverter() override{}; + ~ResampleConverter() override {} void Convert(const float* const* src, size_t src_size, @@ -132,7 +132,7 @@ class CompositionConverter : public AudioConverter { std::unique_ptr>(new ChannelBuffer( (*it)->dst_frames(), (*it)->dst_channels()))); } - ~CompositionConverter() override{}; + ~CompositionConverter() override {} void Convert(const float* const* src, size_t src_size, diff --git a/media/base/media_engine.cc b/media/base/media_engine.cc index 43929116ac..dff7887e0d 100644 --- a/media/base/media_engine.cc +++ b/media/base/media_engine.cc @@ -172,4 +172,4 @@ const VideoEngineInterface& CompositeMediaEngine::video() const { return *video_engine_.get(); } -}; // namespace cricket +} // namespace cricket diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc index 6731d504f9..ff6ac0199f 100644 --- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc +++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc @@ -29,7 +29,7 @@ constexpr float kEventLogMinBitrateChangeFraction = 0.25; constexpr float kEventLogMinPacketLossChangeFraction = 0.5; } // namespace -AudioNetworkAdaptorImpl::Config::Config() : event_log(nullptr){}; +AudioNetworkAdaptorImpl::Config::Config() : event_log(nullptr) {} AudioNetworkAdaptorImpl::Config::~Config() = default; diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.h b/modules/audio_coding/codecs/opus/audio_encoder_opus.h index b970ae92a0..dc14620860 100644 --- a/modules/audio_coding/codecs/opus/audio_encoder_opus.h +++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.h @@ -40,9 +40,9 @@ class AudioEncoderOpusImpl final : public AudioEncoder { float OptimizePacketLossRate(float packet_loss_rate) const; // Getters for testing. - float min_packet_loss_rate() const { return min_packet_loss_rate_; }; - float max_packet_loss_rate() const { return max_packet_loss_rate_; }; - float slope() const { return slope_; }; + float min_packet_loss_rate() const { return min_packet_loss_rate_; } + float max_packet_loss_rate() const { return max_packet_loss_rate_; } + float slope() const { return slope_; } private: const float min_packet_loss_rate_; diff --git a/modules/audio_processing/aec3/aec_state.h b/modules/audio_processing/aec3/aec_state.h index 0ba9e19337..f5114297e7 100644 --- a/modules/audio_processing/aec3/aec_state.h +++ b/modules/audio_processing/aec3/aec_state.h @@ -306,7 +306,7 @@ class AecState { class SaturationDetector { public: // Returns whether the echo is to be considered saturated. - bool SaturatedEcho() const { return saturated_echo_; }; + bool SaturatedEcho() const { return saturated_echo_; } // Updates the detection decision based on new data. void Update(rtc::ArrayView x, @@ -327,7 +327,7 @@ class AecState { explicit LegacySaturationDetector(const EchoCanceller3Config& config); // Returns whether the echo is to be considered saturated. - bool SaturatedEcho() const { return saturated_echo_; }; + bool SaturatedEcho() const { return saturated_echo_; } // Resets the state of the detector. void Reset(); diff --git a/modules/audio_processing/agc2/agc2_common.cc b/modules/audio_processing/agc2/agc2_common.cc index af943df78f..11078855f6 100644 --- a/modules/audio_processing/agc2/agc2_common.cc +++ b/modules/audio_processing/agc2/agc2_common.cc @@ -54,4 +54,4 @@ float GetExtraSaturationMarginOffsetDb() { constexpr float kDefaultExtraSaturationMarginDb = 2.f; return kDefaultExtraSaturationMarginDb; } -}; // namespace webrtc +} // namespace webrtc diff --git a/modules/audio_processing/agc2/gain_applier.h b/modules/audio_processing/agc2/gain_applier.h index 7f9f00e076..d9aa19d1aa 100644 --- a/modules/audio_processing/agc2/gain_applier.h +++ b/modules/audio_processing/agc2/gain_applier.h @@ -22,7 +22,7 @@ class GainApplier { void ApplyGain(AudioFrameView signal); void SetGainFactor(float gain_factor); - float GetGainFactor() const { return current_gain_factor_; }; + float GetGainFactor() const { return current_gain_factor_; } private: void Initialize(size_t samples_per_channel); diff --git a/modules/audio_processing/logging/apm_data_dumper.cc b/modules/audio_processing/logging/apm_data_dumper.cc index cc879c8b08..6d84750d74 100644 --- a/modules/audio_processing/logging/apm_data_dumper.cc +++ b/modules/audio_processing/logging/apm_data_dumper.cc @@ -54,7 +54,7 @@ std::string FormFileName(const char* output_dir, ApmDataDumper::ApmDataDumper(int instance_index) : instance_index_(instance_index) {} #else -ApmDataDumper::ApmDataDumper(int instance_index){}; +ApmDataDumper::ApmDataDumper(int instance_index) {} #endif ApmDataDumper::~ApmDataDumper() = default; diff --git a/modules/desktop_capture/desktop_geometry.h b/modules/desktop_capture/desktop_geometry.h index 78a923023f..91608f0c23 100644 --- a/modules/desktop_capture/desktop_geometry.h +++ b/modules/desktop_capture/desktop_geometry.h @@ -136,7 +136,7 @@ class RTC_EXPORT DesktopRect { // Adds (dx, dy) to the position of the rectangle. void Translate(int32_t dx, int32_t dy); - void Translate(DesktopVector d) { Translate(d.x(), d.y()); }; + void Translate(DesktopVector d) { Translate(d.x(), d.y()); } // Enlarges current DesktopRect by subtracting |left_offset| and |top_offset| // from |left_| and |top_|, and adding |right_offset| and |bottom_offset| to diff --git a/modules/video_capture/video_capture.h b/modules/video_capture/video_capture.h index 90af86d1de..8d2a8f5514 100644 --- a/modules/video_capture/video_capture.h +++ b/modules/video_capture/video_capture.h @@ -109,7 +109,7 @@ class VideoCaptureModule : public rtc::RefCountInterface { virtual bool GetApplyRotation() = 0; protected: - ~VideoCaptureModule() override{}; + ~VideoCaptureModule() override {} }; } // namespace webrtc diff --git a/modules/video_capture/video_capture_defines.h b/modules/video_capture/video_capture_defines.h index 3987c03e10..f69d03ed70 100644 --- a/modules/video_capture/video_capture_defines.h +++ b/modules/video_capture/video_capture_defines.h @@ -35,7 +35,7 @@ struct VideoCaptureCapability { maxFPS = 0; videoType = VideoType::kUnknown; interlaced = false; - }; + } bool operator!=(const VideoCaptureCapability& other) const { if (width != other.width) return true; diff --git a/modules/video_coding/codecs/vp8/libvpx_interface.cc b/modules/video_coding/codecs/vp8/libvpx_interface.cc index 8f6a3a6113..6b39053936 100644 --- a/modules/video_coding/codecs/vp8/libvpx_interface.cc +++ b/modules/video_coding/codecs/vp8/libvpx_interface.cc @@ -141,7 +141,7 @@ class LibvpxVp8Facade : public LibvpxInterface { RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id; } return VPX_CODEC_ERROR; - }; + } vpx_codec_err_t codec_control(vpx_codec_ctx_t* ctx, vp8e_enc_control_id ctrl_id, @@ -153,7 +153,7 @@ class LibvpxVp8Facade : public LibvpxInterface { RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id; } return VPX_CODEC_ERROR; - }; + } vpx_codec_err_t codec_control(vpx_codec_ctx_t* ctx, vp8e_enc_control_id ctrl_id, @@ -165,7 +165,7 @@ class LibvpxVp8Facade : public LibvpxInterface { RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id; } return VPX_CODEC_ERROR; - }; + } vpx_codec_err_t codec_control(vpx_codec_ctx_t* ctx, vp8e_enc_control_id ctrl_id, @@ -177,7 +177,7 @@ class LibvpxVp8Facade : public LibvpxInterface { RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id; } return VPX_CODEC_ERROR; - }; + } vpx_codec_err_t codec_encode(vpx_codec_ctx_t* ctx, const vpx_image_t* img, diff --git a/p2p/base/port.h b/p2p/base/port.h index 5f07eb4297..2358f1b144 100644 --- a/p2p/base/port.h +++ b/p2p/base/port.h @@ -384,7 +384,7 @@ class Port : public PortInterface, int16_t network_cost() const { return network_cost_; } - void GetStunStats(absl::optional* stats) override{}; + void GetStunStats(absl::optional* stats) override {} protected: enum { MSG_DESTROY_IF_DEAD = 0, MSG_FIRST_AVAILABLE }; diff --git a/pc/rtp_transceiver.h b/pc/rtp_transceiver.h index fd74fde155..2c04bd7c80 100644 --- a/pc/rtp_transceiver.h +++ b/pc/rtp_transceiver.h @@ -202,18 +202,18 @@ class RtpTransceiver final BEGIN_SIGNALING_PROXY_MAP(RtpTransceiver) PROXY_SIGNALING_THREAD_DESTRUCTOR() -PROXY_CONSTMETHOD0(cricket::MediaType, media_type); -PROXY_CONSTMETHOD0(absl::optional, mid); -PROXY_CONSTMETHOD0(rtc::scoped_refptr, sender); -PROXY_CONSTMETHOD0(rtc::scoped_refptr, receiver); -PROXY_CONSTMETHOD0(bool, stopped); -PROXY_CONSTMETHOD0(RtpTransceiverDirection, direction); -PROXY_METHOD1(void, SetDirection, RtpTransceiverDirection); -PROXY_CONSTMETHOD0(absl::optional, current_direction); -PROXY_CONSTMETHOD0(absl::optional, fired_direction); -PROXY_METHOD0(void, Stop); -PROXY_METHOD1(void, SetCodecPreferences, rtc::ArrayView); -END_PROXY_MAP(); +PROXY_CONSTMETHOD0(cricket::MediaType, media_type) +PROXY_CONSTMETHOD0(absl::optional, mid) +PROXY_CONSTMETHOD0(rtc::scoped_refptr, sender) +PROXY_CONSTMETHOD0(rtc::scoped_refptr, receiver) +PROXY_CONSTMETHOD0(bool, stopped) +PROXY_CONSTMETHOD0(RtpTransceiverDirection, direction) +PROXY_METHOD1(void, SetDirection, RtpTransceiverDirection) +PROXY_CONSTMETHOD0(absl::optional, current_direction) +PROXY_CONSTMETHOD0(absl::optional, fired_direction) +PROXY_METHOD0(void, Stop) +PROXY_METHOD1(void, SetCodecPreferences, rtc::ArrayView) +END_PROXY_MAP() } // namespace webrtc diff --git a/rtc_base/async_packet_socket.cc b/rtc_base/async_packet_socket.cc index 12afbebfc5..a708faecea 100644 --- a/rtc_base/async_packet_socket.cc +++ b/rtc_base/async_packet_socket.cc @@ -42,4 +42,4 @@ void CopySocketInformationToPacketInfo(size_t packet_size_bytes, } } -}; // namespace rtc +} // namespace rtc diff --git a/rtc_base/async_resolver_interface.cc b/rtc_base/async_resolver_interface.cc index c8d6ab85de..ff8c87e346 100644 --- a/rtc_base/async_resolver_interface.cc +++ b/rtc_base/async_resolver_interface.cc @@ -16,4 +16,4 @@ AsyncResolverInterface::AsyncResolverInterface() {} AsyncResolverInterface::~AsyncResolverInterface() = default; -}; // namespace rtc +} // namespace rtc diff --git a/rtc_base/crypt_string.cc b/rtc_base/crypt_string.cc index 3238255de6..ed0ff163ba 100644 --- a/rtc_base/crypt_string.cc +++ b/rtc_base/crypt_string.cc @@ -69,4 +69,4 @@ void InsecureCryptStringImpl::CopyRawTo( memcpy(&dest->front(), password_.data(), password_.size()); } -}; // namespace rtc +} // namespace rtc diff --git a/stats/rtc_stats.cc b/stats/rtc_stats.cc index 4332fe6acf..f5139a7dbb 100644 --- a/stats/rtc_stats.cc +++ b/stats/rtc_stats.cc @@ -154,79 +154,79 @@ WEBRTC_DEFINE_RTCSTATSMEMBER(bool, false, false, rtc::ToString(value_), - rtc::ToString(value_)); + rtc::ToString(value_)) WEBRTC_DEFINE_RTCSTATSMEMBER(int32_t, kInt32, false, false, rtc::ToString(value_), - rtc::ToString(value_)); + rtc::ToString(value_)) WEBRTC_DEFINE_RTCSTATSMEMBER(uint32_t, kUint32, false, false, rtc::ToString(value_), - rtc::ToString(value_)); + rtc::ToString(value_)) WEBRTC_DEFINE_RTCSTATSMEMBER(int64_t, kInt64, false, false, rtc::ToString(value_), - ToStringAsDouble(value_)); + ToStringAsDouble(value_)) WEBRTC_DEFINE_RTCSTATSMEMBER(uint64_t, kUint64, false, false, rtc::ToString(value_), - ToStringAsDouble(value_)); + ToStringAsDouble(value_)) WEBRTC_DEFINE_RTCSTATSMEMBER(double, kDouble, false, false, rtc::ToString(value_), - ToStringAsDouble(value_)); -WEBRTC_DEFINE_RTCSTATSMEMBER(std::string, kString, false, true, value_, value_); + ToStringAsDouble(value_)) +WEBRTC_DEFINE_RTCSTATSMEMBER(std::string, kString, false, true, value_, value_) WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector, kSequenceBool, true, false, VectorToString(value_), - VectorToString(value_)); + VectorToString(value_)) WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector, kSequenceInt32, true, false, VectorToString(value_), - VectorToString(value_)); + VectorToString(value_)) WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector, kSequenceUint32, true, false, VectorToString(value_), - VectorToString(value_)); + VectorToString(value_)) WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector, kSequenceInt64, true, false, VectorToString(value_), - VectorToStringAsDouble(value_)); + VectorToStringAsDouble(value_)) WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector, kSequenceUint64, true, false, VectorToString(value_), - VectorToStringAsDouble(value_)); + VectorToStringAsDouble(value_)) WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector, kSequenceDouble, true, false, VectorToString(value_), - VectorToStringAsDouble(value_)); + VectorToStringAsDouble(value_)) WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector, kSequenceString, true, false, VectorOfStringsToString(value_), - VectorOfStringsToString(value_)); + VectorOfStringsToString(value_)) } // namespace webrtc diff --git a/stats/rtcstats_objects.cc b/stats/rtcstats_objects.cc index 473a3f3334..14764d702f 100644 --- a/stats/rtcstats_objects.cc +++ b/stats/rtcstats_objects.cc @@ -56,7 +56,7 @@ WEBRTC_RTCSTATS_IMPL(RTCCertificateStats, RTCStats, "certificate", &fingerprint, &fingerprint_algorithm, &base64_certificate, - &issuer_certificate_id); + &issuer_certificate_id) // clang-format on RTCCertificateStats::RTCCertificateStats(const std::string& id, @@ -86,7 +86,7 @@ WEBRTC_RTCSTATS_IMPL(RTCCodecStats, RTCStats, "codec", &clock_rate, &channels, &sdp_fmtp_line, - &implementation); + &implementation) // clang-format on RTCCodecStats::RTCCodecStats(const std::string& id, int64_t timestamp_us) @@ -121,7 +121,7 @@ WEBRTC_RTCSTATS_IMPL(RTCDataChannelStats, RTCStats, "data-channel", &messages_sent, &bytes_sent, &messages_received, - &bytes_received); + &bytes_received) // clang-format on RTCDataChannelStats::RTCDataChannelStats(const std::string& id, @@ -177,7 +177,7 @@ WEBRTC_RTCSTATS_IMPL(RTCIceCandidatePairStats, RTCStats, "candidate-pair", &consent_requests_received, &consent_requests_sent, &consent_responses_received, - &consent_responses_sent); + &consent_responses_sent) // clang-format on RTCIceCandidatePairStats::RTCIceCandidatePairStats(const std::string& id, @@ -254,7 +254,7 @@ WEBRTC_RTCSTATS_IMPL(RTCIceCandidateStats, RTCStats, "abstract-ice-candidate", &candidate_type, &priority, &url, - &deleted); + &deleted) // clang-format on RTCIceCandidateStats::RTCIceCandidateStats(const std::string& id, @@ -333,7 +333,7 @@ const char* RTCRemoteIceCandidateStats::type() const { // clang-format off WEBRTC_RTCSTATS_IMPL(RTCMediaStreamStats, RTCStats, "stream", &stream_identifier, - &track_ids); + &track_ids) // clang-format on RTCMediaStreamStats::RTCMediaStreamStats(const std::string& id, @@ -387,7 +387,7 @@ WEBRTC_RTCSTATS_IMPL(RTCMediaStreamTrackStats, RTCStats, "track", &total_freezes_duration, &total_pauses_duration, &total_frames_duration, - &sum_squared_frame_durations); + &sum_squared_frame_durations) // clang-format on RTCMediaStreamTrackStats::RTCMediaStreamTrackStats(const std::string& id, @@ -480,7 +480,7 @@ RTCMediaStreamTrackStats::~RTCMediaStreamTrackStats() {} // clang-format off WEBRTC_RTCSTATS_IMPL(RTCPeerConnectionStats, RTCStats, "peer-connection", &data_channels_opened, - &data_channels_closed); + &data_channels_closed) // clang-format on RTCPeerConnectionStats::RTCPeerConnectionStats(const std::string& id, @@ -515,7 +515,7 @@ WEBRTC_RTCSTATS_IMPL(RTCRTPStreamStats, RTCStats, "rtp", &pli_count, &nack_count, &sli_count, - &qp_sum); + &qp_sum) // clang-format on RTCRTPStreamStats::RTCRTPStreamStats(const std::string& id, @@ -575,7 +575,7 @@ WEBRTC_RTCSTATS_IMPL( &burst_discard_rate, &gap_loss_rate, &gap_discard_rate, - &frames_decoded); + &frames_decoded) // clang-format on RTCInboundRTPStreamStats::RTCInboundRTPStreamStats(const std::string& id, @@ -632,7 +632,7 @@ WEBRTC_RTCSTATS_IMPL( &packets_sent, &bytes_sent, &target_bitrate, - &frames_encoded); + &frames_encoded) // clang-format on RTCOutboundRTPStreamStats::RTCOutboundRTPStreamStats(const std::string& id, @@ -665,7 +665,7 @@ WEBRTC_RTCSTATS_IMPL(RTCTransportStats, RTCStats, "transport", &dtls_state, &selected_candidate_pair_id, &local_certificate_id, - &remote_certificate_id); + &remote_certificate_id) // clang-format on RTCTransportStats::RTCTransportStats(const std::string& id, diff --git a/stats/test/rtc_test_stats.cc b/stats/test/rtc_test_stats.cc index d5576e6c80..d8bcbb19eb 100644 --- a/stats/test/rtc_test_stats.cc +++ b/stats/test/rtc_test_stats.cc @@ -30,7 +30,7 @@ WEBRTC_RTCSTATS_IMPL(RTCTestStats, &m_sequence_int64, &m_sequence_uint64, &m_sequence_double, - &m_sequence_string); + &m_sequence_string) RTCTestStats::RTCTestStats(const std::string& id, int64_t timestamp_us) : RTCStats(id, timestamp_us), diff --git a/system_wrappers/include/clock.h b/system_wrappers/include/clock.h index 3d292c8c70..b2c6c5fddb 100644 --- a/system_wrappers/include/clock.h +++ b/system_wrappers/include/clock.h @@ -83,6 +83,6 @@ class SimulatedClock : public Clock { std::unique_ptr lock_; }; -}; // namespace webrtc +} // namespace webrtc #endif // SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_ diff --git a/system_wrappers/source/clock.cc b/system_wrappers/source/clock.cc index a0acf40589..f69d13c1db 100644 --- a/system_wrappers/source/clock.cc +++ b/system_wrappers/source/clock.cc @@ -271,4 +271,4 @@ void SimulatedClock::AdvanceTimeMicroseconds(int64_t microseconds) { time_us_ += microseconds; } -}; // namespace webrtc +} // namespace webrtc diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc index 85e61510c1..f4645ad268 100644 --- a/test/fake_encoder.cc +++ b/test/fake_encoder.cc @@ -45,7 +45,7 @@ void WriteCounter(unsigned char* payload, uint32_t counter) { payload[3] = (counter & 0xFF000000) >> 24; } -}; // namespace +} // namespace FakeEncoder::FakeEncoder(Clock* clock) : clock_(clock),