diff options
| author | Erwin Jansen <jansene@google.com> | 2021-06-23 05:52:25 -0700 |
|---|---|---|
| committer | Erwin Jansen <jansene@google.com> | 2021-06-23 06:45:54 -0700 |
| commit | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (patch) | |
| tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /modules/audio_device/linux/audio_device_alsa_linux.h | |
| parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
| parent | 49cb4599560d6005d5df0dadfca2db04b288f216 (diff) | |
| download | webrtc-16be34ae72cdb525c88c2b31b21b976f35fe36d8.tar.gz | |
Merge upstream-master and enable ARM64
We bring in the latest WebRTC changes and turn on arm.
This adds a new third party lib: crc32c, and includes a workaround
for handling a depencency issue for arm.
Bug: 191745658
Change-Id: Ic5be99911990ef14a5f733f19394032b20f85024
Diffstat (limited to 'modules/audio_device/linux/audio_device_alsa_linux.h')
| -rw-r--r-- | modules/audio_device/linux/audio_device_alsa_linux.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/audio_device/linux/audio_device_alsa_linux.h b/modules/audio_device/linux/audio_device_alsa_linux.h index 410afcf42c..1f4a231640 100644 --- a/modules/audio_device/linux/audio_device_alsa_linux.h +++ b/modules/audio_device/linux/audio_device_alsa_linux.h @@ -155,10 +155,8 @@ class AudioDeviceLinuxALSA : public AudioDeviceGeneric { Mutex mutex_; - // TODO(pbos): Make plain members and start/stop instead of resetting these - // pointers. A thread can be reused. - std::unique_ptr<rtc::PlatformThread> _ptrThreadRec; - std::unique_ptr<rtc::PlatformThread> _ptrThreadPlay; + rtc::PlatformThread _ptrThreadRec; + rtc::PlatformThread _ptrThreadPlay; AudioMixerManagerLinuxALSA _mixerManager; |