diff options
| author | Brave Yao <braveyao@webrtc.org> | 2015-07-21 18:27:45 +0800 |
|---|---|---|
| committer | Brave Yao <braveyao@webrtc.org> | 2015-07-21 10:27:52 +0000 |
| commit | 343714eb06491b5c71867035f9ba10b4464283a8 (patch) | |
| tree | cbef5919f30a4847b0cf950df296899ad942b170 | |
| parent | 2981945bcf853891f1106f99a27f34a57b33f49b (diff) | |
| download | webrtc-343714eb06491b5c71867035f9ba10b4464283a8.tar.gz | |
Fix the problom that on Linux no external audio device can be selected since #9243.
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}
| -rw-r--r-- | webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc index 8b0ae6f539..3bbc1859d8 100644 --- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc +++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc @@ -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; |