diff options
author | Erwin Jansen <jansene@google.com> | 2021-06-30 07:29:26 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-30 07:29:26 +0000 |
commit | 059cdc5996938f5f6b5343b6c969c12098275587 (patch) | |
tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /modules/audio_device/mac/audio_device_mac.h | |
parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
parent | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (diff) | |
download | webrtc-059cdc5996938f5f6b5343b6c969c12098275587.tar.gz |
Merge "Merge upstream-master and enable ARM64" into emu-master-devemu-31-stable-releaseemu-31-release
Diffstat (limited to 'modules/audio_device/mac/audio_device_mac.h')
-rw-r--r-- | modules/audio_device/mac/audio_device_mac.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/modules/audio_device/mac/audio_device_mac.h b/modules/audio_device/mac/audio_device_mac.h index 985db9da52..f9504b64b5 100644 --- a/modules/audio_device/mac/audio_device_mac.h +++ b/modules/audio_device/mac/audio_device_mac.h @@ -21,15 +21,12 @@ #include "modules/audio_device/mac/audio_mixer_manager_mac.h" #include "rtc_base/event.h" #include "rtc_base/logging.h" +#include "rtc_base/platform_thread.h" #include "rtc_base/synchronization/mutex.h" #include "rtc_base/thread_annotations.h" struct PaUtilRingBuffer; -namespace rtc { -class PlatformThread; -} // namespace rtc - namespace webrtc { const uint32_t N_REC_SAMPLES_PER_SEC = 48000; @@ -271,13 +268,11 @@ class AudioDeviceMac : public AudioDeviceGeneric { rtc::Event _stopEventRec; rtc::Event _stopEvent; - // TODO(pbos): Replace with direct members, just start/stop, no need to - // recreate the thread. // Only valid/running between calls to StartRecording and StopRecording. - std::unique_ptr<rtc::PlatformThread> capture_worker_thread_; + rtc::PlatformThread capture_worker_thread_; // Only valid/running between calls to StartPlayout and StopPlayout. - std::unique_ptr<rtc::PlatformThread> render_worker_thread_; + rtc::PlatformThread render_worker_thread_; AudioMixerManagerMac _mixerManager; |