From 343714eb06491b5c71867035f9ba10b4464283a8 Mon Sep 17 00:00:00 2001 From: Brave Yao Date: Tue, 21 Jul 2015 18:27:45 +0800 Subject: [PATCH] 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} --- webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc | 2 -- 1 file changed, 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;