refactor: integrated DSPAudioBuffer and DSPAudioArray into codebase (#985)

* refactor: implmented aligned audio array implementation

* refactor: renamed includes from AudioArray.h to AudioArray.hpp

* refactor: implemented AlignedAudioBuffer

* refactor: renamed AudioBuffer.h to AudioBuffer.hpp and updated all includes accordingly

* fix: nitpicks

* refactor: integrated DSPAudioBuffer and DSPAudioArray into codebase

* fix: nits

* fix: nits

---------

Co-authored-by: maciejmakowski2003 <maciejmakowski2003@users.noreply.github.com>

Author: maciejmakowski2003

packages/audiodocs/docs/guides/create-your-own-effect.mdx

@@ -52,8 +52,8 @@ public:
   explicit MyProcessorNode(const std::shared_ptr<BaseAudioContext> &context, );
 
 protected:
-  std::shared_ptr<AudioBuffer>
-  processNode(const std::shared_ptr<AudioBuffer> &buffer,
+  std::shared_ptr<DSPAudioBuffer>
+  processNode(const std::shared_ptr<DSPAudioBuffer> &buffer,
               int framesToProcess) override;
 
 // highlight-start
@@ -80,7 +80,7 @@ namespace audioapi {
         isInitialized_.store(true, std::memory_order_release);
     }
 
-    std::shared_ptr<AudioBuffer> MyProcessorNode::processNode(const std::shared_ptr<AudioBuffer> &buffer,
+    std::shared_ptr<DSPAudioBuffer> MyProcessorNode::processNode(const std::shared_ptr<DSPAudioBuffer> &buffer,
                                     int framesToProcess) {
       // highlight-start
       for (int channel = 0; channel < buffer->getNumberOfChannels(); ++channel) {

packages/custom-node-generator/templates/basic/shared/MyProcessorNode.cpp

@@ -7,8 +7,8 @@ MyProcessorNode::MyProcessorNode(
   isInitialized_.store(true, std::memory_order_release);
 }
 
-std::shared_ptr<AudioBuffer>
-MyProcessorNode::processNode(const std::shared_ptr<AudioBuffer> &buffer,
+std::shared_ptr<DSPAudioBuffer>
+MyProcessorNode::processNode(const std::shared_ptr<DSPAudioBuffer> &buffer,
                              int framesToProcess) {
   // put your processing logic here
 }

packages/custom-node-generator/templates/basic/shared/MyProcessorNode.h

@@ -10,8 +10,8 @@ class MyProcessorNode : public AudioNode {
   explicit MyProcessorNode(const std::shared_ptr<BaseAudioContext> &context, );
 
 protected:
-  std::shared_ptr<AudioBuffer>
-  processNode(const std::shared_ptr<AudioBuffer> &buffer,
+  std::shared_ptr<DSPAudioBuffer>
+  processNode(const std::shared_ptr<DSPAudioBuffer> &buffer,
               int framesToProcess) override;
 };
 } // namespace audioapi

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

@@ -12,7 +12,7 @@
 #include <audioapi/core/utils/Locker.h>
 #include <audioapi/events/AudioEventHandlerRegistry.h>
 #include <audioapi/utils/AudioFileProperties.h>
-#include <audioapi/utils/CircularAudioArray.h>
+#include <audioapi/utils/CircularArray.hpp>
 #include <audioapi/utils/CircularOverflowableAudioArray.h>
 
 #include <memory>

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

@@ -11,7 +11,6 @@
 
 namespace audioapi {
 
-class CircularAudioArray;
 class AudioFileProperties;
 class AndroidRecorderCallback;
 class AndroidFileWriterBackend;

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

@@ -12,7 +12,7 @@
 namespace audioapi {
 
 AudioPlayer::AudioPlayer(
-    const std::function<void(std::shared_ptr<AudioBuffer>, int)> &renderAudio,
+    const std::function<void(std::shared_ptr<DSPAudioBuffer>, int)> &renderAudio,
     float sampleRate,
     int channelCount)
     : renderAudio_(renderAudio),
@@ -42,7 +42,7 @@ bool AudioPlayer::openAudioStream() {
     return false;
   }
 
-  buffer_ = std::make_shared<AudioBuffer>(RENDER_QUANTUM_SIZE, channelCount_, sampleRate_);
+  buffer_ = std::make_shared<DSPAudioBuffer>(RENDER_QUANTUM_SIZE, channelCount_, sampleRate_);
   return true;
 }
 

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<AudioBuffer>, int)> &renderAudio,
+      const std::function<void(std::shared_ptr<DSPAudioBuffer>, int)> &renderAudio,
       float sampleRate,
       int channelCount);
 
@@ -40,9 +40,9 @@ class AudioPlayer : public AudioStreamDataCallback, AudioStreamErrorCallback {
   void onErrorAfterClose(AudioStream * /* audioStream */, Result /* error */) override;
 
  private:
-  std::function<void(std::shared_ptr<AudioBuffer>, int)> renderAudio_;
+  std::function<void(std::shared_ptr<DSPAudioBuffer>, int)> renderAudio_;
   std::shared_ptr<AudioStream> mStream_;
-  std::shared_ptr<AudioBuffer> buffer_;
+  std::shared_ptr<DSPAudioBuffer> buffer_;
   bool isInitialized_ = false;
   float sampleRate_;
   int channelCount_;

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

@@ -4,8 +4,7 @@
 #include <audioapi/events/AudioEventHandlerRegistry.h>
 #include <audioapi/libs/miniaudio/miniaudio.h>
 #include <audioapi/utils/AudioArray.hpp>
-
-#include <audioapi/utils/CircularAudioArray.h>
+#include <audioapi/utils/CircularArray.hpp>
 
 #include <algorithm>
 #include <memory>

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

@@ -10,7 +10,6 @@
 
 namespace audioapi {
 
-class CircularAudioArray;
 class AudioEventHandlerRegistry;
 
 struct CallbackData {

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

@@ -80,17 +80,17 @@ void ConvolverNodeHostObject::setBuffer(const std::shared_ptr<AudioBuffer> &buff
     convolvers.back().init(RENDER_QUANTUM_SIZE, channelData, copiedBuffer->getSize());
   }
 
-  auto internalBuffer = std::make_shared<AudioBuffer>(
+  auto internalBuffer = std::make_shared<DSPAudioBuffer>(
       RENDER_QUANTUM_SIZE * 2, convolverNode->getChannelCount(), copiedBuffer->getSampleRate());
-  auto intermediateBuffer = std::make_shared<AudioBuffer>(
+  auto intermediateBuffer = std::make_shared<DSPAudioBuffer>(
       RENDER_QUANTUM_SIZE, convolvers.size(), copiedBuffer->getSampleRate());
 
   struct SetupData {
     std::shared_ptr<AudioBuffer> buffer;
     std::vector<Convolver> convolvers;
     std::shared_ptr<ThreadPool> threadPool;
-    std::shared_ptr<AudioBuffer> internalBuffer;
-    std::shared_ptr<AudioBuffer> intermediateBuffer;
+    std::shared_ptr<DSPAudioBuffer> internalBuffer;
+    std::shared_ptr<DSPAudioBuffer> intermediateBuffer;
     float scaleFactor;
   };