From 0744ee563d4c0207d0a64a0b4c1a0e94776dc9fb Mon Sep 17 00:00:00 2001 From: "xians@webrtc.org" Date: Fri, 9 Dec 2011 14:05:29 +0000 Subject: [PATCH] Disable API tests on ALSA since the tests don't work for all the alsa devices. Review URL: http://webrtc-codereview.appspot.com/317004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1147 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/source/linux/audio_device_alsa_linux.cc | 2 +- .../audio_device/main/test/audio_device_test_api.cc | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc b/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc index 86d903a38f..88ab2f5ba4 100644 --- a/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc +++ b/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc @@ -94,7 +94,7 @@ AudioDeviceLinuxALSA::AudioDeviceLinuxALSA(const WebRtc_Word32 id) : _recordingFramesLeft(0), _playoutFramesLeft(0), _playbackBufferSize(0), - _playBufType(AudioDeviceModule::kAdaptiveBufferSize), + _playBufType(AudioDeviceModule::kFixedBufferSize), _initialized(false), _recording(false), _playing(false), diff --git a/src/modules/audio_device/main/test/audio_device_test_api.cc b/src/modules/audio_device/main/test/audio_device_test_api.cc index 289908bd99..12f17c720e 100644 --- a/src/modules/audio_device/main/test/audio_device_test_api.cc +++ b/src/modules/audio_device/main/test/audio_device_test_api.cc @@ -338,6 +338,17 @@ int api_test() TEST_LOG("Version: %s\n\n", version); + AudioDeviceModule::AudioLayer audioLayer = + AudioDeviceModule::kPlatformDefaultAudio; + TEST(audioDevice->ActiveAudioLayer(&audioLayer) == 0); + if (audioLayer == AudioDeviceModule::kLinuxAlsaAudio) { + TEST_LOG("API Test is not available on ALSA. \n"); + processThread->DeRegisterModule(audioDevice); + TEST(audioDevice->Terminate() == 0); + TEST(audioDevice->Release() == 0); + return 0; + } + TEST_LOG("Testing...\n\n"); // =====================