Roll chromium_revision e144d30..6fdb142 (318658:318841) + remove OVERRIDE macro
Clang version changed 223108:230914
Details: 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-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org
@ -88,7 +88,7 @@ class VideoCodingModuleImpl : public VideoCodingModule {
|
||||
own_event_factory_.reset();
|
||||
}
|
||||
|
||||
virtual int64_t TimeUntilNextProcess() OVERRIDE {
|
||||
int64_t TimeUntilNextProcess() override {
|
||||
int64_t sender_time = sender_->TimeUntilNextProcess();
|
||||
int64_t receiver_time = receiver_->TimeUntilNextProcess();
|
||||
assert(sender_time >= 0);
|
||||
@ -96,7 +96,7 @@ class VideoCodingModuleImpl : public VideoCodingModule {
|
||||
return VCM_MIN(sender_time, receiver_time);
|
||||
}
|
||||
|
||||
virtual int32_t Process() OVERRIDE {
|
||||
int32_t Process() override {
|
||||
int32_t sender_return = sender_->Process();
|
||||
int32_t receiver_return = receiver_->Process();
|
||||
if (sender_return != VCM_OK)
|
||||
@ -104,78 +104,75 @@ class VideoCodingModuleImpl : public VideoCodingModule {
|
||||
return receiver_return;
|
||||
}
|
||||
|
||||
virtual int32_t InitializeSender() OVERRIDE {
|
||||
return sender_->InitializeSender();
|
||||
}
|
||||
int32_t InitializeSender() override { return sender_->InitializeSender(); }
|
||||
|
||||
virtual int32_t RegisterSendCodec(const VideoCodec* sendCodec,
|
||||
uint32_t numberOfCores,
|
||||
uint32_t maxPayloadSize) OVERRIDE {
|
||||
int32_t RegisterSendCodec(const VideoCodec* sendCodec,
|
||||
uint32_t numberOfCores,
|
||||
uint32_t maxPayloadSize) override {
|
||||
return sender_->RegisterSendCodec(sendCodec, numberOfCores, maxPayloadSize);
|
||||
}
|
||||
|
||||
virtual const VideoCodec& GetSendCodec() const OVERRIDE {
|
||||
const VideoCodec& GetSendCodec() const override {
|
||||
return sender_->GetSendCodec();
|
||||
}
|
||||
|
||||
// DEPRECATED.
|
||||
virtual int32_t SendCodec(VideoCodec* currentSendCodec) const OVERRIDE {
|
||||
int32_t SendCodec(VideoCodec* currentSendCodec) const override {
|
||||
return sender_->SendCodecBlocking(currentSendCodec);
|
||||
}
|
||||
|
||||
// DEPRECATED.
|
||||
virtual VideoCodecType SendCodec() const OVERRIDE {
|
||||
VideoCodecType SendCodec() const override {
|
||||
return sender_->SendCodecBlocking();
|
||||
}
|
||||
|
||||
virtual int32_t RegisterExternalEncoder(VideoEncoder* externalEncoder,
|
||||
uint8_t payloadType,
|
||||
bool internalSource) OVERRIDE {
|
||||
int32_t RegisterExternalEncoder(VideoEncoder* externalEncoder,
|
||||
uint8_t payloadType,
|
||||
bool internalSource) override {
|
||||
return sender_->RegisterExternalEncoder(
|
||||
externalEncoder, payloadType, internalSource);
|
||||
}
|
||||
|
||||
virtual int32_t CodecConfigParameters(uint8_t* buffer,
|
||||
int32_t size) OVERRIDE {
|
||||
int32_t CodecConfigParameters(uint8_t* buffer, int32_t size) override {
|
||||
return sender_->CodecConfigParameters(buffer, size);
|
||||
}
|
||||
|
||||
virtual int Bitrate(unsigned int* bitrate) const OVERRIDE {
|
||||
int Bitrate(unsigned int* bitrate) const override {
|
||||
return sender_->Bitrate(bitrate);
|
||||
}
|
||||
|
||||
virtual int FrameRate(unsigned int* framerate) const OVERRIDE {
|
||||
int FrameRate(unsigned int* framerate) const override {
|
||||
return sender_->FrameRate(framerate);
|
||||
}
|
||||
|
||||
virtual int32_t SetChannelParameters(uint32_t target_bitrate, // bits/s.
|
||||
uint8_t lossRate,
|
||||
int64_t rtt) OVERRIDE {
|
||||
int32_t SetChannelParameters(uint32_t target_bitrate, // bits/s.
|
||||
uint8_t lossRate,
|
||||
int64_t rtt) override {
|
||||
return sender_->SetChannelParameters(target_bitrate, lossRate, rtt);
|
||||
}
|
||||
|
||||
virtual int32_t RegisterTransportCallback(
|
||||
VCMPacketizationCallback* transport) OVERRIDE {
|
||||
int32_t RegisterTransportCallback(
|
||||
VCMPacketizationCallback* transport) override {
|
||||
return sender_->RegisterTransportCallback(transport);
|
||||
}
|
||||
|
||||
virtual int32_t RegisterSendStatisticsCallback(
|
||||
VCMSendStatisticsCallback* sendStats) OVERRIDE {
|
||||
int32_t RegisterSendStatisticsCallback(
|
||||
VCMSendStatisticsCallback* sendStats) override {
|
||||
return sender_->RegisterSendStatisticsCallback(sendStats);
|
||||
}
|
||||
|
||||
virtual int32_t RegisterVideoQMCallback(
|
||||
VCMQMSettingsCallback* videoQMSettings) OVERRIDE {
|
||||
int32_t RegisterVideoQMCallback(
|
||||
VCMQMSettingsCallback* videoQMSettings) override {
|
||||
return sender_->RegisterVideoQMCallback(videoQMSettings);
|
||||
}
|
||||
|
||||
virtual int32_t RegisterProtectionCallback(
|
||||
VCMProtectionCallback* protection) OVERRIDE {
|
||||
int32_t RegisterProtectionCallback(
|
||||
VCMProtectionCallback* protection) override {
|
||||
return sender_->RegisterProtectionCallback(protection);
|
||||
}
|
||||
|
||||
virtual int32_t SetVideoProtection(VCMVideoProtection videoProtection,
|
||||
bool enable) OVERRIDE {
|
||||
int32_t SetVideoProtection(VCMVideoProtection videoProtection,
|
||||
bool enable) override {
|
||||
int32_t sender_return =
|
||||
sender_->SetVideoProtection(videoProtection, enable);
|
||||
int32_t receiver_return =
|
||||
@ -185,172 +182,168 @@ class VideoCodingModuleImpl : public VideoCodingModule {
|
||||
return sender_return;
|
||||
}
|
||||
|
||||
virtual int32_t AddVideoFrame(
|
||||
const I420VideoFrame& videoFrame,
|
||||
const VideoContentMetrics* contentMetrics,
|
||||
const CodecSpecificInfo* codecSpecificInfo) OVERRIDE {
|
||||
int32_t AddVideoFrame(const I420VideoFrame& videoFrame,
|
||||
const VideoContentMetrics* contentMetrics,
|
||||
const CodecSpecificInfo* codecSpecificInfo) override {
|
||||
return sender_->AddVideoFrame(
|
||||
videoFrame, contentMetrics, codecSpecificInfo);
|
||||
}
|
||||
|
||||
virtual int32_t IntraFrameRequest(int stream_index) OVERRIDE {
|
||||
int32_t IntraFrameRequest(int stream_index) override {
|
||||
return sender_->IntraFrameRequest(stream_index);
|
||||
}
|
||||
|
||||
virtual int32_t EnableFrameDropper(bool enable) OVERRIDE {
|
||||
int32_t EnableFrameDropper(bool enable) override {
|
||||
return sender_->EnableFrameDropper(enable);
|
||||
}
|
||||
|
||||
virtual int32_t SentFrameCount(VCMFrameCount& frameCount) const OVERRIDE {
|
||||
int32_t SentFrameCount(VCMFrameCount& frameCount) const override {
|
||||
return sender_->SentFrameCount(&frameCount);
|
||||
}
|
||||
|
||||
virtual int SetSenderNackMode(SenderNackMode mode) OVERRIDE {
|
||||
int SetSenderNackMode(SenderNackMode mode) override {
|
||||
return sender_->SetSenderNackMode(mode);
|
||||
}
|
||||
|
||||
virtual int SetSenderReferenceSelection(bool enable) OVERRIDE {
|
||||
int SetSenderReferenceSelection(bool enable) override {
|
||||
return sender_->SetSenderReferenceSelection(enable);
|
||||
}
|
||||
|
||||
virtual int SetSenderFEC(bool enable) OVERRIDE {
|
||||
int SetSenderFEC(bool enable) override {
|
||||
return sender_->SetSenderFEC(enable);
|
||||
}
|
||||
|
||||
virtual int SetSenderKeyFramePeriod(int periodMs) OVERRIDE {
|
||||
int SetSenderKeyFramePeriod(int periodMs) override {
|
||||
return sender_->SetSenderKeyFramePeriod(periodMs);
|
||||
}
|
||||
|
||||
virtual int StartDebugRecording(const char* file_name_utf8) OVERRIDE {
|
||||
int StartDebugRecording(const char* file_name_utf8) override {
|
||||
return sender_->StartDebugRecording(file_name_utf8);
|
||||
}
|
||||
|
||||
virtual int StopDebugRecording() OVERRIDE {
|
||||
int StopDebugRecording() override {
|
||||
sender_->StopDebugRecording();
|
||||
return VCM_OK;
|
||||
}
|
||||
|
||||
virtual void SuspendBelowMinBitrate() OVERRIDE {
|
||||
void SuspendBelowMinBitrate() override {
|
||||
return sender_->SuspendBelowMinBitrate();
|
||||
}
|
||||
|
||||
virtual bool VideoSuspended() const OVERRIDE {
|
||||
return sender_->VideoSuspended();
|
||||
}
|
||||
bool VideoSuspended() const override { return sender_->VideoSuspended(); }
|
||||
|
||||
virtual int32_t InitializeReceiver() OVERRIDE {
|
||||
int32_t InitializeReceiver() override {
|
||||
return receiver_->InitializeReceiver();
|
||||
}
|
||||
|
||||
virtual int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec,
|
||||
int32_t numberOfCores,
|
||||
bool requireKeyFrame) OVERRIDE {
|
||||
int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec,
|
||||
int32_t numberOfCores,
|
||||
bool requireKeyFrame) override {
|
||||
return receiver_->RegisterReceiveCodec(
|
||||
receiveCodec, numberOfCores, requireKeyFrame);
|
||||
}
|
||||
|
||||
virtual int32_t RegisterExternalDecoder(VideoDecoder* externalDecoder,
|
||||
uint8_t payloadType,
|
||||
bool internalRenderTiming) OVERRIDE {
|
||||
int32_t RegisterExternalDecoder(VideoDecoder* externalDecoder,
|
||||
uint8_t payloadType,
|
||||
bool internalRenderTiming) override {
|
||||
return receiver_->RegisterExternalDecoder(
|
||||
externalDecoder, payloadType, internalRenderTiming);
|
||||
}
|
||||
|
||||
virtual int32_t RegisterReceiveCallback(
|
||||
VCMReceiveCallback* receiveCallback) OVERRIDE {
|
||||
int32_t RegisterReceiveCallback(
|
||||
VCMReceiveCallback* receiveCallback) override {
|
||||
return receiver_->RegisterReceiveCallback(receiveCallback);
|
||||
}
|
||||
|
||||
virtual int32_t RegisterReceiveStatisticsCallback(
|
||||
VCMReceiveStatisticsCallback* receiveStats) OVERRIDE {
|
||||
int32_t RegisterReceiveStatisticsCallback(
|
||||
VCMReceiveStatisticsCallback* receiveStats) override {
|
||||
return receiver_->RegisterReceiveStatisticsCallback(receiveStats);
|
||||
}
|
||||
|
||||
virtual int32_t RegisterDecoderTimingCallback(
|
||||
VCMDecoderTimingCallback* decoderTiming) OVERRIDE {
|
||||
int32_t RegisterDecoderTimingCallback(
|
||||
VCMDecoderTimingCallback* decoderTiming) override {
|
||||
return receiver_->RegisterDecoderTimingCallback(decoderTiming);
|
||||
}
|
||||
|
||||
virtual int32_t RegisterFrameTypeCallback(
|
||||
VCMFrameTypeCallback* frameTypeCallback) OVERRIDE {
|
||||
int32_t RegisterFrameTypeCallback(
|
||||
VCMFrameTypeCallback* frameTypeCallback) override {
|
||||
return receiver_->RegisterFrameTypeCallback(frameTypeCallback);
|
||||
}
|
||||
|
||||
virtual int32_t RegisterPacketRequestCallback(
|
||||
VCMPacketRequestCallback* callback) OVERRIDE {
|
||||
int32_t RegisterPacketRequestCallback(
|
||||
VCMPacketRequestCallback* callback) override {
|
||||
return receiver_->RegisterPacketRequestCallback(callback);
|
||||
}
|
||||
|
||||
virtual int RegisterRenderBufferSizeCallback(
|
||||
VCMRenderBufferSizeCallback* callback) OVERRIDE {
|
||||
int RegisterRenderBufferSizeCallback(
|
||||
VCMRenderBufferSizeCallback* callback) override {
|
||||
return receiver_->RegisterRenderBufferSizeCallback(callback);
|
||||
}
|
||||
|
||||
virtual int32_t Decode(uint16_t maxWaitTimeMs) OVERRIDE {
|
||||
int32_t Decode(uint16_t maxWaitTimeMs) override {
|
||||
return receiver_->Decode(maxWaitTimeMs);
|
||||
}
|
||||
|
||||
virtual int32_t ResetDecoder() OVERRIDE { return receiver_->ResetDecoder(); }
|
||||
int32_t ResetDecoder() override { return receiver_->ResetDecoder(); }
|
||||
|
||||
virtual int32_t ReceiveCodec(VideoCodec* currentReceiveCodec) const OVERRIDE {
|
||||
int32_t ReceiveCodec(VideoCodec* currentReceiveCodec) const override {
|
||||
return receiver_->ReceiveCodec(currentReceiveCodec);
|
||||
}
|
||||
|
||||
virtual VideoCodecType ReceiveCodec() const OVERRIDE {
|
||||
VideoCodecType ReceiveCodec() const override {
|
||||
return receiver_->ReceiveCodec();
|
||||
}
|
||||
|
||||
virtual int32_t IncomingPacket(const uint8_t* incomingPayload,
|
||||
size_t payloadLength,
|
||||
const WebRtcRTPHeader& rtpInfo) OVERRIDE {
|
||||
int32_t IncomingPacket(const uint8_t* incomingPayload,
|
||||
size_t payloadLength,
|
||||
const WebRtcRTPHeader& rtpInfo) override {
|
||||
return receiver_->IncomingPacket(incomingPayload, payloadLength, rtpInfo);
|
||||
}
|
||||
|
||||
virtual int32_t SetMinimumPlayoutDelay(uint32_t minPlayoutDelayMs) OVERRIDE {
|
||||
int32_t SetMinimumPlayoutDelay(uint32_t minPlayoutDelayMs) override {
|
||||
return receiver_->SetMinimumPlayoutDelay(minPlayoutDelayMs);
|
||||
}
|
||||
|
||||
virtual int32_t SetRenderDelay(uint32_t timeMS) OVERRIDE {
|
||||
int32_t SetRenderDelay(uint32_t timeMS) override {
|
||||
return receiver_->SetRenderDelay(timeMS);
|
||||
}
|
||||
|
||||
virtual int32_t Delay() const OVERRIDE { return receiver_->Delay(); }
|
||||
int32_t Delay() const override { return receiver_->Delay(); }
|
||||
|
||||
virtual uint32_t DiscardedPackets() const OVERRIDE {
|
||||
uint32_t DiscardedPackets() const override {
|
||||
return receiver_->DiscardedPackets();
|
||||
}
|
||||
|
||||
virtual int SetReceiverRobustnessMode(ReceiverRobustness robustnessMode,
|
||||
VCMDecodeErrorMode errorMode) OVERRIDE {
|
||||
int SetReceiverRobustnessMode(ReceiverRobustness robustnessMode,
|
||||
VCMDecodeErrorMode errorMode) override {
|
||||
return receiver_->SetReceiverRobustnessMode(robustnessMode, errorMode);
|
||||
}
|
||||
|
||||
virtual void SetNackSettings(size_t max_nack_list_size,
|
||||
int max_packet_age_to_nack,
|
||||
int max_incomplete_time_ms) OVERRIDE {
|
||||
void SetNackSettings(size_t max_nack_list_size,
|
||||
int max_packet_age_to_nack,
|
||||
int max_incomplete_time_ms) override {
|
||||
return receiver_->SetNackSettings(
|
||||
max_nack_list_size, max_packet_age_to_nack, max_incomplete_time_ms);
|
||||
}
|
||||
|
||||
void SetDecodeErrorMode(VCMDecodeErrorMode decode_error_mode) OVERRIDE {
|
||||
void SetDecodeErrorMode(VCMDecodeErrorMode decode_error_mode) override {
|
||||
return receiver_->SetDecodeErrorMode(decode_error_mode);
|
||||
}
|
||||
|
||||
virtual int SetMinReceiverDelay(int desired_delay_ms) OVERRIDE {
|
||||
int SetMinReceiverDelay(int desired_delay_ms) override {
|
||||
return receiver_->SetMinReceiverDelay(desired_delay_ms);
|
||||
}
|
||||
|
||||
virtual int32_t SetReceiveChannelParameters(int64_t rtt) OVERRIDE {
|
||||
int32_t SetReceiveChannelParameters(int64_t rtt) override {
|
||||
return receiver_->SetReceiveChannelParameters(rtt);
|
||||
}
|
||||
|
||||
virtual void RegisterPreDecodeImageCallback(
|
||||
EncodedImageCallback* observer) OVERRIDE {
|
||||
void RegisterPreDecodeImageCallback(EncodedImageCallback* observer) override {
|
||||
receiver_->RegisterPreDecodeImageCallback(observer);
|
||||
}
|
||||
|
||||
virtual void RegisterPostEncodeImageCallback(
|
||||
EncodedImageCallback* observer) OVERRIDE {
|
||||
void RegisterPostEncodeImageCallback(
|
||||
EncodedImageCallback* observer) override {
|
||||
post_encode_callback_.Register(observer);
|
||||
}
|
||||
|
||||
|
||||
@ -70,7 +70,7 @@ MATCHER_P(MatchesVp8StreamInfo, expected, "") {
|
||||
|
||||
class EmptyFrameGenerator : public FrameGenerator {
|
||||
public:
|
||||
virtual I420VideoFrame* NextFrame() OVERRIDE {
|
||||
I420VideoFrame* NextFrame() override {
|
||||
frame_.reset(new I420VideoFrame());
|
||||
return frame_.get();
|
||||
}
|
||||
@ -86,10 +86,10 @@ class PacketizationCallback : public VCMPacketizationCallback {
|
||||
|
||||
virtual ~PacketizationCallback() {}
|
||||
|
||||
virtual int32_t SendData(uint8_t payload_type,
|
||||
const EncodedImage& encoded_image,
|
||||
const RTPFragmentationHeader& fragmentation_header,
|
||||
const RTPVideoHeader* rtp_video_header) OVERRIDE {
|
||||
int32_t SendData(uint8_t payload_type,
|
||||
const EncodedImage& encoded_image,
|
||||
const RTPFragmentationHeader& fragmentation_header,
|
||||
const RTPVideoHeader* rtp_video_header) override {
|
||||
assert(rtp_video_header);
|
||||
frame_data_.push_back(FrameData(encoded_image._length, *rtp_video_header));
|
||||
return 0;
|
||||
@ -171,7 +171,7 @@ class TestVideoSender : public ::testing::Test {
|
||||
// a special case (e.g. frame rate in media optimization).
|
||||
TestVideoSender() : clock_(1000), packetization_callback_(&clock_) {}
|
||||
|
||||
virtual void SetUp() OVERRIDE {
|
||||
void SetUp() override {
|
||||
sender_.reset(new VideoSender(&clock_, &post_encode_callback_, nullptr));
|
||||
EXPECT_EQ(0, sender_->InitializeSender());
|
||||
EXPECT_EQ(0, sender_->RegisterTransportCallback(&packetization_callback_));
|
||||
@ -197,7 +197,7 @@ class TestVideoSenderWithMockEncoder : public TestVideoSender {
|
||||
static const int kNumberOfLayers = 3;
|
||||
static const int kUnusedPayloadType = 10;
|
||||
|
||||
virtual void SetUp() OVERRIDE {
|
||||
void SetUp() override {
|
||||
TestVideoSender::SetUp();
|
||||
generator_.reset(new EmptyFrameGenerator());
|
||||
EXPECT_EQ(
|
||||
@ -220,7 +220,7 @@ class TestVideoSenderWithMockEncoder : public TestVideoSender {
|
||||
EXPECT_EQ(0, sender_->RegisterSendCodec(&settings_, 1, 1200));
|
||||
}
|
||||
|
||||
virtual void TearDown() OVERRIDE { sender_.reset(); }
|
||||
void TearDown() override { sender_.reset(); }
|
||||
|
||||
void ExpectIntraRequest(int stream) {
|
||||
if (stream == -1) {
|
||||
@ -313,7 +313,7 @@ class TestVideoSenderWithVp8 : public TestVideoSender {
|
||||
TestVideoSenderWithVp8()
|
||||
: codec_bitrate_kbps_(300), available_bitrate_kbps_(1000) {}
|
||||
|
||||
virtual void SetUp() OVERRIDE {
|
||||
void SetUp() override {
|
||||
TestVideoSender::SetUp();
|
||||
|
||||
const char* input_video = "foreman_cif";
|
||||
|
||||
Reference in New Issue
Block a user