commit a3361ff2f577b608a3bcddfa20f8248377c82002
author Niels Möller <nisse@webrtc.org> Thu Jan 13 13:05:38 2022
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jan 13 15:49:49 2022
tree c1cd8c922955ff8b21916f4f2894afa992d8701e
parent 96296bc25241e2a496b2fdb2a3f058548abc5037

Update audio code to not use implicit T* --> scoped_refptr<T> conversion

Bug: webrtc:13464
Change-Id: Ida1694537b47c62ce327eb5c77897af451a63ae7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/246202
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35688}

audio/channel_receive_frame_transformer_delegate.cc

diff --git a/audio/channel_receive_frame_transformer_delegate.cc b/audio/channel_receive_frame_transformer_delegate.cc
index c9e8a8b..c9865cb 100644
--- a/audio/channel_receive_frame_transformer_delegate.cc
+++ b/audio/channel_receive_frame_transformer_delegate.cc
@@ -79,7 +79,7 @@
 
 void ChannelReceiveFrameTransformerDelegate::OnTransformedFrame(
     std::unique_ptr<TransformableFrameInterface> frame) {
-  rtc::scoped_refptr<ChannelReceiveFrameTransformerDelegate> delegate = this;
+  rtc::scoped_refptr<ChannelReceiveFrameTransformerDelegate> delegate(this);
   channel_receive_thread_->PostTask(ToQueuedTask(
       [delegate = std::move(delegate), frame = std::move(frame)]() mutable {
         delegate->ReceiveFrame(std::move(frame));

audio/channel_send_frame_transformer_delegate.cc

diff --git a/audio/channel_send_frame_transformer_delegate.cc b/audio/channel_send_frame_transformer_delegate.cc
index eee4cd0..29bb0b8 100644
--- a/audio/channel_send_frame_transformer_delegate.cc
+++ b/audio/channel_send_frame_transformer_delegate.cc
@@ -102,7 +102,7 @@
   MutexLock lock(&send_lock_);
   if (!send_frame_callback_)
     return;
-  rtc::scoped_refptr<ChannelSendFrameTransformerDelegate> delegate = this;
+  rtc::scoped_refptr<ChannelSendFrameTransformerDelegate> delegate(this);
   encoder_queue_->PostTask(
       [delegate = std::move(delegate), frame = std::move(frame)]() mutable {
         delegate->SendFrame(std::move(frame));

modules/audio_coding/acm2/audio_coding_module_unittest.cc

diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
index f6e9e47..7ddb3ed 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 @@
   const auto opus_decoder =
       AudioDecoderMultiChannelOpus::MakeAudioDecoder(*decoder_config);
 
-  rtc::scoped_refptr<AudioDecoderFactory> decoder_factory =
+  rtc::scoped_refptr<AudioDecoderFactory> decoder_factory(
       new rtc::RefCountedObject<test::AudioDecoderProxyFactory>(
-          opus_decoder.get());
+          opus_decoder.get()));
 
   // Set up an EXTERNAL DECODER to parse 4 channels.
   Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(  // audio checksum

modules/audio_device/win/audio_device_core_win.cc

diff --git a/modules/audio_device/win/audio_device_core_win.cc b/modules/audio_device/win/audio_device_core_win.cc
index 6365d9f..096e49c 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 @@
 // ----------------------------------------------------------------------------
 
 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),