Skip to content

Commit 22f9925

Browse files
nicoCommit Bot
authored and
Commit Bot
committed
webrtc: Remove semicolons.
Bug: chromium:926235 Change-Id: I66c10ab3df38adf87152d1f18cc8162afedca7e4 Reviewed-on: https://webrtc-review.googlesource.com/c/123560 Commit-Queue: Tommi <[email protected]> Reviewed-by: Tommi <[email protected]> Cr-Commit-Position: refs/heads/master@{#26780}
1 parent af623ae commit 22f9925

27 files changed

+86
-88
lines changed

api/peer_connection_factory_proxy.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ PROXY_METHOD4(rtc::scoped_refptr<PeerConnectionInterface>,
3131
const PeerConnectionInterface::RTCConfiguration&,
3232
std::unique_ptr<cricket::PortAllocator>,
3333
std::unique_ptr<rtc::RTCCertificateGeneratorInterface>,
34-
PeerConnectionObserver*);
34+
PeerConnectionObserver*)
3535
PROXY_METHOD2(rtc::scoped_refptr<PeerConnectionInterface>,
3636
CreatePeerConnection,
3737
const PeerConnectionInterface::RTCConfiguration&,
38-
PeerConnectionDependencies);
38+
PeerConnectionDependencies)
3939
PROXY_CONSTMETHOD1(webrtc::RtpCapabilities,
4040
GetRtpSenderCapabilities,
41-
cricket::MediaType);
41+
cricket::MediaType)
4242
PROXY_CONSTMETHOD1(webrtc::RtpCapabilities,
4343
GetRtpReceiverCapabilities,
44-
cricket::MediaType);
44+
cricket::MediaType)
4545
PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>,
4646
CreateLocalMediaStream,
4747
const std::string&)

api/rtp_receiver_interface.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,15 @@ PROXY_CONSTMETHOD0(std::vector<rtc::scoped_refptr<MediaStreamInterface>>,
160160
streams)
161161
PROXY_CONSTMETHOD0(cricket::MediaType, media_type)
162162
PROXY_CONSTMETHOD0(std::string, id)
163-
PROXY_CONSTMETHOD0(RtpParameters, GetParameters);
163+
PROXY_CONSTMETHOD0(RtpParameters, GetParameters)
164164
PROXY_METHOD1(bool, SetParameters, const RtpParameters&)
165-
PROXY_METHOD1(void, SetObserver, RtpReceiverObserverInterface*);
166-
PROXY_CONSTMETHOD0(std::vector<RtpSource>, GetSources);
165+
PROXY_METHOD1(void, SetObserver, RtpReceiverObserverInterface*)
166+
PROXY_CONSTMETHOD0(std::vector<RtpSource>, GetSources)
167167
PROXY_METHOD1(void,
168168
SetFrameDecryptor,
169-
rtc::scoped_refptr<FrameDecryptorInterface>);
169+
rtc::scoped_refptr<FrameDecryptorInterface>)
170170
PROXY_CONSTMETHOD0(rtc::scoped_refptr<FrameDecryptorInterface>,
171-
GetFrameDecryptor);
171+
GetFrameDecryptor)
172172
END_PROXY_MAP()
173173

174174
} // namespace webrtc

api/rtp_sender_interface.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ PROXY_CONSTMETHOD0(cricket::MediaType, media_type)
106106
PROXY_CONSTMETHOD0(std::string, id)
107107
PROXY_CONSTMETHOD0(std::vector<std::string>, stream_ids)
108108
PROXY_CONSTMETHOD0(std::vector<RtpEncodingParameters>, init_send_encodings)
109-
PROXY_CONSTMETHOD0(RtpParameters, GetParameters);
109+
PROXY_CONSTMETHOD0(RtpParameters, GetParameters)
110110
PROXY_METHOD1(RTCError, SetParameters, const RtpParameters&)
111-
PROXY_CONSTMETHOD0(rtc::scoped_refptr<DtmfSenderInterface>, GetDtmfSender);
111+
PROXY_CONSTMETHOD0(rtc::scoped_refptr<DtmfSenderInterface>, GetDtmfSender)
112112
PROXY_METHOD1(void,
113113
SetFrameEncryptor,
114-
rtc::scoped_refptr<FrameEncryptorInterface>);
114+
rtc::scoped_refptr<FrameEncryptorInterface>)
115115
PROXY_CONSTMETHOD0(rtc::scoped_refptr<FrameEncryptorInterface>,
116-
GetFrameEncryptor);
116+
GetFrameEncryptor)
117117
END_PROXY_MAP()
118118

