| Index: webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
|
| diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
|
| index dc6bbf69c25929bc5dcf3682ec9d1661029f096e..503acdd65d9d7c8e7e1dd8a36c738d6be922ec09 100644
|
| --- a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
|
| +++ b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
|
| @@ -608,7 +608,7 @@
|
|
|
| ~AcmIsacMtTestOldApi() {}
|
|
|
| - void SetUp() override {
|
| + void SetUp() {
|
| AudioCodingModuleTestOldApi::SetUp();
|
| RegisterCodec(); // Must be called before the threads start below.
|
|
|
| @@ -642,7 +642,7 @@
|
| ASSERT_EQ(0, acm_->RegisterSendCodec(codec_));
|
| }
|
|
|
| - void InsertPacket() override {
|
| + void InsertPacket() {
|
| int num_calls = packet_cb_.num_calls(); // Store locally for thread safety.
|
| if (num_calls > last_packet_number_) {
|
| // Get the new payload out from the callback handler.
|
| @@ -661,7 +661,7 @@
|
| &last_payload_vec_[0], last_payload_vec_.size(), rtp_header_));
|
| }
|
|
|
| - void InsertAudio() override {
|
| + void InsertAudio() {
|
| // TODO(kwiberg): Use std::copy here. Might be complications because AFAICS
|
| // this call confuses the number of samples with the number of bytes, and
|
| // ends up copying only half of what it should.
|
| @@ -677,7 +677,7 @@
|
| // This method is the same as AudioCodingModuleMtTestOldApi::TestDone(), but
|
| // here it is using the constants defined in this class (i.e., shorter test
|
| // run).
|
| - bool TestDone() override {
|
| + virtual bool TestDone() {
|
| if (packet_cb_.num_calls() > kNumPackets) {
|
| rtc::CritScope lock(&crit_sect_);
|
| if (pull_audio_count_ > kNumPullCalls) {
|
| @@ -728,7 +728,7 @@
|
| clock_ = fake_clock_.get();
|
| }
|
|
|
| - void SetUp() override {
|
| + void SetUp() {
|
| AudioCodingModuleTestOldApi::SetUp();
|
| // Set up input audio source to read from specified file, loop after 5
|
| // seconds, and deliver blocks of 10 ms.
|
| @@ -757,7 +757,7 @@
|
| codec_registration_thread_.SetPriority(rtc::kRealtimePriority);
|
| }
|
|
|
| - void TearDown() override {
|
| + void TearDown() {
|
| AudioCodingModuleTestOldApi::TearDown();
|
| receive_thread_.Stop();
|
| codec_registration_thread_.Stop();
|
| @@ -1737,7 +1737,7 @@
|
| }
|
|
|
| // Inherited from test::AudioSink.
|
| - bool WriteArray(const int16_t* audio, size_t num_samples) override {
|
| + bool WriteArray(const int16_t* audio, size_t num_samples) {
|
| // Skip checking the first output frame, since it has a number of zeros
|
| // due to how NetEq is initialized.
|
| if (first_output_) {
|
|
|