admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add code for dummy file audio to fallback to dummy audio.

Browse Source 
BUG=

Review-Url: https://codereview.webrtc.org/2250853002
Cr-Commit-Position: refs/heads/master@{#13804}
This commit is contained in:
noahric 2016-08-17 15:19:50 -07:00 committed by Commit bot
parent 7c0f8ee67a
commit 6a35590d14
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/audio_device/audio_device_impl.cc
View File

@ -186,7 +186,13 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() {
LOG(INFO) << "Dummy Audio APIs will be utilized";
#elif defined(WEBRTC_DUMMY_FILE_DEVICES)
ptrAudioDevice = FileAudioDeviceFactory::CreateFileAudioDevice(Id());
LOG(INFO) << "Will use file-playing dummy device.";
if (ptrAudioDevice) {
LOG(INFO) << "Will use file-playing dummy device.";
} else {
// Create a dummy device instead.
ptrAudioDevice = new AudioDeviceDummy(Id());
LOG(INFO) << "Dummy Audio APIs will be utilized";
}
#else
AudioLayer audioLayer(PlatformAudioLayer());

10
webrtc/modules/audio_device/dummy/file_audio_device_factory.cc
View File

@ -13,6 +13,7 @@
#include <cstdlib>
#include <cstring>
#include "webrtc/base/logging.h"
#include "webrtc/modules/audio_device/dummy/file_audio_device.h"
namespace webrtc {
@ -24,10 +25,13 @@ char FileAudioDeviceFactory::_outputAudioFilename[MAX_FILENAME_LEN] = "";
FileAudioDevice* FileAudioDeviceFactory::CreateFileAudioDevice(
const int32_t id) {
// Bail out here if the files haven't been set explicitly.
// audio_device_impl.cc should then fall back to dummy audio.
if (!_isConfigured) {
printf("Was compiled with WEBRTC_DUMMY_AUDIO_PLAY_STATIC_FILE "
"but did not set input/output files to use. Bailing out.\n");
std::exit(1);
LOG(LS_WARNING) << "WebRTC configured with WEBRTC_DUMMY_FILE_DEVICES but "
<< "no device files supplied. Will fall back to dummy "
<< "audio.";
return nullptr;
}
return new FileAudioDevice(id, _inputAudioFilename, _outputAudioFilename);
}