diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn index dea07e6561..6088a667e2 100644 --- a/webrtc/voice_engine/BUILD.gn +++ b/webrtc/voice_engine/BUILD.gn @@ -385,8 +385,6 @@ if (rtc_include_tests) { "test/auto_test/standard/voe_base_misc_test.cc", "test/auto_test/standard/volume_test.cc", "test/auto_test/voe_conference_test.cc", - "test/auto_test/voe_cpu_test.cc", - "test/auto_test/voe_cpu_test.h", "test/auto_test/voe_standard_test.cc", "test/auto_test/voe_standard_test.h", "test/auto_test/voe_stress_test.cc", diff --git a/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc b/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc deleted file mode 100644 index 093209df40..0000000000 --- a/webrtc/voice_engine/test/auto_test/voe_cpu_test.cc +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2012 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. - */ - -#include "webrtc/voice_engine/test/auto_test/voe_cpu_test.h" - -#include -#include -#include -#if defined(_WIN32) -#include -#endif - -#include - -#include "webrtc/voice_engine/test/channel_transport/channel_transport.h" -#include "webrtc/voice_engine/test/auto_test/voe_test_defines.h" - -using namespace webrtc; -using namespace test; - -namespace voetest { - -#define CHECK(expr) \ - if (expr) \ - { \ - printf("Error at line: %i, %s \n", __LINE__, #expr); \ - printf("Error code: %i \n", base->LastError()); \ - PAUSE \ - return -1; \ - } - -VoECpuTest::VoECpuTest(VoETestManager& mgr) - : _mgr(mgr) { - -} - -int VoECpuTest::DoTest() { - printf("------------------------------------------------\n"); - printf(" CPU Reference Test\n"); - printf("------------------------------------------------\n"); - - VoEBase* base = _mgr.BasePtr(); - VoEFile* file = _mgr.FilePtr(); - VoECodec* codec = _mgr.CodecPtr(); - VoEAudioProcessing* apm = _mgr.APMPtr(); - VoENetwork* voe_network = _mgr.NetworkPtr(); - - int channel(-1); - CodecInst isac; - - isac.pltype = 104; - strcpy(isac.plname, "ISAC"); - isac.pacsize = 960; - isac.plfreq = 32000; - isac.channels = 1; - isac.rate = -1; - - CHECK(base->Init()); - channel = base->CreateChannel(); - - std::unique_ptr voice_socket_transport( - new VoiceChannelTransport(voe_network, channel)); - - CHECK(voice_socket_transport->SetSendDestination("127.0.0.1", 5566)); - CHECK(voice_socket_transport->SetLocalReceiver(5566)); - - CHECK(codec->SetRecPayloadType(channel, isac)); - CHECK(codec->SetSendCodec(channel, isac)); - - CHECK(base->StartPlayout(channel)); - CHECK(base->StartSend(channel)); - CHECK(file->StartPlayingFileAsMicrophone(channel, _mgr.AudioFilename(), - true, true)); - - CHECK(codec->SetVADStatus(channel, true)); - CHECK(apm->SetAgcStatus(true, kAgcAdaptiveAnalog)); - CHECK(apm->SetNsStatus(true, kNsModerateSuppression)); - CHECK(apm->SetEcStatus(true, kEcAec)); - - TEST_LOG("\nMeasure CPU and memory while running a full-duplex" - " iSAC-swb call.\n\n"); - - PAUSE - - CHECK(base->StopSend(channel)); - CHECK(base->StopPlayout(channel)); - - base->DeleteChannel(channel); - CHECK(base->Terminate()); - return 0; -} - -} // namespace voetest diff --git a/webrtc/voice_engine/test/auto_test/voe_cpu_test.h b/webrtc/voice_engine/test/auto_test/voe_cpu_test.h deleted file mode 100644 index 74ba3e9272..0000000000 --- a/webrtc/voice_engine/test/auto_test/voe_cpu_test.h +++ /dev/null @@ -1,31 +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 WEBRTC_VOICE_ENGINE_VOE_CPU_TEST_H -#define WEBRTC_VOICE_ENGINE_VOE_CPU_TEST_H - -#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h" - -namespace voetest { - -class VoETestManager; - -class VoECpuTest { - public: - VoECpuTest(VoETestManager& mgr); - ~VoECpuTest() {} - int DoTest(); - private: - VoETestManager& _mgr; -}; - -} // namespace voetest - -#endif // WEBRTC_VOICE_ENGINE_VOE_CPU_TEST_H diff --git a/webrtc/voice_engine/test/auto_test/voe_standard_test.cc b/webrtc/voice_engine/test/auto_test/voe_standard_test.cc index fdf453a90a..448764ef85 100644 --- a/webrtc/voice_engine/test/auto_test/voe_standard_test.cc +++ b/webrtc/voice_engine/test/auto_test/voe_standard_test.cc @@ -18,7 +18,6 @@ #include "webrtc/typedefs.h" #include "webrtc/voice_engine/include/voe_neteq_stats.h" #include "webrtc/voice_engine/test/auto_test/automated_mode.h" -#include "webrtc/voice_engine/test/auto_test/voe_cpu_test.h" #include "webrtc/voice_engine/test/auto_test/voe_stress_test.h" #include "webrtc/voice_engine/test/auto_test/voe_test_defines.h" #include "webrtc/voice_engine/voice_engine_defines.h" @@ -228,9 +227,6 @@ int run_auto_test(TestType test_type) { if (test_type == Stress) { VoEStressTest stressTest(test_manager); result = stressTest.DoTest(); - } else if (test_type == CPU) { - VoECpuTest cpuTest(test_manager); - result = cpuTest.DoTest(); } else { // Should never end up here assert(false); @@ -264,7 +260,6 @@ int RunInManualMode() { printf(" (2) [OBSOLETE: Extended test(s)...]\n"); printf(" (3) Stress test(s)...\n"); printf(" (4) [OBSOLETE: Unit test(s)...]\n"); - printf(" (5) CPU & memory reference test [Windows]...\n"); printf("\n: "); int selection(0); @@ -284,9 +279,6 @@ int RunInManualMode() { break; case 4: break; - case 5: - test_type = CPU; - break; default: TEST_LOG("Invalid selection!\n"); return 0; diff --git a/webrtc/voice_engine/test/auto_test/voe_test_interface.h b/webrtc/voice_engine/test/auto_test/voe_test_interface.h index aea55a49ff..b8c48638fd 100644 --- a/webrtc/voice_engine/test/auto_test/voe_test_interface.h +++ b/webrtc/voice_engine/test/auto_test/voe_test_interface.h @@ -26,9 +26,7 @@ enum TestType { Invalid = -1, Standard = 0, - Stress = 2, - - CPU = 4 + Stress = 2 }; // Main test function