zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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}
This commit is contained in:
Niels Möller
2022-01-13 14:05:38 +01:00
committed by WebRTC LUCI CQ
parent 96296bc252
commit a3361ff2f5
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
audio/channel_receive_frame_transformer_delegate.cc
View File

@ -79,7 +79,7 @@ void ChannelReceiveFrameTransformerDelegate::Transform(
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));

2
audio/channel_send_frame_transformer_delegate.cc
View File

@ -102,7 +102,7 @@ void ChannelSendFrameTransformerDelegate::OnTransformedFrame(
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));

4
modules/audio_coding/acm2/audio_coding_module_unittest.cc
View File

@ -1540,9 +1540,9 @@ TEST_F(AcmSenderBitExactnessNewApi, DISABLED_OpusManyChannels) {
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

48
modules/audio_device/win/audio_device_core_win.cc
View File

@ -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),