generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensures that all test files in VoE and ADM are read from

Browse Source 
the new /test/data-folders.
Review URL: http://webrtc-codereview.appspot.com/55005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@178 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrika@google.com 2011-07-07 14:10:34 +00:00
parent 67c6769b1d
commit 807c04d377
8 changed files with 24 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/modules/audio_device/main/test/audio_short16.pcm
View File

Binary file not shown.

BIN
src/modules/audio_device/main/test/audio_short44.pcm
View File

Binary file not shown.

BIN
src/modules/audio_device/main/test/audio_short48.pcm
View File

Binary file not shown.

BIN
src/modules/audio_device/main/test/audio_short8.pcm
View File

Binary file not shown.

BIN
src/modules/audio_device/main/test/recordedRaw_48.pcm
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 MiB

49
src/voice_engine.gyp
View File

@ -37,45 +37,11 @@
'voice_engine/main/test/auto_test/voe_unit_test.h', 'voice_engine/main/test/auto_test/voe_unit_test.h',
], ],
'conditions': [ '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"', { ['OS=="win"', {
'dependencies': [ 'dependencies': [
'voice_engine.gyp:voe_ui_win_test', '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.cpp',
'voice_engine/main/test/win_test/stdafx.h', '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': { 'configurations': {
'Common_Base': { 'Common_Base': {
'msvs_configuration_attributes': { 'msvs_configuration_attributes': {

8
src/voice_engine/main/test/auto_test/voe_standard_test.cc
View File

@ -143,9 +143,13 @@ char micFile[256] = {0}; // Filename copied to buffer in code
const char* micFile = "audio_long16bigendian.pcm"; const char* micFile = "audio_long16bigendian.pcm";
#elif defined(ANDROID) #elif defined(ANDROID)
const char* micFile = "/sdcard/audio_long16.pcm"; 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 #else
const char* micFile =
"/tmp/audio_long16.pcm";
#endif #endif
#if !defined(MAC_IPHONE) #if !defined(MAC_IPHONE)

31
src/voice_engine/main/test/win_test/WinTestDlg.cpp
View File

@ -2306,7 +2306,8 @@ void CWinTestDlg::OnBnClickedCheckExtTrans2()
void CWinTestDlg::OnBnClickedCheckPlayFileIn1() 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 ret(0);
int channel = GetDlgItemInt(IDC_EDIT_1); int channel = GetDlgItemInt(IDC_EDIT_1);
@ -2340,7 +2341,8 @@ void CWinTestDlg::OnBnClickedCheckPlayFileIn1()
void CWinTestDlg::OnBnClickedCheckPlayFileIn2() 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 ret(0);
int channel = GetDlgItemInt(IDC_EDIT_2); int channel = GetDlgItemInt(IDC_EDIT_2);
@ -2381,14 +2383,15 @@ void CWinTestDlg::OnBnClickedCheckPlayFileOut1()
{kFileFormatWavFile}, {kFileFormatWavFile},
{kFileFormatWavFile}, {kFileFormatWavFile},
{kFileFormatWavFile}}; {kFileFormatWavFile}};
const char spkrFiles[8][32] = {{"/tmp/audio_short16.pcm"}, // File path is relative to the location of 'voice_engine.gyp'.
{"/tmp/audio_tiny8.wav"}, const char spkrFiles[8][64] = {{"../test/data/voice_engine/audio_short16.pcm"},
{"/tmp/audio_tiny11.wav"}, {"../test/data/voice_engine/audio_tiny8.wav"},
{"/tmp/audio_tiny16.wav"}, {"../test/data/voice_engine/audio_tiny11.wav"},
{"/tmp/audio_tiny22.wav"}, {"../test/data/voice_engine/audio_tiny16.wav"},
{"/tmp/audio_tiny32.wav"}, {"../test/data/voice_engine/audio_tiny22.wav"},
{"/tmp/audio_tiny44.wav"}, {"../test/data/voice_engine/audio_tiny32.wav"},
{"/tmp/audio_tiny48.wav"}}; {"../test/data/voice_engine/audio_tiny44.wav"},
{"../test/data/voice_engine/audio_tiny48.wav"}};
int ret(0); int ret(0);
int channel = GetDlgItemInt(IDC_EDIT_1); int channel = GetDlgItemInt(IDC_EDIT_1);
CButton* button = (CButton*)GetDlgItem(IDC_CHECK_PLAY_FILE_OUT_1); CButton* button = (CButton*)GetDlgItem(IDC_CHECK_PLAY_FILE_OUT_1);
@ -2432,7 +2435,8 @@ void CWinTestDlg::OnBnClickedCheckPlayFileOut1()
void CWinTestDlg::OnBnClickedCheckPlayFileOut2() 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 ret(0);
int channel = GetDlgItemInt(IDC_EDIT_2); int channel = GetDlgItemInt(IDC_EDIT_2);
@ -3097,8 +3101,9 @@ void CWinTestDlg::OnBnClickedCheckNs1()
void CWinTestDlg::OnBnClickedCheckPlayFileIn() void CWinTestDlg::OnBnClickedCheckPlayFileIn()
{ {
const char micFile[] = "/tmp/audio_short16.pcm"; // File path is relative to the location of 'voice_engine.gyp'.
// const char micFile[] = "/tmp/audio_long16noise.pcm"; const char micFile[] = "../test/data/voice_engine/audio_short16.pcm";
// const char micFile[] = "../test/data/voice_engine/audio_long16noise.pcm";
int ret(0); int ret(0);
int channel(-1); int channel(-1);