react-native-audio-api 0.6.3-rc.1 → 0.6.4-nightly-a960beb-20250703

package/android/src/main/cpp/audioapi/android/AudioAPIModule.cpp

@@ -58,11 +58,19 @@ void AudioAPIModule::invokeHandlerWithEventNameAndEventBody(
     } else if (value->isInstanceOf(jni::JFloat::javaClassStatic())) {
       body[name] = jni::static_ref_cast<jni::JFloat>(value)->value();
     } else if (value->isInstanceOf(jni::JBoolean::javaClassStatic())) {
-      body[name] = jni::static_ref_cast<jni::JBoolean>(value)->value();
+      auto booleanValue = jni::static_ref_cast<jni::JBoolean>(value)->value();
+
+      if (booleanValue) {
+        body[name] = true;
+      } else {
+        body[name] = false;
+      }
     }
   }
 
-  audioEventHandlerRegistry_->invokeHandlerWithEventBody(
-      eventName->toStdString(), body);
+  if (audioEventHandlerRegistry_ != nullptr) {
+    audioEventHandlerRegistry_->invokeHandlerWithEventBody(
+        eventName->toStdString(), body);
+  }
 }
 } // namespace audioapi

package/android/src/main/java/com/swmansion/audioapi/AudioAPIModule.kt

