From a3361ff2f577b608a3bcddfa20f8248377c82002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Thu, 13 Jan 2022 14:05:38 +0100 Subject: [PATCH] Update audio code to not use implicit T* --> scoped_refptr conversion Bug: webrtc:13464 Change-Id: Ida1694537b47c62ce327eb5c77897af451a63ae7 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/246202 Reviewed-by: Henrik Andreassson Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/main@{#35688} --- ...nnel_receive_frame_transformer_delegate.cc | 2 +- ...channel_send_frame_transformer_delegate.cc | 2 +- .../acm2/audio_coding_module_unittest.cc | 4 +- .../audio_device/win/audio_device_core_win.cc | 48 +++++++++---------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/audio/channel_receive_frame_transformer_delegate.cc b/audio/channel_receive_frame_transformer_delegate.cc index c9e8a8b29d..c9865cbe19 100644 --- a/audio/channel_receive_frame_transformer_delegate.cc +++ b/audio/channel_receive_frame_transformer_delegate.cc @@ -79,7 +79,7 @@ void ChannelReceiveFrameTransformerDelegate::Transform( void ChannelReceiveFrameTransformerDelegate::OnTransformedFrame( std::unique_ptr frame) { - rtc::scoped_refptr delegate = this; + rtc::scoped_refptr delegate(this); channel_receive_thread_->PostTask(ToQueuedTask( [delegate = std::move(delegate), frame = std::move(frame)]() mutable { delegate->ReceiveFrame(std::move(frame)); diff --git a/audio/channel_send_frame_transformer_delegate.cc b/audio/channel_send_frame_transformer_delegate.cc index eee4cd0d96..29bb0b81d8 100644 --- a/audio/channel_send_frame_transformer_delegate.cc +++ b/audio/channel_send_frame_transformer_delegate.cc @@ -102,7 +102,7 @@ void ChannelSendFrameTransformerDelegate::OnTransformedFrame( MutexLock lock(&send_lock_); if (!send_frame_callback_) return; - rtc::scoped_refptr delegate = this; + rtc::scoped_refptr delegate(this); encoder_queue_->PostTask( [delegate = std::move(delegate), frame = std::move(frame)]() mutable { delegate->SendFrame(std::move(frame)); diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc index f6e9e47828..7ddb3ed0c7 100644 --- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc +++ b/modules/audio_coding/acm2/audio_coding_module_unittest.cc @@ -1540,9 +1540,9 @@ TEST_F(AcmSenderBitExactnessNewApi, DISABLED_OpusManyChannels) { const auto opus_decoder = AudioDecoderMultiChannelOpus::MakeAudioDecoder(*decoder_config); - rtc::scoped_refptr decoder_factory = + rtc::scoped_refptr decoder_factory( new rtc::RefCountedObject( - opus_decoder.get()); + opus_decoder.get())); // Set up an EXTERNAL DECODER to parse 4 channels. Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( // audio checksum diff --git a/modules/audio_device/win/audio_device_core_win.cc b/modules/audio_device/win/audio_device_core_win.cc index 6365d9f567..096e49cc12 100644 --- a/modules/audio_device/win/audio_device_core_win.cc +++ b/modules/audio_device/win/audio_device_core_win.cc @@ -343,33 +343,33 @@ bool AudioDeviceWindowsCore::CoreAudioIsSupported() { // ---------------------------------------------------------------------------- AudioDeviceWindowsCore::AudioDeviceWindowsCore() - : _avrtLibrary(NULL), + : _avrtLibrary(nullptr), _winSupportAvrt(false), _comInit(ScopedCOMInitializer::kMTA), - _ptrAudioBuffer(NULL), - _ptrEnumerator(NULL), - _ptrRenderCollection(NULL), - _ptrCaptureCollection(NULL), - _ptrDeviceOut(NULL), - _ptrDeviceIn(NULL), - _ptrClientOut(NULL), - _ptrClientIn(NULL), - _ptrRenderClient(NULL), - _ptrCaptureClient(NULL), - _ptrCaptureVolume(NULL), - _ptrRenderSimpleVolume(NULL), - _dmo(NULL), - _mediaBuffer(NULL), + _ptrAudioBuffer(nullptr), + _ptrEnumerator(nullptr), + _ptrRenderCollection(nullptr), + _ptrCaptureCollection(nullptr), + _ptrDeviceOut(nullptr), + _ptrDeviceIn(nullptr), + _ptrClientOut(nullptr), + _ptrClientIn(nullptr), + _ptrRenderClient(nullptr), + _ptrCaptureClient(nullptr), + _ptrCaptureVolume(nullptr), + _ptrRenderSimpleVolume(nullptr), + _dmo(nullptr), + _mediaBuffer(nullptr), _builtInAecEnabled(false), - _hRenderSamplesReadyEvent(NULL), - _hPlayThread(NULL), - _hRenderStartedEvent(NULL), - _hShutdownRenderEvent(NULL), - _hCaptureSamplesReadyEvent(NULL), - _hRecThread(NULL), - _hCaptureStartedEvent(NULL), - _hShutdownCaptureEvent(NULL), - _hMmTask(NULL), + _hRenderSamplesReadyEvent(nullptr), + _hPlayThread(nullptr), + _hRenderStartedEvent(nullptr), + _hShutdownRenderEvent(nullptr), + _hCaptureSamplesReadyEvent(nullptr), + _hRecThread(nullptr), + _hCaptureStartedEvent(nullptr), + _hShutdownCaptureEvent(nullptr), + _hMmTask(nullptr), _playAudioFrameSize(0), _playSampleRate(0), _playBlockSize(0),