119119
} // namespace webrtc

api/stats/rtc_stats.h

+5-7
Original file line numberDiff line numberDiff line change
@@ -140,18 +140,16 @@ class RTC_EXPORT RTCStats {
140140
// }
141141
//
142142
#define WEBRTC_RTCSTATS_DECL() \
143-
public: \
144-
static const char kType[]; \
145-
\
146-
std::unique_ptr<webrtc::RTCStats> copy() const override; \
147-
const char* type() const override; \
148-
\
149143
protected: \
150144
std::vector<const webrtc::RTCStatsMemberInterface*> \
151145
MembersOfThisObjectAndAncestors(size_t local_var_additional_capacity) \
152146
const override; \
153147
\
154-
public:
148+
public: \
149+
static const char kType[]; \
150+
\
151+
std::unique_ptr<webrtc::RTCStats> copy() const override; \
152+
const char* type() const override
155153

156154
#define WEBRTC_RTCSTATS_IMPL(this_class, parent_class, type_str, ...) \
157155
const char this_class::kType[] = type_str; \

common_audio/audio_converter.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class CopyConverter : public AudioConverter {
3131
size_t dst_channels,
3232
size_t dst_frames)
3333
: AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {}
34-
~CopyConverter() override{};
34+
~CopyConverter() override {}
3535

3636
void Convert(const float* const* src,
3737
size_t src_size,
@@ -52,7 +52,7 @@ class UpmixConverter : public AudioConverter {
5252
size_t dst_channels,
5353
size_t dst_frames)
5454
: AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {}
55-
~UpmixConverter() override{};
55+
~UpmixConverter() override {}
5656

5757
void Convert(const float* const* src,
5858
size_t src_size,
@@ -74,7 +74,7 @@ class DownmixConverter : public AudioConverter {
7474
size_t dst_channels,
7575
size_t dst_frames)
7676
: AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {}
77-
~DownmixConverter() override{};
77+
~DownmixConverter() override {}
7878

7979
void Convert(const float* const* src,
8080
size_t src_size,
@@ -103,7 +103,7 @@ class ResampleConverter : public AudioConverter {
103103
resamplers_.push_back(std::unique_ptr<PushSincResampler>(
104104
new PushSincResampler(src_frames, dst_frames)));
105105
}
106-
~ResampleConverter() override{};
106+
~ResampleConverter() override {}
107107

108108
void Convert(const float* const* src,
109109
size_t src_size,
@@ -132,7 +132,7 @@ class CompositionConverter : public AudioConverter {
132132
std::unique_ptr<ChannelBuffer<float>>(new ChannelBuffer<float>(
133133
(*it)->dst_frames(), (*it)->dst_channels())));
134134
}
135-
~CompositionConverter() override{};
135+
~CompositionConverter() override {}
136136

137137
void Convert(const float* const* src,
138138
size_t src_size,

media/base/media_engine.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,4 @@ const VideoEngineInterface& CompositeMediaEngine::video() const {
172172
return *video_engine_.get();
173173
}
174174

175-
}; // namespace cricket
175+
} // namespace cricket

modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ constexpr float kEventLogMinBitrateChangeFraction = 0.25;
2929
constexpr float kEventLogMinPacketLossChangeFraction = 0.5;
3030
} // namespace
3131

32-
AudioNetworkAdaptorImpl::Config::Config() : event_log(nullptr){};
32+
AudioNetworkAdaptorImpl::Config::Config() : event_log(nullptr) {}
3333

3434
AudioNetworkAdaptorImpl::Config::~Config() = default;
3535

modules/audio_coding/codecs/opus/audio_encoder_opus.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ class AudioEncoderOpusImpl final : public AudioEncoder {
4040
float OptimizePacketLossRate(float packet_loss_rate) const;
4141

4242
// Getters for testing.
43-
float min_packet_loss_rate() const { return min_packet_loss_rate_; };
44-
float max_packet_loss_rate() const { return max_packet_loss_rate_; };
45-
float slope() const { return slope_; };
43+
float min_packet_loss_rate() const { return min_packet_loss_rate_; }
44+
float max_packet_loss_rate() const { return max_packet_loss_rate_; }
45+
float slope() const { return slope_; }
4646

4747
private:
4848
const float min_packet_loss_rate_;

modules/audio_processing/aec3/aec_state.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ class AecState {
306306
class SaturationDetector {
307307
public:
308308
// Returns whether the echo is to be considered saturated.
309-
bool SaturatedEcho() const { return saturated_echo_; };
309+
bool SaturatedEcho() const { return saturated_echo_; }
310310

311311
// Updates the detection decision based on new data.
312312
void Update(rtc::ArrayView<const float> x,
@@ -327,7 +327,7 @@ class AecState {
327327
explicit LegacySaturationDetector(const EchoCanceller3Config& config);
328328

329329
// Returns whether the echo is to be considered saturated.
330-
bool SaturatedEcho() const { return saturated_echo_; };
330+
bool SaturatedEcho() const { return saturated_echo_; }
331331

332332
// Resets the state of the detector.
333333
void Reset();

modules/audio_processing/agc2/agc2_common.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ float GetExtraSaturationMarginOffsetDb() {
5454
constexpr float kDefaultExtraSaturationMarginDb = 2.f;
5555
return kDefaultExtraSaturationMarginDb;
5656
}
57-
}; // namespace webrtc
57+
} // namespace webrtc

modules/audio_processing/agc2/gain_applier.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class GainApplier {
2222

2323
void ApplyGain(AudioFrameView<float> signal);
2424
void SetGainFactor(float gain_factor);
25-
float GetGainFactor() const { return current_gain_factor_; };
25+
float GetGainFactor() const { return current_gain_factor_; }
2626

2727
private:
2828
void Initialize(size_t samples_per_channel);

modules/audio_processing/logging/apm_data_dumper.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ std::string FormFileName(const char* output_dir,
5454
ApmDataDumper::ApmDataDumper(int instance_index)
5555
: instance_index_(instance_index) {}
5656
#else
57-
ApmDataDumper::ApmDataDumper(int instance_index){};
57+
ApmDataDumper::ApmDataDumper(int instance_index) {}
5858
#endif
5959

6060
ApmDataDumper::~ApmDataDumper() = default;

modules/desktop_capture/desktop_geometry.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class RTC_EXPORT DesktopRect {
136136

137137
// Adds (dx, dy) to the position of the rectangle.
138138
void Translate(int32_t dx, int32_t dy);
139-
void Translate(DesktopVector d) { Translate(d.x(), d.y()); };
139+
void Translate(DesktopVector d) { Translate(d.x(), d.y()); }
140140

141141
// Enlarges current DesktopRect by subtracting |left_offset| and |top_offset|
142142
// from |left_| and |top_|, and adding |right_offset| and |bottom_offset| to

modules/video_capture/video_capture.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class VideoCaptureModule : public rtc::RefCountInterface {
109109
virtual bool GetApplyRotation() = 0;
110110

111111
protected:
112-
~VideoCaptureModule() override{};
112+
~VideoCaptureModule() override {}
113113
};
114114

115115
} // namespace webrtc

modules/video_capture/video_capture_defines.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct VideoCaptureCapability {
3535
maxFPS = 0;
3636
videoType = VideoType::kUnknown;
3737
interlaced = false;
38-
};
38+
}
3939
bool operator!=(const VideoCaptureCapability& other) const {
4040
if (width != other.width)
4141
return true;

modules/video_coding/codecs/vp8/libvpx_interface.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class LibvpxVp8Facade : public LibvpxInterface {
141141
RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id;
142142
}
143143
return VPX_CODEC_ERROR;
144-
};
144+
}
145145

146146
vpx_codec_err_t codec_control(vpx_codec_ctx_t* ctx,
147147
vp8e_enc_control_id ctrl_id,
@@ -153,7 +153,7 @@ class LibvpxVp8Facade : public LibvpxInterface {
153153
RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id;
154154
}
155155
return VPX_CODEC_ERROR;
156-
};
156+
}
157157

158158
vpx_codec_err_t codec_control(vpx_codec_ctx_t* ctx,
159159
vp8e_enc_control_id ctrl_id,
@@ -165,7 +165,7 @@ class LibvpxVp8Facade : public LibvpxInterface {
165165
RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id;
166166
}
167167
return VPX_CODEC_ERROR;
168-
};
168+
}
169169

170170
vpx_codec_err_t codec_control(vpx_codec_ctx_t* ctx,
171171
vp8e_enc_control_id ctrl_id,
@@ -177,7 +177,7 @@ class LibvpxVp8Facade : public LibvpxInterface {
177177
RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id;
178178
}
179179
return VPX_CODEC_ERROR;
180-
};
180+
}
181181

182182
vpx_codec_err_t codec_encode(vpx_codec_ctx_t* ctx,
183183
const vpx_image_t* img,

p2p/base/port.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ class Port : public PortInterface,
384384

385385
int16_t network_cost() const { return network_cost_; }
386386

387-
void GetStunStats(absl::optional<StunStats>* stats) override{};
387+
void GetStunStats(absl::optional<StunStats>* stats) override {}
388388

389389
protected:
390390
enum { MSG_DESTROY_IF_DEAD = 0, MSG_FIRST_AVAILABLE };

pc/rtp_transceiver.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -202,18 +202,18 @@ class RtpTransceiver final
202202

203203
BEGIN_SIGNALING_PROXY_MAP(RtpTransceiver)
204204
PROXY_SIGNALING_THREAD_DESTRUCTOR()
205-
PROXY_CONSTMETHOD0(cricket::MediaType, media_type);
206-
PROXY_CONSTMETHOD0(absl::optional<std::string>, mid);
207-
PROXY_CONSTMETHOD0(rtc::scoped_refptr<RtpSenderInterface>, sender);
208-
PROXY_CONSTMETHOD0(rtc::scoped_refptr<RtpReceiverInterface>, receiver);
209-
PROXY_CONSTMETHOD0(bool, stopped);
210-
PROXY_CONSTMETHOD0(RtpTransceiverDirection, direction);
211-
PROXY_METHOD1(void, SetDirection, RtpTransceiverDirection);
212-
PROXY_CONSTMETHOD0(absl::optional<RtpTransceiverDirection>, current_direction);
213-
PROXY_CONSTMETHOD0(absl::optional<RtpTransceiverDirection>, fired_direction);
214-
PROXY_METHOD0(void, Stop);
215-
PROXY_METHOD1(void, SetCodecPreferences, rtc::ArrayView<RtpCodecCapability>);
216-
END_PROXY_MAP();
205+
PROXY_CONSTMETHOD0(cricket::MediaType, media_type)
206+
PROXY_CONSTMETHOD0(absl::optional<std::string>, mid)
207+
PROXY_CONSTMETHOD0(rtc::scoped_refptr<RtpSenderInterface>, sender)
208+
PROXY_CONSTMETHOD0(rtc::scoped_refptr<RtpReceiverInterface>, receiver)
209+
PROXY_CONSTMETHOD0(bool, stopped)
210+
PROXY_CONSTMETHOD0(RtpTransceiverDirection, direction)
211+
PROXY_METHOD1(void, SetDirection, RtpTransceiverDirection)
212+
PROXY_CONSTMETHOD0(absl::optional<RtpTransceiverDirection>, current_direction)
213+
PROXY_CONSTMETHOD0(absl::optional<RtpTransceiverDirection>, fired_direction)
214+
PROXY_METHOD0(void, Stop)
215+
PROXY_METHOD1(void, SetCodecPreferences, rtc::ArrayView<RtpCodecCapability>)
216+
END_PROXY_MAP()
217217

218218
} // namespace webrtc
219219

rtc_base/async_packet_socket.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ void CopySocketInformationToPacketInfo(size_t packet_size_bytes,
4242
}
4343
}
4444

45-
}; // namespace rtc
45+
} // namespace rtc

rtc_base/async_resolver_interface.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ AsyncResolverInterface::AsyncResolverInterface() {}
1616

1717
AsyncResolverInterface::~AsyncResolverInterface() = default;
1818

19-
}; // namespace rtc
19+
} // namespace rtc

rtc_base/crypt_string.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ void InsecureCryptStringImpl::CopyRawTo(
6969
memcpy(&dest->front(), password_.data(), password_.size());
7070
}
7171

72-
}; // namespace rtc
72+
} // namespace rtc

0 commit comments

Comments
 (0)