Roll chromium_revision e144d30..6fdb142 (318658:318841) + remove OVERRIDE macro
Clang version changed 223108:230914
Details: https://chromium.googlesource.com/chromium/src/+/e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Original-Commit-Position: refs/heads/master@{#8596}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 14665ff7d4024d07e58622f498b23fd980001871
diff --git a/test/call_test.h b/test/call_test.h
index 502d613..4771dee 100644
--- a/test/call_test.h
+++ b/test/call_test.h
@@ -109,7 +109,7 @@
explicit SendTest(unsigned int timeout_ms);
SendTest(unsigned int timeout_ms, const FakeNetworkPipe::Config& config);
- virtual bool ShouldCreateReceivers() const OVERRIDE;
+ bool ShouldCreateReceivers() const override;
};
class EndToEndTest : public BaseTest {
@@ -117,7 +117,7 @@
explicit EndToEndTest(unsigned int timeout_ms);
EndToEndTest(unsigned int timeout_ms, const FakeNetworkPipe::Config& config);
- virtual bool ShouldCreateReceivers() const OVERRIDE;
+ bool ShouldCreateReceivers() const override;
};
} // namespace test
diff --git a/test/channel_transport/include/channel_transport.h b/test/channel_transport/include/channel_transport.h
index df22012..77107d9 100644
--- a/test/channel_transport/include/channel_transport.h
+++ b/test/channel_transport/include/channel_transport.h
@@ -28,15 +28,15 @@
virtual ~VoiceChannelTransport();
// Start implementation of UdpTransportData.
- virtual void IncomingRTPPacket(const int8_t* incoming_rtp_packet,
- const size_t packet_length,
- const char* /*from_ip*/,
- const uint16_t /*from_port*/) OVERRIDE;
+ void IncomingRTPPacket(const int8_t* incoming_rtp_packet,
+ const size_t packet_length,
+ const char* /*from_ip*/,
+ const uint16_t /*from_port*/) override;
- virtual void IncomingRTCPPacket(const int8_t* incoming_rtcp_packet,
- const size_t packet_length,
- const char* /*from_ip*/,
- const uint16_t /*from_port*/) OVERRIDE;
+ void IncomingRTCPPacket(const int8_t* incoming_rtcp_packet,
+ const size_t packet_length,
+ const char* /*from_ip*/,
+ const uint16_t /*from_port*/) override;
// End implementation of UdpTransportData.
// Specifies the ports to receive RTP packets on.
@@ -59,15 +59,15 @@
virtual ~VideoChannelTransport();
// Start implementation of UdpTransportData.
- virtual void IncomingRTPPacket(const int8_t* incoming_rtp_packet,
+ void IncomingRTPPacket(const int8_t* incoming_rtp_packet,
const size_t packet_length,
const char* /*from_ip*/,
- const uint16_t /*from_port*/) OVERRIDE;
+ const uint16_t /*from_port*/) override;
- virtual void IncomingRTCPPacket(const int8_t* incoming_rtcp_packet,
+ void IncomingRTCPPacket(const int8_t* incoming_rtcp_packet,
const size_t packet_length,
const char* /*from_ip*/,
- const uint16_t /*from_port*/) OVERRIDE;
+ const uint16_t /*from_port*/) override;
// End implementation of UdpTransportData.
// Specifies the ports to receive RTP packets on.
diff --git a/test/channel_transport/udp_socket2_win.h b/test/channel_transport/udp_socket2_win.h
index 6971154..5d6b212 100644
--- a/test/channel_transport/udp_socket2_win.h
+++ b/test/channel_transport/udp_socket2_win.h
@@ -42,35 +42,41 @@
bool ipV6Enable = false, bool disableGQOS = false);
virtual ~UdpSocket2Windows();
- virtual bool ValidHandle() OVERRIDE;
+ bool ValidHandle() override;
- virtual bool SetCallback(CallbackObj, IncomingSocketCallback) OVERRIDE;
+ bool SetCallback(CallbackObj, IncomingSocketCallback) override;
- virtual bool Bind(const SocketAddress& name) OVERRIDE;
- virtual bool SetSockopt(int32_t level, int32_t optname,
- const int8_t* optval, int32_t optlen) OVERRIDE;
+ bool Bind(const SocketAddress& name) override;
+ bool SetSockopt(int32_t level,
+ int32_t optname,
+ const int8_t* optval,
+ int32_t optlen) override;
- virtual bool StartReceiving(const uint32_t receiveBuffers) OVERRIDE;
- virtual inline bool StartReceiving() OVERRIDE {return StartReceiving(8);}
- virtual bool StopReceiving() OVERRIDE;
+ bool StartReceiving(const uint32_t receiveBuffers) override;
+ inline bool StartReceiving() override { return StartReceiving(8); }
+ bool StopReceiving() override;
- virtual int32_t SendTo(const int8_t* buf, size_t len,
- const SocketAddress& to) OVERRIDE;
+ int32_t SendTo(const int8_t* buf,
+ size_t len,
+ const SocketAddress& to) override;
- virtual void CloseBlocking() OVERRIDE;
+ void CloseBlocking() override;
SOCKET GetFd() { return _socket;}
- virtual bool SetQos(int32_t serviceType, int32_t tokenRate,
- int32_t bucketSize, int32_t peekBandwith,
- int32_t minPolicedSize, int32_t maxSduSize,
- const SocketAddress &stRemName,
- int32_t overrideDSCP = 0) OVERRIDE;
+ bool SetQos(int32_t serviceType,
+ int32_t tokenRate,
+ int32_t bucketSize,
+ int32_t peekBandwith,
+ int32_t minPolicedSize,
+ int32_t maxSduSize,
+ const SocketAddress& stRemName,
+ int32_t overrideDSCP = 0) override;
- virtual int32_t SetTOS(const int32_t serviceType) OVERRIDE;
- virtual int32_t SetPCP(const int32_t pcp) OVERRIDE;
+ int32_t SetTOS(const int32_t serviceType) override;
+ int32_t SetPCP(const int32_t pcp) override;
- virtual uint32_t ReceiveBuffers() OVERRIDE {return _receiveBuffers.Value();}
+ uint32_t ReceiveBuffers() override { return _receiveBuffers.Value(); }
protected:
void IOCompleted(PerIoContext* pIOContext, uint32_t ioSize, uint32_t error);
diff --git a/test/channel_transport/udp_socket_manager_posix.h b/test/channel_transport/udp_socket_manager_posix.h
index 478d76b..f41de2f 100644
--- a/test/channel_transport/udp_socket_manager_posix.h
+++ b/test/channel_transport/udp_socket_manager_posix.h
@@ -38,13 +38,14 @@
UdpSocketManagerPosix();
virtual ~UdpSocketManagerPosix();
- virtual bool Init(int32_t id, uint8_t& numOfWorkThreads) OVERRIDE;
+ bool Init(int32_t id, uint8_t& numOfWorkThreads) override;
- virtual bool Start() OVERRIDE;
- virtual bool Stop() OVERRIDE;
+ bool Start() override;
+ bool Stop() override;
- virtual bool AddSocket(UdpSocketWrapper* s) OVERRIDE;
- virtual bool RemoveSocket(UdpSocketWrapper* s) OVERRIDE;
+ bool AddSocket(UdpSocketWrapper* s) override;
+ bool RemoveSocket(UdpSocketWrapper* s) override;
+
private:
int32_t _id;
CriticalSectionWrapper* _critSect;
diff --git a/test/channel_transport/udp_socket_posix.h b/test/channel_transport/udp_socket_posix.h
index 15fdca4..6ddf7e5 100644
--- a/test/channel_transport/udp_socket_posix.h
+++ b/test/channel_transport/udp_socket_posix.h
@@ -33,35 +33,37 @@
virtual ~UdpSocketPosix();
- virtual bool SetCallback(CallbackObj obj,
- IncomingSocketCallback cb) OVERRIDE;
+ bool SetCallback(CallbackObj obj, IncomingSocketCallback cb) override;
- virtual bool Bind(const SocketAddress& name) OVERRIDE;
+ bool Bind(const SocketAddress& name) override;
- virtual bool SetSockopt(int32_t level, int32_t optname,
- const int8_t* optval, int32_t optlen) OVERRIDE;
+ bool SetSockopt(int32_t level,
+ int32_t optname,
+ const int8_t* optval,
+ int32_t optlen) override;
- virtual int32_t SetTOS(const int32_t serviceType) OVERRIDE;
+ int32_t SetTOS(const int32_t serviceType) override;
- virtual int32_t SendTo(const int8_t* buf, size_t len,
- const SocketAddress& to) OVERRIDE;
+ int32_t SendTo(const int8_t* buf,
+ size_t len,
+ const SocketAddress& to) override;
// Deletes socket in addition to closing it.
// TODO (hellner): make destructor protected.
- virtual void CloseBlocking() OVERRIDE;
+ void CloseBlocking() override;
SOCKET GetFd();
- virtual bool ValidHandle() OVERRIDE;
+ bool ValidHandle() override;
- virtual bool SetQos(int32_t /*serviceType*/,
- int32_t /*tokenRate*/,
- int32_t /*bucketSize*/,
- int32_t /*peekBandwith*/,
- int32_t /*minPolicedSize*/,
- int32_t /*maxSduSize*/,
- const SocketAddress& /*stRemName*/,
- int32_t /*overrideDSCP*/) OVERRIDE;
+ bool SetQos(int32_t /*serviceType*/,
+ int32_t /*tokenRate*/,
+ int32_t /*bucketSize*/,
+ int32_t /*peekBandwith*/,
+ int32_t /*minPolicedSize*/,
+ int32_t /*maxSduSize*/,
+ const SocketAddress& /*stRemName*/,
+ int32_t /*overrideDSCP*/) override;
bool CleanUp();
void HasIncoming();
diff --git a/test/channel_transport/udp_transport_impl.cc b/test/channel_transport/udp_transport_impl.cc
index c367b2f..ab7a1ff 100644
--- a/test/channel_transport/udp_transport_impl.cc
+++ b/test/channel_transport/udp_transport_impl.cc
@@ -68,12 +68,12 @@
class SocketFactory : public UdpTransportImpl::SocketFactoryInterface {
public:
- virtual UdpSocketWrapper* CreateSocket(const int32_t id,
+ UdpSocketWrapper* CreateSocket(const int32_t id,
UdpSocketManager* mgr,
CallbackObj obj,
IncomingSocketCallback cb,
bool ipV6Enable,
- bool disableGQOS) OVERRIDE {
+ bool disableGQOS) override {
return UdpSocketWrapper::CreateSocket(id, mgr, obj, cb, ipV6Enable,
disableGQOS);
}
diff --git a/test/channel_transport/udp_transport_impl.h b/test/channel_transport/udp_transport_impl.h
index 65ad095..5dbf5d8 100644
--- a/test/channel_transport/udp_transport_impl.h
+++ b/test/channel_transport/udp_transport_impl.h
@@ -47,98 +47,89 @@
virtual ~UdpTransportImpl();
// UdpTransport functions
- virtual int32_t InitializeSendSockets(
- const char* ipAddr,
- const uint16_t rtpPort,
- const uint16_t rtcpPort = 0) OVERRIDE;
- virtual int32_t InitializeReceiveSockets(
- UdpTransportData* const packetCallback,
- const uint16_t rtpPort,
- const char* ipAddr = NULL,
- const char* multicastIpAddr = NULL,
- const uint16_t rtcpPort = 0) OVERRIDE;
- virtual int32_t InitializeSourcePorts(
- const uint16_t rtpPort,
- const uint16_t rtcpPort = 0) OVERRIDE;
- virtual int32_t SourcePorts(uint16_t& rtpPort,
- uint16_t& rtcpPort) const OVERRIDE;
- virtual int32_t ReceiveSocketInformation(
+ int32_t InitializeSendSockets(const char* ipAddr,
+ const uint16_t rtpPort,
+ const uint16_t rtcpPort = 0) override;
+ int32_t InitializeReceiveSockets(UdpTransportData* const packetCallback,
+ const uint16_t rtpPort,
+ const char* ipAddr = NULL,
+ const char* multicastIpAddr = NULL,
+ const uint16_t rtcpPort = 0) override;
+ int32_t InitializeSourcePorts(const uint16_t rtpPort,
+ const uint16_t rtcpPort = 0) override;
+ int32_t SourcePorts(uint16_t& rtpPort, uint16_t& rtcpPort) const override;
+ int32_t ReceiveSocketInformation(
char ipAddr[kIpAddressVersion6Length],
uint16_t& rtpPort,
uint16_t& rtcpPort,
- char multicastIpAddr[kIpAddressVersion6Length]) const OVERRIDE;
- virtual int32_t SendSocketInformation(
- char ipAddr[kIpAddressVersion6Length],
- uint16_t& rtpPort,
- uint16_t& rtcpPort) const OVERRIDE;
- virtual int32_t RemoteSocketInformation(
- char ipAddr[kIpAddressVersion6Length],
- uint16_t& rtpPort,
- uint16_t& rtcpPort) const OVERRIDE;
- virtual int32_t SetQoS(const bool QoS,
- const int32_t serviceType,
- const uint32_t maxBitrate = 0,
- const int32_t overrideDSCP = 0,
- const bool audio = false) OVERRIDE;
- virtual int32_t QoS(bool& QoS, int32_t& serviceType,
- int32_t& overrideDSCP) const OVERRIDE;
- virtual int32_t SetToS(const int32_t DSCP,
- const bool useSetSockOpt = false) OVERRIDE;
- virtual int32_t ToS(int32_t& DSCP, bool& useSetSockOpt) const OVERRIDE;
- virtual int32_t SetPCP(const int32_t PCP) OVERRIDE;
- virtual int32_t PCP(int32_t& PCP) const OVERRIDE;
- virtual int32_t EnableIpV6() OVERRIDE;
- virtual bool IpV6Enabled() const OVERRIDE;
- virtual int32_t SetFilterIP(
- const char filterIPAddress[kIpAddressVersion6Length]) OVERRIDE;
- virtual int32_t FilterIP(
- char filterIPAddress[kIpAddressVersion6Length]) const OVERRIDE;
- virtual int32_t SetFilterPorts(const uint16_t rtpFilterPort,
- const uint16_t rtcpFilterPort) OVERRIDE;
- virtual int32_t FilterPorts(uint16_t& rtpFilterPort,
- uint16_t& rtcpFilterPort) const OVERRIDE;
- virtual int32_t StartReceiving(
- const uint32_t numberOfSocketBuffers) OVERRIDE;
- virtual int32_t StopReceiving() OVERRIDE;
- virtual bool Receiving() const OVERRIDE;
- virtual bool SendSocketsInitialized() const OVERRIDE;
- virtual bool SourcePortsInitialized() const OVERRIDE;
- virtual bool ReceiveSocketsInitialized() const OVERRIDE;
- virtual int32_t SendRaw(const int8_t* data,
- size_t length, int32_t isRTCP,
- uint16_t portnr = 0,
- const char* ip = NULL) OVERRIDE;
- virtual int32_t SendRTPPacketTo(const int8_t *data,
- size_t length,
- const SocketAddress& to) OVERRIDE;
- virtual int32_t SendRTCPPacketTo(const int8_t *data,
- size_t length,
- const SocketAddress& to) OVERRIDE;
- virtual int32_t SendRTPPacketTo(const int8_t *data,
- size_t length,
- uint16_t rtpPort) OVERRIDE;
- virtual int32_t SendRTCPPacketTo(const int8_t *data,
- size_t length,
- uint16_t rtcpPort) OVERRIDE;
+ char multicastIpAddr[kIpAddressVersion6Length]) const override;
+ int32_t SendSocketInformation(char ipAddr[kIpAddressVersion6Length],
+ uint16_t& rtpPort,
+ uint16_t& rtcpPort) const override;
+ int32_t RemoteSocketInformation(char ipAddr[kIpAddressVersion6Length],
+ uint16_t& rtpPort,
+ uint16_t& rtcpPort) const override;
+ int32_t SetQoS(const bool QoS,
+ const int32_t serviceType,
+ const uint32_t maxBitrate = 0,
+ const int32_t overrideDSCP = 0,
+ const bool audio = false) override;
+ int32_t QoS(bool& QoS,
+ int32_t& serviceType,
+ int32_t& overrideDSCP) const override;
+ int32_t SetToS(const int32_t DSCP,
+ const bool useSetSockOpt = false) override;
+ int32_t ToS(int32_t& DSCP, bool& useSetSockOpt) const override;
+ int32_t SetPCP(const int32_t PCP) override;
+ int32_t PCP(int32_t& PCP) const override;
+ int32_t EnableIpV6() override;
+ bool IpV6Enabled() const override;
+ int32_t SetFilterIP(
+ const char filterIPAddress[kIpAddressVersion6Length]) override;
+ int32_t FilterIP(
+ char filterIPAddress[kIpAddressVersion6Length]) const override;
+ int32_t SetFilterPorts(const uint16_t rtpFilterPort,
+ const uint16_t rtcpFilterPort) override;
+ int32_t FilterPorts(uint16_t& rtpFilterPort,
+ uint16_t& rtcpFilterPort) const override;
+ int32_t StartReceiving(const uint32_t numberOfSocketBuffers) override;
+ int32_t StopReceiving() override;
+ bool Receiving() const override;
+ bool SendSocketsInitialized() const override;
+ bool SourcePortsInitialized() const override;
+ bool ReceiveSocketsInitialized() const override;
+ int32_t SendRaw(const int8_t* data,
+ size_t length,
+ int32_t isRTCP,
+ uint16_t portnr = 0,
+ const char* ip = NULL) override;
+ int32_t SendRTPPacketTo(const int8_t* data,
+ size_t length,
+ const SocketAddress& to) override;
+ int32_t SendRTCPPacketTo(const int8_t* data,
+ size_t length,
+ const SocketAddress& to) override;
+ int32_t SendRTPPacketTo(const int8_t* data,
+ size_t length,
+ uint16_t rtpPort) override;
+ int32_t SendRTCPPacketTo(const int8_t* data,
+ size_t length,
+ uint16_t rtcpPort) override;
// Transport functions
- virtual int SendPacket(int channel,
- const void* data,
- size_t length) OVERRIDE;
- virtual int SendRTCPPacket(int channel,
- const void* data,
- size_t length) OVERRIDE;
+ int SendPacket(int channel, const void* data, size_t length) override;
+ int SendRTCPPacket(int channel, const void* data, size_t length) override;
// UdpTransport functions continue.
- virtual int32_t SetSendIP(const char* ipaddr) OVERRIDE;
- virtual int32_t SetSendPorts(const uint16_t rtpPort,
- const uint16_t rtcpPort = 0) OVERRIDE;
+ int32_t SetSendIP(const char* ipaddr) override;
+ int32_t SetSendPorts(const uint16_t rtpPort,
+ const uint16_t rtcpPort = 0) override;
- virtual ErrorCode LastError() const OVERRIDE;
+ ErrorCode LastError() const override;
- virtual int32_t IPAddressCached(const SocketAddress& address,
- char* ip,
- uint32_t& ipSize,
- uint16_t& sourcePort) OVERRIDE;
+ int32_t IPAddressCached(const SocketAddress& address,
+ char* ip,
+ uint32_t& ipSize,
+ uint16_t& sourcePort) override;
int32_t Id() const {return _id;}
protected:
diff --git a/test/configurable_frame_size_encoder.h b/test/configurable_frame_size_encoder.h
index 24f6be8..eed4498 100644
--- a/test/configurable_frame_size_encoder.h
+++ b/test/configurable_frame_size_encoder.h
@@ -24,28 +24,26 @@
explicit ConfigurableFrameSizeEncoder(size_t max_frame_size);
virtual ~ConfigurableFrameSizeEncoder();
- virtual int32_t InitEncode(const VideoCodec* codec_settings,
- int32_t number_of_cores,
- size_t max_payload_size) OVERRIDE;
+ int32_t InitEncode(const VideoCodec* codec_settings,
+ int32_t number_of_cores,
+ size_t max_payload_size) override;
- virtual int32_t Encode(const I420VideoFrame& input_image,
- const CodecSpecificInfo* codec_specific_info,
- const std::vector<VideoFrameType>* frame_types)
- OVERRIDE;
+ int32_t Encode(const I420VideoFrame& input_image,
+ const CodecSpecificInfo* codec_specific_info,
+ const std::vector<VideoFrameType>* frame_types) override;
- virtual int32_t RegisterEncodeCompleteCallback(EncodedImageCallback* callback)
- OVERRIDE;
+ int32_t RegisterEncodeCompleteCallback(
+ EncodedImageCallback* callback) override;
- virtual int32_t Release() OVERRIDE;
+ int32_t Release() override;
- virtual int32_t SetChannelParameters(uint32_t packet_loss,
- int64_t rtt) OVERRIDE;
+ int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
- virtual int32_t SetRates(uint32_t new_bit_rate, uint32_t frame_rate) OVERRIDE;
+ int32_t SetRates(uint32_t new_bit_rate, uint32_t frame_rate) override;
- virtual int32_t SetPeriodicKeyFrames(bool enable) OVERRIDE;
+ int32_t SetPeriodicKeyFrames(bool enable) override;
- virtual int32_t CodecConfigParameters(uint8_t* buffer, int32_t size) OVERRIDE;
+ int32_t CodecConfigParameters(uint8_t* buffer, int32_t size) override;
int32_t SetFrameSize(size_t size);
diff --git a/test/direct_transport.h b/test/direct_transport.h
index b9fd454..338be75 100644
--- a/test/direct_transport.h
+++ b/test/direct_transport.h
@@ -39,8 +39,8 @@
virtual void StopSending();
virtual void SetReceiver(PacketReceiver* receiver);
- virtual bool SendRtp(const uint8_t* data, size_t length) OVERRIDE;
- virtual bool SendRtcp(const uint8_t* data, size_t length) OVERRIDE;
+ bool SendRtp(const uint8_t* data, size_t length) override;
+ bool SendRtcp(const uint8_t* data, size_t length) override;
private:
static bool NetworkProcess(void* transport);
diff --git a/test/fake_audio_device.h b/test/fake_audio_device.h
index ce5231e..6df53e9 100644
--- a/test/fake_audio_device.h
+++ b/test/fake_audio_device.h
@@ -33,12 +33,12 @@
virtual ~FakeAudioDevice();
- virtual int32_t Init() OVERRIDE;
- virtual int32_t RegisterAudioCallback(AudioTransport* callback) OVERRIDE;
+ int32_t Init() override;
+ int32_t RegisterAudioCallback(AudioTransport* callback) override;
- virtual bool Playing() const OVERRIDE;
- virtual int32_t PlayoutDelay(uint16_t* delay_ms) const OVERRIDE;
- virtual bool Recording() const OVERRIDE;
+ bool Playing() const override;
+ int32_t PlayoutDelay(uint16_t* delay_ms) const override;
+ bool Recording() const override;
void Start();
void Stop();
diff --git a/test/fake_common.h b/test/fake_common.h
index a074808..ec81798 100644
--- a/test/fake_common.h
+++ b/test/fake_common.h
@@ -16,28 +16,24 @@
#include "webrtc/typedefs.h"
#define WEBRTC_STUB(method, args) \
- virtual int method args OVERRIDE { return 0; }
+ int method args override { return 0; }
#define WEBRTC_STUB_CONST(method, args) \
- virtual int method args const OVERRIDE { return 0; }
+ int method args const override { return 0; }
#define WEBRTC_BOOL_STUB(method, args) \
- virtual bool method args OVERRIDE { return true; }
+ bool method args override { return true; }
#define WEBRTC_VOID_STUB(method, args) \
- virtual void method args OVERRIDE {}
+ void method args override {}
-#define WEBRTC_FUNC(method, args) \
- virtual int method args OVERRIDE
+#define WEBRTC_FUNC(method, args) int method args override
-#define WEBRTC_FUNC_CONST(method, args) \
- virtual int method args const OVERRIDE
+#define WEBRTC_FUNC_CONST(method, args) int method args const override
-#define WEBRTC_BOOL_FUNC(method, args) \
- virtual bool method args OVERRIDE
+#define WEBRTC_BOOL_FUNC(method, args) bool method args override
-#define WEBRTC_VOID_FUNC(method, args) \
- virtual void method args OVERRIDE
+#define WEBRTC_VOID_FUNC(method, args) void method args override
#define WEBRTC_CHECK_CHANNEL(channel) \
if (channels_.find(channel) == channels_.end()) return -1;
diff --git a/test/fake_encoder.h b/test/fake_encoder.h
index 2cb28ca..096b9c2 100644
--- a/test/fake_encoder.h
+++ b/test/fake_encoder.h
@@ -28,20 +28,17 @@
// Sets max bitrate. Not thread-safe, call before registering the encoder.
void SetMaxBitrate(int max_kbps);
- virtual int32_t InitEncode(const VideoCodec* config,
- int32_t number_of_cores,
- size_t max_payload_size) OVERRIDE;
- virtual int32_t Encode(
- const I420VideoFrame& input_image,
- const CodecSpecificInfo* codec_specific_info,
- const std::vector<VideoFrameType>* frame_types) OVERRIDE;
- virtual int32_t RegisterEncodeCompleteCallback(
- EncodedImageCallback* callback) OVERRIDE;
- virtual int32_t Release() OVERRIDE;
- virtual int32_t SetChannelParameters(uint32_t packet_loss,
- int64_t rtt) OVERRIDE;
- virtual int32_t SetRates(uint32_t new_target_bitrate,
- uint32_t framerate) OVERRIDE;
+ int32_t InitEncode(const VideoCodec* config,
+ int32_t number_of_cores,
+ size_t max_payload_size) override;
+ int32_t Encode(const I420VideoFrame& input_image,
+ const CodecSpecificInfo* codec_specific_info,
+ const std::vector<VideoFrameType>* frame_types) override;
+ int32_t RegisterEncodeCompleteCallback(
+ EncodedImageCallback* callback) override;
+ int32_t Release() override;
+ int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
+ int32_t SetRates(uint32_t new_target_bitrate, uint32_t framerate) override;
protected:
Clock* const clock_;
@@ -58,13 +55,12 @@
explicit FakeH264Encoder(Clock* clock);
virtual ~FakeH264Encoder() {}
- virtual int32_t RegisterEncodeCompleteCallback(
- EncodedImageCallback* callback) OVERRIDE;
+ int32_t RegisterEncodeCompleteCallback(
+ EncodedImageCallback* callback) override;
- virtual int32_t Encoded(
- const EncodedImage& encodedImage,
- const CodecSpecificInfo* codecSpecificInfo,
- const RTPFragmentationHeader* fragments) OVERRIDE;
+ int32_t Encoded(const EncodedImage& encodedImage,
+ const CodecSpecificInfo* codecSpecificInfo,
+ const RTPFragmentationHeader* fragments) override;
private:
EncodedImageCallback* callback_;
@@ -76,10 +72,9 @@
DelayedEncoder(Clock* clock, int delay_ms);
virtual ~DelayedEncoder() {}
- virtual int32_t Encode(
- const I420VideoFrame& input_image,
- const CodecSpecificInfo* codec_specific_info,
- const std::vector<VideoFrameType>* frame_types) OVERRIDE;
+ int32_t Encode(const I420VideoFrame& input_image,
+ const CodecSpecificInfo* codec_specific_info,
+ const std::vector<VideoFrameType>* frame_types) override;
private:
const int delay_ms_;
diff --git a/test/frame_generator.cc b/test/frame_generator.cc
index fe6b1b1..71be89e 100644
--- a/test/frame_generator.cc
+++ b/test/frame_generator.cc
@@ -28,7 +28,7 @@
assert(height > 0);
}
- virtual I420VideoFrame* NextFrame() OVERRIDE {
+ I420VideoFrame* NextFrame() override {
frame_.CreateEmptyFrame(static_cast<int>(width_),
static_cast<int>(height_),
static_cast<int>(width_),
@@ -77,7 +77,7 @@
fclose(file);
}
- virtual I420VideoFrame* NextFrame() OVERRIDE {
+ I420VideoFrame* NextFrame() override {
if (current_display_count_ == 0)
ReadNextFrame();
if (++current_display_count_ >= frame_display_count_)
diff --git a/test/frame_generator_capturer.h b/test/frame_generator_capturer.h
index 69b9f5f..1064a5f 100644
--- a/test/frame_generator_capturer.h
+++ b/test/frame_generator_capturer.h
@@ -42,8 +42,8 @@
Clock* clock);
virtual ~FrameGeneratorCapturer();
- virtual void Start() OVERRIDE;
- virtual void Stop() OVERRIDE;
+ void Start() override;
+ void Stop() override;
int64_t first_frame_capture_time() const { return first_frame_capture_time_; }
diff --git a/test/gl/gl_renderer.h b/test/gl/gl_renderer.h
index c2110b2..b712f25 100644
--- a/test/gl/gl_renderer.h
+++ b/test/gl/gl_renderer.h
@@ -26,8 +26,8 @@
class GlRenderer : public VideoRenderer {
public:
- virtual void RenderFrame(const webrtc::I420VideoFrame& frame,
- int time_to_render_ms) OVERRIDE;
+ void RenderFrame(const webrtc::I420VideoFrame& frame,
+ int time_to_render_ms) override;
protected:
GlRenderer();
diff --git a/test/linux/glx_renderer.h b/test/linux/glx_renderer.h
index 8def121..6d9e4e6 100644
--- a/test/linux/glx_renderer.h
+++ b/test/linux/glx_renderer.h
@@ -26,9 +26,8 @@
size_t height);
virtual ~GlxRenderer();
- virtual void RenderFrame(const webrtc::I420VideoFrame& frame,
- int delta) override;
- virtual bool IsTextureSupported() const override { return false; }
+ void RenderFrame(const webrtc::I420VideoFrame& frame, int delta) override;
+ bool IsTextureSupported() const override { return false; }
private:
GlxRenderer(size_t width, size_t height);
diff --git a/test/mac/video_renderer_mac.h b/test/mac/video_renderer_mac.h
index 330fd04..6237709 100644
--- a/test/mac/video_renderer_mac.h
+++ b/test/mac/video_renderer_mac.h
@@ -27,8 +27,8 @@
bool Init(const char* window_title, int width, int height);
// Implements GlRenderer.
- virtual void RenderFrame(const I420VideoFrame& frame, int delta) override;
- virtual bool IsTextureSupported() const override { return false; }
+ void RenderFrame(const I420VideoFrame& frame, int delta) override;
+ bool IsTextureSupported() const override { return false; }
private:
CocoaWindow* window_;
diff --git a/test/null_transport.h b/test/null_transport.h
index e8d4d10..b80f751 100644
--- a/test/null_transport.h
+++ b/test/null_transport.h
@@ -19,8 +19,8 @@
namespace test {
class NullTransport : public newapi::Transport {
public:
- virtual bool SendRtp(const uint8_t* packet, size_t length) OVERRIDE;
- virtual bool SendRtcp(const uint8_t* packet, size_t length) OVERRIDE;
+ bool SendRtp(const uint8_t* packet, size_t length) override;
+ bool SendRtcp(const uint8_t* packet, size_t length) override;
};
} // namespace test
} // namespace webrtc
diff --git a/test/rtp_file_reader.cc b/test/rtp_file_reader.cc
index 34290ac..26151bb 100644
--- a/test/rtp_file_reader.cc
+++ b/test/rtp_file_reader.cc
@@ -168,7 +168,7 @@
return true;
}
- virtual bool NextPacket(RtpPacket* packet) OVERRIDE {
+ bool NextPacket(RtpPacket* packet) override {
uint8_t* rtp_data = packet->data;
packet->length = RtpPacket::kMaxPacketBufferSize;
@@ -265,7 +265,7 @@
}
}
- bool Init(const std::string& filename) OVERRIDE {
+ bool Init(const std::string& filename) override {
return Initialize(filename) == kResultSuccess;
}
@@ -334,7 +334,7 @@
return kResultSuccess;
}
- virtual bool NextPacket(RtpPacket* packet) OVERRIDE {
+ bool NextPacket(RtpPacket* packet) override {
uint32_t length = RtpPacket::kMaxPacketBufferSize;
if (NextPcap(packet->data, &length, &packet->time_ms) != kResultSuccess)
return false;
diff --git a/test/rtp_file_writer.cc b/test/rtp_file_writer.cc
index 1b9bfdc..4acaa27 100644
--- a/test/rtp_file_writer.cc
+++ b/test/rtp_file_writer.cc
@@ -38,7 +38,7 @@
}
}
- virtual bool WritePacket(const RtpPacket* packet) OVERRIDE {
+ bool WritePacket(const RtpPacket* packet) override {
uint16_t len = static_cast<uint16_t>(packet->length + kPacketHeaderSize);
CHECK_GE(packet->original_length, packet->length);
uint16_t plen = static_cast<uint16_t>(packet->original_length);
diff --git a/test/rtp_rtcp_observer.h b/test/rtp_rtcp_observer.h
index 37451f4..dd731f0 100644
--- a/test/rtp_rtcp_observer.h
+++ b/test/rtp_rtcp_observer.h
@@ -127,7 +127,7 @@
on_rtcp_(on_rtcp) {}
private:
- virtual bool SendRtp(const uint8_t* packet, size_t length) OVERRIDE {
+ bool SendRtp(const uint8_t* packet, size_t length) override {
EXPECT_FALSE(RtpHeaderParser::IsRtcp(packet, length));
Action action;
{
@@ -144,7 +144,7 @@
return true; // Will never happen, makes compiler happy.
}
- virtual bool SendRtcp(const uint8_t* packet, size_t length) OVERRIDE {
+ bool SendRtcp(const uint8_t* packet, size_t length) override {
EXPECT_TRUE(RtpHeaderParser::IsRtcp(packet, length));
Action action;
{
diff --git a/test/testsupport/frame_reader.h b/test/testsupport/frame_reader.h
index 4ee90f9..9b50ec7 100644
--- a/test/testsupport/frame_reader.h
+++ b/test/testsupport/frame_reader.h
@@ -54,12 +54,12 @@
// frame_length_in_bytes The size of each frame.
// For YUV this is 3 * width * height / 2
FrameReaderImpl(std::string input_filename, size_t frame_length_in_bytes);
- virtual ~FrameReaderImpl();
- virtual bool Init() OVERRIDE;
- virtual bool ReadFrame(uint8_t* source_buffer) OVERRIDE;
- virtual void Close() OVERRIDE;
- virtual size_t FrameLength() OVERRIDE;
- virtual int NumberOfFrames() OVERRIDE;
+ ~FrameReaderImpl() override;
+ bool Init() override;
+ bool ReadFrame(uint8_t* source_buffer) override;
+ void Close() override;
+ size_t FrameLength() override;
+ int NumberOfFrames() override;
private:
std::string input_filename_;
diff --git a/test/testsupport/frame_writer.h b/test/testsupport/frame_writer.h
index daa3894..8a6b1c2 100644
--- a/test/testsupport/frame_writer.h
+++ b/test/testsupport/frame_writer.h
@@ -52,11 +52,11 @@
// frame_length_in_bytes The size of each frame.
// For YUV: 3*width*height/2
FrameWriterImpl(std::string output_filename, size_t frame_length_in_bytes);
- virtual ~FrameWriterImpl();
- virtual bool Init() OVERRIDE;
- virtual bool WriteFrame(uint8_t* frame_buffer) OVERRIDE;
- virtual void Close() OVERRIDE;
- virtual size_t FrameLength() OVERRIDE;
+ ~FrameWriterImpl() override;
+ bool Init() override;
+ bool WriteFrame(uint8_t* frame_buffer) override;
+ void Close() override;
+ size_t FrameLength() override;
private:
std::string output_filename_;
diff --git a/test/testsupport/trace_to_stderr.h b/test/testsupport/trace_to_stderr.h
index 1220834..88f1811 100644
--- a/test/testsupport/trace_to_stderr.h
+++ b/test/testsupport/trace_to_stderr.h
@@ -28,7 +28,7 @@
// This is useful for offline test tools, where the file time is much more
// informative than the real time.
explicit TraceToStderr(bool override_time);
- virtual ~TraceToStderr();
+ ~TraceToStderr() override;
// Every subsequent trace printout will use |time|. Has no effect if
// |override_time| in the constructor was set to false.
@@ -39,9 +39,7 @@
virtual void SetTimeSeconds(float time);
// Implements TraceCallback.
- virtual void Print(TraceLevel level,
- const char* msg_array,
- int length) OVERRIDE;
+ void Print(TraceLevel level, const char* msg_array, int length) override;
private:
bool override_time_;
diff --git a/test/vcm_capturer.h b/test/vcm_capturer.h
index dde3edc..1cb5b4e 100644
--- a/test/vcm_capturer.h
+++ b/test/vcm_capturer.h
@@ -24,13 +24,12 @@
size_t height, size_t target_fps);
virtual ~VcmCapturer();
- virtual void Start() OVERRIDE;
- virtual void Stop() OVERRIDE;
+ void Start() override;
+ void Stop() override;
- virtual void OnIncomingCapturedFrame(
- const int32_t id, I420VideoFrame& frame) OVERRIDE; // NOLINT
- virtual void OnCaptureDelayChanged(const int32_t id, const int32_t delay)
- OVERRIDE;
+ void OnIncomingCapturedFrame(const int32_t id,
+ I420VideoFrame& frame) override; // NOLINT
+ void OnCaptureDelayChanged(const int32_t id, const int32_t delay) override;
private:
explicit VcmCapturer(VideoSendStreamInput* input);
diff --git a/test/video_renderer.cc b/test/video_renderer.cc
index 447b5b7..03c4948 100644
--- a/test/video_renderer.cc
+++ b/test/video_renderer.cc
@@ -17,9 +17,9 @@
namespace test {
class NullRenderer : public VideoRenderer {
- virtual void RenderFrame(const I420VideoFrame& video_frame,
- int time_to_render_ms) override {}
- virtual bool IsTextureSupported() const override { return false; }
+ void RenderFrame(const I420VideoFrame& video_frame,
+ int time_to_render_ms) override {}
+ bool IsTextureSupported() const override { return false; }
};
VideoRenderer* VideoRenderer::Create(const char* window_title,
diff --git a/test/win/d3d_renderer.h b/test/win/d3d_renderer.h
index 7cf4982..4fa6c7e 100644
--- a/test/win/d3d_renderer.h
+++ b/test/win/d3d_renderer.h
@@ -27,9 +27,8 @@
size_t height);
virtual ~D3dRenderer();
- virtual void RenderFrame(const webrtc::I420VideoFrame& frame,
- int delta) override;
- virtual bool IsTextureSupported() const override { return false; }
+ void RenderFrame(const webrtc::I420VideoFrame& frame, int delta) override;
+ bool IsTextureSupported() const override { return false; }
private:
D3dRenderer(size_t width, size_t height);
