react-native-audio-api 0.4.15 → 0.4.16

package/common/cpp/audioapi/core/sources/AudioBufferSourceNode.cpp

@@ -16,8 +16,7 @@ AudioBufferSourceNode::AudioBufferSourceNode(BaseAudioContext *context)
       loopEnd_(0),
       vReadIndex_(0.0) {
   buffer_ = std::shared_ptr<AudioBuffer>(nullptr);
-  alignedBus_ = std::make_shared<AudioBus>(
-      RENDER_QUANTUM_SIZE, 1, context_->getSampleRate());
+  alignedBus_ = std::shared_ptr<AudioBus>(nullptr);
 
   detuneParam_ = std::make_shared<AudioParam>(0.0, MIN_DETUNE, MAX_DETUNE);
   playbackRateParam_ = std::make_shared<AudioParam>(
@@ -26,6 +25,13 @@ AudioBufferSourceNode::AudioBufferSourceNode(BaseAudioContext *context)
   isInitialized_ = true;
 }
 
+AudioBufferSourceNode::~AudioBufferSourceNode() {
+  Locker locker(getBufferLock());
+
+  buffer_ = std::shared_ptr<AudioBuffer>(nullptr);
+  alignedBus_ = std::shared_ptr<AudioBus>(nullptr);
+}
+
 bool AudioBufferSourceNode::getLoop() const {
   return loop_;
 }
@@ -69,8 +75,7 @@ void AudioBufferSourceNode::setBuffer(
 
   if (!buffer) {
     buffer_ = std::shared_ptr<AudioBuffer>(nullptr);
-    alignedBus_ = std::make_shared<AudioBus>(
-        RENDER_QUANTUM_SIZE, 1, context_->getSampleRate());
+    alignedBus_ = std::shared_ptr<AudioBus>(nullptr);
     loopEnd_ = 0;
     return;
   }
@@ -80,6 +85,7 @@ void AudioBufferSourceNode::setBuffer(
 
   alignedBus_ = std::make_shared<AudioBus>(
       buffer_->getLength(), channelCount_, context_->getSampleRate());
+
   alignedBus_->zero();
   alignedBus_->sum(buffer_->bus_.get());
 
@@ -116,13 +122,13 @@ std::mutex &AudioBufferSourceNode::getBufferLock() {
 void AudioBufferSourceNode::processNode(
     const std::shared_ptr<AudioBus> &processingBus,
     int framesToProcess) {
-  // No audio data to fill, zero the output and return.
-  if (!buffer_) {
+  if (!Locker::tryLock(getBufferLock())) {
     processingBus->zero();
     return;
   }
 
-  if (!Locker::tryLock(getBufferLock())) {
+  // No audio data to fill, zero the output and return.
+  if (!buffer_) {
     processingBus->zero();
     return;
   }
@@ -179,6 +185,11 @@ void AudioBufferSourceNode::processWithoutInterpolation(
     size_t framesToCopy = std::min(framesToEnd, framesLeft);
     framesToCopy = framesToCopy > 0 ? framesToCopy : 0;
 
+    assert(readIndex >= 0);
+    assert(writeIndex >= 0);
+    assert(readIndex + framesToCopy <= alignedBus_->getSize());
+    assert(writeIndex + framesToCopy <= processingBus->getSize());
+
     // Direction is forward, we can normally copy the data
     if (direction == 1) {
       processingBus->copy(

package/common/cpp/audioapi/core/sources/AudioBufferSourceNode.h

@@ -16,6 +16,7 @@ class AudioParam;
 class AudioBufferSourceNode : public AudioScheduledSourceNode {
  public:
   explicit AudioBufferSourceNode(BaseAudioContext *context);
+  ~AudioBufferSourceNode();
 
   [[nodiscard]] bool getLoop() const;
   [[nodiscard]] double getLoopStart() const;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-api",
-  "version": "0.4.15",
+  "version": "0.4.16",
   "description": "react-native-audio-api provides system for controlling audio in React Native environment compatible with Web Audio API specification",
   "bin": {
     "setup-custom-wasm": "./scripts/setup-custom-wasm.js"