refactor: minor improvements

Author: Maciej Makowski

packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioBufferStreamSourceNodeHostObject.h

@@ -26,7 +26,7 @@ class AudioBufferStreamSourceNodeHostObject
 
         addFunctions(
                 JSI_EXPORT_FUNCTION(AudioBufferStreamSourceNodeHostObject, start),
-                JSI_EXPORT_FUNCTION(AudioBufferStreamSourceNodeHostObject, enqueueAudioBuffer));
+                JSI_EXPORT_FUNCTION(AudioBufferStreamSourceNodeHostObject, enqueueBuffer));
     }
 
     JSI_PROPERTY_GETTER(detune) {
@@ -58,14 +58,16 @@ class AudioBufferStreamSourceNodeHostObject
         return jsi::Value::undefined();
     }
 
-    JSI_HOST_FUNCTION(enqueueAudioBuffer) {
+    JSI_HOST_FUNCTION(enqueueBuffer) {
         auto audioBufferStreamSourceNode =
                 std::static_pointer_cast<AudioBufferStreamSourceNode>(node_);
 
         auto audioBufferHostObject =
                 args[0].getObject(runtime).asHostObject<AudioBufferHostObject>(runtime);
 
-        audioBufferStreamSourceNode->enqueueAudioBuffer(audioBufferHostObject->audioBuffer_);
+        auto isLastBuffer = args[1].asBool();
+
+        audioBufferStreamSourceNode->enqueueBuffer(audioBufferHostObject->audioBuffer_, isLastBuffer);
 
         return jsi::Value::undefined();
     }

packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioBufferStreamSourceNode.cpp

@@ -51,10 +51,13 @@ void AudioBufferStreamSourceNode::start(double when, double offset) {
   vReadIndex_ = static_cast<double>(context_->getSampleRate() * offset);
 }
 
-void AudioBufferStreamSourceNode::enqueueAudioBuffer(
-    const std::shared_ptr<AudioBuffer> &buffer) {
+void AudioBufferStreamSourceNode::enqueueBuffer(
+    const std::shared_ptr<AudioBuffer> &buffer,
+    bool isLastBuffer) {
   auto locker = Locker(getBufferLock());
   buffers_.push(buffer);
+
+  isLastBuffer_ = isLastBuffer;
 }
 
 void AudioBufferStreamSourceNode::disable() {
@@ -165,6 +168,10 @@ void AudioBufferStreamSourceNode::processWithoutInterpolation(
       if (buffers_.empty()) {
         processingBus->zero(writeIndex, framesLeft);
         readIndex = 0;
+
+        if (isLastBuffer_) {
+            playbackState_ = PlaybackState::STOP_SCHEDULED;
+        }
         break;
       } else {
         buffer = buffers_.front();

packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioBufferStreamSourceNode.h

@@ -24,7 +24,7 @@ class AudioBufferStreamSourceNode : public AudioScheduledSourceNode {
     [[nodiscard]] std::shared_ptr<AudioParam> getPlaybackRateParam() const;
 
     void start(double when, double offset);
-    void enqueueAudioBuffer(const std::shared_ptr<AudioBuffer> &buffer);
+    void enqueueBuffer(const std::shared_ptr<AudioBuffer> &buffer, bool isLastBuffer);
     void disable() override;
 
  protected:
@@ -37,18 +37,18 @@ class AudioBufferStreamSourceNode : public AudioScheduledSourceNode {
 
     // pitch correction
     std::shared_ptr<signalsmith::stretch::SignalsmithStretch<float>> stretch_;
+    std::shared_ptr<AudioBus> playbackRateBus_;
 
     // k-rate params
     std::shared_ptr<AudioParam> detuneParam_;
     std::shared_ptr<AudioParam> playbackRateParam_;
 
-    std::shared_ptr<AudioBus> playbackRateBus_;
-
     // internal helper
     double vReadIndex_;
 
     // User provided buffer
     std::queue<std::shared_ptr<AudioBuffer>> buffers_;
+    bool isLastBuffer_ = false;
 
     void processWithPitchCorrection(const std::shared_ptr<AudioBus> &processingBus,
                                     int framesToProcess);

packages/react-native-audio-api/src/core/AudioBufferStreamSourceNode.ts

@@ -16,9 +16,13 @@ export default class AudioBufferStreamSourceNode extends AudioScheduledSourceNod
     this.playbackRate = new AudioParam(node.playbackRate, context);
   }
 
-  public enqueueAudioBuffer(buffer: AudioBuffer): void {
-    (this.node as IAudioBufferStreamSourceNode).enqueueAudioBuffer(
-      buffer.buffer
+  public enqueueBuffer(
+    buffer: AudioBuffer,
+    isLastBuffer: boolean = false
+  ): void {
+    (this.node as IAudioBufferStreamSourceNode).enqueueBuffer(
+      buffer.buffer,
+      isLastBuffer
     );
   }
 

packages/react-native-audio-api/src/interfaces.ts

@@ -115,7 +115,7 @@ export interface IAudioBufferStreamSourceNode
   detune: IAudioParam;
   playbackRate: IAudioParam;
 
-  enqueueAudioBuffer: (audioBuffer: IAudioBuffer) => void;
+  enqueueBuffer: (audioBuffer: IAudioBuffer, isLastBuffer: boolean) => void;
   start: (when?: number, offset?: number) => void;
 }