Remove the useless ACMTest base class
Bug: webrtc:8396
Change-Id: I021a2429910b21ffe4829e0ed51b9290bc715c0c
Reviewed-on: https://webrtc-review.googlesource.com/102884
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24907}diff --git a/modules/audio_coding/test/ACMTest.h b/modules/audio_coding/test/ACMTest.h
deleted file mode 100644
index 3fc97ca..0000000
--- a/modules/audio_coding/test/ACMTest.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_CODING_TEST_ACMTEST_H_
-#define MODULES_AUDIO_CODING_TEST_ACMTEST_H_
-
-class ACMTest {
- public:
- ACMTest() {}
- virtual ~ACMTest() {}
- virtual void Perform() = 0;
-};
-
-#endif // MODULES_AUDIO_CODING_TEST_ACMTEST_H_
diff --git a/modules/audio_coding/test/EncodeDecodeTest.h b/modules/audio_coding/test/EncodeDecodeTest.h
index 7a21cb5..9132d71 100644
--- a/modules/audio_coding/test/EncodeDecodeTest.h
+++ b/modules/audio_coding/test/EncodeDecodeTest.h
@@ -15,7 +15,6 @@
#include <string.h>
#include "modules/audio_coding/include/audio_coding_module.h"
-#include "modules/audio_coding/test/ACMTest.h"
#include "modules/audio_coding/test/PCMFile.h"
#include "modules/audio_coding/test/RTPFile.h"
#include "modules/include/module_common_types.h"
@@ -95,10 +94,10 @@
uint32_t _nextTime;
};
-class EncodeDecodeTest : public ACMTest {
+class EncodeDecodeTest {
public:
explicit EncodeDecodeTest(int test_mode);
- void Perform() override;
+ void Perform();
uint16_t _playoutFreq;
diff --git a/modules/audio_coding/test/PacketLossTest.h b/modules/audio_coding/test/PacketLossTest.h
index f6f92db..6018301 100644
--- a/modules/audio_coding/test/PacketLossTest.h
+++ b/modules/audio_coding/test/PacketLossTest.h
@@ -53,7 +53,7 @@
int expected_loss_rate_;
};
-class PacketLossTest : public ACMTest {
+class PacketLossTest {
public:
PacketLossTest(int channels,
int expected_loss_rate_,
diff --git a/modules/audio_coding/test/TestAllCodecs.h b/modules/audio_coding/test/TestAllCodecs.h
index 03539ff..669a118 100644
--- a/modules/audio_coding/test/TestAllCodecs.h
+++ b/modules/audio_coding/test/TestAllCodecs.h
@@ -13,7 +13,6 @@
#include <memory>
-#include "modules/audio_coding/test/ACMTest.h"
#include "modules/audio_coding/test/Channel.h"
#include "modules/audio_coding/test/PCMFile.h"
@@ -47,12 +46,12 @@
size_t payload_size_;
};
-class TestAllCodecs : public ACMTest {
+class TestAllCodecs {
public:
explicit TestAllCodecs(int test_mode);
~TestAllCodecs();
- void Perform() override;
+ void Perform();
private:
// The default value of '-1' indicates that the registration is based only on
diff --git a/modules/audio_coding/test/TestRedFec.h b/modules/audio_coding/test/TestRedFec.h
index 1d9dead..3b3fd17 100644
--- a/modules/audio_coding/test/TestRedFec.h
+++ b/modules/audio_coding/test/TestRedFec.h
@@ -14,13 +14,12 @@
#include <memory>
#include <string>
-#include "modules/audio_coding/test/ACMTest.h"
#include "modules/audio_coding/test/Channel.h"
#include "modules/audio_coding/test/PCMFile.h"
namespace webrtc {
-class TestRedFec : public ACMTest {
+class TestRedFec {
public:
explicit TestRedFec();
~TestRedFec();
diff --git a/modules/audio_coding/test/TestStereo.h b/modules/audio_coding/test/TestStereo.h
index d449d6d..0d80631 100644
--- a/modules/audio_coding/test/TestStereo.h
+++ b/modules/audio_coding/test/TestStereo.h
@@ -15,7 +15,6 @@
#include <memory>
-#include "modules/audio_coding/test/ACMTest.h"
#include "modules/audio_coding/test/Channel.h"
#include "modules/audio_coding/test/PCMFile.h"
@@ -57,12 +56,12 @@
bool lost_packet_;
};
-class TestStereo : public ACMTest {
+class TestStereo {
public:
explicit TestStereo(int test_mode);
~TestStereo();
- void Perform() override;
+ void Perform();
private:
// The default value of '-1' indicates that the registration is based only on
diff --git a/modules/audio_coding/test/TestVADDTX.h b/modules/audio_coding/test/TestVADDTX.h
index e3840f7..26a695c 100644
--- a/modules/audio_coding/test/TestVADDTX.h
+++ b/modules/audio_coding/test/TestVADDTX.h
@@ -16,7 +16,6 @@
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/include/audio_coding_module.h"
#include "modules/audio_coding/include/audio_coding_module_typedefs.h"
-#include "modules/audio_coding/test/ACMTest.h"
#include "modules/audio_coding/test/Channel.h"
namespace webrtc {
@@ -42,14 +41,12 @@
// an audio file and check if the occurrence of various packet types follows
// expectation. TestVadDtx needs its derived class to implement the Perform()
// to put the test together.
-class TestVadDtx : public ACMTest {
+class TestVadDtx {
public:
static const int kOutputFreqHz = 16000;
TestVadDtx();
- virtual void Perform() = 0;
-
protected:
void RegisterCodec(CodecInst codec_param);
@@ -84,7 +81,7 @@
public:
TestWebRtcVadDtx();
- void Perform() override;
+ void Perform();
private:
void RunTestCases();
@@ -99,7 +96,7 @@
// TestOpusDtx is to verify that the Opus DTX performs as it should.
class TestOpusDtx final : public TestVadDtx {
public:
- void Perform() override;
+ void Perform();
};
} // namespace webrtc
diff --git a/modules/audio_coding/test/TwoWayCommunication.h b/modules/audio_coding/test/TwoWayCommunication.h
index c034e90..a679732 100644
--- a/modules/audio_coding/test/TwoWayCommunication.h
+++ b/modules/audio_coding/test/TwoWayCommunication.h
@@ -16,14 +16,13 @@
#include "api/audio_codecs/audio_encoder_factory.h"
#include "api/audio_codecs/audio_format.h"
#include "modules/audio_coding/include/audio_coding_module.h"
-#include "modules/audio_coding/test/ACMTest.h"
#include "modules/audio_coding/test/Channel.h"
#include "modules/audio_coding/test/PCMFile.h"
#include "modules/audio_coding/test/utility.h"
namespace webrtc {
-class TwoWayCommunication : public ACMTest {
+class TwoWayCommunication {
public:
TwoWayCommunication();
~TwoWayCommunication();
diff --git a/modules/audio_coding/test/iSACTest.h b/modules/audio_coding/test/iSACTest.h
index 22c85b4..0b140b6 100644
--- a/modules/audio_coding/test/iSACTest.h
+++ b/modules/audio_coding/test/iSACTest.h
@@ -17,7 +17,6 @@
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/include/audio_coding_module.h"
-#include "modules/audio_coding/test/ACMTest.h"
#include "modules/audio_coding/test/Channel.h"
#include "modules/audio_coding/test/PCMFile.h"
#include "modules/audio_coding/test/utility.h"
@@ -36,7 +35,7 @@
bool enforceFrameSize;
};
-class ISACTest : public ACMTest {
+class ISACTest {
public:
explicit ISACTest(int testMode);
~ISACTest();
diff --git a/modules/audio_coding/test/opus_test.h b/modules/audio_coding/test/opus_test.h
index 1356f27..019e96b 100644
--- a/modules/audio_coding/test/opus_test.h
+++ b/modules/audio_coding/test/opus_test.h
@@ -17,14 +17,13 @@
#include "modules/audio_coding/acm2/acm_resampler.h"
#include "modules/audio_coding/codecs/opus/opus_interface.h"
-#include "modules/audio_coding/test/ACMTest.h"
#include "modules/audio_coding/test/Channel.h"
#include "modules/audio_coding/test/PCMFile.h"
#include "modules/audio_coding/test/TestStereo.h"
namespace webrtc {
-class OpusTest : public ACMTest {
+class OpusTest {
public:
OpusTest();
~OpusTest();