diff options
author | Niels Möller <nisse@webrtc.org> | 2020-07-15 17:28:39 +0200 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-07-16 07:42:02 +0000 |
commit | e51d6ac5d2880f652e51a9352ca80afbdd99bf97 (patch) | |
tree | 8393e49219a834e6463d9df3369089db763269fe /modules/audio_coding | |
parent | e43648a36e7dd04c20d49b200078c5571a94ae72 (diff) | |
download | webrtc-e51d6ac5d2880f652e51a9352ca80afbdd99bf97.tar.gz |
Fix override declarations and delete related TODOs
Bug: webrtc:10198, chromium:428099
Change-Id: Ic7b0dd3c58c3daa5ade4d2c503b77a51b29c716e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179380
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31739}
Diffstat (limited to 'modules/audio_coding')
-rw-r--r-- | modules/audio_coding/neteq/neteq_network_stats_unittest.cc | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc index df34622722..a43e52def3 100644 --- a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc +++ b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc @@ -42,10 +42,6 @@ using ::testing::SetArgPointee; class MockAudioDecoder final : public AudioDecoder { public: - // TODO(nisse): Valid overrides commented out, because the gmock - // methods don't use any override declarations, and we want to avoid - // warnings from -Winconsistent-missing-override. See - // http://crbug.com/428099. static const int kPacketDuration = 960; // 48 kHz * 20 ms MockAudioDecoder(int sample_rate_hz, size_t num_channels) @@ -83,7 +79,7 @@ class MockAudioDecoder final : public AudioDecoder { }; std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload, - uint32_t timestamp) /* override */ { + uint32_t timestamp) override { std::vector<ParseResult> results; if (fec_enabled_) { std::unique_ptr<MockFrame> fec_frame(new MockFrame(num_channels_)); @@ -96,23 +92,22 @@ class MockAudioDecoder final : public AudioDecoder { return results; } - int PacketDuration(const uint8_t* encoded, size_t encoded_len) const - /* override */ { + int PacketDuration(const uint8_t* encoded, + size_t encoded_len) const override { ADD_FAILURE() << "Since going through ParsePayload, PacketDuration should " "never get called."; return kPacketDuration; } - bool PacketHasFec(const uint8_t* encoded, size_t encoded_len) const - /* override */ { + bool PacketHasFec(const uint8_t* encoded, size_t encoded_len) const override { ADD_FAILURE() << "Since going through ParsePayload, PacketHasFec should " "never get called."; return fec_enabled_; } - int SampleRateHz() const /* override */ { return sample_rate_hz_; } + int SampleRateHz() const override { return sample_rate_hz_; } - size_t Channels() const /* override */ { return num_channels_; } + size_t Channels() const override { return num_channels_; } void set_fec_enabled(bool enable_fec) { fec_enabled_ = enable_fec; } @@ -123,7 +118,7 @@ class MockAudioDecoder final : public AudioDecoder { size_t encoded_len, int sample_rate_hz, int16_t* decoded, - SpeechType* speech_type) /* override */ { + SpeechType* speech_type) override { ADD_FAILURE() << "Since going through ParsePayload, DecodeInternal should " "never get called."; return -1; |