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/audio_device_data_observer.cc | |
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/audio_device_data_observer.cc')
-rw-r--r-- | modules/audio_device/audio_device_data_observer.cc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/modules/audio_device/audio_device_data_observer.cc b/modules/audio_device/audio_device_data_observer.cc index 89265a288f..be78fd16d7 100644 --- a/modules/audio_device/audio_device_data_observer.cc +++ b/modules/audio_device/audio_device_data_observer.cc @@ -301,9 +301,8 @@ class ADMWrapper : public AudioDeviceModule, public AudioTransport { rtc::scoped_refptr<AudioDeviceModule> CreateAudioDeviceWithDataObserver( rtc::scoped_refptr<AudioDeviceModule> impl, std::unique_ptr<AudioDeviceDataObserver> observer) { - rtc::scoped_refptr<ADMWrapper> audio_device( - new rtc::RefCountedObject<ADMWrapper>(impl, observer.get(), - std::move(observer))); + auto audio_device = rtc::make_ref_counted<ADMWrapper>(impl, observer.get(), + std::move(observer)); if (!audio_device->IsValid()) { return nullptr; @@ -315,8 +314,8 @@ rtc::scoped_refptr<AudioDeviceModule> CreateAudioDeviceWithDataObserver( rtc::scoped_refptr<AudioDeviceModule> CreateAudioDeviceWithDataObserver( rtc::scoped_refptr<AudioDeviceModule> impl, AudioDeviceDataObserver* legacy_observer) { - rtc::scoped_refptr<ADMWrapper> audio_device( - new rtc::RefCountedObject<ADMWrapper>(impl, legacy_observer, nullptr)); + auto audio_device = + rtc::make_ref_counted<ADMWrapper>(impl, legacy_observer, nullptr); if (!audio_device->IsValid()) { return nullptr; @@ -329,10 +328,8 @@ rtc::scoped_refptr<AudioDeviceModule> CreateAudioDeviceWithDataObserver( AudioDeviceModule::AudioLayer audio_layer, TaskQueueFactory* task_queue_factory, std::unique_ptr<AudioDeviceDataObserver> observer) { - rtc::scoped_refptr<ADMWrapper> audio_device( - new rtc::RefCountedObject<ADMWrapper>(audio_layer, task_queue_factory, - observer.get(), - std::move(observer))); + auto audio_device = rtc::make_ref_counted<ADMWrapper>( + audio_layer, task_queue_factory, observer.get(), std::move(observer)); if (!audio_device->IsValid()) { return nullptr; @@ -345,9 +342,8 @@ rtc::scoped_refptr<AudioDeviceModule> CreateAudioDeviceWithDataObserver( AudioDeviceModule::AudioLayer audio_layer, TaskQueueFactory* task_queue_factory, AudioDeviceDataObserver* legacy_observer) { - rtc::scoped_refptr<ADMWrapper> audio_device( - new rtc::RefCountedObject<ADMWrapper>(audio_layer, task_queue_factory, - legacy_observer, nullptr)); + auto audio_device = rtc::make_ref_counted<ADMWrapper>( + audio_layer, task_queue_factory, legacy_observer, nullptr); if (!audio_device->IsValid()) { return nullptr; |