diff --git a/src/modules/audio_device/main/test/audio_short16.pcm b/src/modules/audio_device/main/test/audio_short16.pcm deleted file mode 100644 index 15a0f1811c..0000000000 Binary files a/src/modules/audio_device/main/test/audio_short16.pcm and /dev/null differ diff --git a/src/modules/audio_device/main/test/audio_short44.pcm b/src/modules/audio_device/main/test/audio_short44.pcm deleted file mode 100644 index 011cdce959..0000000000 Binary files a/src/modules/audio_device/main/test/audio_short44.pcm and /dev/null differ diff --git a/src/modules/audio_device/main/test/audio_short48.pcm b/src/modules/audio_device/main/test/audio_short48.pcm deleted file mode 100644 index 06fd8261cd..0000000000 Binary files a/src/modules/audio_device/main/test/audio_short48.pcm and /dev/null differ diff --git a/src/modules/audio_device/main/test/audio_short8.pcm b/src/modules/audio_device/main/test/audio_short8.pcm deleted file mode 100644 index 43afd5a182..0000000000 Binary files a/src/modules/audio_device/main/test/audio_short8.pcm and /dev/null differ diff --git a/src/modules/audio_device/main/test/recordedRaw_48.pcm b/src/modules/audio_device/main/test/recordedRaw_48.pcm deleted file mode 100644 index 32fd79e6c1..0000000000 Binary files a/src/modules/audio_device/main/test/recordedRaw_48.pcm and /dev/null differ diff --git a/src/voice_engine.gyp b/src/voice_engine.gyp index 96a0527eea..7962ede126 100644 --- a/src/voice_engine.gyp +++ b/src/voice_engine.gyp @@ -37,45 +37,11 @@ 'voice_engine/main/test/auto_test/voe_unit_test.h', ], 'conditions': [ - ['OS=="linux" or OS=="mac"', { - 'actions': [ - { - 'action_name': 'copy audio file', - 'inputs': [ - 'test/data/voice_engine/audio_long16.pcm', - ], - 'outputs': [ - '/tmp/audio_long16.pcm', - ], - 'action': [ - '/bin/sh', '-c', - 'cp -f test/data/voice_engine/audio_* /tmp/;'\ - ], - }, - ], - }], ['OS=="win"', { 'dependencies': [ 'voice_engine.gyp:voe_ui_win_test', ], }], - ['OS=="win"', { - 'actions': [ - { - 'action_name': 'copy audio file', - 'inputs': [ - 'test/data/voice_engine/audio_long16.pcm', - ], - 'outputs': [ - '/tmp/audio_long16.pcm', - ], - 'action': [ - 'cmd', '/c', - 'xcopy /Y /R .\\test\\data\\voice_engine\\audio_* \\tmp', - ], - }, - ], - }], ], }, { @@ -117,21 +83,6 @@ 'voice_engine/main/test/win_test/stdafx.cpp', 'voice_engine/main/test/win_test/stdafx.h', ], - 'actions': [ - { - 'action_name': 'copy audio file', - 'inputs': [ - 'test/data/voice_engine/audio_tiny11.wav', - ], - 'outputs': [ - '/tmp/audio_tiny11.wav', - ], - 'action': [ - 'cmd', '/c', - 'xcopy /Y /R .\\test\\data\\voice_engine\\audio_* \\tmp', - ], - }, - ], 'configurations': { 'Common_Base': { 'msvs_configuration_attributes': { diff --git a/src/voice_engine/main/test/auto_test/voe_standard_test.cc b/src/voice_engine/main/test/auto_test/voe_standard_test.cc index 4acb0f9f16..13953671ab 100644 --- a/src/voice_engine/main/test/auto_test/voe_standard_test.cc +++ b/src/voice_engine/main/test/auto_test/voe_standard_test.cc @@ -143,9 +143,13 @@ char micFile[256] = {0}; // Filename copied to buffer in code const char* micFile = "audio_long16bigendian.pcm"; #elif defined(ANDROID) const char* micFile = "/sdcard/audio_long16.pcm"; +#elif defined(_WIN32) +// File path is relative to the location of 'voice_engine.gyp'. +const char* micFile = "../test/data/voice_engine/audio_long16.pcm"; +#elif defined(WEBRTC_LINUX) +const char* micFile = "./test/data/voice_engine/audio_long16.pcm"; +#elif (defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_MAC)) #else -const char* micFile = - "/tmp/audio_long16.pcm"; #endif #if !defined(MAC_IPHONE) diff --git a/src/voice_engine/main/test/win_test/WinTestDlg.cpp b/src/voice_engine/main/test/win_test/WinTestDlg.cpp index 4e1b91e9fa..ec8c4015eb 100644 --- a/src/voice_engine/main/test/win_test/WinTestDlg.cpp +++ b/src/voice_engine/main/test/win_test/WinTestDlg.cpp @@ -2306,7 +2306,8 @@ void CWinTestDlg::OnBnClickedCheckExtTrans2() void CWinTestDlg::OnBnClickedCheckPlayFileIn1() { - const char micFile[] = "/tmp/audio_short16.pcm"; + // File path is relative to the location of 'voice_engine.gyp'. + const char micFile[] = "../test/data/voice_engine/audio_short16.pcm"; int ret(0); int channel = GetDlgItemInt(IDC_EDIT_1); @@ -2340,7 +2341,8 @@ void CWinTestDlg::OnBnClickedCheckPlayFileIn1() void CWinTestDlg::OnBnClickedCheckPlayFileIn2() { - const char micFile[] = "/tmp/audio_long16.pcm"; + // File path is relative to the location of 'voice_engine.gyp'. + const char micFile[] = "../test/data/voice_engine/audio_long16.pcm"; int ret(0); int channel = GetDlgItemInt(IDC_EDIT_2); @@ -2381,14 +2383,15 @@ void CWinTestDlg::OnBnClickedCheckPlayFileOut1() {kFileFormatWavFile}, {kFileFormatWavFile}, {kFileFormatWavFile}}; - const char spkrFiles[8][32] = {{"/tmp/audio_short16.pcm"}, - {"/tmp/audio_tiny8.wav"}, - {"/tmp/audio_tiny11.wav"}, - {"/tmp/audio_tiny16.wav"}, - {"/tmp/audio_tiny22.wav"}, - {"/tmp/audio_tiny32.wav"}, - {"/tmp/audio_tiny44.wav"}, - {"/tmp/audio_tiny48.wav"}}; + // File path is relative to the location of 'voice_engine.gyp'. + const char spkrFiles[8][64] = {{"../test/data/voice_engine/audio_short16.pcm"}, + {"../test/data/voice_engine/audio_tiny8.wav"}, + {"../test/data/voice_engine/audio_tiny11.wav"}, + {"../test/data/voice_engine/audio_tiny16.wav"}, + {"../test/data/voice_engine/audio_tiny22.wav"}, + {"../test/data/voice_engine/audio_tiny32.wav"}, + {"../test/data/voice_engine/audio_tiny44.wav"}, + {"../test/data/voice_engine/audio_tiny48.wav"}}; int ret(0); int channel = GetDlgItemInt(IDC_EDIT_1); CButton* button = (CButton*)GetDlgItem(IDC_CHECK_PLAY_FILE_OUT_1); @@ -2432,7 +2435,8 @@ void CWinTestDlg::OnBnClickedCheckPlayFileOut1() void CWinTestDlg::OnBnClickedCheckPlayFileOut2() { - const char spkrFile[] = "/tmp/audio_long16.pcm"; + // File path is relative to the location of 'voice_engine.gyp'. + const char spkrFile[] = "../test/data/voice_engine/audio_long16.pcm"; int ret(0); int channel = GetDlgItemInt(IDC_EDIT_2); @@ -3097,8 +3101,9 @@ void CWinTestDlg::OnBnClickedCheckNs1() void CWinTestDlg::OnBnClickedCheckPlayFileIn() { - const char micFile[] = "/tmp/audio_short16.pcm"; - // const char micFile[] = "/tmp/audio_long16noise.pcm"; + // File path is relative to the location of 'voice_engine.gyp'. + const char micFile[] = "../test/data/voice_engine/audio_short16.pcm"; + // const char micFile[] = "../test/data/voice_engine/audio_long16noise.pcm"; int ret(0); int channel(-1);