zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

webrtc: Remove semicolons.

Browse Source 
Bug: chromium:926235
Change-Id: I66c10ab3df38adf87152d1f18cc8162afedca7e4
Reviewed-on: https://webrtc-review.googlesource.com/c/123560
Commit-Queue: Tommi <tommi@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26780}
This commit is contained in:
Nico Weber
2019-02-20 10:13:16 -05:00
committed by Commit Bot
parent af623ae7f8
commit 22f9925b3e
27 changed files with 86 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/peer_connection_factory_proxy.h
View File

@ -31,17 +31,17 @@ PROXY_METHOD4(rtc::scoped_refptr<PeerConnectionInterface>,
const PeerConnectionInterface::RTCConfiguration&, const PeerConnectionInterface::RTCConfiguration&,
std::unique_ptr<cricket::PortAllocator>, std::unique_ptr<cricket::PortAllocator>,
std::unique_ptr<rtc::RTCCertificateGeneratorInterface>, std::unique_ptr<rtc::RTCCertificateGeneratorInterface>,
PeerConnectionObserver*); PeerConnectionObserver*)
PROXY_METHOD2(rtc::scoped_refptr<PeerConnectionInterface>, PROXY_METHOD2(rtc::scoped_refptr<PeerConnectionInterface>,
CreatePeerConnection, CreatePeerConnection,
const PeerConnectionInterface::RTCConfiguration&, const PeerConnectionInterface::RTCConfiguration&,
PeerConnectionDependencies); PeerConnectionDependencies)
PROXY_CONSTMETHOD1(webrtc::RtpCapabilities, PROXY_CONSTMETHOD1(webrtc::RtpCapabilities,
GetRtpSenderCapabilities, GetRtpSenderCapabilities,
cricket::MediaType); cricket::MediaType)
PROXY_CONSTMETHOD1(webrtc::RtpCapabilities, PROXY_CONSTMETHOD1(webrtc::RtpCapabilities,
GetRtpReceiverCapabilities, GetRtpReceiverCapabilities,
cricket::MediaType); cricket::MediaType)
PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>,
CreateLocalMediaStream, CreateLocalMediaStream,
const std::string&) const std::string&)

10
api/rtp_receiver_interface.h
View File

@ -160,15 +160,15 @@ PROXY_CONSTMETHOD0(std::vector<rtc::scoped_refptr<MediaStreamInterface>>,
streams) streams)
PROXY_CONSTMETHOD0(cricket::MediaType, media_type) PROXY_CONSTMETHOD0(cricket::MediaType, media_type)
PROXY_CONSTMETHOD0(std::string, id) PROXY_CONSTMETHOD0(std::string, id)
PROXY_CONSTMETHOD0(RtpParameters, GetParameters); PROXY_CONSTMETHOD0(RtpParameters, GetParameters)
PROXY_METHOD1(bool, SetParameters, const RtpParameters&) PROXY_METHOD1(bool, SetParameters, const RtpParameters&)
PROXY_METHOD1(void, SetObserver, RtpReceiverObserverInterface*); PROXY_METHOD1(void, SetObserver, RtpReceiverObserverInterface*)
PROXY_CONSTMETHOD0(std::vector<RtpSource>, GetSources); PROXY_CONSTMETHOD0(std::vector<RtpSource>, GetSources)
PROXY_METHOD1(void, PROXY_METHOD1(void,
SetFrameDecryptor, SetFrameDecryptor,
rtc::scoped_refptr<FrameDecryptorInterface>); rtc::scoped_refptr<FrameDecryptorInterface>)
PROXY_CONSTMETHOD0(rtc::scoped_refptr<FrameDecryptorInterface>, PROXY_CONSTMETHOD0(rtc::scoped_refptr<FrameDecryptorInterface>,
GetFrameDecryptor); GetFrameDecryptor)
END_PROXY_MAP() END_PROXY_MAP()
} // namespace webrtc } // namespace webrtc

8
api/rtp_sender_interface.h
View File