@@ -60,7 +60,7 @@ class AudioAPIModule(
     enabled: Boolean,
     promise: Promise?,
   ) {
-    // noting to do here
+    promise?.resolve(true)
   }
 
   override fun setAudioSessionOptions(

package/android/src/main/java/com/swmansion/audioapi/system/AudioFocusListener.kt

@@ -13,7 +13,7 @@ class AudioFocusListener(
   private val audioAPIModule: WeakReference<AudioAPIModule>,
   private val lockScreenManager: WeakReference<LockScreenManager>,
 ) : AudioManager.OnAudioFocusChangeListener {
-  private var playOnAudioFocus = false
+  private var playOnAudioFocus: Boolean = false
   private var focusRequest: AudioFocusRequest? = null
 
   override fun onAudioFocusChange(focusChange: Int) {
@@ -23,7 +23,7 @@ class AudioFocusListener(
         playOnAudioFocus = false
         val body =
           HashMap<String, Any>().apply {
-            put("value", "began")
+            put("type", "began")
             put("shouldResume", false)
           }
         audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("interruption", body)
@@ -32,7 +32,7 @@ class AudioFocusListener(
         playOnAudioFocus = lockScreenManager.get()?.isPlaying == true
         val body =
           HashMap<String, Any>().apply {
-            put("value", "began")
+            put("type", "began")
             put("shouldResume", playOnAudioFocus)
           }
         audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("interruption", body)
@@ -41,14 +41,14 @@ class AudioFocusListener(
         if (playOnAudioFocus) {
           val body =
             HashMap<String, Any>().apply {
-              put("value", "ended")
+              put("type", "ended")
               put("shouldResume", true)
             }
           audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("interruption", body)
         } else {
           val body =
             HashMap<String, Any>().apply {
-              put("value", "ended")
+              put("type", "ended")
               put("shouldResume", false)
             }
           audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("interruption", body)

package/android/src/main/java/com/swmansion/audioapi/system/LockScreenManager.kt

@@ -12,7 +12,6 @@ import androidx.media.app.NotificationCompat.MediaStyle
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
-import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper.Companion.instance
 import com.swmansion.audioapi.R
 import java.io.IOException
 import java.lang.ref.WeakReference
@@ -250,7 +249,7 @@ class LockScreenManager(
       // If we are running the app in debug mode, the "local" image will be served from htt://localhost:8080, so we need to check for this case and load those images from URL
       if (local && !url.startsWith("http")) {
         // Gets the drawable from the RN's helper for local resources
-        val helper = instance
+        val helper = com.facebook.react.views.imagehelper.ResourceDrawableIdHelper.instance
         val image = helper.getResourceDrawable(reactContext.get()!!, url)
 
         bitmap =

package/common/cpp/audioapi/HostObjects/AudioBufferBaseSourceNodeHostObject.h

@@ -18,7 +18,8 @@ class AudioBufferBaseSourceNodeHostObject
             : AudioScheduledSourceNodeHostObject(node) {
         addGetters(
                 JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, detune),
-                JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, playbackRate));
+                JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, playbackRate),
+                JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, onPositionChangedInterval));
 
         addSetters(
                 JSI_EXPORT_PROPERTY_SETTER(AudioBufferBaseSourceNodeHostObject, onPositionChanged),
@@ -49,6 +50,12 @@ class AudioBufferBaseSourceNodeHostObject
         sourceNode->setOnPositionChangedCallbackId(std::stoull(value.getString(runtime).utf8(runtime)));
     }
 
+    JSI_PROPERTY_GETTER(onPositionChangedInterval) {
+        auto sourceNode =
+                std::static_pointer_cast<AudioBufferBaseSourceNode>(node_);
+        return jsi::Value(sourceNode->getOnPositionChangedInterval());
+    }
+
     JSI_PROPERTY_SETTER(onPositionChangedInterval) {
         auto sourceNode =
                 std::static_pointer_cast<AudioBufferBaseSourceNode>(node_);

package/common/cpp/audioapi/core/AudioContext.cpp

@@ -13,7 +13,8 @@ namespace audioapi {
 AudioContext::AudioContext(
     float sampleRate,
     bool initSuspended,
-    const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry)
+    const std::shared_ptr<IAudioEventHandlerRegistry>
+        &audioEventHandlerRegistry)
     : BaseAudioContext(audioEventHandlerRegistry) {
 #ifdef ANDROID
   audioPlayer_ = std::make_shared<AudioPlayer>(this->renderAudio(), sampleRate);

package/common/cpp/audioapi/core/AudioContext.h

@@ -14,7 +14,7 @@ class IOSAudioPlayer;
 
 class AudioContext : public BaseAudioContext {
  public:
-  explicit AudioContext(float sampleRate, bool initSuspended, const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry);
+  explicit AudioContext(float sampleRate, bool initSuspended, const std::shared_ptr<IAudioEventHandlerRegistry> &audioEventHandlerRegistry);
   ~AudioContext() override;
 
   void close();

package/common/cpp/audioapi/core/AudioParam.cpp

@@ -1,5 +1,6 @@
 #include <audioapi/core/AudioParam.h>
 #include <audioapi/core/BaseAudioContext.h>
+#include <audioapi/core/utils/Locker.h>
 #include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/dsp/VectorMath.h>
 #include <audioapi/utils/AudioArray.h>
@@ -17,11 +18,10 @@ AudioParam::AudioParam(
       minValue_(minValue),
       maxValue_(maxValue),
       context_(context),
-      audioBus_(
-          std::make_shared<AudioBus>(
-              RENDER_QUANTUM_SIZE,
-              1,
-              context->getSampleRate())) {
+      audioBus_(std::make_shared<AudioBus>(
+          RENDER_QUANTUM_SIZE,
+          1,
+          context->getSampleRate())) {
   startTime_ = 0;
   endTime_ = 0;
   startValue_ = value_;
@@ -47,11 +47,16 @@ float AudioParam::getMaxValue() const {
   return maxValue_;
 }
 
+std::mutex &AudioParam::getQueueLock() {
+  return queueLock_;
+}
+
 void AudioParam::setValue(float value) {
   value_ = std::clamp(value, minValue_, maxValue_);
 }
 
 float AudioParam::getValueAtTime(double time) {
+  Locker lock(getQueueLock());
   if (endTime_ < time && !eventsQueue_.empty()) {
     auto event = eventsQueue_.front();
     startTime_ = event.getStartTime();
@@ -84,6 +89,7 @@ void AudioParam::setValueAtTime(float value, double startTime) {
     return endValue;
   };
 
+  Locker lock(getQueueLock());
   auto event = ParamChangeEvent(
       startTime,
       startTime,
@@ -117,6 +123,7 @@ void AudioParam::linearRampToValueAtTime(float value, double endTime) {
     return endValue;
   };
 
+  Locker lock(getQueueLock());
   auto event = ParamChangeEvent(
       getQueueEndTime(),
       endTime,
@@ -151,6 +158,7 @@ void AudioParam::exponentialRampToValueAtTime(float value, double endTime) {
     return endValue;
   };
 
+  Locker lock(getQueueLock());
   auto event = ParamChangeEvent(
       getQueueEndTime(),
       endTime,
@@ -181,6 +189,7 @@ void AudioParam::setTargetAtTime(
             (startValue - target) * exp(-(time - startTime) / timeConstant));
       };
 
+  Locker lock(getQueueLock());
   auto event = ParamChangeEvent(
       startTime,
       startTime,
@@ -225,6 +234,7 @@ void AudioParam::setValueCurveAtTime(
     return endValue;
   };
 
+  Locker lock(getQueueLock());
   auto event = ParamChangeEvent(
       startTime,
       startTime + duration,
@@ -236,6 +246,7 @@ void AudioParam::setValueCurveAtTime(
 }
 
 void AudioParam::cancelScheduledValues(double cancelTime) {
+  Locker lock(getQueueLock());
   auto it = eventsQueue_.rbegin();
   while (it->getEndTime() >= cancelTime) {
     if (it->getStartTime() >= cancelTime ||
@@ -248,6 +259,7 @@ void AudioParam::cancelScheduledValues(double cancelTime) {
 }
 
 void AudioParam::cancelAndHoldAtTime(double cancelTime) {
+  Locker lock(getQueueLock());
   auto it = eventsQueue_.rbegin();
   while (it->getEndTime() >= cancelTime) {
     if (it->getStartTime() >= cancelTime) {

package/common/cpp/audioapi/core/AudioParam.h

@@ -10,6 +10,7 @@
 #include <vector>
 #include <unordered_set>
 #include <cstddef>
+#include <mutex>
 
 namespace audioapi {
 
@@ -50,6 +51,7 @@ class AudioParam {
   std::deque<ParamChangeEvent> eventsQueue_;
   std::unordered_set<AudioNode *> inputNodes_;
   std::shared_ptr<AudioBus> audioBus_;
+  std::mutex queueLock_;
 
   double startTime_;
   double endTime_;
@@ -58,6 +60,7 @@ class AudioParam {
   std::function<float(double, double, float, float, double)> calculateValue_;
   std::vector<std::shared_ptr<AudioBus>> inputBuses_ = {};
 
+  std::mutex &getQueueLock();
   double getQueueEndTime();
   float getQueueEndValue();
   void updateQueue(ParamChangeEvent &event);

package/common/cpp/audioapi/core/BaseAudioContext.cpp

@@ -19,7 +19,7 @@
 namespace audioapi {
 
 BaseAudioContext::BaseAudioContext(
-    const std::shared_ptr<AudioEventHandlerRegistry>
+    const std::shared_ptr<IAudioEventHandlerRegistry>
         &audioEventHandlerRegistry) {
   nodeManager_ = std::make_shared<AudioNodeManager>();
   destination_ = std::make_shared<AudioDestinationNode>(this);
@@ -119,6 +119,7 @@ std::shared_ptr<AnalyserNode> BaseAudioContext::createAnalyser() {
 
 std::shared_ptr<AudioBuffer> BaseAudioContext::decodeAudioDataSource(
     const std::string &path) {
+#ifndef AUDIO_API_TEST_SUITE
   auto audioBus = audioDecoder_->decodeWithFilePath(path);
 
   if (!audioBus) {
@@ -126,11 +127,13 @@ std::shared_ptr<AudioBuffer> BaseAudioContext::decodeAudioDataSource(
   }
 
   return std::make_shared<AudioBuffer>(audioBus);
+#endif // AUDIO_API_TEST_SUITE
 }
 
 std::shared_ptr<AudioBuffer> BaseAudioContext::decodeAudioData(
     const void *data,
     size_t size) {
+#ifndef AUDIO_API_TEST_SUITE
   auto audioBus = audioDecoder_->decodeWithMemoryBlock(data, size);
 
   if (!audioBus) {
@@ -138,10 +141,12 @@ std::shared_ptr<AudioBuffer> BaseAudioContext::decodeAudioData(
   }
 
   return std::make_shared<AudioBuffer>(audioBus);
+#endif // AUDIO_API_TEST_SUITE
 }
 
 std::shared_ptr<AudioBuffer> BaseAudioContext::decodeWithPCMInBase64(
     const std::string &data) {
+#ifndef AUDIO_API_TEST_SUITE
   auto audioBus = audioDecoder_->decodeWithPCMInBase64(data);
 
   if (!audioBus) {
@@ -149,6 +154,7 @@ std::shared_ptr<AudioBuffer> BaseAudioContext::decodeWithPCMInBase64(
   }
 
   return std::make_shared<AudioBuffer>(audioBus);
+#endif // AUDIO_API_TEST_SUITE
 }
 
 AudioNodeManager *BaseAudioContext::getNodeManager() {

package/common/cpp/audioapi/core/BaseAudioContext.h

@@ -29,10 +29,11 @@ class AudioBufferQueueSourceNode;
 class AudioDecoder;
 class AnalyserNode;
 class AudioEventHandlerRegistry;
+class IAudioEventHandlerRegistry;
 
 class BaseAudioContext {
  public:
-  explicit BaseAudioContext(const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry);
+  explicit BaseAudioContext(const std::shared_ptr<IAudioEventHandlerRegistry> &audioEventHandlerRegistry);
   virtual ~BaseAudioContext() = default;
 
   std::string getState();
@@ -56,9 +57,11 @@ class BaseAudioContext {
       int length);
   std::shared_ptr<AnalyserNode> createAnalyser();
 
+  #ifndef TESTING
   std::shared_ptr<AudioBuffer> decodeAudioDataSource(const std::string &path);
   std::shared_ptr<AudioBuffer> decodeAudioData(const void *data, size_t size);
   std::shared_ptr<AudioBuffer> decodeWithPCMInBase64(const std::string &data);
+  #endif //TESTING
 
   std::shared_ptr<PeriodicWave> getBasicWaveForm(OscillatorType type);
   [[nodiscard]] float getNyquistFrequency() const;
@@ -86,7 +89,7 @@ class BaseAudioContext {
   std::shared_ptr<PeriodicWave> cachedTriangleWave_ = nullptr;
 
  public:
-    std::shared_ptr<AudioEventHandlerRegistry> audioEventHandlerRegistry_;
+    std::shared_ptr<IAudioEventHandlerRegistry> audioEventHandlerRegistry_;
 };
 
 } // namespace audioapi

package/common/cpp/audioapi/core/OfflineAudioContext.cpp

@@ -22,7 +22,8 @@ OfflineAudioContext::OfflineAudioContext(
     int numberOfChannels,
     size_t length,
     float sampleRate,
-    const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry)
+    const std::shared_ptr<IAudioEventHandlerRegistry>
+        &audioEventHandlerRegistry)
     : BaseAudioContext(audioEventHandlerRegistry),
       length_(length),
       numberOfChannels_(numberOfChannels),

package/common/cpp/audioapi/core/OfflineAudioContext.h

@@ -14,7 +14,7 @@ using OfflineAudioContextResultCallback = std::function<void(std::shared_ptr<Aud
 
 class OfflineAudioContext : public BaseAudioContext {
  public:
-  explicit OfflineAudioContext(int numberOfChannels, size_t length, float sampleRate, const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry);
+  explicit OfflineAudioContext(int numberOfChannels, size_t length, float sampleRate, const std::shared_ptr<IAudioEventHandlerRegistry> &audioEventHandlerRegistry);
   ~OfflineAudioContext() override;
 
   void resume();

package/common/cpp/audioapi/core/effects/PeriodicWave.cpp

@@ -118,7 +118,7 @@ int PeriodicWave::getNumberOfPartialsPerRange(int rangeIndex) const {
   auto centsToCull = static_cast<float>(rangeIndex) * CentsPerRange;
 
   // A value from 0 -> 1 representing what fraction of the partials to keep.
-  auto cullingScale = std::powf(2, -centsToCull / 1200);
+  auto cullingScale = std::pow(2, -centsToCull / 1200);
 
   // The very top range will have all the partials culled.
   int numberOfPartials =

package/common/cpp/audioapi/core/inputs/AudioRecorder.cpp

@@ -36,8 +36,10 @@ void AudioRecorder::invokeOnAudioReadyCallback(
   body.insert({"numFrames", numFrames});
   body.insert({"when", when});
 
-  audioEventHandlerRegistry_->invokeHandlerWithEventBody(
-      "audioReady", onAudioReadyCallbackId_, body);
+  if (audioEventHandlerRegistry_ != nullptr) {
+    audioEventHandlerRegistry_->invokeHandlerWithEventBody(
+        "audioReady", onAudioReadyCallbackId_, body);
+  }
 }
 
 void AudioRecorder::sendRemainingData() {

package/common/cpp/audioapi/core/inputs/AudioRecorder.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <memory>
+#include <atomic>
 
 namespace audioapi {
 class AudioBus;

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

@@ -5,6 +5,7 @@
 #include <string>
 #include <vector>
 #include <cstddef>
+#include <cstring>
 
 namespace audioapi {
 

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

@@ -23,6 +23,15 @@ AudioBufferBaseSourceNode::AudioBufferBaseSourceNode(BaseAudioContext *context)
       std::make_shared<signalsmith::stretch::SignalsmithStretch<float>>();
 }
 
+AudioBufferBaseSourceNode::~AudioBufferBaseSourceNode() {
+  if (onPositionChangedCallbackId_ != 0 &&
+      context_->audioEventHandlerRegistry_ != nullptr) {
+    context_->audioEventHandlerRegistry_->unregisterHandler(
+        "positionChanged", onPositionChangedCallbackId_);
+    onPositionChangedCallbackId_ = 0;
+  }
+}
+
 std::shared_ptr<AudioParam> AudioBufferBaseSourceNode::getDetuneParam() const {
   return detuneParam_;
 }
@@ -42,13 +51,18 @@ void AudioBufferBaseSourceNode::setOnPositionChangedInterval(int interval) {
       context_->getSampleRate() * static_cast<float>(interval) / 1000);
 }
 
+int AudioBufferBaseSourceNode::getOnPositionChangedInterval() {
+  return onPositionChangedInterval_;
+}
+
 std::mutex &AudioBufferBaseSourceNode::getBufferLock() {
   return bufferLock_;
 }
 
 void AudioBufferBaseSourceNode::sendOnPositionChangedEvent() {
   if (onPositionChangedCallbackId_ != 0 &&
-      onPositionChangedTime_ > onPositionChangedInterval_) {
+      onPositionChangedTime_ > onPositionChangedInterval_ &&
+      context_->audioEventHandlerRegistry_ != nullptr) {
     std::unordered_map<std::string, EventValue> body = {
         {"value", getCurrentPosition()}};
 

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

@@ -4,6 +4,7 @@
 #include <audioapi/libs/signalsmith-stretch/signalsmith-stretch.h>
 
 #include <memory>
+#include <mutex>
 
 namespace audioapi {
 
@@ -13,12 +14,14 @@ class AudioParam;
 class AudioBufferBaseSourceNode : public AudioScheduledSourceNode {
  public:
   explicit AudioBufferBaseSourceNode(BaseAudioContext *context);
+  virtual ~AudioBufferBaseSourceNode();
 
-    [[nodiscard]] std::shared_ptr<AudioParam> getDetuneParam() const;
-    [[nodiscard]] std::shared_ptr<AudioParam> getPlaybackRateParam() const;
+  [[nodiscard]] std::shared_ptr<AudioParam> getDetuneParam() const;
+  [[nodiscard]] std::shared_ptr<AudioParam> getPlaybackRateParam() const;
 
-    void setOnPositionChangedCallbackId(uint64_t callbackId);
-    void setOnPositionChangedInterval(int interval);
+  void setOnPositionChangedCallbackId(uint64_t callbackId);
+  void setOnPositionChangedInterval(int interval);
+  [[nodiscard]] int getOnPositionChangedInterval();
 
  protected:
     std::mutex bufferLock_;

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

@@ -16,6 +16,15 @@ AudioScheduledSourceNode::AudioScheduledSourceNode(BaseAudioContext *context)
   numberOfInputs_ = 0;
 }
 
+AudioScheduledSourceNode::~AudioScheduledSourceNode() {
+  if (onEndedCallbackId_ != 0 &&
+      context_->audioEventHandlerRegistry_ != nullptr) {
+    context_->audioEventHandlerRegistry_->unregisterHandler(
+        "ended", onEndedCallbackId_);
+    onEndedCallbackId_ = 0;
+  }
+}
+
 void AudioScheduledSourceNode::start(double when) {
   playbackState_ = PlaybackState::SCHEDULED;
   startTime_ = when;
@@ -149,8 +158,10 @@ void AudioScheduledSourceNode::updatePlaybackInfo(
 void AudioScheduledSourceNode::disable() {
   AudioNode::disable();
 
-  context_->audioEventHandlerRegistry_->invokeHandlerWithEventBody(
-      "ended", onEndedCallbackId_, {});
+  if (context_->audioEventHandlerRegistry_ != nullptr) {
+    context_->audioEventHandlerRegistry_->invokeHandlerWithEventBody(
+        "ended", onEndedCallbackId_, {});
+  }
 }
 
 void AudioScheduledSourceNode::handleStopScheduled() {

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

@@ -27,6 +27,7 @@ class AudioScheduledSourceNode : public AudioNode {
   // FINISHED: The node has finished playing.
   enum class PlaybackState { UNSCHEDULED, SCHEDULED, PLAYING, STOP_SCHEDULED, FINISHED };
   explicit AudioScheduledSourceNode(BaseAudioContext *context);
+  virtual ~AudioScheduledSourceNode();
 
   void start(double when);
   virtual void stop(double when);

package/common/cpp/audioapi/core/utils/AudioNodeDestructor.h

@@ -4,6 +4,7 @@
 #include <mutex>
 #include <thread>
 #include <atomic>
+#include <functional>
 #include <vector>
 #include <memory>
 

package/common/cpp/audioapi/core/utils/AudioNodeManager.h

@@ -20,8 +20,6 @@ class AudioNodeManager {
   AudioNodeManager() = default;
   ~AudioNodeManager();
 
-  std::mutex &getGraphLock();
-
   void preProcessGraph();
 
   void addPendingNodeConnection(
@@ -62,6 +60,7 @@ class AudioNodeManager {
       ConnectionType>>
       audioParamToConnect_;
 
+  std::mutex &getGraphLock();
   void settlePendingConnections();
   void cleanupNode(const std::shared_ptr<AudioNode> &node);
   void prepareNodesForDestruction();

package/common/cpp/audioapi/dsp/AudioUtils.cpp

@@ -28,6 +28,6 @@ float linearToDecibels(float value) {
 }
 
 float decibelsToLinear(float value) {
-  return powf(10, value / 20);
+  return pow(10, value / 20);
 }
 } // namespace audioapi::dsp