Update refcounting of AudioState to use rtc::RefCountedObject
Bug: webrtc:8270, webrtc:9305
Change-Id: I9ce76ebe358b3f34d2ad424861a396a0dc2a537d
Reviewed-on: https://webrtc-review.googlesource.com/c/116486
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26177}diff --git a/audio/audio_state.cc b/audio/audio_state.cc
index 7d473ae..ce9e894 100644
--- a/audio/audio_state.cc
+++ b/audio/audio_state.cc
@@ -17,9 +17,9 @@
#include "absl/memory/memory.h"
#include "audio/audio_receive_stream.h"
#include "modules/audio_device/include/audio_device.h"
-#include "rtc_base/atomicops.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
+#include "rtc_base/refcountedobject.h"
#include "rtc_base/thread.h"
namespace webrtc {
@@ -168,20 +168,6 @@
audio_transport_.SetStereoChannelSwapping(enable);
}
-// Reference count; implementation copied from rtc::RefCountedObject.
-void AudioState::AddRef() const {
- rtc::AtomicOps::Increment(&ref_count_);
-}
-
-// Reference count; implementation copied from rtc::RefCountedObject.
-rtc::RefCountReleaseStatus AudioState::Release() const {
- if (rtc::AtomicOps::Decrement(&ref_count_) == 0) {
- delete this;
- return rtc::RefCountReleaseStatus::kDroppedLastRef;
- }
- return rtc::RefCountReleaseStatus::kOtherRefsRemained;
-}
-
void AudioState::UpdateAudioTransportWithSendingStreams() {
RTC_DCHECK(thread_checker_.CalledOnValidThread());
std::vector<webrtc::AudioSendStream*> sending_streams;
@@ -199,6 +185,6 @@
rtc::scoped_refptr<AudioState> AudioState::Create(
const AudioState::Config& config) {
- return rtc::scoped_refptr<AudioState>(new internal::AudioState(config));
+ return new rtc::RefCountedObject<internal::AudioState>(config);
}
} // namespace webrtc
