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

Fix the problom that on Linux no external audio device can be selected since #9243.

Browse Source 
In #9243 we added some thread_checker. But it shouldn't be added into PlayoutDevices() and RecordingDevices(), since these two will be invoked from RecThread and PlayoutThread too, other than the main thread.

BUG=webrtc:4852
TEST=voe_cmd_test
R=henrika@webrtc.org

Review URL: https://codereview.webrtc.org/1249573002 .

Cr-Commit-Position: refs/heads/master@{#9605}
This commit is contained in:
Brave Yao 2015-07-21 18:27:45 +08:00
parent 2981945bcf
commit 343714eb06
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
View File

@ -891,7 +891,6 @@ int32_t AudioDeviceLinuxPulse::MicrophoneVolumeStepSize(
int16_t AudioDeviceLinuxPulse::PlayoutDevices()
{
DCHECK(thread_checker_.CalledOnValidThread());
PaLock();
pa_operation* paOperation = NULL;
@ -1029,7 +1028,6 @@ int32_t AudioDeviceLinuxPulse::RecordingDeviceName(
int16_t AudioDeviceLinuxPulse::RecordingDevices()
{
DCHECK(thread_checker_.CalledOnValidThread());
PaLock();
pa_operation* paOperation = NULL;