Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(494)

Side by Side Diff: webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc

Issue 1921653002: Enable -Winconsistent-missing-override flag. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after
770 uint8_t payload[kPayloadLengthBytes]= {0}; 770 uint8_t payload[kPayloadLengthBytes]= {0};
771 int16_t dummy_output[kPayloadLengthSamples * kChannels] = {0}; 771 int16_t dummy_output[kPayloadLengthSamples * kChannels] = {0};
772 WebRtcRTPHeader rtp_header; 772 WebRtcRTPHeader rtp_header;
773 rtp_header.header.payloadType = kPayloadType; 773 rtp_header.header.payloadType = kPayloadType;
774 rtp_header.header.sequenceNumber = 0x1234; 774 rtp_header.header.sequenceNumber = 0x1234;
775 rtp_header.header.timestamp = 0x12345678; 775 rtp_header.header.timestamp = 0x12345678;
776 rtp_header.header.ssrc = 0x87654321; 776 rtp_header.header.ssrc = 0x87654321;
777 777
778 class MockAudioDecoder : public AudioDecoder { 778 class MockAudioDecoder : public AudioDecoder {
779 public: 779 public:
780 void Reset() override {} 780 // TODO(nisse): Valid overrides commented out, because the gmock
781 // methods don't use any override declarations, and we want to avoid
782 // warnings from -Winconsistent-missing-override. See
783 // http://crbug.com/428099.
784 void Reset() /* override */ {}
781 MOCK_CONST_METHOD2(PacketDuration, int(const uint8_t*, size_t)); 785 MOCK_CONST_METHOD2(PacketDuration, int(const uint8_t*, size_t));
782 MOCK_METHOD5(DecodeInternal, int(const uint8_t*, size_t, int, int16_t*, 786 MOCK_METHOD5(DecodeInternal, int(const uint8_t*, size_t, int, int16_t*,
783 SpeechType*)); 787 SpeechType*));
784 size_t Channels() const override { return kChannels; } 788 size_t Channels() const /* override */ { return kChannels; }
785 } decoder_; 789 } decoder_;
786 790
787 const uint8_t kFirstPayloadValue = 1; 791 const uint8_t kFirstPayloadValue = 1;
788 const uint8_t kSecondPayloadValue = 2; 792 const uint8_t kSecondPayloadValue = 2;
789 793
790 EXPECT_CALL(decoder_, PacketDuration(Pointee(kFirstPayloadValue), 794 EXPECT_CALL(decoder_, PacketDuration(Pointee(kFirstPayloadValue),
791 kPayloadLengthBytes)) 795 kPayloadLengthBytes))
792 .Times(AtLeast(1)) 796 .Times(AtLeast(1))
793 .WillRepeatedly(Return(kNetEqMaxFrameSize + 1)); 797 .WillRepeatedly(Return(kNetEqMaxFrameSize + 1));
794 798
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
1173 UseNoMocks(); 1177 UseNoMocks();
1174 CreateInstance(); 1178 CreateInstance();
1175 ASSERT_TRUE(tick_timer_); 1179 ASSERT_TRUE(tick_timer_);
1176 EXPECT_EQ(0u, tick_timer_->ticks()); 1180 EXPECT_EQ(0u, tick_timer_->ticks());
1177 AudioFrame output; 1181 AudioFrame output;
1178 EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(&output)); 1182 EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(&output));
1179 EXPECT_EQ(1u, tick_timer_->ticks()); 1183 EXPECT_EQ(1u, tick_timer_->ticks());
1180 } 1184 }
1181 1185
1182 }// namespace webrtc 1186 }// namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698