refactor: first part of integration

Author: maciejmakowski2003

packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp

@@ -12,14 +12,11 @@
 namespace audioapi {
 
 AudioPlayer::AudioPlayer(
-    const std::function<void(std::shared_ptr<DSPAudioBuffer>, int)> &renderAudio,
+    const std::function<void(DSPAudioBuffer *, int)> &renderAudio,
     float sampleRate,
     int channelCount)
-    : renderAudio_(renderAudio),
-      sampleRate_(sampleRate),
-      channelCount_(channelCount),
-      isRunning_(false) {
-  isInitialized_ = openAudioStream();
+    : renderAudio_(renderAudio), sampleRate_(sampleRate), channelCount_(channelCount) {
+  isInitialized_.store(openAudioStream(), std::memory_order_release);
 }
 
 bool AudioPlayer::openAudioStream() {
@@ -85,7 +82,7 @@ void AudioPlayer::suspend() {
 }
 
 void AudioPlayer::cleanup() {
-  isInitialized_ = false;
+  isInitialized_.store(false, std::memory_order_release);
 
   if (mStream_ != nullptr) {
     mStream_->close();
@@ -100,7 +97,7 @@ bool AudioPlayer::isRunning() const {
 
 DataCallbackResult
 AudioPlayer::onAudioReady(AudioStream *oboeStream, void *audioData, int32_t numFrames) {
-  if (!isInitialized_) {
+  if (!isInitialized_.load(std::memory_order_acquire)) {
     return DataCallbackResult::Continue;
   }
 
@@ -111,7 +108,7 @@ AudioPlayer::onAudioReady(AudioStream *oboeStream, void *audioData, int32_t numF
     auto framesToProcess = std::min(numFrames - processedFrames, RENDER_QUANTUM_SIZE);
 
     if (isRunning_.load(std::memory_order_acquire)) {
-      renderAudio_(buffer_, framesToProcess);
+      renderAudio_(buffer_.get(), framesToProcess);
     } else {
       buffer_->zero();
     }
@@ -129,7 +126,7 @@ void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result erro
   if (error == oboe::Result::ErrorDisconnected) {
     cleanup();
     if (openAudioStream()) {
-      isInitialized_ = true;
+      isInitialized_.store(true, std::memory_order_release);
       resume();
     }
   }

packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.h

@@ -17,7 +17,7 @@ class AudioContext;
 class AudioPlayer : public AudioStreamDataCallback, AudioStreamErrorCallback {
  public:
   AudioPlayer(
-      const std::function<void(std::shared_ptr<DSPAudioBuffer>, int)> &renderAudio,
+      const std::function<void(DSPAudioBuffer *, int)> &renderAudio,
       float sampleRate,
       int channelCount);
 
@@ -40,13 +40,13 @@ class AudioPlayer : public AudioStreamDataCallback, AudioStreamErrorCallback {
   void onErrorAfterClose(AudioStream * /* audioStream */, Result /* error */) override;
 
  private:
-  std::function<void(std::shared_ptr<DSPAudioBuffer>, int)> renderAudio_;
+  std::function<void(DSPAudioBuffer *, int)> renderAudio_;
   std::shared_ptr<AudioStream> mStream_;
   std::shared_ptr<DSPAudioBuffer> buffer_;
-  bool isInitialized_ = false;
   float sampleRate_;
   int channelCount_;
-  std::atomic<bool> isRunning_;
+  std::atomic<bool> isInitialized_{false};
+  std::atomic<bool> isRunning_{false};
 
   bool openAudioStream();
 

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

@@ -1,5 +1,6 @@
 #include <audioapi/HostObjects/AudioNodeHostObject.h>
 #include <audioapi/HostObjects/AudioParamHostObject.h>
+#include <audioapi/HostObjects/destinations/AudioDestinationNodeHostObject.h>
 #include <audioapi/HostObjects/utils/JsEnumParser.h>
 #include <audioapi/core/AudioNode.h>
 
@@ -63,8 +64,10 @@ JSI_HOST_FUNCTION_IMPL(AudioNodeHostObject, connect) {
   if (obj.isHostObject<AudioNodeHostObject>(runtime)) {
     auto node = obj.getHostObject<AudioNodeHostObject>(runtime);
     connectNode(*node);
-  }
-  if (obj.isHostObject<AudioParamHostObject>(runtime)) {
+  } else if (obj.isHostObject<AudioDestinationNodeHostObject>(runtime)) {
+    auto dest = obj.getHostObject<AudioDestinationNodeHostObject>(runtime);
+    graph_->addEdge(node_, dest->rawNode());
+  } else if (obj.isHostObject<AudioParamHostObject>(runtime)) {
     auto param = obj.getHostObject<AudioParamHostObject>(runtime);
     // TODO
     // connectParam(*param->owner_, param->param_.get());
@@ -82,13 +85,15 @@ JSI_HOST_FUNCTION_IMPL(AudioNodeHostObject, disconnect) {
   if (obj.isHostObject<AudioNodeHostObject>(runtime)) {
     auto node = obj.getHostObject<AudioNodeHostObject>(runtime);
     disconnectNode(*node);
-  }
-
-  if (obj.isHostObject<AudioParamHostObject>(runtime)) {
+  } else if (obj.isHostObject<AudioDestinationNodeHostObject>(runtime)) {
+    auto dest = obj.getHostObject<AudioDestinationNodeHostObject>(runtime);
+    graph_->removeEdge(node_, dest->rawNode());
+  } else if (obj.isHostObject<AudioParamHostObject>(runtime)) {
     auto param = obj.getHostObject<AudioParamHostObject>(runtime);
     // TODO
     // disconnectParam(*param->owner_, param->param_.get());
   }
+
   return jsi::Value::undefined();
 }
 } // namespace audioapi

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

@@ -35,9 +35,9 @@ BaseAudioContextHostObject::BaseAudioContextHostObject(
     : context_(context),
       promiseVendor_(std::make_shared<PromiseVendor>(runtime, callInvoker)),
       callInvoker_(callInvoker) {
-  context_->initialize();
-  // TODO
-  // destination_ = std::make_shared<AudioDestinationNodeHostObject>(context_->getGraph(), context_->getDestination());
+  auto *destinationNode = context_->initialize();
+  destination_ =
+      std::make_shared<AudioDestinationNodeHostObject>(destinationNode, context_->getDestination());
 
   addGetters(
       JSI_EXPORT_PROPERTY_GETTER(BaseAudioContextHostObject, destination),

packages/react-native-audio-api/common/cpp/audioapi/HostObjects/destinations/AudioDestinationNodeHostObject.cpp

@@ -0,0 +1,30 @@
+#include <audioapi/HostObjects/destinations/AudioDestinationNodeHostObject.h>
+
+#include <memory>
+#include <utility>
+
+namespace audioapi {
+
+AudioDestinationNodeHostObject::AudioDestinationNodeHostObject(
+    utils::graph::HostGraph::Node *node,
+    std::shared_ptr<AudioDestinationNode> destination)
+    : node_(node), destination_(std::move(destination)) {
+  addGetters(
+      JSI_EXPORT_PROPERTY_GETTER(AudioDestinationNodeHostObject, numberOfInputs),
+      JSI_EXPORT_PROPERTY_GETTER(AudioDestinationNodeHostObject, numberOfOutputs),
+      JSI_EXPORT_PROPERTY_GETTER(AudioDestinationNodeHostObject, channelCount));
+}
+
+JSI_PROPERTY_GETTER_IMPL(AudioDestinationNodeHostObject, numberOfInputs) {
+  return {1};
+}
+
+JSI_PROPERTY_GETTER_IMPL(AudioDestinationNodeHostObject, numberOfOutputs) {
+  return {0};
+}
+
+JSI_PROPERTY_GETTER_IMPL(AudioDestinationNodeHostObject, channelCount) {
+  return {static_cast<int>(destination_->getChannelCount())};
+}
+
+} // namespace audioapi

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

@@ -1,20 +1,31 @@
 #pragma once
 
-#include <audioapi/HostObjects/AudioNodeHostObject.h>
 #include <audioapi/core/destinations/AudioDestinationNode.h>
-#include <audioapi/types/NodeOptions.h>
+#include <audioapi/core/utils/graph/HostGraph.hpp>
+#include <audioapi/jsi/JsiHostObject.h>
 
 #include <memory>
-#include <utility>
 
 namespace audioapi {
 using namespace facebook;
 
-class AudioDestinationNodeHostObject : public AudioNodeHostObject {
+class AudioDestinationNodeHostObject : public JsiHostObject {
  public:
   explicit AudioDestinationNodeHostObject(
-      const std::shared_ptr<utils::graph::Graph> &graph,
-      std::unique_ptr<AudioNode> node)
-      : AudioNodeHostObject(graph, std::move(node), AudioDestinationOptions()) {}
+      utils::graph::HostGraph::Node *node,
+      std::shared_ptr<AudioDestinationNode> destination);
+
+  [[nodiscard]] utils::graph::HostGraph::Node *rawNode() const {
+    return node_;
+  }
+
+  JSI_PROPERTY_GETTER_DECL(numberOfInputs);
+  JSI_PROPERTY_GETTER_DECL(numberOfOutputs);
+  JSI_PROPERTY_GETTER_DECL(channelCount);
+
+ private:
+  utils::graph::HostGraph::Node *node_; // borrowed from BaseAudioContext; never removed
+  std::shared_ptr<AudioDestinationNode> destination_;
 };
+
 } // namespace audioapi

packages/react-native-audio-api/common/cpp/audioapi/HostObjects/effects/ConvolverNodeHostObject.cpp

@@ -74,13 +74,13 @@ void ConvolverNodeHostObject::setBuffer(const std::shared_ptr<AudioBuffer> &buff
   std::vector<std::unique_ptr<Convolver>> convolvers;
   for (size_t i = 0; i < copiedBuffer->getNumberOfChannels(); ++i) {
     AudioArray channelData(*copiedBuffer->getChannel(i));
-    convolvers.emplace_back();
+    convolvers.emplace_back(std::make_unique<Convolver>());
     convolvers.back()->init(RENDER_QUANTUM_SIZE, channelData, copiedBuffer->getSize());
   }
   if (copiedBuffer->getNumberOfChannels() == 1) {
     // add one more convolver, because right now input is always stereo
     AudioArray channelData(*copiedBuffer->getChannel(0));
-    convolvers.emplace_back();
+    convolvers.emplace_back(std::make_unique<Convolver>());
     convolvers.back()->init(RENDER_QUANTUM_SIZE, channelData, copiedBuffer->getSize());
   }
 

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

@@ -6,7 +6,6 @@
 
 #include <audioapi/core/AudioContext.h>
 #include <audioapi/core/destinations/AudioDestinationNode.h>
-#include <audioapi/core/utils/AudioGraphManager.h>
 #include <memory>
 
 namespace audioapi {
@@ -23,23 +22,27 @@ AudioContext::~AudioContext() {
   }
 }
 
-void AudioContext::initialize() {
-  BaseAudioContext::initialize();
+utils::graph::HostGraph::Node *AudioContext::initialize() {
+  auto *destinationNode = BaseAudioContext::initialize();
 #ifdef ANDROID
   audioPlayer_ = std::make_shared<AudioPlayer>(
-      this->renderAudio(), getSampleRate(), destination_->getChannelCount());
+      [this](DSPAudioBuffer *buf, int n) { processGraph(buf, n); },
+      getSampleRate(),
+      destination_->getChannelCount());
 #else
   audioPlayer_ = std::make_shared<IOSAudioPlayer>(
-      this->renderAudio(), getSampleRate(), destination_->getChannelCount());
+      [this](DSPAudioBuffer *buf, int n) { processGraph(buf, n); },
+      getSampleRate(),
+      destination_->getChannelCount());
 #endif
+  return destinationNode;
 }
 
 void AudioContext::close() {
   setState(ContextState::CLOSED);
 
   audioPlayer_->stop();
   audioPlayer_->cleanup();
-  getGraphManager()->cleanup();
 }
 
 bool AudioContext::resume() {
@@ -89,12 +92,6 @@ bool AudioContext::start() {
   return false;
 }
 
-std::function<void(std::shared_ptr<DSPAudioBuffer>, int)> AudioContext::renderAudio() {
-  return [this](const std::shared_ptr<DSPAudioBuffer> &data, int frames) {
-    destination_->renderAudio(data, frames);
-  };
-}
-
 bool AudioContext::isDriverRunning() const {
   return audioPlayer_->isRunning();
 }

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

@@ -26,7 +26,7 @@ class AudioContext : public BaseAudioContext {
   bool resume();
   bool suspend();
   bool start();
-  void initialize() override;
+  utils::graph::HostGraph::Node *initialize() override;
 
  private:
 #ifdef ANDROID
@@ -37,8 +37,6 @@ class AudioContext : public BaseAudioContext {
   std::atomic<bool> isInitialized_{false};
 
   bool isDriverRunning() const override;
-
-  std::function<void(std::shared_ptr<DSPAudioBuffer>, int)> renderAudio();
 };
 
 } // namespace audioapi