react-native-audio-api 0.11.0-alpha.1 → 0.11.0-alpha.2

package/common/cpp/audioapi/HostObjects/sources/AudioBufferSourceNodeHostObject.cpp

@@ -2,6 +2,7 @@
 
 #include <audioapi/HostObjects/sources/AudioBufferHostObject.h>
 #include <audioapi/core/sources/AudioBufferSourceNode.h>
+#include <memory>
 
 namespace audioapi {
 
@@ -31,32 +32,28 @@ AudioBufferSourceNodeHostObject::AudioBufferSourceNodeHostObject(
 }
 
 AudioBufferSourceNodeHostObject::~AudioBufferSourceNodeHostObject() {
-  auto audioBufferSourceNode =
-      std::static_pointer_cast<AudioBufferSourceNode>(node_);
+  auto audioBufferSourceNode = std::static_pointer_cast<AudioBufferSourceNode>(node_);
 
   // When JSI object is garbage collected (together with the eventual callback),
   // underlying source node might still be active and try to call the
   // non-existing callback.
-  audioBufferSourceNode->clearOnLoopEndedCallback();
+  audioBufferSourceNode->setOnLoopEndedCallbackId(0);
 }
 
 JSI_PROPERTY_GETTER_IMPL(AudioBufferSourceNodeHostObject, loop) {
-  auto audioBufferSourceNode =
-      std::static_pointer_cast<AudioBufferSourceNode>(node_);
+  auto audioBufferSourceNode = std::static_pointer_cast<AudioBufferSourceNode>(node_);
   auto loop = audioBufferSourceNode->getLoop();
   return {loop};
 }
 
 JSI_PROPERTY_GETTER_IMPL(AudioBufferSourceNodeHostObject, loopSkip) {
-  auto audioBufferSourceNode =
-      std::static_pointer_cast<AudioBufferSourceNode>(node_);
+  auto audioBufferSourceNode = std::static_pointer_cast<AudioBufferSourceNode>(node_);
   auto loopSkip = audioBufferSourceNode->getLoopSkip();
   return {loopSkip};
 }
 
 JSI_PROPERTY_GETTER_IMPL(AudioBufferSourceNodeHostObject, buffer) {
-  auto audioBufferSourceNode =
-      std::static_pointer_cast<AudioBufferSourceNode>(node_);
+  auto audioBufferSourceNode = std::static_pointer_cast<AudioBufferSourceNode>(node_);
   auto buffer = audioBufferSourceNode->getBuffer();
 
   if (!buffer) {
@@ -64,50 +61,45 @@ JSI_PROPERTY_GETTER_IMPL(AudioBufferSourceNodeHostObject, buffer) {
   }
 
   auto bufferHostObject = std::make_shared<AudioBufferHostObject>(buffer);
-  return jsi::Object::createFromHostObject(runtime, bufferHostObject);
+  auto jsiObject = jsi::Object::createFromHostObject(runtime, bufferHostObject);
+  jsiObject.setExternalMemoryPressure(runtime, bufferHostObject->getSizeInBytes() + 16);
+  return jsiObject;
 }
 
 JSI_PROPERTY_GETTER_IMPL(AudioBufferSourceNodeHostObject, loopStart) {
-  auto audioBufferSourceNode =
-      std::static_pointer_cast<AudioBufferSourceNode>(node_);
+  auto audioBufferSourceNode = std::static_pointer_cast<AudioBufferSourceNode>(node_);
   auto loopStart = audioBufferSourceNode->getLoopStart();
   return {loopStart};
 }
 
 JSI_PROPERTY_GETTER_IMPL(AudioBufferSourceNodeHostObject, loopEnd) {
-  auto audioBufferSourceNode =
-      std::static_pointer_cast<AudioBufferSourceNode>(node_);
+  auto audioBufferSourceNode = std::static_pointer_cast<AudioBufferSourceNode>(node_);
   auto loopEnd = audioBufferSourceNode->getLoopEnd();
   return {loopEnd};
 }
 
 JSI_PROPERTY_SETTER_IMPL(AudioBufferSourceNodeHostObject, loop) {
-  auto audioBufferSourceNode =
-      std::static_pointer_cast<AudioBufferSourceNode>(node_);
+  auto audioBufferSourceNode = std::static_pointer_cast<AudioBufferSourceNode>(node_);
   audioBufferSourceNode->setLoop(value.getBool());
 }
 
 JSI_PROPERTY_SETTER_IMPL(AudioBufferSourceNodeHostObject, loopSkip) {
-  auto audioBufferSourceNode =
-      std::static_pointer_cast<AudioBufferSourceNode>(node_);
+  auto audioBufferSourceNode = std::static_pointer_cast<AudioBufferSourceNode>(node_);
   audioBufferSourceNode->setLoopSkip(value.getBool());
 }
 
 JSI_PROPERTY_SETTER_IMPL(AudioBufferSourceNodeHostObject, loopStart) {
-  auto audioBufferSourceNode =
-      std::static_pointer_cast<AudioBufferSourceNode>(node_);
+  auto audioBufferSourceNode = std::static_pointer_cast<AudioBufferSourceNode>(node_);
   audioBufferSourceNode->setLoopStart(value.getNumber());
 }
 
 JSI_PROPERTY_SETTER_IMPL(AudioBufferSourceNodeHostObject, loopEnd) {
-  auto audioBufferSourceNode =
-      std::static_pointer_cast<AudioBufferSourceNode>(node_);
+  auto audioBufferSourceNode = std::static_pointer_cast<AudioBufferSourceNode>(node_);
   audioBufferSourceNode->setLoopEnd(value.getNumber());
 }
 
 JSI_PROPERTY_SETTER_IMPL(AudioBufferSourceNodeHostObject, onLoopEnded) {
-  auto audioBufferSourceNode =
-      std::static_pointer_cast<AudioBufferSourceNode>(node_);
+  auto audioBufferSourceNode = std::static_pointer_cast<AudioBufferSourceNode>(node_);
 
   audioBufferSourceNode->setOnLoopEndedCallbackId(
       std::stoull(value.getString(runtime).utf8(runtime)));
@@ -117,8 +109,7 @@ JSI_HOST_FUNCTION_IMPL(AudioBufferSourceNodeHostObject, start) {
   auto when = args[0].getNumber();
   auto offset = args[1].getNumber();
 
-  auto audioBufferSourceNode =
-      std::static_pointer_cast<AudioBufferSourceNode>(node_);
+  auto audioBufferSourceNode = std::static_pointer_cast<AudioBufferSourceNode>(node_);
 
   if (args[2].isUndefined()) {
     audioBufferSourceNode->start(when, offset);
@@ -133,16 +124,14 @@ JSI_HOST_FUNCTION_IMPL(AudioBufferSourceNodeHostObject, start) {
 }
 
 JSI_HOST_FUNCTION_IMPL(AudioBufferSourceNodeHostObject, setBuffer) {
-  auto audioBufferSourceNode =
-      std::static_pointer_cast<AudioBufferSourceNode>(node_);
+  auto audioBufferSourceNode = std::static_pointer_cast<AudioBufferSourceNode>(node_);
 
   if (args[0].isNull()) {
     audioBufferSourceNode->setBuffer(std::shared_ptr<AudioBuffer>(nullptr));
     return jsi::Value::undefined();
   }
 
-  auto bufferHostObject =
-      args[0].getObject(runtime).asHostObject<AudioBufferHostObject>(runtime);
+  auto bufferHostObject = args[0].getObject(runtime).asHostObject<AudioBufferHostObject>(runtime);
   thisValue.asObject(runtime).setExternalMemoryPressure(
       runtime, bufferHostObject->getSizeInBytes() + 16);
   audioBufferSourceNode->setBuffer(bufferHostObject->audioBuffer_);

package/common/cpp/audioapi/HostObjects/sources/AudioBufferSourceNodeHostObject.h

@@ -10,11 +10,9 @@ using namespace facebook;
 
 class AudioBufferSourceNode;
 
-class AudioBufferSourceNodeHostObject
-    : public AudioBufferBaseSourceNodeHostObject {
+class AudioBufferSourceNodeHostObject : public AudioBufferBaseSourceNodeHostObject {
  public:
-  explicit AudioBufferSourceNodeHostObject(
-      const std::shared_ptr<AudioBufferSourceNode> &node);
+  explicit AudioBufferSourceNodeHostObject(const std::shared_ptr<AudioBufferSourceNode> &node);
 
   ~AudioBufferSourceNodeHostObject() override;
 

package/common/cpp/audioapi/HostObjects/sources/AudioScheduledSourceNodeHostObject.cpp

@@ -1,14 +1,14 @@
 #include <audioapi/HostObjects/sources/AudioScheduledSourceNodeHostObject.h>
 
 #include <audioapi/core/sources/AudioScheduledSourceNode.h>
+#include <memory>
 
 namespace audioapi {
 
 AudioScheduledSourceNodeHostObject::AudioScheduledSourceNodeHostObject(
     const std::shared_ptr<AudioScheduledSourceNode> &node)
     : AudioNodeHostObject(node) {
-  addSetters(
-      JSI_EXPORT_PROPERTY_SETTER(AudioScheduledSourceNodeHostObject, onEnded));
+  addSetters(JSI_EXPORT_PROPERTY_SETTER(AudioScheduledSourceNodeHostObject, onEnded));
 
   addFunctions(
       JSI_EXPORT_FUNCTION(AudioScheduledSourceNodeHostObject, start),
@@ -16,18 +16,16 @@ AudioScheduledSourceNodeHostObject::AudioScheduledSourceNodeHostObject(
 }
 
 AudioScheduledSourceNodeHostObject::~AudioScheduledSourceNodeHostObject() {
-  auto audioScheduledSourceNode =
-      std::static_pointer_cast<AudioScheduledSourceNode>(node_);
+  auto audioScheduledSourceNode = std::static_pointer_cast<AudioScheduledSourceNode>(node_);
 
   // When JSI object is garbage collected (together with the eventual callback),
   // underlying source node might still be active and try to call the
   // non-existing callback.
-  audioScheduledSourceNode->clearOnEndedCallback();
+  audioScheduledSourceNode->setOnEndedCallbackId(0);
 }
 
 JSI_PROPERTY_SETTER_IMPL(AudioScheduledSourceNodeHostObject, onEnded) {
-  auto audioScheduleSourceNode =
-      std::static_pointer_cast<AudioScheduledSourceNode>(node_);
+  auto audioScheduleSourceNode = std::static_pointer_cast<AudioScheduledSourceNode>(node_);
 
   audioScheduleSourceNode->setOnEndedCallbackId(
       std::stoull(value.getString(runtime).utf8(runtime)));
@@ -35,16 +33,14 @@ JSI_PROPERTY_SETTER_IMPL(AudioScheduledSourceNodeHostObject, onEnded) {
 
 JSI_HOST_FUNCTION_IMPL(AudioScheduledSourceNodeHostObject, start) {
   auto when = args[0].getNumber();
-  auto audioScheduleSourceNode =
-      std::static_pointer_cast<AudioScheduledSourceNode>(node_);
+  auto audioScheduleSourceNode = std::static_pointer_cast<AudioScheduledSourceNode>(node_);
   audioScheduleSourceNode->start(when);
   return jsi::Value::undefined();
 }
 
 JSI_HOST_FUNCTION_IMPL(AudioScheduledSourceNodeHostObject, stop) {
   auto time = args[0].getNumber();
-  auto audioScheduleSourceNode =
-      std::static_pointer_cast<AudioScheduledSourceNode>(node_);
+  auto audioScheduleSourceNode = std::static_pointer_cast<AudioScheduledSourceNode>(node_);
   audioScheduleSourceNode->stop(time);
   return jsi::Value::undefined();
 }

package/common/cpp/audioapi/HostObjects/sources/ConstantSourceNodeHostObject.cpp

@@ -1,6 +1,7 @@
 #include <audioapi/HostObjects/AudioParamHostObject.h>
 #include <audioapi/HostObjects/sources/ConstantSourceNodeHostObject.h>
 #include <audioapi/core/sources/ConstantSourceNode.h>
+#include <memory>
 
 namespace audioapi {
 
@@ -12,8 +13,7 @@ ConstantSourceNodeHostObject::ConstantSourceNodeHostObject(
 
 JSI_PROPERTY_GETTER_IMPL(ConstantSourceNodeHostObject, offset) {
   auto constantSourceNode = std::static_pointer_cast<ConstantSourceNode>(node_);
-  auto offsetParam_ = std::make_shared<AudioParamHostObject>(
-      constantSourceNode->getOffsetParam());
+  auto offsetParam_ = std::make_shared<AudioParamHostObject>(constantSourceNode->getOffsetParam());
   return jsi::Object::createFromHostObject(runtime, offsetParam_);
 }
 } // namespace audioapi

package/common/cpp/audioapi/HostObjects/sources/ConstantSourceNodeHostObject.h

@@ -13,8 +13,7 @@ class ConstantSourceNode;
 
 class ConstantSourceNodeHostObject : public AudioScheduledSourceNodeHostObject {
  public:
-  explicit ConstantSourceNodeHostObject(
-        const std::shared_ptr<ConstantSourceNode> &node);
+  explicit ConstantSourceNodeHostObject(const std::shared_ptr<ConstantSourceNode> &node);
 
   JSI_PROPERTY_GETTER_DECL(offset);
 };

package/common/cpp/audioapi/HostObjects/sources/OscillatorNodeHostObject.cpp

@@ -3,11 +3,11 @@
 #include <audioapi/HostObjects/AudioParamHostObject.h>
 #include <audioapi/HostObjects/effects/PeriodicWaveHostObject.h>
 #include <audioapi/core/sources/OscillatorNode.h>
+#include <memory>
 
 namespace audioapi {
 
-OscillatorNodeHostObject::OscillatorNodeHostObject(
-    const std::shared_ptr<OscillatorNode> &node)
+OscillatorNodeHostObject::OscillatorNodeHostObject(const std::shared_ptr<OscillatorNode> &node)
     : AudioScheduledSourceNodeHostObject(node) {
   addGetters(
       JSI_EXPORT_PROPERTY_GETTER(OscillatorNodeHostObject, frequency),
@@ -21,15 +21,14 @@ OscillatorNodeHostObject::OscillatorNodeHostObject(
 
 JSI_PROPERTY_GETTER_IMPL(OscillatorNodeHostObject, frequency) {
   auto oscillatorNode = std::static_pointer_cast<OscillatorNode>(node_);
-  auto frequencyParam_ = std::make_shared<AudioParamHostObject>(
-      oscillatorNode->getFrequencyParam());
+  auto frequencyParam_ =
+      std::make_shared<AudioParamHostObject>(oscillatorNode->getFrequencyParam());
   return jsi::Object::createFromHostObject(runtime, frequencyParam_);
 }
 
 JSI_PROPERTY_GETTER_IMPL(OscillatorNodeHostObject, detune) {
   auto oscillatorNode = std::static_pointer_cast<OscillatorNode>(node_);
-  auto detuneParam_ =
-      std::make_shared<AudioParamHostObject>(oscillatorNode->getDetuneParam());
+  auto detuneParam_ = std::make_shared<AudioParamHostObject>(oscillatorNode->getDetuneParam());
   return jsi::Object::createFromHostObject(runtime, detuneParam_);
 }
 
@@ -41,8 +40,7 @@ JSI_PROPERTY_GETTER_IMPL(OscillatorNodeHostObject, type) {
 
 JSI_HOST_FUNCTION_IMPL(OscillatorNodeHostObject, setPeriodicWave) {
   auto oscillatorNode = std::static_pointer_cast<OscillatorNode>(node_);
-  auto periodicWave =
-      args[0].getObject(runtime).getHostObject<PeriodicWaveHostObject>(runtime);
+  auto periodicWave = args[0].getObject(runtime).getHostObject<PeriodicWaveHostObject>(runtime);
   oscillatorNode->setPeriodicWave(periodicWave->periodicWave_);
   return jsi::Value::undefined();
 }

package/common/cpp/audioapi/HostObjects/sources/OscillatorNodeHostObject.h

@@ -13,8 +13,7 @@ class OscillatorNode;
 
 class OscillatorNodeHostObject : public AudioScheduledSourceNodeHostObject {
  public:
-  explicit OscillatorNodeHostObject(
-          const std::shared_ptr<OscillatorNode> &node);
+  explicit OscillatorNodeHostObject(const std::shared_ptr<OscillatorNode> &node);
 
   JSI_PROPERTY_GETTER_DECL(frequency);
   JSI_PROPERTY_GETTER_DECL(detune);

package/common/cpp/audioapi/HostObjects/sources/RecorderAdapterNodeHostObject.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <audioapi/core/sources/RecorderAdapterNode.h>
 #include <audioapi/HostObjects/AudioNodeHostObject.h>
+#include <audioapi/core/sources/RecorderAdapterNode.h>
 
 #include <memory>
 #include <string>
@@ -14,12 +14,11 @@ class AudioRecorderHostObject;
 
 class RecorderAdapterNodeHostObject : public AudioNodeHostObject {
  public:
-    explicit RecorderAdapterNodeHostObject(
-        const std::shared_ptr<RecorderAdapterNode> &node)
-        : AudioNodeHostObject(node) {}
+  explicit RecorderAdapterNodeHostObject(const std::shared_ptr<RecorderAdapterNode> &node)
+      : AudioNodeHostObject(node) {}
 
  private:
-    friend class AudioRecorderHostObject;
+  friend class AudioRecorderHostObject;
 };
 
 } // namespace audioapi

package/common/cpp/audioapi/HostObjects/sources/StreamerNodeHostObject.cpp

@@ -3,20 +3,24 @@
 #include <audioapi/HostObjects/AudioParamHostObject.h>
 #include <audioapi/HostObjects/effects/PeriodicWaveHostObject.h>
 #include <audioapi/core/sources/StreamerNode.h>
+#include <memory>
 
 namespace audioapi {
 
-StreamerNodeHostObject::StreamerNodeHostObject(
-    const std::shared_ptr<StreamerNode> &node)
+StreamerNodeHostObject::StreamerNodeHostObject(const std::shared_ptr<StreamerNode> &node)
     : AudioScheduledSourceNodeHostObject(node) {
   addFunctions(JSI_EXPORT_FUNCTION(StreamerNodeHostObject, initialize));
 }
 
 JSI_HOST_FUNCTION_IMPL(StreamerNodeHostObject, initialize) {
+#if !RN_AUDIO_API_FFMPEG_DISABLED
   auto streamerNode = std::static_pointer_cast<StreamerNode>(node_);
   auto path = args[0].getString(runtime).utf8(runtime);
   auto result = streamerNode->initialize(path);
   return {result};
+#else
+  return false;
+#endif
 }
 
 } // namespace audioapi

package/common/cpp/audioapi/HostObjects/sources/StreamerNodeHostObject.h

@@ -13,16 +13,15 @@ class StreamerNode;
 
 class StreamerNodeHostObject : public AudioScheduledSourceNodeHostObject {
  public:
-  explicit StreamerNodeHostObject(
-          const std::shared_ptr<StreamerNode> &node);
+  explicit StreamerNodeHostObject(const std::shared_ptr<StreamerNode> &node);
 
-    [[nodiscard]] static inline size_t getSizeInBytes() {
-        return SIZE;
-    }
+  [[nodiscard]] static inline size_t getSizeInBytes() {
+    return SIZE;
+  }
 
   JSI_HOST_FUNCTION_DECL(initialize);
 
  private:
-    static constexpr size_t SIZE = 4'000'000; // 4MB
+  static constexpr size_t SIZE = 4'000'000; // 4MB
 };
 } // namespace audioapi

package/common/cpp/audioapi/HostObjects/sources/WorkletSourceNodeHostObject.h

@@ -12,7 +12,6 @@ using namespace facebook;
 class WorkletSourceNodeHostObject : public AudioScheduledSourceNodeHostObject {
  public:
   explicit WorkletSourceNodeHostObject(const std::shared_ptr<WorkletSourceNode> &node)
-      : AudioScheduledSourceNodeHostObject(node) {
-  }
+      : AudioScheduledSourceNodeHostObject(node) {}
 };
 } // namespace audioapi

package/common/cpp/audioapi/HostObjects/utils/AudioDecoderHostObject.cpp

@@ -21,40 +21,31 @@ AudioDecoderHostObject::AudioDecoderHostObject(
 }
 
 JSI_HOST_FUNCTION_IMPL(AudioDecoderHostObject, decodeWithMemoryBlock) {
-  auto arrayBuffer = args[0]
-                         .getObject(runtime)
-                         .getPropertyAsObject(runtime, "buffer")
-                         .getArrayBuffer(runtime);
+  auto arrayBuffer =
+      args[0].getObject(runtime).getPropertyAsObject(runtime, "buffer").getArrayBuffer(runtime);
   auto data = arrayBuffer.data(runtime);
   auto size = static_cast<int>(arrayBuffer.size(runtime));
 
   auto sampleRate = args[1].getNumber();
 
-  auto promise = promiseVendor_->createAsyncPromise(
-      [data, size, sampleRate]() -> PromiseResolver {
-        auto result =
-            AudioDecoder::decodeWithMemoryBlock(data, size, sampleRate);
+  auto promise = promiseVendor_->createAsyncPromise([data, size, sampleRate]() -> PromiseResolver {
+    auto result = AudioDecoder::decodeWithMemoryBlock(data, size, sampleRate);
 
-        if (!result) {
-          return [](jsi::Runtime &runtime)
-                     -> std::variant<jsi::Value, std::string> {
-            return std::string("Failed to decode audio data.");
-          };
-        }
+    if (!result) {
+      return [](jsi::Runtime &runtime) -> std::variant<jsi::Value, std::string> {
+        return std::string("Failed to decode audio data.");
+      };
+    }
 
-        auto audioBufferHostObject =
-            std::make_shared<AudioBufferHostObject>(result);
+    auto audioBufferHostObject = std::make_shared<AudioBufferHostObject>(result);
 
-        return [audioBufferHostObject =
-                    std::move(audioBufferHostObject)](jsi::Runtime &runtime)
-                   -> std::variant<jsi::Value, std::string> {
-          auto jsiObject =
-              jsi::Object::createFromHostObject(runtime, audioBufferHostObject);
-          jsiObject.setExternalMemoryPressure(
-              runtime, audioBufferHostObject->getSizeInBytes());
-          return jsiObject;
-        };
-      });
+    return [audioBufferHostObject = std::move(audioBufferHostObject)](
+               jsi::Runtime &runtime) -> std::variant<jsi::Value, std::string> {
+      auto jsiObject = jsi::Object::createFromHostObject(runtime, audioBufferHostObject);
+      jsiObject.setExternalMemoryPressure(runtime, audioBufferHostObject->getSizeInBytes());
+      return jsiObject;
+    };
+  });
   return promise;
 }
 
@@ -62,30 +53,24 @@ JSI_HOST_FUNCTION_IMPL(AudioDecoderHostObject, decodeWithFilePath) {
   auto sourcePath = args[0].getString(runtime).utf8(runtime);
   auto sampleRate = args[1].getNumber();
 
-  auto promise = promiseVendor_->createAsyncPromise(
-      [sourcePath, sampleRate]() -> PromiseResolver {
-        auto result = AudioDecoder::decodeWithFilePath(sourcePath, sampleRate);
+  auto promise = promiseVendor_->createAsyncPromise([sourcePath, sampleRate]() -> PromiseResolver {
+    auto result = AudioDecoder::decodeWithFilePath(sourcePath, sampleRate);
 
-        if (!result) {
-          return [](jsi::Runtime &runtime)
-                     -> std::variant<jsi::Value, std::string> {
-            return std::string("Failed to decode audio data source.");
-          };
-        }
+    if (!result) {
+      return [](jsi::Runtime &runtime) -> std::variant<jsi::Value, std::string> {
+        return std::string("Failed to decode audio data source.");
+      };
+    }
 
-        auto audioBufferHostObject =
-            std::make_shared<AudioBufferHostObject>(result);
+    auto audioBufferHostObject = std::make_shared<AudioBufferHostObject>(result);
 
-        return [audioBufferHostObject =
-                    std::move(audioBufferHostObject)](jsi::Runtime &runtime)
-                   -> std::variant<jsi::Value, std::string> {
-          auto jsiObject =
-              jsi::Object::createFromHostObject(runtime, audioBufferHostObject);
-          jsiObject.setExternalMemoryPressure(
-              runtime, audioBufferHostObject->getSizeInBytes());
-          return jsiObject;
-        };
-      });
+    return [audioBufferHostObject = std::move(audioBufferHostObject)](
+               jsi::Runtime &runtime) -> std::variant<jsi::Value, std::string> {
+      auto jsiObject = jsi::Object::createFromHostObject(runtime, audioBufferHostObject);
+      jsiObject.setExternalMemoryPressure(runtime, audioBufferHostObject->getSizeInBytes());
+      return jsiObject;
+    };
+  });
 
   return promise;
 }
@@ -97,28 +82,22 @@ JSI_HOST_FUNCTION_IMPL(AudioDecoderHostObject, decodeWithPCMInBase64) {
   auto interleaved = args[3].getBool();
 
   auto promise = promiseVendor_->createAsyncPromise(
-      [b64, inputSampleRate, inputChannelCount, interleaved]()
-          -> PromiseResolver {
+      [b64, inputSampleRate, inputChannelCount, interleaved]() -> PromiseResolver {
         auto result = AudioDecoder::decodeWithPCMInBase64(
             b64, inputSampleRate, inputChannelCount, interleaved);
 
         if (!result) {
-          return [](jsi::Runtime &runtime)
-                     -> std::variant<jsi::Value, std::string> {
+          return [](jsi::Runtime &runtime) -> std::variant<jsi::Value, std::string> {
             return std::string("Failed to decode audio data source.");
           };
         }
 
-        auto audioBufferHostObject =
-            std::make_shared<AudioBufferHostObject>(result);
+        auto audioBufferHostObject = std::make_shared<AudioBufferHostObject>(result);
 
-        return [audioBufferHostObject =
-                    std::move(audioBufferHostObject)](jsi::Runtime &runtime)
-                   -> std::variant<jsi::Value, std::string> {
-          auto jsiObject =
-              jsi::Object::createFromHostObject(runtime, audioBufferHostObject);
-          jsiObject.setExternalMemoryPressure(
-              runtime, audioBufferHostObject->getSizeInBytes());
+        return [audioBufferHostObject = std::move(audioBufferHostObject)](
+                   jsi::Runtime &runtime) -> std::variant<jsi::Value, std::string> {
+          auto jsiObject = jsi::Object::createFromHostObject(runtime, audioBufferHostObject);
+          jsiObject.setExternalMemoryPressure(runtime, audioBufferHostObject->getSizeInBytes());
           return jsiObject;
         };
       });

package/common/cpp/audioapi/HostObjects/utils/AudioStretcherHostObject.cpp

@@ -15,41 +15,26 @@ AudioStretcherHostObject::AudioStretcherHostObject(
     jsi::Runtime *runtime,
     const std::shared_ptr<react::CallInvoker> &callInvoker) {
   promiseVendor_ = std::make_shared<PromiseVendor>(runtime, callInvoker);
-  addFunctions(
-      JSI_EXPORT_FUNCTION(AudioStretcherHostObject, changePlaybackSpeed));
+  addFunctions(JSI_EXPORT_FUNCTION(AudioStretcherHostObject, changePlaybackSpeed));
 }
 
 JSI_HOST_FUNCTION_IMPL(AudioStretcherHostObject, changePlaybackSpeed) {
-  auto audioBuffer =
-      args[0].getObject(runtime).asHostObject<AudioBufferHostObject>(runtime);
+  auto audioBuffer = args[0].getObject(runtime).asHostObject<AudioBufferHostObject>(runtime);
   auto playbackSpeed = static_cast<float>(args[1].asNumber());
 
-  auto promise = promiseVendor_->createPromise(
-      [audioBuffer, playbackSpeed](std::shared_ptr<Promise> promise) {
-        std::thread([audioBuffer,
-                     playbackSpeed,
-                     promise = std::move(promise)]() {
-          auto result = AudioStretcher::changePlaybackSpeed(
-              *audioBuffer->audioBuffer_, playbackSpeed);
-
-          if (!result) {
-            promise->reject("Failed to change audio playback speed.");
-            return;
-          }
-
-          auto audioBufferHostObject =
-              std::make_shared<AudioBufferHostObject>(result);
-
-          promise->resolve([audioBufferHostObject = std::move(
-                                audioBufferHostObject)](jsi::Runtime &runtime) {
-            auto jsiObject = jsi::Object::createFromHostObject(
-                runtime, audioBufferHostObject);
-            jsiObject.setExternalMemoryPressure(
-                runtime, audioBufferHostObject->getSizeInBytes());
-            return jsiObject;
-          });
-        }).detach();
-      });
+  auto promise = promiseVendor_->createAsyncPromise([=]() -> PromiseResolver {
+    auto result = AudioStretcher::changePlaybackSpeed(*audioBuffer->audioBuffer_, playbackSpeed);
+
+    if (result == nullptr) {
+      return [](jsi::Runtime &runtime) {
+        return std::string("Failed to change audio playback speed.");
+      };
+    }
+    return [result](jsi::Runtime &runtime) {
+      auto audioBufferHostObject = std::make_shared<AudioBufferHostObject>(result);
+      return jsi::Object::createFromHostObject(runtime, audioBufferHostObject);
+    };
+  });
   return promise;
 }
 

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

@@ -7,13 +7,13 @@
 #include <audioapi/core/AudioContext.h>
 #include <audioapi/core/destinations/AudioDestinationNode.h>
 #include <audioapi/core/utils/AudioNodeManager.h>
+#include <memory>
+#include <string>
 
 namespace audioapi {
 AudioContext::AudioContext(
     float sampleRate,
-    bool initSuspended,
-    const std::shared_ptr<IAudioEventHandlerRegistry>
-        &audioEventHandlerRegistry,
+    const std::shared_ptr<IAudioEventHandlerRegistry> &audioEventHandlerRegistry,
     const RuntimeRegistry &runtimeRegistry)
     : BaseAudioContext(audioEventHandlerRegistry, runtimeRegistry) {
 #ifdef ANDROID
@@ -25,17 +25,8 @@ AudioContext::AudioContext(
 #endif
 
   sampleRate_ = sampleRate;
-
-  if (initSuspended) {
-    playerHasBeenStarted_ = false;
-    state_ = ContextState::SUSPENDED;
-
-    return;
-  }
-
-  playerHasBeenStarted_ = true;
-  audioPlayer_->start();
-  state_ = ContextState::RUNNING;
+  playerHasBeenStarted_ = false;
+  state_ = ContextState::SUSPENDED;
 }
 
 AudioContext::~AudioContext() {
@@ -61,22 +52,12 @@ bool AudioContext::resume() {
     return true;
   }
 
-  if (!playerHasBeenStarted_) {
-    if (audioPlayer_->start()) {
-      playerHasBeenStarted_ = true;
-      state_ = ContextState::RUNNING;
-      return true;
-    }
-
-    return false;
-  }
-
-  if (audioPlayer_->resume()) {
+  if (playerHasBeenStarted_ && audioPlayer_->resume()) {
     state_ = ContextState::RUNNING;
     return true;
   }
 
-  return false;
+  return start();
 }
 
 bool AudioContext::suspend() {
@@ -94,8 +75,22 @@ bool AudioContext::suspend() {
   return true;
 }
 
-std::function<void(std::shared_ptr<AudioBus>, int)>
-AudioContext::renderAudio() {
+bool AudioContext::start() {
+  if (isClosed()) {
+    return false;
+  }
+
+  if (!playerHasBeenStarted_ && audioPlayer_->start()) {
+    playerHasBeenStarted_ = true;
+    state_ = ContextState::RUNNING;
+
+    return true;
+  }
+
+  return false;
+}
+
+std::function<void(std::shared_ptr<AudioBus>, int)> AudioContext::renderAudio() {
   return [this](const std::shared_ptr<AudioBus> &data, int frames) {
     destination_->renderAudio(data, frames);
   };