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

take away some compiling warnings.

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@66 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
xians@google.com 2011-06-10 12:01:25 +00:00
parent d2f3b7ea3d
commit cb8715660d
2 changed files with 40 additions and 37 deletions
modules/audio_device/main/test
audio_device_test_func.ccfunc_test_manager.cc

11
modules/audio_device/main/test/audio_device_test_func.cc

@ -126,10 +126,13 @@ SHOW_MENU:
case 12: case 12:
testType = TTLoopback; testType = TTLoopback;
break; break;
case 14: case 13:
testType = TTMobileAPI; testType = TTDeviceRemoval;
break; break;
case 66: case 14:
testType = TTMobileAPI;
break;
case 66:
testType = TTTest; testType = TTTest;
break; break;
default: default:

66
modules/audio_device/main/test/func_test_manager.cc

@ -1272,7 +1272,7 @@ WebRtc_Word32 FuncTestManager::TestAudioTransport()
if (audioDevice->Playing()) if (audioDevice->Playing())
{ {
TEST_LOG("\n> Listen to the file being played (fs=%d) out " TEST_LOG("\n> Listen to the file being played (fs=%d) out "
"and verify that the audio quality is OK.\n " "and verify that the audio quality is OK.\n"
"> Press any key to stop playing...\n \n", "> Press any key to stop playing...\n \n",
samplesPerSec); samplesPerSec);
PAUSE(DEFAULT_PAUSE_TIME); PAUSE(DEFAULT_PAUSE_TIME);
@ -2005,12 +2005,12 @@ WebRtc_Word32 FuncTestManager::TestMicrophoneBoost()
if (audioDevice->Recording() && audioDevice->Playing()) if (audioDevice->Recording() && audioDevice->Playing())
{ {
TEST_LOG("\n> Speak into the microphone and verify that the selected " TEST_LOG("\n> Speak into the microphone and verify that the selected "
"microphone boost control is toggled between [BOOST ON] and [BOOST OFF].\n\ "microphone boost control is toggled between [BOOST ON] and [BOOST OFF].\n"
> You should hear your own voice with an increased volume level " "> You should hear your own voice with an increased volume level "
"during the 'BOOST ON' periods.\n \n\ "during the 'BOOST ON' periods.\n \n"
> After a finalized test (and if file recording was enabled) verify" "> After a finalized test (and if file recording was enabled) verify"
" the recorded result off line.\n\ " the recorded result off line.\n"
> Press any key to stop...\n \n"); "> Press any key to stop...\n \n");
PAUSE(DEFAULT_PAUSE_TIME); PAUSE(DEFAULT_PAUSE_TIME);
} }
@ -2142,12 +2142,12 @@ WebRtc_Word32 FuncTestManager::TestMicrophoneAGC()
if (audioDevice->Recording() && audioDevice->Playing()) if (audioDevice->Recording() && audioDevice->Playing())
{ {
TEST_LOG("\n> Speak into the microphone and verify that the volume of" TEST_LOG("\n> Speak into the microphone and verify that the volume of"
" the selected microphone is varied between [~0] and [~MAX].\n\ " the selected microphone is varied between [~0] and [~MAX].\n"
> You should hear your own voice with an increasing volume level" "> You should hear your own voice with an increasing volume level"
" correlated to an emulated AGC setting.\n\ " correlated to an emulated AGC setting.\n"
> After a finalized test (and if file recording was enabled) verify" "> After a finalized test (and if file recording was enabled) verify"
" the recorded result off line.\n\ " the recorded result off line.\n"
> Press any key to stop...\n \n"); "> Press any key to stop...\n \n");
PAUSE(DEFAULT_PAUSE_TIME); PAUSE(DEFAULT_PAUSE_TIME);
} }
@ -2404,14 +2404,14 @@ WebRtc_Word32 FuncTestManager::TestDeviceRemoval()
if (audioLayer == AudioDeviceModule::kLinuxPulseAudio) if (audioLayer == AudioDeviceModule::kLinuxPulseAudio)
{ {
TEST_LOG("\n \n> PulseAudio loopback audio is now active.\n\ TEST_LOG("\n \n> PulseAudio loopback audio is now active.\n"
> Rec : fs=%u, #channels=%u.\n\ "> Rec : fs=%u, #channels=%u.\n"
> Play: fs=%u, #channels=%u.\n\ "> Play: fs=%u, #channels=%u.\n"
> Speak into the microphone and verify that your voice is" "> Speak into the microphone and verify that your voice is"
" played out in loopback.\n\ " played out in loopback.\n"
> Unplug the device and make sure that your voice is played" "> Unplug the device and make sure that your voice is played"
" out in loop back on the built-in soundcard.\n\ " out in loop back on the built-in soundcard.\n"
> Then press any key...\n", "> Then press any key...\n",
recSamplesPerSecRec, nRecChannels, playSamplesPerSec, recSamplesPerSecRec, nRecChannels, playSamplesPerSec,
nPlayChannels); nPlayChannels);
@ -2420,12 +2420,12 @@ WebRtc_Word32 FuncTestManager::TestDeviceRemoval()
{ {
if (loopCount < 1) if (loopCount < 1)
{ {
TEST_LOG("\n \n> Loopback audio is now active.\n\ TEST_LOG("\n \n> Loopback audio is now active.\n"
> Rec : fs=%u, #channels=%u.\n\ "> Rec : fs=%u, #channels=%u.\n"
> Play: fs=%u, #channels=%u.\n\ "> Play: fs=%u, #channels=%u.\n"
> Speak into the microphone and verify that your voice" "> Speak into the microphone and verify that your voice"
" is played out in loopback.\n\ " is played out in loopback.\n"
> Unplug the device and wait for the error message...\n", "> Unplug the device and wait for the error message...\n",
recSamplesPerSecRec, nRecChannels, recSamplesPerSecRec, nRecChannels,
playSamplesPerSec, nPlayChannels); playSamplesPerSec, nPlayChannels);
@ -2438,12 +2438,12 @@ WebRtc_Word32 FuncTestManager::TestDeviceRemoval()
} }
} else } else
{ {
TEST_LOG("\n \n> Loopback audio is now active.\n\ TEST_LOG("\n \n> Loopback audio is now active.\n"
> Rec : fs=%u, #channels=%u.\n\ "> Rec : fs=%u, #channels=%u.\n"
> Play: fs=%u, #channels=%u.\n\ "> Play: fs=%u, #channels=%u.\n"
> Speak into the microphone and verify that your voice" "> Speak into the microphone and verify that your voice"
" is played out in loopback.\n\ " is played out in loopback.\n"
> Press any key to stop...\n", "> Press any key to stop...\n",
recSamplesPerSecRec, nRecChannels, recSamplesPerSecRec, nRecChannels,
playSamplesPerSec, nPlayChannels); playSamplesPerSec, nPlayChannels);