From 9b1367f2337d147ca7558ab11b7f2a510df12fd7 Mon Sep 17 00:00:00 2001 From: saza Date: Fri, 14 Jul 2017 05:22:33 -0700 Subject: [PATCH] Patch set 1: Run a script to replace occurrences of WEBRTC_TRACE logging with the new style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc. Patch set 2: Manually fix log lines not handled by the script, remove unused header and variable. I would like to do this will the following files, too: webrtc/modules/audio_device/.. .../linux/audio_device_alsa_linux.cc .../linux/audio_device_pulse_linux.cc .../linux/audio_mixer_manager_alsa_linux.cc .../linux/audio_mixer_manager_pulse_linux.cc .../linux/latebindingsymboltable_linux.cc .../mac/audio_device_mac.cc .../mac/audio_mixer_manager_mac.cc .../win/audio_device_core_win.cc BUG=webrtc:5118 Review-Url: https://codereview.webrtc.org/2978953003 Cr-Commit-Position: refs/heads/master@{#19019} --- .../linux/audio_device_alsa_linux.cc | 260 +++++++----------- .../linux/audio_device_alsa_linux.h | 2 - 2 files changed, 102 insertions(+), 160 deletions(-) diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc index 140dbcb327..4d0dbada2f 100644 --- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc @@ -16,8 +16,6 @@ #include "webrtc/system_wrappers/include/event_wrapper.h" #include "webrtc/system_wrappers/include/sleep.h" -#include "webrtc/system_wrappers/include/trace.h" - webrtc::adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable; // Accesses ALSA functions through our late-binding symbol table instead of @@ -62,7 +60,6 @@ static const unsigned int ALSA_CAPTURE_WAIT_TIMEOUT = 5; // in ms AudioDeviceLinuxALSA::AudioDeviceLinuxALSA(const int32_t id) : _ptrAudioBuffer(NULL), - _id(id), _mixerManager(id), _inputDeviceIndex(0), _outputDeviceIndex(0), @@ -103,8 +100,7 @@ AudioDeviceLinuxALSA::AudioDeviceLinuxALSA(const int32_t id) : _playBufDelayFixed(80) { memset(_oldKeyState, 0, sizeof(_oldKeyState)); - WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, id, - "%s created", __FUNCTION__); + LOG(LS_INFO) << __FUNCTION__ << " created"; } // ---------------------------------------------------------------------------- @@ -113,8 +109,7 @@ AudioDeviceLinuxALSA::AudioDeviceLinuxALSA(const int32_t id) : AudioDeviceLinuxALSA::~AudioDeviceLinuxALSA() { - WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, - "%s destroyed", __FUNCTION__); + LOG(LS_INFO) << __FUNCTION__ << " destroyed"; Terminate(); @@ -332,8 +327,7 @@ int32_t AudioDeviceLinuxALSA::SetWaveOutVolume(uint16_t volumeLeft, uint16_t volumeRight) { - WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, - " API call not supported on this platform"); + LOG(LS_WARNING) << "API call not supported on this platform"; return -1; } @@ -342,8 +336,7 @@ int32_t AudioDeviceLinuxALSA::WaveOutVolume( uint16_t& /*volumeRight*/) const { - WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, - " API call not supported on this platform"); + LOG(LS_WARNING) << "API call not supported on this platform"; return -1; } @@ -754,8 +747,7 @@ int32_t AudioDeviceLinuxALSA::MicrophoneVolume(uint32_t& volume) const if (_mixerManager.MicrophoneVolume(level) == -1) { - WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, - " failed to retrive current microphone level"); + LOG(LS_WARNING) << "failed to retrive current microphone level"; return -1; } @@ -827,13 +819,13 @@ int32_t AudioDeviceLinuxALSA::SetPlayoutDevice(uint16_t index) } uint32_t nDevices = GetDevicesInfo(0, true); - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, - " number of availiable audio output devices is %u", nDevices); + LOG(LS_VERBOSE) << "number of available audio output devices is " + << nDevices; if (index > (nDevices-1)) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " device index is out of range [0,%u]", (nDevices-1)); + LOG(LS_ERROR) << "device index is out of range [0," << (nDevices-1) + << "]"; return -1; } @@ -846,8 +838,7 @@ int32_t AudioDeviceLinuxALSA::SetPlayoutDevice(uint16_t index) int32_t AudioDeviceLinuxALSA::SetPlayoutDevice( AudioDeviceModule::WindowsDeviceType /*device*/) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - "WindowsDeviceType not supported"); + LOG(LS_ERROR) << "WindowsDeviceType not supported"; return -1; } @@ -912,13 +903,13 @@ int32_t AudioDeviceLinuxALSA::SetRecordingDevice(uint16_t index) } uint32_t nDevices = GetDevicesInfo(0, false); - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, - " number of availiable audio input devices is %u", nDevices); + LOG(LS_VERBOSE) << "number of availiable audio input devices is " + << nDevices; if (index > (nDevices-1)) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " device index is out of range [0,%u]", (nDevices-1)); + LOG(LS_ERROR) << "device index is out of range [0," << (nDevices-1) + << "]"; return -1; } @@ -935,8 +926,7 @@ int32_t AudioDeviceLinuxALSA::SetRecordingDevice(uint16_t index) int32_t AudioDeviceLinuxALSA::SetRecordingDevice( AudioDeviceModule::WindowsDeviceType /*device*/) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - "WindowsDeviceType not supported"); + LOG(LS_ERROR) << "WindowsDeviceType not supported"; return -1; } @@ -1025,8 +1015,7 @@ int32_t AudioDeviceLinuxALSA::InitPlayout() // Initialize the speaker (devices might have been added or removed) if (InitSpeaker() == -1) { - WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, - " InitSpeaker() failed"); + LOG(LS_WARNING) << "InitSpeaker() failed"; } // Start by closing any existing wave-output devices @@ -1038,9 +1027,9 @@ int32_t AudioDeviceLinuxALSA::InitPlayout() _playIsInitialized = false; if (errVal < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " Error closing current playout sound device, error:" - " %s", LATE(snd_strerror)(errVal)); + LOG(LS_ERROR) + << "Error closing current playout sound device, error: " + << LATE(snd_strerror)(errVal); } } @@ -1049,8 +1038,7 @@ int32_t AudioDeviceLinuxALSA::InitPlayout() GetDevicesInfo(2, true, _outputDeviceIndex, deviceName, kAdmMaxDeviceNameSize); - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, - " InitPlayout open (%s)", deviceName); + LOG(LS_VERBOSE) << "InitPlayout open (" << deviceName << ")"; errVal = LATE(snd_pcm_open) (&_handlePlayout, @@ -1076,10 +1064,8 @@ int32_t AudioDeviceLinuxALSA::InitPlayout() } if (errVal < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " unable to open playback device: %s (%d)", - LATE(snd_strerror)(errVal), - errVal); + LOG(LS_ERROR) << "unable to open playback device: " + << LATE(snd_strerror)(errVal) << " (" << errVal << ")"; _handlePlayout = NULL; return -1; } @@ -1099,10 +1085,8 @@ int32_t AudioDeviceLinuxALSA::InitPlayout() )) < 0) { /* 0.5sec */ _playoutFramesIn10MS = 0; - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " unable to set playback device: %s (%d)", - LATE(snd_strerror)(errVal), - errVal); + LOG(LS_ERROR) << "unable to set playback device: " + << LATE(snd_strerror)(errVal) << " (" << errVal << ")"; ErrorRecovery(errVal, _handlePlayout); errVal = LATE(snd_pcm_close)(_handlePlayout); _handlePlayout = NULL; @@ -1113,18 +1097,15 @@ int32_t AudioDeviceLinuxALSA::InitPlayout() &_playoutBufferSizeInFrame, &_playoutPeriodSizeInFrame); if (errVal < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " snd_pcm_get_params %s", - LATE(snd_strerror)(errVal), - errVal); + LOG(LS_ERROR) << "snd_pcm_get_params: " << LATE(snd_strerror)(errVal) + << " (" << errVal << ")"; _playoutBufferSizeInFrame = 0; _playoutPeriodSizeInFrame = 0; } else { - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, - " playout snd_pcm_get_params " - "buffer_size:%d period_size :%d", - _playoutBufferSizeInFrame, _playoutPeriodSizeInFrame); + LOG(LS_VERBOSE) << "playout snd_pcm_get_params buffer_size:" + << _playoutBufferSizeInFrame << " period_size :" + << _playoutPeriodSizeInFrame; } if (_ptrAudioBuffer) @@ -1180,8 +1161,7 @@ int32_t AudioDeviceLinuxALSA::InitRecording() // Initialize the microphone (devices might have been added or removed) if (InitMicrophone() == -1) { - WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, - " InitMicrophone() failed"); + LOG(LS_WARNING) << "InitMicrophone() failed"; } // Start by closing any existing pcm-input devices @@ -1193,10 +1173,9 @@ int32_t AudioDeviceLinuxALSA::InitRecording() _recIsInitialized = false; if (errVal < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " Error closing current recording sound device," - " error: %s", - LATE(snd_strerror)(errVal)); + LOG(LS_ERROR) + << "Error closing current recording sound device, error: " + << LATE(snd_strerror)(errVal); } } @@ -1206,8 +1185,7 @@ int32_t AudioDeviceLinuxALSA::InitRecording() GetDevicesInfo(2, false, _inputDeviceIndex, deviceName, kAdmMaxDeviceNameSize); - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, - "InitRecording open (%s)", deviceName); + LOG(LS_VERBOSE) << "InitRecording open (" << deviceName << ")"; errVal = LATE(snd_pcm_open) (&_handleRecord, deviceName, @@ -1233,9 +1211,8 @@ int32_t AudioDeviceLinuxALSA::InitRecording() } if (errVal < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " unable to open record device: %s", - LATE(snd_strerror)(errVal)); + LOG(LS_ERROR) << "unable to open record device: " + << LATE(snd_strerror)(errVal); _handleRecord = NULL; return -1; } @@ -1274,9 +1251,9 @@ int32_t AudioDeviceLinuxALSA::InitRecording() )) < 0) { _recordingFramesIn10MS = 0; - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " unable to set record settings: %s (%d)", - LATE(snd_strerror)(errVal), errVal); + LOG(LS_ERROR) << "unable to set record settings: " + << LATE(snd_strerror)(errVal) << " (" << errVal + << ")"; ErrorRecovery(errVal, _handleRecord); errVal = LATE(snd_pcm_close)(_handleRecord); _handleRecord = NULL; @@ -1288,17 +1265,15 @@ int32_t AudioDeviceLinuxALSA::InitRecording() &_recordingBuffersizeInFrame, &_recordingPeriodSizeInFrame); if (errVal < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " snd_pcm_get_params %s", - LATE(snd_strerror)(errVal), errVal); + LOG(LS_ERROR) << "snd_pcm_get_params " << LATE(snd_strerror)(errVal) + << " (" << errVal << ")"; _recordingBuffersizeInFrame = 0; _recordingPeriodSizeInFrame = 0; } else { - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, - " capture snd_pcm_get_params " - "buffer_size:%d period_size:%d", - _recordingBuffersizeInFrame, _recordingPeriodSizeInFrame); + LOG(LS_VERBOSE) << "capture snd_pcm_get_params, buffer_size:" + << _recordingBuffersizeInFrame << ", period_size:" + << _recordingPeriodSizeInFrame; } if (_ptrAudioBuffer) @@ -1349,8 +1324,7 @@ int32_t AudioDeviceLinuxALSA::StartRecording() _recordingBuffer = new int8_t[_recordingBufferSizeIn10MS]; if (!_recordingBuffer) { - WEBRTC_TRACE(kTraceCritical, kTraceAudioDevice, _id, - " failed to alloc recording buffer"); + LOG(LS_ERROR) << "failed to alloc recording buffer"; _recording = false; return -1; } @@ -1364,9 +1338,8 @@ int32_t AudioDeviceLinuxALSA::StartRecording() errVal = LATE(snd_pcm_prepare)(_handleRecord); if (errVal < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " capture snd_pcm_prepare failed (%s)\n", - LATE(snd_strerror)(errVal)); + LOG(LS_ERROR) << "capture snd_pcm_prepare failed (" + << LATE(snd_strerror)(errVal) << ")\n"; // just log error // if snd_pcm_open fails will return -1 } @@ -1374,15 +1347,13 @@ int32_t AudioDeviceLinuxALSA::StartRecording() errVal = LATE(snd_pcm_start)(_handleRecord); if (errVal < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " capture snd_pcm_start err: %s", - LATE(snd_strerror)(errVal)); + LOG(LS_ERROR) << "capture snd_pcm_start err: " + << LATE(snd_strerror)(errVal); errVal = LATE(snd_pcm_start)(_handleRecord); if (errVal < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " capture snd_pcm_start 2nd try err: %s", - LATE(snd_strerror)(errVal)); + LOG(LS_ERROR) << "capture snd_pcm_start 2nd try err: " + << LATE(snd_strerror)(errVal); StopRecording(); return -1; } @@ -1430,18 +1401,15 @@ int32_t AudioDeviceLinuxALSA::StopRecording() int errVal = LATE(snd_pcm_drop)(_handleRecord); if (errVal < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " Error stop recording: %s", - LATE(snd_strerror)(errVal)); + LOG(LS_ERROR) << "Error stop recording: " << LATE(snd_strerror)(errVal); return -1; } errVal = LATE(snd_pcm_close)(_handleRecord); if (errVal < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " Error closing record sound device, error: %s", - LATE(snd_strerror)(errVal)); + LOG(LS_ERROR) << "Error closing record sound device, error: " + << LATE(snd_strerror)(errVal); return -1; } @@ -1492,8 +1460,7 @@ int32_t AudioDeviceLinuxALSA::StartPlayout() _playoutBuffer = new int8_t[_playoutBufferSizeIn10MS]; if (!_playoutBuffer) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " failed to alloc playout buf"); + LOG(LS_ERROR) << "failed to alloc playout buf"; _playing = false; return -1; } @@ -1507,9 +1474,8 @@ int32_t AudioDeviceLinuxALSA::StartPlayout() int errVal = LATE(snd_pcm_prepare)(_handlePlayout); if (errVal < 0) { - WEBRTC_TRACE(kTraceCritical, kTraceAudioDevice, _id, - " playout snd_pcm_prepare failed (%s)\n", - LATE(snd_strerror)(errVal)); + LOG(LS_ERROR) << "playout snd_pcm_prepare failed (" + << LATE(snd_strerror)(errVal) << ")\n"; // just log error // if snd_pcm_open fails will return -1 } @@ -1553,22 +1519,18 @@ int32_t AudioDeviceLinuxALSA::StopPlayout() int errVal = LATE(snd_pcm_drop)(_handlePlayout); if (errVal < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " Error stop playing: %s", - LATE(snd_strerror)(errVal)); + LOG(LS_ERROR) << "Error stop playing: " << LATE(snd_strerror)(errVal); } errVal = LATE(snd_pcm_close)(_handlePlayout); if (errVal < 0) - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " Error closing playout sound device, error: %s", - LATE(snd_strerror)(errVal)); + LOG(LS_ERROR) << "Error closing playout sound device, error: " + << LATE(snd_strerror)(errVal); // set the pcm input handle to NULL _playIsInitialized = false; _handlePlayout = NULL; - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, - " handle_playout is now set to NULL"); + LOG(LS_VERBOSE) << "handle_playout is now set to NULL"; return 0; } @@ -1626,8 +1588,7 @@ int32_t AudioDeviceLinuxALSA::PlayoutBuffer( int32_t AudioDeviceLinuxALSA::CPULoad(uint16_t& load) const { - WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, - " API call not supported on this platform"); + LOG(LS_WARNING) << "API call not supported on this platform"; return -1; } @@ -1716,9 +1677,8 @@ int32_t AudioDeviceLinuxALSA::GetDevicesInfo( err = LATE(snd_device_name_hint)(card, "pcm", &hints); if (err != 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - "GetDevicesInfo - device name hint error: %s", - LATE(snd_strerror)(err)); + LOG(LS_ERROR) << "GetDevicesInfo - device name hint error: " + << LATE(snd_strerror)(err); return -1; } @@ -1731,9 +1691,9 @@ int32_t AudioDeviceLinuxALSA::GetDevicesInfo( err = LATE(snd_device_name_free_hint)(hints); if (err != 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - "GetDevicesInfo - device name free hint error: %s", - LATE(snd_strerror)(err)); + LOG(LS_ERROR) + << "GetDevicesInfo - device name free hint error: " + << LATE(snd_strerror)(err); } return 0; @@ -1756,8 +1716,7 @@ int32_t AudioDeviceLinuxALSA::GetDevicesInfo( char *name = LATE(snd_device_name_get_hint)(*list, "NAME"); if (!name) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - "Device has no name"); + LOG(LS_ERROR) << "Device has no name"; // Skip it. continue; } @@ -1779,8 +1738,8 @@ int32_t AudioDeviceLinuxALSA::GetDevicesInfo( if (FUNC_GET_NUM_OF_DEVICE == function) { - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, - " Enum device %d - %s", enumCount, name); + LOG(LS_VERBOSE) << "Enum device " << enumCount << " - " + << name; } if ((FUNC_GET_DEVICE_NAME == function) && @@ -1820,9 +1779,8 @@ int32_t AudioDeviceLinuxALSA::GetDevicesInfo( err = LATE(snd_device_name_free_hint)(hints); if (err != 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - "GetDevicesInfo - device name free hint error: %s", - LATE(snd_strerror)(err)); + LOG(LS_ERROR) << "GetDevicesInfo - device name free hint error: " + << LATE(snd_strerror)(err); // Continue and return true anyway, since we did get the whole list. } } @@ -1838,8 +1796,8 @@ int32_t AudioDeviceLinuxALSA::GetDevicesInfo( { // If we get here for function 1 and 2, we didn't find the specified // enum device. - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - "GetDevicesInfo - Could not find device name or numbers"); + LOG(LS_ERROR) + << "GetDevicesInfo - Could not find device name or numbers"; return -1; } @@ -1850,8 +1808,7 @@ int32_t AudioDeviceLinuxALSA::InputSanityCheckAfterUnlockedPeriod() const { if (_handleRecord == NULL) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " input state has been modified during unlocked period"); + LOG(LS_ERROR) << "input state has been modified during unlocked period"; return -1; } return 0; @@ -1861,8 +1818,8 @@ int32_t AudioDeviceLinuxALSA::OutputSanityCheckAfterUnlockedPeriod() const { if (_handlePlayout == NULL) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " output state has been modified during unlocked period"); + LOG(LS_ERROR) + << "output state has been modified during unlocked period"; return -1; } return 0; @@ -1872,10 +1829,10 @@ int32_t AudioDeviceLinuxALSA::ErrorRecovery(int32_t error, snd_pcm_t* deviceHandle) { int st = LATE(snd_pcm_state)(deviceHandle); - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, - "Trying to recover from error: %s (%d) (state %d)", - (LATE(snd_pcm_stream)(deviceHandle) == SND_PCM_STREAM_CAPTURE) ? - "capture" : "playout", LATE(snd_strerror)(error), error, st); + LOG(LS_VERBOSE) << "Trying to recover from " + << ((LATE(snd_pcm_stream)(deviceHandle) == SND_PCM_STREAM_CAPTURE) + ? "capture" : "playout") << " error: " << LATE(snd_strerror)(error) + << " (" << error << ") (state " << st << ")"; // It is recommended to use snd_pcm_recover for all errors. If that function // cannot handle the error, the input error code will be returned, otherwise @@ -1910,8 +1867,7 @@ int32_t AudioDeviceLinuxALSA::ErrorRecovery(int32_t error, int res = LATE(snd_pcm_recover)(deviceHandle, error, 1); if (0 == res) { - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, - " Recovery - snd_pcm_recover OK"); + LOG(LS_VERBOSE) << "Recovery - snd_pcm_recover OK"; if ((error == -EPIPE || error == -ESTRPIPE) && // Buf underrun/overrun. _recording && @@ -1922,8 +1878,7 @@ int32_t AudioDeviceLinuxALSA::ErrorRecovery(int32_t error, int err = LATE(snd_pcm_start)(deviceHandle); if (err != 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " Recovery - snd_pcm_start error: %u", err); + LOG(LS_ERROR) << "Recovery - snd_pcm_start error: " << err; return -1; } } @@ -1937,9 +1892,8 @@ int32_t AudioDeviceLinuxALSA::ErrorRecovery(int32_t error, int err = LATE(snd_pcm_start)(deviceHandle); if (err != 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " Recovery - snd_pcm_start error: %s", - LATE(snd_strerror)(err)); + LOG(LS_ERROR) << "Recovery - snd_pcm_start error: " + << LATE(snd_strerror)(err); return -1; } } @@ -1947,8 +1901,7 @@ int32_t AudioDeviceLinuxALSA::ErrorRecovery(int32_t error, return -EPIPE == error ? 1 : 0; } else { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - " Unrecoverable alsa stream error: %d", res); + LOG(LS_ERROR) << "Unrecoverable alsa stream error: " << res; } return res; @@ -1982,9 +1935,8 @@ bool AudioDeviceLinuxALSA::PlayThreadProcess() avail_frames = LATE(snd_pcm_avail_update)(_handlePlayout); if (avail_frames < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - "playout snd_pcm_avail_update error: %s", - LATE(snd_strerror)(avail_frames)); + LOG(LS_ERROR) << "playout snd_pcm_avail_update error: " + << LATE(snd_strerror)(avail_frames); ErrorRecovery(avail_frames, _handlePlayout); UnLock(); return true; @@ -1997,8 +1949,7 @@ bool AudioDeviceLinuxALSA::PlayThreadProcess() err = LATE(snd_pcm_wait)(_handlePlayout, 2); if (err == 0) { //timeout occured - WEBRTC_TRACE(kTraceStream, kTraceAudioDevice, _id, - "playout snd_pcm_wait timeout"); + LOG(LS_VERBOSE) << "playout snd_pcm_wait timeout"; } return true; @@ -2026,9 +1977,8 @@ bool AudioDeviceLinuxALSA::PlayThreadProcess() if (frames < 0) { - WEBRTC_TRACE(kTraceStream, kTraceAudioDevice, _id, - "playout snd_pcm_writei error: %s", - LATE(snd_strerror)(frames)); + LOG(LS_VERBOSE) << "playout snd_pcm_writei error: " + << LATE(snd_strerror)(frames); _playoutFramesLeft = 0; ErrorRecovery(frames, _handlePlayout); UnLock(); @@ -2059,9 +2009,8 @@ bool AudioDeviceLinuxALSA::RecThreadProcess() avail_frames = LATE(snd_pcm_avail_update)(_handleRecord); if (avail_frames < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - "capture snd_pcm_avail_update error: %s", - LATE(snd_strerror)(avail_frames)); + LOG(LS_ERROR) << "capture snd_pcm_avail_update error: " + << LATE(snd_strerror)(avail_frames); ErrorRecovery(avail_frames, _handleRecord); UnLock(); return true; @@ -2074,8 +2023,7 @@ bool AudioDeviceLinuxALSA::RecThreadProcess() err = LATE(snd_pcm_wait)(_handleRecord, ALSA_CAPTURE_WAIT_TIMEOUT); if (err == 0) //timeout occured - WEBRTC_TRACE(kTraceStream, kTraceAudioDevice, _id, - "capture snd_pcm_wait timeout"); + LOG(LS_VERBOSE) << "capture snd_pcm_wait timeout"; return true; } @@ -2087,9 +2035,8 @@ bool AudioDeviceLinuxALSA::RecThreadProcess() buffer, avail_frames); // frames to be written if (frames < 0) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - "capture snd_pcm_readi error: %s", - LATE(snd_strerror)(frames)); + LOG(LS_ERROR) << "capture snd_pcm_readi error: " + << LATE(snd_strerror)(frames); ErrorRecovery(frames, _handleRecord); UnLock(); return true; @@ -2141,9 +2088,8 @@ bool AudioDeviceLinuxALSA::RecThreadProcess() { // TODO(xians): Shall we call ErrorRecovery() here? _playoutDelay = 0; - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - "playout snd_pcm_delay: %s", - LATE(snd_strerror)(err)); + LOG(LS_ERROR) << "playout snd_pcm_delay: " + << LATE(snd_strerror)(err); } } @@ -2153,9 +2099,8 @@ bool AudioDeviceLinuxALSA::RecThreadProcess() { // TODO(xians): Shall we call ErrorRecovery() here? _recordingDelay = 0; - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, - "capture snd_pcm_delay: %s", - LATE(snd_strerror)(err)); + LOG(LS_ERROR) << "capture snd_pcm_delay: " + << LATE(snd_strerror)(err); } // TODO(xians): Shall we add 10ms buffer delay to the record delay? @@ -2180,9 +2125,8 @@ bool AudioDeviceLinuxALSA::RecThreadProcess() // change is needed. Set this new mic level (received from the // observer as return value in the callback). if (SetMicrophoneVolume(newMicLevel) == -1) - WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, - " the required modification of the " - "microphone volume failed"); + LOG(LS_WARNING) + << "the required modification of the microphone volume failed"; } } } diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h index 42d63b56da..6cda100bec 100644 --- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h +++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.h @@ -186,8 +186,6 @@ private: std::unique_ptr _ptrThreadRec; std::unique_ptr _ptrThreadPlay; - int32_t _id; - AudioMixerManagerLinuxALSA _mixerManager; uint16_t _inputDeviceIndex;