refactor: removed isInitialized and added overrides for canBeDestructed

maciejmakowski2003 · maciejmakowski2003 · commit b6adf6ce7c54 · 2026-03-26T17:26:34.000+01:00
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioNode.cpp
@@ -34,8 +34,4 @@ bool AudioNode::requiresTailProcessing() const {
   return requiresTailProcessing_;
 }
 
-void AudioNode::cleanup() {
-  isInitialized_.store(false, std::memory_order_release);
-}
-
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioNode.h b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioNode.h
@@ -105,14 +105,7 @@ class AudioNode : public utils::graph::GraphObject, public std::enable_shared_fr
   const ChannelInterpretation channelInterpretation_ = ChannelInterpretation::SPEAKERS;
   const bool requiresTailProcessing_;
 
-  std::atomic<bool> isInitialized_ = false;
-
-  virtual void disable() {
-    cleanup();
-  };
-
   virtual void processNode(int) = 0;
-  void cleanup();
 };
 
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/analysis/AnalyserNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/analysis/AnalyserNode.cpp
@@ -21,7 +21,6 @@ AnalyserNode::AnalyserNode(
       maxDecibels_(options.maxDecibels),
       smoothingTimeConstant_(options.smoothingTimeConstant) {
   setFFTSize(options.fftSize);
-  isInitialized_.store(true, std::memory_order_release);
 }
 
 void AnalyserNode::setFFTSize(int fftSize) {
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/destinations/AudioDestinationNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/destinations/AudioDestinationNode.cpp
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/destinations/AudioDestinationNode.h b/packages/react-native-audio-api/common/cpp/audioapi/core/destinations/AudioDestinationNode.h
@@ -13,10 +13,14 @@ class BaseAudioContext;
 
 class AudioDestinationNode : public AudioNode {
  public:
-  explicit AudioDestinationNode(const std::shared_ptr<BaseAudioContext> &context);
+  explicit AudioDestinationNode(const std::shared_ptr<BaseAudioContext> &context)
+      : AudioNode(context, AudioDestinationOptions()) {}
+
+  bool canBeDestructed() const override {
+    return false;
+  }
 
  protected:
-  // DestinationNode's processNode is never called; graph traversal skips it.
   void processNode(int) final {
     audioBuffer_->normalize();
   };
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/effects/BiquadFilterNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/effects/BiquadFilterNode.cpp
@@ -67,9 +67,7 @@ BiquadFilterNode::BiquadFilterNode(
       x1_(MAX_CHANNEL_COUNT),
       x2_(MAX_CHANNEL_COUNT),
       y1_(MAX_CHANNEL_COUNT),
-      y2_(MAX_CHANNEL_COUNT) {
-  isInitialized_.store(true, std::memory_order_release);
-}
+      y2_(MAX_CHANNEL_COUNT) {}
 
 void BiquadFilterNode::setType(BiquadFilterType type) {
   type_ = type;
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/effects/ConvolverNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/effects/ConvolverNode.cpp
@@ -20,9 +20,7 @@ ConvolverNode::ConvolverNode(
       scaleFactor_(1.0f),
       intermediateBuffer_(nullptr),
       buffer_(nullptr),
-      internalBuffer_(nullptr) {
-  isInitialized_.store(true, std::memory_order_release);
-}
+      internalBuffer_(nullptr) {}
 
 void ConvolverNode::setBuffer(
     const std::shared_ptr<AudioBuffer> &buffer,
@@ -99,7 +97,6 @@ void ConvolverNode::processNode(int framesToProcess) {
     if (remainingSegments_ > 0) {
       remainingSegments_--;
     } else {
-      disable();
       signalledToStop_ = false;
       internalBufferIndex_ = 0;
       return;
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/effects/DelayNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/effects/DelayNode.cpp
@@ -18,9 +18,7 @@ DelayNode::DelayNode(const std::shared_ptr<BaseAudioContext> &context, const Del
                   options.maxDelayTime * context->getSampleRate() +
                   1), // +1 to enable delayTime equal to maxDelayTime
               channelCount_,
-              context->getSampleRate())) {
-  isInitialized_.store(true, std::memory_order_release);
-}
+              context->getSampleRate())) {}
 
 std::shared_ptr<AudioParam> DelayNode::getDelayTimeParam() const {
   return delayTimeParam_;
@@ -71,7 +69,6 @@ void DelayNode::processNode(int framesToProcess) {
   // handling tail processing
   if (signalledToStop_) {
     if (remainingFrames_ <= 0) {
-      disable();
       signalledToStop_ = false;
       return;
     }
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/effects/GainNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/effects/GainNode.cpp
@@ -15,9 +15,7 @@ GainNode::GainNode(const std::shared_ptr<BaseAudioContext> &context, const GainO
               options.gain,
               MOST_NEGATIVE_SINGLE_FLOAT,
               MOST_POSITIVE_SINGLE_FLOAT,
-              context)) {
-  isInitialized_.store(true, std::memory_order_release);
-}
+              context)) {}
 
 std::shared_ptr<AudioParam> GainNode::getGainParam() const {
   return gainParam_;
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/effects/IIRFilterNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/effects/IIRFilterNode.cpp
@@ -42,9 +42,7 @@ IIRFilterNode::IIRFilterNode(
       feedback_(createNormalizedArray(options.feedback, options.feedback[0])),
       xBuffers_(bufferLength, MAX_CHANNEL_COUNT, context->getSampleRate()),
       yBuffers_(bufferLength, MAX_CHANNEL_COUNT, context->getSampleRate()),
-      bufferIndices_(bufferLength) {
-  isInitialized_.store(true, std::memory_order_release);
-}
+      bufferIndices_(bufferLength) {}
 
 // Compute Z-transform of the filter
 //
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/effects/StereoPannerNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/effects/StereoPannerNode.cpp
@@ -19,9 +19,7 @@ StereoPannerNode::StereoPannerNode(
           std::make_shared<DSPAudioBuffer>(
               RENDER_QUANTUM_SIZE,
               channelCount_,
-              context->getSampleRate())) {
-  isInitialized_.store(true, std::memory_order_release);
-}
+              context->getSampleRate())) {}
 
 std::shared_ptr<AudioParam> StereoPannerNode::getPanParam() const {
   return panParam_;
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/effects/WaveShaperNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/effects/WaveShaperNode.cpp
@@ -17,7 +17,6 @@ WaveShaperNode::WaveShaperNode(
     waveShapers_.emplace_back(std::make_unique<WaveShaper>(nullptr, context->getSampleRate()));
   }
   setCurve(options.curve);
-  isInitialized_.store(true, std::memory_order_release);
 }
 
 void WaveShaperNode::setOversample(OverSampleType type) {
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/effects/WorkletNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/effects/WorkletNode.cpp
@@ -16,9 +16,7 @@ WorkletNode::WorkletNode(
           std::make_shared<AudioBuffer>(bufferLength, inputChannelCount, context->getSampleRate())),
       bufferLength_(bufferLength),
       inputChannelCount_(inputChannelCount),
-      curBuffIndex_(0) {
-  isInitialized_.store(true, std::memory_order_release);
-}
+      curBuffIndex_(0) {}
 
 void WorkletNode::processNode(int framesToProcess) {
   size_t processed = 0;
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/effects/WorkletProcessingNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/effects/WorkletProcessingNode.cpp
@@ -18,8 +18,6 @@ WorkletProcessingNode::WorkletProcessingNode(
     inputBuffsHandles_[i] = std::make_shared<AudioArrayBuffer>(RENDER_QUANTUM_SIZE);
     outputBuffsHandles_[i] = std::make_shared<AudioArrayBuffer>(RENDER_QUANTUM_SIZE);
   }
-
-  isInitialized_.store(true, std::memory_order_release);
 }
 
 void WorkletProcessingNode::processNode(int framesToProcess) {
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioBufferQueueSourceNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioBufferQueueSourceNode.cpp
@@ -25,8 +25,6 @@ AudioBufferQueueSourceNode::AudioBufferQueueSourceNode(
     // to compensate for processing latency.
     addExtraTailFrames_ = true;
   }
-
-  isInitialized_.store(true, std::memory_order_release);
 }
 
 void AudioBufferQueueSourceNode::stop(double when) {
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioBufferSourceNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioBufferSourceNode.cpp
@@ -21,9 +21,7 @@ AudioBufferSourceNode::AudioBufferSourceNode(
       loop_(options.loop),
       loopSkip_(options.loopSkip),
       loopStart_(options.loopStart),
-      loopEnd_(options.loopEnd) {
-  isInitialized_.store(true, std::memory_order_release);
-}
+      loopEnd_(options.loopEnd) {}
 
 void AudioBufferSourceNode::setLoop(bool loop) {
   loop_ = loop;
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioScheduledSourceNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioScheduledSourceNode.cpp
@@ -68,6 +68,10 @@ void AudioScheduledSourceNode::unregisterOnEndedCallback(uint64_t callbackId) {
   audioEventHandlerRegistry_->unregisterHandler(AudioEvent::ENDED, callbackId);
 }
 
+bool AudioScheduledSourceNode::canBeDestructed() const {
+  return isUnscheduled() || isFinished();
+}
+
 void AudioScheduledSourceNode::updatePlaybackInfo(
     const std::shared_ptr<DSPAudioBuffer> &processingBuffer,
     int framesToProcess,
@@ -155,8 +159,6 @@ void AudioScheduledSourceNode::updatePlaybackInfo(
 }
 
 void AudioScheduledSourceNode::disable() {
-  AudioNode::disable();
-
   if (onEndedCallbackId_ != 0) {
     audioEventHandlerRegistry_->invokeHandlerWithEventBody(
         AudioEvent::ENDED, onEndedCallbackId_, {});
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioScheduledSourceNode.h b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioScheduledSourceNode.h
@@ -44,10 +44,12 @@ class AudioScheduledSourceNode : public AudioNode {
   /// @note Audio Thread only
   void setOnEndedCallbackId(uint64_t callbackId);
 
-  void disable() override;
+  virtual void disable();
 
   void unregisterOnEndedCallback(uint64_t callbackId);
 
+  bool canBeDestructed() const override;
+
  protected:
   double startTime_;
   double stopTime_;
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/ConstantSourceNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/ConstantSourceNode.cpp
@@ -16,9 +16,7 @@ ConstantSourceNode::ConstantSourceNode(
               options.offset,
               MOST_NEGATIVE_SINGLE_FLOAT,
               MOST_POSITIVE_SINGLE_FLOAT,
-              context)) {
-  isInitialized_.store(true, std::memory_order_release);
-}
+              context)) {}
 
 std::shared_ptr<AudioParam> ConstantSourceNode::getOffsetParam() const {
   return offsetParam_;
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/OscillatorNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/OscillatorNode.cpp
@@ -26,8 +26,6 @@ OscillatorNode::OscillatorNode(
   } else {
     periodicWave_ = context->getBasicWaveForm(type_);
   }
-
-  isInitialized_.store(true, std::memory_order_release);
 }
 
 std::shared_ptr<AudioParam> OscillatorNode::getFrequencyParam() const {
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/RecorderAdapterNode.h b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/RecorderAdapterNode.h
@@ -51,6 +51,8 @@ class RecorderAdapterNode : public AudioNode {
   // Accumulates resampled output across calls
   AudioBuffer overflowBuffer_;
   size_t overflowSize_ = 0;
+
+  std::atomic<bool> isInitialized_{false};
 };
 
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/StreamerNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/StreamerNode.cpp
@@ -112,10 +112,6 @@ bool StreamerNode::initialize(const std::string &input_url) {
     return false;
   }
 
-  if (isInitialized_.load(std::memory_order_acquire)) {
-    return false;
-  }
-
   if (!openInput(input_url)) {
     if (VERBOSE)
       printf("Failed to open input\n");
@@ -151,7 +147,6 @@ bool StreamerNode::initialize(const std::string &input_url) {
   receiver_ = std::move(receiver);
 
   streamingThread_ = std::thread(&StreamerNode::streamAudio, this);
-  isInitialized_.store(true, std::memory_order_release);
   return true;
 }
 
@@ -344,7 +339,6 @@ void StreamerNode::cleanup() {
   decoder_ = nullptr;
   codecpar_ = nullptr;
   maxResampledSamples_ = 0;
-  isInitialized_.store(false, std::memory_order_release);
 }
 #endif // RN_AUDIO_API_FFMPEG_DISABLED
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/WorkletSourceNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/WorkletSourceNode.cpp
@@ -15,8 +15,6 @@ WorkletSourceNode::WorkletSourceNode(
   for (size_t i = 0; i < outputChannelCount; ++i) {
     outputBuffsHandles_[i] = std::make_shared<AudioArrayBuffer>(RENDER_QUANTUM_SIZE);
   }
-
-  isInitialized_.store(true, std::memory_order_release);
 }
 
 void WorkletSourceNode::processNode(int framesToProcess) {
@@ -41,7 +39,7 @@ void WorkletSourceNode::processNode(int framesToProcess) {
       context->getSampleRate(),
       context->getCurrentSampleFrame());
 
-  if (nonSilentFramesToProcess == 0) {
+  if (!isPlaying() && !isStopScheduled() || nonSilentFramesToProcess == 0) {
     audioBuffer_->zero();
     return;
   }
diff --git a/packages/react-native-audio-api/common/cpp/test/src/core/sources/AudioScheduledSourceTest.cpp b/packages/react-native-audio-api/common/cpp/test/src/core/sources/AudioScheduledSourceTest.cpp
@@ -31,9 +31,7 @@ class AudioScheduledSourceTest : public ::testing::Test {
 class TestableAudioScheduledSourceNode : public AudioScheduledSourceNode {
  public:
   explicit TestableAudioScheduledSourceNode(std::shared_ptr<BaseAudioContext> context)
-      : AudioScheduledSourceNode(context) {
-    isInitialized_.store(true, std::memory_order_release);
-  }
+      : AudioScheduledSourceNode(context) {}
 
   void updatePlaybackInfo(
       const std::shared_ptr<DSPAudioBuffer> &processingBuffer,

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,4 @@ bool AudioNode::requiresTailProcessing() const {`
`34`	`34`	`return requiresTailProcessing_;`
`35`	`35`	`}`
`36`	`36`
`37`		`-void AudioNode::cleanup() {`
`38`		`- isInitialized_.store(false, std::memory_order_release);`
`39`		`-}`
`40`		`-`
`41`	`37`	`} // namespace audioapi`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ AnalyserNode::AnalyserNode(`
`21`	`21`	`maxDecibels_(options.maxDecibels),`
`22`	`22`	`smoothingTimeConstant_(options.smoothingTimeConstant) {`
`23`	`23`	`setFFTSize(options.fftSize);`
`24`		`- isInitialized_.store(true, std::memory_order_release);`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`void AnalyserNode::setFFTSize(int fftSize) {`