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

[clang-tidy] Apply modernize-use-override fixes.

Browse Source 
This CL applies clang-tidy's modernize-use-override [1] to the
WebRTC codebase.

All changes in this CL are automatically generated by both clang-tidy
and 'git cl format'.

[1] - https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-override.html

Bug: webrtc:10252
Change-Id: I2bb8bd90fa8adb90aa33861fe7c788132a819a20
Reviewed-on: https://webrtc-review.googlesource.com/c/120412
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26461}
This commit is contained in:
Mirko Bonadei
2019-01-29 22:53:28 +01:00
committed by Commit Bot
parent 6957abeff1
commit fe055c197a
13 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
audio/channel_send.cc
View File

@ -410,7 +410,7 @@ class VoERtcpObserver : public RtcpBandwidthObserver {
public:
explicit VoERtcpObserver(ChannelSend* owner)
: owner_(owner), bandwidth_observer_(nullptr) {}
virtual ~VoERtcpObserver() {}
~VoERtcpObserver() override {}
void SetBandwidthObserver(RtcpBandwidthObserver* bandwidth_observer) {
rtc::CritScope lock(&crit_);

2
modules/audio_device/audio_device_data_observer.cc
View File

@ -28,7 +28,7 @@ class ADMWrapper : public AudioDeviceModule, public AudioTransport {
auto res = impl_->RegisterAudioCallback(this);
is_valid_ = (impl_.get() != nullptr) && (res == 0);
}
virtual ~ADMWrapper() {
~ADMWrapper() override {
audio_transport_ = nullptr;
observer_ = nullptr;
}

22
modules/audio_device/include/test_audio_device.cc
View File

@ -79,7 +79,7 @@ class TestAudioDeviceModuleImpl
}
}
~TestAudioDeviceModuleImpl() {
~TestAudioDeviceModuleImpl() override {
StopPlayout();
StopRecording();
if (thread_) {
@ -91,7 +91,7 @@ class TestAudioDeviceModuleImpl
}
}
int32_t Init() {
int32_t Init() override {
thread_ = absl::make_unique<rtc::PlatformThread>(
TestAudioDeviceModuleImpl::Run, this, "TestAudioDeviceModuleImpl",
rtc::kHighPriority);
@ -99,58 +99,58 @@ class TestAudioDeviceModuleImpl
return 0;
}
int32_t RegisterAudioCallback(AudioTransport* callback) {
int32_t RegisterAudioCallback(AudioTransport* callback) override {
rtc::CritScope cs(&lock_);
RTC_DCHECK(callback || audio_callback_);
audio_callback_ = callback;
return 0;
}
int32_t StartPlayout() {
int32_t StartPlayout() override {
rtc::CritScope cs(&lock_);
RTC_CHECK(renderer_);
rendering_ = true;
return 0;
}
int32_t StopPlayout() {
int32_t StopPlayout() override {
rtc::CritScope cs(&lock_);
rendering_ = false;
return 0;
}
int32_t StartRecording() {
int32_t StartRecording() override {
rtc::CritScope cs(&lock_);
RTC_CHECK(capturer_);
capturing_ = true;
return 0;
}
int32_t StopRecording() {
int32_t StopRecording() override {
rtc::CritScope cs(&lock_);
capturing_ = false;
return 0;
}
bool Playing() const {
bool Playing() const override {
rtc::CritScope cs(&lock_);
return rendering_;
}
bool Recording() const {
bool Recording() const override {
rtc::CritScope cs(&lock_);
return capturing_;
}
// Blocks until the Renderer refuses to receive data.
// Returns false if |timeout_ms| passes before that happens.
bool WaitForPlayoutEnd(int timeout_ms = rtc::Event::kForever) {
bool WaitForPlayoutEnd(int timeout_ms = rtc::Event::kForever) override {
return done_rendering_.Wait(timeout_ms);
}
// Blocks until the Recorder stops producing data.
// Returns false if |timeout_ms| passes before that happens.
bool WaitForRecordingEnd(int timeout_ms = rtc::Event::kForever) {
bool WaitForRecordingEnd(int timeout_ms = rtc::Event::kForever) override {
return done_capturing_.Wait(timeout_ms);
}

2
modules/remote_bitrate_estimator/bwe_simulations.cc
View File

@ -36,7 +36,7 @@ class BweSimulation : public BweTest,
public:
BweSimulation()
: BweTest(), random_(Clock::GetRealTimeClock()->TimeInMicroseconds()) {}
virtual ~BweSimulation() {}
~BweSimulation() override {}
protected:
void SetUp() override {

8
modules/video_coding/utility/simulcast_test_fixture_impl.cc
View File

@ -70,14 +70,14 @@ class SimulcastTestFixtureImpl::TestEncodedImageCallback
memset(layer_sync_, false, sizeof(layer_sync_));
}
~TestEncodedImageCallback() {
~TestEncodedImageCallback() override {
delete[] encoded_key_frame_.data();
delete[] encoded_frame_.data();
}
virtual Result OnEncodedImage(const EncodedImage& encoded_image,
const CodecSpecificInfo* codec_specific_info,
const RTPFragmentationHeader* fragmentation) {
Result OnEncodedImage(const EncodedImage& encoded_image,
const CodecSpecificInfo* codec_specific_info,
const RTPFragmentationHeader* fragmentation) override {
bool is_vp8 = (codec_specific_info->codecType == kVideoCodecVP8);
// Only store the base layer.
if (encoded_image.SpatialIndex().value_or(0) == 0) {

2
modules/video_coding/video_coding_impl.cc
View File

@ -50,7 +50,7 @@ class VideoCodingModuleImpl : public VideoCodingModule {
timing_(new VCMTiming(clock)),
receiver_(clock, timing_.get(), nack_sender, keyframe_request_sender) {}
virtual ~VideoCodingModuleImpl() {}
~VideoCodingModuleImpl() override {}
int64_t TimeUntilNextProcess() override {
int64_t receiver_time = receiver_.TimeUntilNextProcess();

10
sdk/objc/native/src/objc_video_decoder_factory.mm
View File

@ -37,7 +37,7 @@ class ObjCVideoDecoder : public VideoDecoder {
ObjCVideoDecoder(id<RTCVideoDecoder> decoder)
: decoder_(decoder), implementation_name_([decoder implementationName].stdString) {}
int32_t InitDecode(const VideoCodec *codec_settings, int32_t number_of_cores) {
int32_t InitDecode(const VideoCodec *codec_settings, int32_t number_of_cores) override {
if ([decoder_ respondsToSelector:@selector(startDecodeWithNumberOfCores:)]) {
return [decoder_ startDecodeWithNumberOfCores:number_of_cores];
} else {
@ -52,7 +52,7 @@ class ObjCVideoDecoder : public VideoDecoder {
int32_t Decode(const EncodedImage &input_image,
bool missing_frames,
const CodecSpecificInfo *codec_specific_info = NULL,
int64_t render_time_ms = -1) {
int64_t render_time_ms = -1) override {
RTCEncodedImage *encodedImage =
[[RTCEncodedImage alloc] initWithNativeEncodedImage:input_image];
@ -73,7 +73,7 @@ class ObjCVideoDecoder : public VideoDecoder {
renderTimeMs:render_time_ms];
}
int32_t RegisterDecodeCompleteCallback(DecodedImageCallback *callback) {
int32_t RegisterDecodeCompleteCallback(DecodedImageCallback *callback) override {
[decoder_ setCallback:^(RTCVideoFrame *frame) {
const rtc::scoped_refptr<VideoFrameBuffer> buffer =
new rtc::RefCountedObject<ObjCFrameBuffer>(frame.buffer);
@ -92,9 +92,9 @@ class ObjCVideoDecoder : public VideoDecoder {
return WEBRTC_VIDEO_CODEC_OK;
}
int32_t Release() { return [decoder_ releaseDecoder]; }
int32_t Release() override { return [decoder_ releaseDecoder]; }
const char *ImplementationName() const { return implementation_name_.c_str(); }
const char *ImplementationName() const override { return implementation_name_.c_str(); }
private:
id<RTCVideoDecoder> decoder_;

12
sdk/objc/native/src/objc_video_encoder_factory.mm
View File

@ -43,13 +43,13 @@ class ObjCVideoEncoder : public VideoEncoder {
int32_t InitEncode(const VideoCodec *codec_settings,
int32_t number_of_cores,
size_t max_payload_size) {
size_t max_payload_size) override {
RTCVideoEncoderSettings *settings =
[[RTCVideoEncoderSettings alloc] initWithNativeVideoCodec:codec_settings];
return [encoder_ startEncodeWithSettings:settings numberOfCores:number_of_cores];
}
int32_t RegisterEncodeCompleteCallback(EncodedImageCallback *callback) {
int32_t RegisterEncodeCompleteCallback(EncodedImageCallback *callback) override {
[encoder_ setCallback:^BOOL(RTCEncodedImage *_Nonnull frame,
id<RTCCodecSpecificInfo> _Nonnull info,
RTCRtpFragmentationHeader *_Nonnull header) {
@ -71,11 +71,11 @@ class ObjCVideoEncoder : public VideoEncoder {
return WEBRTC_VIDEO_CODEC_OK;
}
int32_t Release() { return [encoder_ releaseEncoder]; }
int32_t Release() override { return [encoder_ releaseEncoder]; }
int32_t Encode(const VideoFrame &frame,
const CodecSpecificInfo *codec_specific_info,
const std::vector<FrameType> *frame_types) {
const std::vector<FrameType> *frame_types) override {
NSMutableArray<NSNumber *> *rtcFrameTypes = [NSMutableArray array];
for (size_t i = 0; i < frame_types->size(); ++i) {
[rtcFrameTypes addObject:@(RTCFrameType(frame_types->at(i)))];
@ -86,11 +86,11 @@ class ObjCVideoEncoder : public VideoEncoder {
frameTypes:rtcFrameTypes];
}
int32_t SetRates(uint32_t bitrate, uint32_t framerate) {
int32_t SetRates(uint32_t bitrate, uint32_t framerate) override {
return [encoder_ setBitrate:bitrate framerate:framerate];
}
VideoEncoder::EncoderInfo GetEncoderInfo() const {
VideoEncoder::EncoderInfo GetEncoderInfo() const override {
EncoderInfo info;
info.supports_native_handle = true;
info.implementation_name = implementation_name_;

4
test/frame_generator.cc
View File

@ -197,7 +197,7 @@ class YuvFileGenerator : public FrameGenerator {
RTC_DCHECK_GT(frame_repeat_count, 0);
}
virtual ~YuvFileGenerator() {
~YuvFileGenerator() override {
for (FILE* file : files_)
fclose(file);
}
@ -359,7 +359,7 @@ class ScrollingImageFrameGenerator : public FrameGenerator {
RTC_DCHECK_GT(scroll_time_ms + pause_time_ms, 0);
}
virtual ~ScrollingImageFrameGenerator() {}
~ScrollingImageFrameGenerator() override {}
VideoFrame* NextFrame() override {
const int64_t kFrameDisplayTime = scroll_time_ + pause_time_;

12
test/rtp_file_reader.cc
View File

@ -69,15 +69,15 @@ class RtpFileReaderImpl : public RtpFileReader {
class InterleavedRtpFileReader : public RtpFileReaderImpl {
public:
virtual ~InterleavedRtpFileReader() {
~InterleavedRtpFileReader() override {
if (file_ != NULL) {
fclose(file_);
file_ = NULL;
}
}
virtual bool Init(const std::string& filename,
const std::set<uint32_t>& ssrc_filter) {
bool Init(const std::string& filename,
const std::set<uint32_t>& ssrc_filter) override {
file_ = fopen(filename.c_str(), "rb");
if (file_ == NULL) {
printf("ERROR: Can't open file: %s\n", filename.c_str());
@ -85,7 +85,7 @@ class InterleavedRtpFileReader : public RtpFileReaderImpl {
}
return true;
}
virtual bool NextPacket(RtpPacket* packet) {
bool NextPacket(RtpPacket* packet) override {
assert(file_ != NULL);
packet->length = RtpPacket::kMaxPacketBufferSize;
uint32_t len = 0;
@ -116,7 +116,7 @@ class InterleavedRtpFileReader : public RtpFileReaderImpl {
class RtpDumpReader : public RtpFileReaderImpl {
public:
RtpDumpReader() : file_(NULL) {}
virtual ~RtpDumpReader() {
~RtpDumpReader() override {
if (file_ != NULL) {
fclose(file_);
file_ = NULL;
@ -255,7 +255,7 @@ class PcapReader : public RtpFileReaderImpl {
next_packet_it_() {
}
virtual ~PcapReader() {
~PcapReader() override {
if (file_ != NULL) {
fclose(file_);
file_ = NULL;

2
test/rtp_file_writer.cc
View File

@ -31,7 +31,7 @@ class RtpDumpWriter : public RtpFileWriter {
RTC_CHECK(file_ != NULL);
Init();
}
virtual ~RtpDumpWriter() {
~RtpDumpWriter() override {
if (file_ != NULL) {
fclose(file_);
file_ = NULL;

4
video/overuse_frame_detector.cc
View File

@ -83,7 +83,7 @@ class SendProcessingUsage1 : public OveruseFrameDetector::ProcessingUsage {
filtered_frame_diff_ms_(new rtc::ExpFilter(kWeightFactorFrameDiff)) {
Reset();
}
virtual ~SendProcessingUsage1() {}
~SendProcessingUsage1() override {}
void Reset() override {
frame_timing_.clear();
@ -226,7 +226,7 @@ class SendProcessingUsage2 : public OveruseFrameDetector::ProcessingUsage {
: options_(options) {
Reset();
}
virtual ~SendProcessingUsage2() = default;
~SendProcessingUsage2() override = default;
void Reset() override {
prev_time_us_ = -1;

4
video/video_replay.cc
View File

@ -186,7 +186,7 @@ class FileRenderPassthrough : public rtc::VideoSinkInterface<VideoFrame> {
rtc::VideoSinkInterface<VideoFrame>* renderer)
: basename_(basename), renderer_(renderer), file_(nullptr), count_(0) {}
~FileRenderPassthrough() {
~FileRenderPassthrough() override {
if (file_)
fclose(file_);
}
@ -219,7 +219,7 @@ class DecoderBitstreamFileWriter : public test::FakeDecoder {
: file_(fopen(filename, "wb")) {
RTC_DCHECK(file_);
}
~DecoderBitstreamFileWriter() { fclose(file_); }
~DecoderBitstreamFileWriter() override { fclose(file_); }
int32_t Decode(const EncodedImage& encoded_frame,
bool /* missing_frames */,