@ -106,14 +106,14 @@ PROXY_CONSTMETHOD0(cricket::MediaType, media_type)
PROXY_CONSTMETHOD0(std::string, id) PROXY_CONSTMETHOD0(std::string, id)
PROXY_CONSTMETHOD0(std::vector<std::string>, stream_ids) PROXY_CONSTMETHOD0(std::vector<std::string>, stream_ids)
PROXY_CONSTMETHOD0(std::vector<RtpEncodingParameters>, init_send_encodings) PROXY_CONSTMETHOD0(std::vector<RtpEncodingParameters>, init_send_encodings)
PROXY_CONSTMETHOD0(RtpParameters, GetParameters); PROXY_CONSTMETHOD0(RtpParameters, GetParameters)
PROXY_METHOD1(RTCError, SetParameters, const RtpParameters&) PROXY_METHOD1(RTCError, SetParameters, const RtpParameters&)
PROXY_CONSTMETHOD0(rtc::scoped_refptr<DtmfSenderInterface>, GetDtmfSender); PROXY_CONSTMETHOD0(rtc::scoped_refptr<DtmfSenderInterface>, GetDtmfSender)
PROXY_METHOD1(void, PROXY_METHOD1(void,
SetFrameEncryptor, SetFrameEncryptor,
rtc::scoped_refptr<FrameEncryptorInterface>); rtc::scoped_refptr<FrameEncryptorInterface>)
PROXY_CONSTMETHOD0(rtc::scoped_refptr<FrameEncryptorInterface>, PROXY_CONSTMETHOD0(rtc::scoped_refptr<FrameEncryptorInterface>,
GetFrameEncryptor); GetFrameEncryptor)
END_PROXY_MAP() END_PROXY_MAP()
} // namespace webrtc } // namespace webrtc

12
api/stats/rtc_stats.h
View File

