#include <vector>
#include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/common.h"
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
#include "webrtc/modules/audio_coding/main/test/APITest.h"
#include "webrtc/modules/audio_coding/main/test/EncodeDecodeTest.h"
#include "webrtc/modules/audio_coding/main/test/TestStereo.h"
#include "webrtc/modules/audio_coding/main/test/TestVADDTX.h"
#include "webrtc/modules/audio_coding/main/test/TwoWayCommunication.h"
-#include "webrtc/modules/audio_coding/main/test/utility.h"
#include "webrtc/system_wrappers/interface/trace.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/gtest_disable.h"
Trace::CreateTrace();
Trace::SetTraceFile((webrtc::test::OutputPath() +
"acm_allcodecs_trace.txt").c_str());
- webrtc::Config config;
-
- UseLegacyAcm(&config);
- webrtc::TestAllCodecs(ACM_TEST_MODE, config).Perform();
- Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, TestAllCodecsNewACM) {
- Trace::CreateTrace();
- Trace::SetTraceFile((webrtc::test::OutputPath() +
- "acm_allcodecs_trace_new.txt").c_str());
- webrtc::Config config;
-
- UseNewAcm(&config);
- webrtc::TestAllCodecs(ACM_TEST_MODE, config).Perform();
+ webrtc::TestAllCodecs(ACM_TEST_MODE).Perform();
Trace::ReturnTrace();
}
Trace::CreateTrace();
Trace::SetTraceFile((webrtc::test::OutputPath() +
"acm_encodedecode_trace.txt").c_str());
- webrtc::Config config;
-
- UseLegacyAcm(&config);
- webrtc::EncodeDecodeTest(ACM_TEST_MODE, config).Perform();
- Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestEncodeDecodeNewACM)) {
- Trace::CreateTrace();
- Trace::SetTraceFile((webrtc::test::OutputPath() +
- "acm_encodedecode_trace_new.txt").c_str());
- webrtc::Config config;
-
- UseNewAcm(&config);
- webrtc::EncodeDecodeTest(ACM_TEST_MODE, config).Perform();
+ webrtc::EncodeDecodeTest(ACM_TEST_MODE).Perform();
Trace::ReturnTrace();
}
Trace::CreateTrace();
Trace::SetTraceFile((webrtc::test::OutputPath() +
"acm_fec_trace.txt").c_str());
- webrtc::Config config;
-
- UseLegacyAcm(&config);
- webrtc::TestFEC(config).Perform();
- Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestFECNewACM)) {
- Trace::CreateTrace();
- Trace::SetTraceFile((webrtc::test::OutputPath() +
- "acm_fec_trace_new.txt").c_str());
- webrtc::Config config;
-
- UseNewAcm(&config);
- webrtc::TestFEC(config).Perform();
+ webrtc::TestFEC().Perform();
Trace::ReturnTrace();
}
Trace::CreateTrace();
Trace::SetTraceFile((webrtc::test::OutputPath() +
"acm_isac_trace.txt").c_str());
- webrtc::Config config;
-
- UseLegacyAcm(&config);
- webrtc::ISACTest(ACM_TEST_MODE, config).Perform();
- Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestIsacNewACM)) {
- Trace::CreateTrace();
- Trace::SetTraceFile((webrtc::test::OutputPath() +
- "acm_isac_trace_new.txt").c_str());
- webrtc::Config config;
-
- UseNewAcm(&config);
- webrtc::ISACTest(ACM_TEST_MODE, config).Perform();
+ webrtc::ISACTest(ACM_TEST_MODE).Perform();
Trace::ReturnTrace();
}
Trace::CreateTrace();
Trace::SetTraceFile((webrtc::test::OutputPath() +
"acm_twowaycom_trace.txt").c_str());
- webrtc::Config config;
-
- UseLegacyAcm(&config);
- webrtc::TwoWayCommunication(ACM_TEST_MODE, config).Perform();
- Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TwoWayCommunicationNewACM)) {
- Trace::CreateTrace();
- Trace::SetTraceFile((webrtc::test::OutputPath() +
- "acm_twowaycom_trace_new.txt").c_str());
- webrtc::Config config;
-
- UseNewAcm(&config);
- webrtc::TwoWayCommunication(ACM_TEST_MODE, config).Perform();
+ webrtc::TwoWayCommunication(ACM_TEST_MODE).Perform();
Trace::ReturnTrace();
}
Trace::CreateTrace();
Trace::SetTraceFile((webrtc::test::OutputPath() +
"acm_stereo_trace.txt").c_str());
- webrtc::Config config;
-
- UseLegacyAcm(&config);
- webrtc::TestStereo(ACM_TEST_MODE, config).Perform();
- Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestStereoNewACM)) {
- Trace::CreateTrace();
- Trace::SetTraceFile((webrtc::test::OutputPath() +
- "acm_stereo_trace_new.txt").c_str());
- webrtc::Config config;
-
- UseNewAcm(&config);
- webrtc::TestStereo(ACM_TEST_MODE, config).Perform();
+ webrtc::TestStereo(ACM_TEST_MODE).Perform();
Trace::ReturnTrace();
}
Trace::CreateTrace();
Trace::SetTraceFile((webrtc::test::OutputPath() +
"acm_vaddtx_trace.txt").c_str());
- webrtc::Config config;
-
- UseLegacyAcm(&config);
- webrtc::TestVADDTX(config).Perform();
- Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestVADDTXNewACM)) {
- Trace::CreateTrace();
- Trace::SetTraceFile((webrtc::test::OutputPath() +
- "acm_vaddtx_trace_new.txt").c_str());
- webrtc::Config config;
-
- UseNewAcm(&config);
- webrtc::TestVADDTX(config).Perform();
+ webrtc::TestVADDTX().Perform();
Trace::ReturnTrace();
}
Trace::CreateTrace();
Trace::SetTraceFile((webrtc::test::OutputPath() +
"acm_opus_trace.txt").c_str());
- webrtc::Config config;
-
- UseLegacyAcm(&config);
- webrtc::OpusTest(config).Perform();
- Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestOpusNewACM)) {
- Trace::CreateTrace();
- Trace::SetTraceFile((webrtc::test::OutputPath() +
- "acm_opus_trace_new.txt").c_str());
- webrtc::Config config;
-
- UseNewAcm(&config);
- webrtc::OpusTest(config).Perform();
+ webrtc::OpusTest().Perform();
Trace::ReturnTrace();
}
Trace::CreateTrace();
Trace::SetTraceFile((webrtc::test::OutputPath() +
"acm_apitest_trace.txt").c_str());
- webrtc::Config config;
-
- UseLegacyAcm(&config);
- webrtc::APITest(config).Perform();
-
- UseNewAcm(&config);
- webrtc::APITest(config).Perform();
-
+ webrtc::APITest().Perform();
Trace::ReturnTrace();
}
#endif