ACM test are modified to run with both ACM1 and ACM2.
Beside the changes in test files. acm2/acm_generic_codec.cc and acm2/audio_coding_module_impl.cc are modified to fix a bug.
Also, nack{.cc, .h, _unittest.cc} are removed form main/sourc as nack files in both ACM1 and ACM2 are essentially identical.
R=andrew@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2192005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4908 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/main/test/EncodeDecodeTest.h b/webrtc/modules/audio_coding/main/test/EncodeDecodeTest.h
index 548f172..5aa3596 100644
--- a/webrtc/modules/audio_coding/main/test/EncodeDecodeTest.h
+++ b/webrtc/modules/audio_coding/main/test/EncodeDecodeTest.h
@@ -13,16 +13,18 @@
#include <stdio.h>
-#include "ACMTest.h"
-#include "audio_coding_module.h"
-#include "RTPFile.h"
-#include "PCMFile.h"
-#include "typedefs.h"
+#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
+#include "webrtc/modules/audio_coding/main/test/ACMTest.h"
+#include "webrtc/modules/audio_coding/main/test/PCMFile.h"
+#include "webrtc/modules/audio_coding/main/test/RTPFile.h"
+#include "webrtc/typedefs.h"
namespace webrtc {
#define MAX_INCOMING_PAYLOAD 8096
+class Config;
+
// TestPacketization callback which writes the encoded payloads to file
class TestPacketization : public AudioPacketizationCallback {
public:
@@ -90,8 +92,8 @@
class EncodeDecodeTest : public ACMTest {
public:
- EncodeDecodeTest();
- EncodeDecodeTest(int testMode);
+ explicit EncodeDecodeTest(const Config& config);
+ EncodeDecodeTest(int testMode, const Config& config);
virtual void Perform();
uint16_t _playoutFreq;
@@ -100,6 +102,8 @@
private:
void EncodeToFile(int fileType, int codeId, int* codePars, int testMode);
+ const Config& config_;
+
protected:
Sender _sender;
Receiver _receiver;
@@ -107,4 +111,4 @@
} // namespace webrtc
-#endif
+#endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_ENCODEDECODETEST_H_