@ -140,18 +140,16 @@ class RTC_EXPORT RTCStats {
// } // }
// //
#define WEBRTC_RTCSTATS_DECL() \ #define WEBRTC_RTCSTATS_DECL() \
public: \
static const char kType[]; \
\
std::unique_ptr<webrtc::RTCStats> copy() const override; \
const char* type() const override; \
\
protected: \ protected: \
std::vector<const webrtc::RTCStatsMemberInterface*> \ std::vector<const webrtc::RTCStatsMemberInterface*> \
MembersOfThisObjectAndAncestors(size_t local_var_additional_capacity) \ MembersOfThisObjectAndAncestors(size_t local_var_additional_capacity) \
const override; \ const override; \
\ \
public: public: \
static const char kType[]; \
\
std::unique_ptr<webrtc::RTCStats> copy() const override; \
const char* type() const override
#define WEBRTC_RTCSTATS_IMPL(this_class, parent_class, type_str, ...) \ #define WEBRTC_RTCSTATS_IMPL(this_class, parent_class, type_str, ...) \
const char this_class::kType[] = type_str; \ const char this_class::kType[] = type_str; \

10
common_audio/audio_converter.cc
View File

@ -31,7 +31,7 @@ class CopyConverter : public AudioConverter {
size_t dst_channels, size_t dst_channels,
size_t dst_frames) size_t dst_frames)
: AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {} : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {}
~CopyConverter() override{}; ~CopyConverter() override {}
void Convert(const float* const* src, void Convert(const float* const* src,
size_t src_size, size_t src_size,
@ -52,7 +52,7 @@ class UpmixConverter : public AudioConverter {
size_t dst_channels, size_t dst_channels,
size_t dst_frames) size_t dst_frames)
: AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {} : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {}
~UpmixConverter() override{}; ~UpmixConverter() override {}
void Convert(const float* const* src, void Convert(const float* const* src,
size_t src_size, size_t src_size,
@ -74,7 +74,7 @@ class DownmixConverter : public AudioConverter {
size_t dst_channels, size_t dst_channels,
size_t dst_frames) size_t dst_frames)
: AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {} : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {}
~DownmixConverter() override{}; ~DownmixConverter() override {}
void Convert(const float* const* src, void Convert(const float* const* src,
size_t src_size, size_t src_size,
@ -103,7 +103,7 @@ class ResampleConverter : public AudioConverter {
resamplers_.push_back(std::unique_ptr<PushSincResampler>( resamplers_.push_back(std::unique_ptr<PushSincResampler>(
new PushSincResampler(src_frames, dst_frames))); new PushSincResampler(src_frames, dst_frames)));
} }
~ResampleConverter() override{}; ~ResampleConverter() override {}
void Convert(const float* const* src, void Convert(const float* const* src,
size_t src_size, size_t src_size,
@ -132,7 +132,7 @@ class CompositionConverter : public AudioConverter {
std::unique_ptr<ChannelBuffer<float>>(new ChannelBuffer<float>( std::unique_ptr<ChannelBuffer<float>>(new ChannelBuffer<float>(
(*it)->dst_frames(), (*it)->dst_channels()))); (*it)->dst_frames(), (*it)->dst_channels())));
} }
~CompositionConverter() override{}; ~CompositionConverter() override {}
void Convert(const float* const* src, void Convert(const float* const* src,
size_t src_size, size_t src_size,

2
media/base/media_engine.cc
View File

@ -172,4 +172,4 @@ const VideoEngineInterface& CompositeMediaEngine::video() const {
return *video_engine_.get(); return *video_engine_.get();
} }
}; // namespace cricket } // namespace cricket

2
modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc
View File

@ -29,7 +29,7 @@ constexpr float kEventLogMinBitrateChangeFraction = 0.25;
constexpr float kEventLogMinPacketLossChangeFraction = 0.5; constexpr float kEventLogMinPacketLossChangeFraction = 0.5;
} // namespace } // namespace
AudioNetworkAdaptorImpl::Config::Config() : event_log(nullptr){}; AudioNetworkAdaptorImpl::Config::Config() : event_log(nullptr) {}
AudioNetworkAdaptorImpl::Config::~Config() = default; AudioNetworkAdaptorImpl::Config::~Config() = default;

6
modules/audio_coding/codecs/opus/audio_encoder_opus.h
View File

@ -40,9 +40,9 @@ class AudioEncoderOpusImpl final : public AudioEncoder {
float OptimizePacketLossRate(float packet_loss_rate) const; float OptimizePacketLossRate(float packet_loss_rate) const;
// Getters for testing. // Getters for testing.
float min_packet_loss_rate() const { return min_packet_loss_rate_; }; float min_packet_loss_rate() const { return min_packet_loss_rate_; }
float max_packet_loss_rate() const { return max_packet_loss_rate_; }; float max_packet_loss_rate() const { return max_packet_loss_rate_; }
float slope() const { return slope_; }; float slope() const { return slope_; }
private: private:
const float min_packet_loss_rate_; const float min_packet_loss_rate_;

4
modules/audio_processing/aec3/aec_state.h
View File

@ -306,7 +306,7 @@ class AecState {
class SaturationDetector { class SaturationDetector {
public: public:
// Returns whether the echo is to be considered saturated. // 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. // Updates the detection decision based on new data.
void Update(rtc::ArrayView<const float> x, void Update(rtc::ArrayView<const float> x,
@ -327,7 +327,7 @@ class AecState {
explicit LegacySaturationDetector(const EchoCanceller3Config& config); explicit LegacySaturationDetector(const EchoCanceller3Config& config);
// Returns whether the echo is to be considered saturated. // 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. // Resets the state of the detector.
void Reset(); void Reset();

2
modules/audio_processing/agc2/agc2_common.cc
View File

@ -54,4 +54,4 @@ float GetExtraSaturationMarginOffsetDb() {
constexpr float kDefaultExtraSaturationMarginDb = 2.f; constexpr float kDefaultExtraSaturationMarginDb = 2.f;
return kDefaultExtraSaturationMarginDb; return kDefaultExtraSaturationMarginDb;
} }
}; // namespace webrtc } // namespace webrtc

2
modules/audio_processing/agc2/gain_applier.h
View File

@ -22,7 +22,7 @@ class GainApplier {
void ApplyGain(AudioFrameView<float> signal); void ApplyGain(AudioFrameView<float> signal);
void SetGainFactor(float gain_factor); void SetGainFactor(float gain_factor);
float GetGainFactor() const { return current_gain_factor_; }; float GetGainFactor() const { return current_gain_factor_; }
private: private:
void Initialize(size_t samples_per_channel); void Initialize(size_t samples_per_channel);

2
modules/audio_processing/logging/apm_data_dumper.cc
View File

@ -54,7 +54,7 @@ std::string FormFileName(const char* output_dir,
ApmDataDumper::ApmDataDumper(int instance_index) ApmDataDumper::ApmDataDumper(int instance_index)
: instance_index_(instance_index) {} : instance_index_(instance_index) {}
#else #else
ApmDataDumper::ApmDataDumper(int instance_index){}; ApmDataDumper::ApmDataDumper(int instance_index) {}
#endif #endif
ApmDataDumper::~ApmDataDumper() = default; ApmDataDumper::~ApmDataDumper() = default;

2
modules/desktop_capture/desktop_geometry.h
View File

@ -136,7 +136,7 @@ class RTC_EXPORT DesktopRect {
// Adds (dx, dy) to the position of the rectangle. // Adds (dx, dy) to the position of the rectangle.
void Translate(int32_t dx, int32_t dy); 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| // Enlarges current DesktopRect by subtracting |left_offset| and |top_offset|
// from |left_| and |top_|, and adding |right_offset| and |bottom_offset| to // from |left_| and |top_|, and adding |right_offset| and |bottom_offset| to

2
modules/video_capture/video_capture.h
View File

@ -109,7 +109,7 @@ class VideoCaptureModule : public rtc::RefCountInterface {
virtual bool GetApplyRotation() = 0; virtual bool GetApplyRotation() = 0;
protected: protected:
~VideoCaptureModule() override{}; ~VideoCaptureModule() override {}
}; };
} // namespace webrtc } // namespace webrtc

2
modules/video_capture/video_capture_defines.h
View File

@ -35,7 +35,7 @@ struct VideoCaptureCapability {
maxFPS = 0; maxFPS = 0;
videoType = VideoType::kUnknown; videoType = VideoType::kUnknown;
interlaced = false; interlaced = false;
}; }
bool operator!=(const VideoCaptureCapability& other) const { bool operator!=(const VideoCaptureCapability& other) const {
if (width != other.width) if (width != other.width)
return true; return true;

8
modules/video_coding/codecs/vp8/libvpx_interface.cc
View File

@ -141,7 +141,7 @@ class LibvpxVp8Facade : public LibvpxInterface {
RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id; RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id;
} }
return VPX_CODEC_ERROR; return VPX_CODEC_ERROR;
}; }
vpx_codec_err_t codec_control(vpx_codec_ctx_t* ctx, vpx_codec_err_t codec_control(vpx_codec_ctx_t* ctx,
vp8e_enc_control_id ctrl_id, vp8e_enc_control_id ctrl_id,
@ -153,7 +153,7 @@ class LibvpxVp8Facade : public LibvpxInterface {
RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id; RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id;
} }
return VPX_CODEC_ERROR; return VPX_CODEC_ERROR;
}; }
vpx_codec_err_t codec_control(vpx_codec_ctx_t* ctx, vpx_codec_err_t codec_control(vpx_codec_ctx_t* ctx,
vp8e_enc_control_id ctrl_id, vp8e_enc_control_id ctrl_id,
@ -165,7 +165,7 @@ class LibvpxVp8Facade : public LibvpxInterface {
RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id; RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id;
} }
return VPX_CODEC_ERROR; return VPX_CODEC_ERROR;
}; }
vpx_codec_err_t codec_control(vpx_codec_ctx_t* ctx, vpx_codec_err_t codec_control(vpx_codec_ctx_t* ctx,
vp8e_enc_control_id ctrl_id, vp8e_enc_control_id ctrl_id,
@ -177,7 +177,7 @@ class LibvpxVp8Facade : public LibvpxInterface {
RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id; RTC_NOTREACHED() << "Unsupported libvpx ctrl_id: " << ctrl_id;
} }
return VPX_CODEC_ERROR; return VPX_CODEC_ERROR;
}; }
vpx_codec_err_t codec_encode(vpx_codec_ctx_t* ctx, vpx_codec_err_t codec_encode(vpx_codec_ctx_t* ctx,
const vpx_image_t* img, const vpx_image_t* img,

2
p2p/base/port.h
View File

@ -384,7 +384,7 @@ class Port : public PortInterface,
int16_t network_cost() const { return network_cost_; } int16_t network_cost() const { return network_cost_; }
void GetStunStats(absl::optional<StunStats>* stats) override{}; void GetStunStats(absl::optional<StunStats>* stats) override {}
protected: protected:
enum { MSG_DESTROY_IF_DEAD = 0, MSG_FIRST_AVAILABLE }; enum { MSG_DESTROY_IF_DEAD = 0, MSG_FIRST_AVAILABLE };

24
pc/rtp_transceiver.h
View File

@ -202,18 +202,18 @@ class RtpTransceiver final
BEGIN_SIGNALING_PROXY_MAP(RtpTransceiver) BEGIN_SIGNALING_PROXY_MAP(RtpTransceiver)
PROXY_SIGNALING_THREAD_DESTRUCTOR() PROXY_SIGNALING_THREAD_DESTRUCTOR()
PROXY_CONSTMETHOD0(cricket::MediaType, media_type); PROXY_CONSTMETHOD0(cricket::MediaType, media_type)
PROXY_CONSTMETHOD0(absl::optional<std::string>, mid); PROXY_CONSTMETHOD0(absl::optional<std::string>, mid)
PROXY_CONSTMETHOD0(rtc::scoped_refptr<RtpSenderInterface>, sender); PROXY_CONSTMETHOD0(rtc::scoped_refptr<RtpSenderInterface>, sender)
PROXY_CONSTMETHOD0(rtc::scoped_refptr<RtpReceiverInterface>, receiver); PROXY_CONSTMETHOD0(rtc::scoped_refptr<RtpReceiverInterface>, receiver)
PROXY_CONSTMETHOD0(bool, stopped); PROXY_CONSTMETHOD0(bool, stopped)
PROXY_CONSTMETHOD0(RtpTransceiverDirection, direction); PROXY_CONSTMETHOD0(RtpTransceiverDirection, direction)
PROXY_METHOD1(void, SetDirection, RtpTransceiverDirection); PROXY_METHOD1(void, SetDirection, RtpTransceiverDirection)
PROXY_CONSTMETHOD0(absl::optional<RtpTransceiverDirection>, current_direction); PROXY_CONSTMETHOD0(absl::optional<RtpTransceiverDirection>, current_direction)
PROXY_CONSTMETHOD0(absl::optional<RtpTransceiverDirection>, fired_direction); PROXY_CONSTMETHOD0(absl::optional<RtpTransceiverDirection>, fired_direction)
PROXY_METHOD0(void, Stop); PROXY_METHOD0(void, Stop)
PROXY_METHOD1(void, SetCodecPreferences, rtc::ArrayView<RtpCodecCapability>); PROXY_METHOD1(void, SetCodecPreferences, rtc::ArrayView<RtpCodecCapability>)
END_PROXY_MAP(); END_PROXY_MAP()
} // namespace webrtc } // namespace webrtc

2
rtc_base/async_packet_socket.cc
View File

@ -42,4 +42,4 @@ void CopySocketInformationToPacketInfo(size_t packet_size_bytes,
} }
} }
}; // namespace rtc } // namespace rtc

