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/video/call_perf_tests.cc b/video/call_perf_tests.cc
index 9edd55d..9f3dbf2 100644
--- a/video/call_perf_tests.cc
+++ b/video/call_perf_tests.cc
@@ -63,7 +63,7 @@
: test::RtpRtcpObserver(CallPerfTest::kLongTimeoutMs, config),
crit_(CriticalSectionWrapper::CreateCriticalSection()) {}
- virtual Action OnSendRtcp(const uint8_t* packet, size_t length) OVERRIDE {
+ Action OnSendRtcp(const uint8_t* packet, size_t length) override {
RTCPUtility::RTCPParserV2 parser(packet, length, true);
EXPECT_TRUE(parser.IsValid());
@@ -137,8 +137,8 @@
creation_time_ms_(clock_->TimeInMilliseconds()),
first_time_in_sync_(-1) {}
- virtual void RenderFrame(const I420VideoFrame& video_frame,
- int time_to_render_ms) OVERRIDE {
+ void RenderFrame(const I420VideoFrame& video_frame,
+ int time_to_render_ms) override {
int64_t now_ms = clock_->TimeInMilliseconds();
uint32_t playout_timestamp = 0;
if (voe_sync_->GetPlayoutTimestamp(voe_channel_, playout_timestamp) != 0)
@@ -180,7 +180,7 @@
}
}
- virtual bool IsTextureSupported() const override { return false; }
+ bool IsTextureSupported() const override { return false; }
private:
Clock* const clock_;
@@ -198,8 +198,8 @@
: channel_(channel),
voe_network_(voe_network),
parser_(RtpHeaderParser::Create()) {}
- virtual DeliveryStatus DeliverPacket(const uint8_t* packet,
- size_t length) OVERRIDE {
+ DeliveryStatus DeliverPacket(const uint8_t* packet,
+ size_t length) override {
int ret;
if (parser_->IsRtcp(packet, length)) {
ret = voe_network_->ReceivedRTCPPacket(channel_, packet, length);
@@ -335,8 +335,8 @@
rtp_start_timestamp_(0) {}
private:
- virtual void RenderFrame(const I420VideoFrame& video_frame,
- int time_to_render_ms) OVERRIDE {
+ void RenderFrame(const I420VideoFrame& video_frame,
+ int time_to_render_ms) override {
if (video_frame.ntp_time_ms() <= 0) {
// Haven't got enough RTCP SR in order to calculate the capture ntp
// time.
@@ -374,7 +374,7 @@
EXPECT_TRUE(std::abs(time_offset_ms) < threshold_ms_);
}
- virtual bool IsTextureSupported() const override { return false; }
+ bool IsTextureSupported() const override { return false; }
virtual Action OnSendRtp(const uint8_t* packet, size_t length) {
RTPHeader header;
@@ -396,21 +396,20 @@
return SEND_PACKET;
}
- virtual void OnFrameGeneratorCapturerCreated(
- test::FrameGeneratorCapturer* frame_generator_capturer) OVERRIDE {
+ void OnFrameGeneratorCapturerCreated(
+ test::FrameGeneratorCapturer* frame_generator_capturer) override {
capturer_ = frame_generator_capturer;
}
- virtual void ModifyConfigs(
- VideoSendStream::Config* send_config,
- std::vector<VideoReceiveStream::Config>* receive_configs,
- VideoEncoderConfig* encoder_config) OVERRIDE {
+ void ModifyConfigs(VideoSendStream::Config* send_config,
+ std::vector<VideoReceiveStream::Config>* receive_configs,
+ VideoEncoderConfig* encoder_config) override {
(*receive_configs)[0].renderer = this;
// Enable the receiver side rtt calculation.
(*receive_configs)[0].rtp.rtcp_xr.receiver_reference_time_report = true;
}
- virtual void PerformTest() OVERRIDE {
+ void PerformTest() override {
EXPECT_EQ(kEventSignaled, Wait()) << "Timed out while waiting for "
"estimated capture NTP time to be "
"within bounds.";
@@ -463,25 +462,24 @@
tested_load_(tested_load),
encoder_(Clock::GetRealTimeClock(), encode_delay_ms) {}
- virtual void OnLoadUpdate(Load load) OVERRIDE {
+ void OnLoadUpdate(Load load) override {
if (load == tested_load_)
observation_complete_->Set();
}
- virtual Call::Config GetSenderCallConfig() OVERRIDE {
+ Call::Config GetSenderCallConfig() override {
Call::Config config(SendTransport());
config.overuse_callback = this;
return config;
}
- virtual void ModifyConfigs(
- VideoSendStream::Config* send_config,
- std::vector<VideoReceiveStream::Config>* receive_configs,
- VideoEncoderConfig* encoder_config) OVERRIDE {
+ void ModifyConfigs(VideoSendStream::Config* send_config,
+ std::vector<VideoReceiveStream::Config>* receive_configs,
+ VideoEncoderConfig* encoder_config) override {
send_config->encoder_settings.encoder = &encoder_;
}
- virtual void PerformTest() OVERRIDE {
+ void PerformTest() override {
EXPECT_EQ(kEventSignaled, Wait())
<< "Timed out before receiving an overuse callback.";
}
@@ -519,15 +517,14 @@
num_bitrate_observations_in_range_(0) {}
private:
- virtual void SetReceivers(PacketReceiver* send_transport_receiver,
- PacketReceiver* receive_transport_receiver)
- OVERRIDE {
+ void SetReceivers(PacketReceiver* send_transport_receiver,
+ PacketReceiver* receive_transport_receiver) override {
send_transport_receiver_ = send_transport_receiver;
test::RtpRtcpObserver::SetReceivers(this, receive_transport_receiver);
}
- virtual DeliveryStatus DeliverPacket(const uint8_t* packet,
- size_t length) OVERRIDE {
+ DeliveryStatus DeliverPacket(const uint8_t* packet,
+ size_t length) override {
VideoSendStream::Stats stats = send_stream_->GetStats();
if (stats.substreams.size() > 0) {
assert(stats.substreams.size() == 1);
@@ -562,16 +559,15 @@
return send_transport_receiver_->DeliverPacket(packet, length);
}
- virtual void OnStreamsCreated(
+ void OnStreamsCreated(
VideoSendStream* send_stream,
- const std::vector<VideoReceiveStream*>& receive_streams) OVERRIDE {
+ const std::vector<VideoReceiveStream*>& receive_streams) override {
send_stream_ = send_stream;
}
- virtual void ModifyConfigs(
- VideoSendStream::Config* send_config,
- std::vector<VideoReceiveStream::Config>* receive_configs,
- VideoEncoderConfig* encoder_config) OVERRIDE {
+ void ModifyConfigs(VideoSendStream::Config* send_config,
+ std::vector<VideoReceiveStream::Config>* receive_configs,
+ VideoEncoderConfig* encoder_config) override {
if (pad_to_min_bitrate_) {
encoder_config->min_transmit_bitrate_bps = kMinTransmitBitrateBps;
} else {
@@ -579,7 +575,7 @@
}
}
- virtual void PerformTest() OVERRIDE {
+ void PerformTest() override {
EXPECT_EQ(kEventSignaled, Wait())
<< "Timeout while waiting for send-bitrate stats.";
}
@@ -613,9 +609,9 @@
time_to_reconfigure_(webrtc::EventWrapper::Create()),
encoder_inits_(0) {}
- virtual int32_t InitEncode(const VideoCodec* config,
- int32_t number_of_cores,
- size_t max_payload_size) OVERRIDE {
+ int32_t InitEncode(const VideoCodec* config,
+ int32_t number_of_cores,
+ size_t max_payload_size) override {
if (encoder_inits_ == 0) {
EXPECT_EQ(kInitialBitrateKbps, config->startBitrate)
<< "Encoder not initialized at expected bitrate.";
@@ -632,8 +628,8 @@
return FakeEncoder::InitEncode(config, number_of_cores, max_payload_size);
}
- virtual int32_t SetRates(uint32_t new_target_bitrate_kbps,
- uint32_t framerate) OVERRIDE {
+ int32_t SetRates(uint32_t new_target_bitrate_kbps,
+ uint32_t framerate) override {
last_set_bitrate_ = new_target_bitrate_kbps;
if (encoder_inits_ == 1 &&
new_target_bitrate_kbps > kReconfigureThresholdKbps) {
@@ -642,16 +638,15 @@
return FakeEncoder::SetRates(new_target_bitrate_kbps, framerate);
}
- Call::Config GetSenderCallConfig() OVERRIDE {
+ Call::Config GetSenderCallConfig() override {
Call::Config config = EndToEndTest::GetSenderCallConfig();
config.stream_bitrates.start_bitrate_bps = kInitialBitrateKbps * 1000;
return config;
}
- virtual void ModifyConfigs(
- VideoSendStream::Config* send_config,
- std::vector<VideoReceiveStream::Config>* receive_configs,
- VideoEncoderConfig* encoder_config) OVERRIDE {
+ void ModifyConfigs(VideoSendStream::Config* send_config,
+ std::vector<VideoReceiveStream::Config>* receive_configs,
+ VideoEncoderConfig* encoder_config) override {
send_config->encoder_settings.encoder = this;
encoder_config->streams[0].min_bitrate_bps = 50000;
encoder_config->streams[0].target_bitrate_bps =
@@ -660,13 +655,13 @@
encoder_config_ = *encoder_config;
}
- virtual void OnStreamsCreated(
+ void OnStreamsCreated(
VideoSendStream* send_stream,
- const std::vector<VideoReceiveStream*>& receive_streams) OVERRIDE {
+ const std::vector<VideoReceiveStream*>& receive_streams) override {
send_stream_ = send_stream;
}
- virtual void PerformTest() OVERRIDE {
+ void PerformTest() override {
ASSERT_EQ(kEventSignaled, time_to_reconfigure_->Wait(kDefaultTimeoutMs))
<< "Timed out before receiving an initial high bitrate.";
encoder_config_.streams[0].width *= 2;