2
rtc_base/async_resolver_interface.cc
View File

@ -16,4 +16,4 @@ AsyncResolverInterface::AsyncResolverInterface() {}
AsyncResolverInterface::~AsyncResolverInterface() = default; AsyncResolverInterface::~AsyncResolverInterface() = default;
}; // namespace rtc } // namespace rtc

2
rtc_base/crypt_string.cc
View File

@ -69,4 +69,4 @@ void InsecureCryptStringImpl::CopyRawTo(
memcpy(&dest->front(), password_.data(), password_.size()); memcpy(&dest->front(), password_.data(), password_.size());
} }
}; // namespace rtc } // namespace rtc

28
stats/rtc_stats.cc
View File

@ -154,79 +154,79 @@ WEBRTC_DEFINE_RTCSTATSMEMBER(bool,
false, false,
false, false,
rtc::ToString(value_), rtc::ToString(value_),
rtc::ToString(value_)); rtc::ToString(value_))
WEBRTC_DEFINE_RTCSTATSMEMBER(int32_t, WEBRTC_DEFINE_RTCSTATSMEMBER(int32_t,
kInt32, kInt32,
false, false,
false, false,
rtc::ToString(value_), rtc::ToString(value_),
rtc::ToString(value_)); rtc::ToString(value_))
WEBRTC_DEFINE_RTCSTATSMEMBER(uint32_t, WEBRTC_DEFINE_RTCSTATSMEMBER(uint32_t,
kUint32, kUint32,
false, false,
false, false,
rtc::ToString(value_), rtc::ToString(value_),
rtc::ToString(value_)); rtc::ToString(value_))
WEBRTC_DEFINE_RTCSTATSMEMBER(int64_t, WEBRTC_DEFINE_RTCSTATSMEMBER(int64_t,
kInt64, kInt64,
false, false,
false, false,
rtc::ToString(value_), rtc::ToString(value_),
ToStringAsDouble(value_)); ToStringAsDouble(value_))
WEBRTC_DEFINE_RTCSTATSMEMBER(uint64_t, WEBRTC_DEFINE_RTCSTATSMEMBER(uint64_t,
kUint64, kUint64,
false, false,
false, false,
rtc::ToString(value_), rtc::ToString(value_),
ToStringAsDouble(value_)); ToStringAsDouble(value_))
WEBRTC_DEFINE_RTCSTATSMEMBER(double, WEBRTC_DEFINE_RTCSTATSMEMBER(double,
kDouble, kDouble,
false, false,
false, false,
rtc::ToString(value_), rtc::ToString(value_),
ToStringAsDouble(value_)); ToStringAsDouble(value_))
WEBRTC_DEFINE_RTCSTATSMEMBER(std::string, kString, false, true, value_, value_); WEBRTC_DEFINE_RTCSTATSMEMBER(std::string, kString, false, true, value_, value_)
WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<bool>, WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<bool>,
kSequenceBool, kSequenceBool,
true, true,
false, false,
VectorToString(value_), VectorToString(value_),
VectorToString(value_)); VectorToString(value_))
WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<int32_t>, WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<int32_t>,
kSequenceInt32, kSequenceInt32,
true, true,
false, false,
VectorToString(value_), VectorToString(value_),
VectorToString(value_)); VectorToString(value_))
WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<uint32_t>, WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<uint32_t>,
kSequenceUint32, kSequenceUint32,
true, true,
false, false,
VectorToString(value_), VectorToString(value_),
VectorToString(value_)); VectorToString(value_))
WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<int64_t>, WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<int64_t>,
kSequenceInt64, kSequenceInt64,
true, true,
false, false,
VectorToString(value_), VectorToString(value_),
VectorToStringAsDouble(value_)); VectorToStringAsDouble(value_))
WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<uint64_t>, WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<uint64_t>,
kSequenceUint64, kSequenceUint64,
true, true,
false, false,
VectorToString(value_), VectorToString(value_),
VectorToStringAsDouble(value_)); VectorToStringAsDouble(value_))
WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<double>, WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<double>,
kSequenceDouble, kSequenceDouble,
true, true,
false, false,
VectorToString(value_), VectorToString(value_),
VectorToStringAsDouble(value_)); VectorToStringAsDouble(value_))
WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<std::string>, WEBRTC_DEFINE_RTCSTATSMEMBER(std::vector<std::string>,
kSequenceString, kSequenceString,
true, true,
false, false,
VectorOfStringsToString(value_), VectorOfStringsToString(value_),
VectorOfStringsToString(value_)); VectorOfStringsToString(value_))
} // namespace webrtc } // namespace webrtc

24
stats/rtcstats_objects.cc
View File

@ -56,7 +56,7 @@ WEBRTC_RTCSTATS_IMPL(RTCCertificateStats, RTCStats, "certificate",
&fingerprint, &fingerprint,
&fingerprint_algorithm, &fingerprint_algorithm,
&base64_certificate, &base64_certificate,
&issuer_certificate_id); &issuer_certificate_id)
// clang-format on // clang-format on
RTCCertificateStats::RTCCertificateStats(const std::string& id, RTCCertificateStats::RTCCertificateStats(const std::string& id,
@ -86,7 +86,7 @@ WEBRTC_RTCSTATS_IMPL(RTCCodecStats, RTCStats, "codec",
&clock_rate, &clock_rate,
&channels, &channels,
&sdp_fmtp_line, &sdp_fmtp_line,
&implementation); &implementation)
// clang-format on // clang-format on
RTCCodecStats::RTCCodecStats(const std::string& id, int64_t timestamp_us) RTCCodecStats::RTCCodecStats(const std::string& id, int64_t timestamp_us)
@ -121,7 +121,7 @@ WEBRTC_RTCSTATS_IMPL(RTCDataChannelStats, RTCStats, "data-channel",
&messages_sent, &messages_sent,
&bytes_sent, &bytes_sent,
&messages_received, &messages_received,
&bytes_received); &bytes_received)
// clang-format on // clang-format on
RTCDataChannelStats::RTCDataChannelStats(const std::string& id, RTCDataChannelStats::RTCDataChannelStats(const std::string& id,
@ -177,7 +177,7 @@ WEBRTC_RTCSTATS_IMPL(RTCIceCandidatePairStats, RTCStats, "candidate-pair",
&consent_requests_received, &consent_requests_received,
&consent_requests_sent, &consent_requests_sent,
&consent_responses_received, &consent_responses_received,
&consent_responses_sent); &consent_responses_sent)
// clang-format on // clang-format on
RTCIceCandidatePairStats::RTCIceCandidatePairStats(const std::string& id, RTCIceCandidatePairStats::RTCIceCandidatePairStats(const std::string& id,
@ -254,7 +254,7 @@ WEBRTC_RTCSTATS_IMPL(RTCIceCandidateStats, RTCStats, "abstract-ice-candidate",
&candidate_type, &candidate_type,
&priority, &priority,
&url, &url,
&deleted); &deleted)
// clang-format on // clang-format on
RTCIceCandidateStats::RTCIceCandidateStats(const std::string& id, RTCIceCandidateStats::RTCIceCandidateStats(const std::string& id,
@ -333,7 +333,7 @@ const char* RTCRemoteIceCandidateStats::type() const {
// clang-format off // clang-format off
WEBRTC_RTCSTATS_IMPL(RTCMediaStreamStats, RTCStats, "stream", WEBRTC_RTCSTATS_IMPL(RTCMediaStreamStats, RTCStats, "stream",
&stream_identifier, &stream_identifier,
&track_ids); &track_ids)
// clang-format on // clang-format on
RTCMediaStreamStats::RTCMediaStreamStats(const std::string& id, RTCMediaStreamStats::RTCMediaStreamStats(const std::string& id,
@ -387,7 +387,7 @@ WEBRTC_RTCSTATS_IMPL(RTCMediaStreamTrackStats, RTCStats, "track",
&total_freezes_duration, &total_freezes_duration,
&total_pauses_duration, &total_pauses_duration,
&total_frames_duration, &total_frames_duration,
&sum_squared_frame_durations); &sum_squared_frame_durations)
// clang-format on // clang-format on
RTCMediaStreamTrackStats::RTCMediaStreamTrackStats(const std::string& id, RTCMediaStreamTrackStats::RTCMediaStreamTrackStats(const std::string& id,
@ -480,7 +480,7 @@ RTCMediaStreamTrackStats::~RTCMediaStreamTrackStats() {}
// clang-format off // clang-format off
WEBRTC_RTCSTATS_IMPL(RTCPeerConnectionStats, RTCStats, "peer-connection", WEBRTC_RTCSTATS_IMPL(RTCPeerConnectionStats, RTCStats, "peer-connection",
&data_channels_opened, &data_channels_opened,
&data_channels_closed); &data_channels_closed)
// clang-format on // clang-format on
RTCPeerConnectionStats::RTCPeerConnectionStats(const std::string& id, RTCPeerConnectionStats::RTCPeerConnectionStats(const std::string& id,
@ -515,7 +515,7 @@ WEBRTC_RTCSTATS_IMPL(RTCRTPStreamStats, RTCStats, "rtp",
&pli_count, &pli_count,
&nack_count, &nack_count,
&sli_count, &sli_count,
&qp_sum); &qp_sum)
// clang-format on // clang-format on
RTCRTPStreamStats::RTCRTPStreamStats(const std::string& id, RTCRTPStreamStats::RTCRTPStreamStats(const std::string& id,
@ -575,7 +575,7 @@ WEBRTC_RTCSTATS_IMPL(
&burst_discard_rate, &burst_discard_rate,
&gap_loss_rate, &gap_loss_rate,
&gap_discard_rate, &gap_discard_rate,
&frames_decoded); &frames_decoded)
// clang-format on // clang-format on
RTCInboundRTPStreamStats::RTCInboundRTPStreamStats(const std::string& id, RTCInboundRTPStreamStats::RTCInboundRTPStreamStats(const std::string& id,
@ -632,7 +632,7 @@ WEBRTC_RTCSTATS_IMPL(
&packets_sent, &packets_sent,
&bytes_sent, &bytes_sent,
&target_bitrate, &target_bitrate,
&frames_encoded); &frames_encoded)
// clang-format on // clang-format on
RTCOutboundRTPStreamStats::RTCOutboundRTPStreamStats(const std::string& id, RTCOutboundRTPStreamStats::RTCOutboundRTPStreamStats(const std::string& id,
@ -665,7 +665,7 @@ WEBRTC_RTCSTATS_IMPL(RTCTransportStats, RTCStats, "transport",
&dtls_state, &dtls_state,
&selected_candidate_pair_id, &selected_candidate_pair_id,
&local_certificate_id, &local_certificate_id,
&remote_certificate_id); &remote_certificate_id)
// clang-format on // clang-format on
RTCTransportStats::RTCTransportStats(const std::string& id, RTCTransportStats::RTCTransportStats(const std::string& id,

2
stats/test/rtc_test_stats.cc
View File

@ -30,7 +30,7 @@ WEBRTC_RTCSTATS_IMPL(RTCTestStats,
&m_sequence_int64, &m_sequence_int64,
&m_sequence_uint64, &m_sequence_uint64,
&m_sequence_double, &m_sequence_double,
&m_sequence_string); &m_sequence_string)
RTCTestStats::RTCTestStats(const std::string& id, int64_t timestamp_us) RTCTestStats::RTCTestStats(const std::string& id, int64_t timestamp_us)
: RTCStats(id, timestamp_us), : RTCStats(id, timestamp_us),

2
system_wrappers/include/clock.h
View File

@ -83,6 +83,6 @@ class SimulatedClock : public Clock {
std::unique_ptr<RWLockWrapper> lock_; std::unique_ptr<RWLockWrapper> lock_;
}; };
}; // namespace webrtc } // namespace webrtc
#endif // SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_ #endif // SYSTEM_WRAPPERS_INCLUDE_CLOCK_H_

2
system_wrappers/source/clock.cc
View File

@ -271,4 +271,4 @@ void SimulatedClock::AdvanceTimeMicroseconds(int64_t microseconds) {
time_us_ += microseconds; time_us_ += microseconds;
} }
}; // namespace webrtc } // namespace webrtc

2
test/fake_encoder.cc
View File

@ -45,7 +45,7 @@ void WriteCounter(unsigned char* payload, uint32_t counter) {
payload[3] = (counter & 0xFF000000) >> 24; payload[3] = (counter & 0xFF000000) >> 24;
} }
}; // namespace } // namespace
FakeEncoder::FakeEncoder(Clock* clock) FakeEncoder::FakeEncoder(Clock* clock)
: clock_(clock), : clock_(clock),