react-native-audio-api 0.4.10-rc.1 → 0.4.10

package/android/src/main/cpp/core/AudioPlayer.cpp

@@ -9,7 +9,7 @@
 namespace audioapi {
 
 AudioPlayer::AudioPlayer(
-    const std::function<void(AudioBus *, int)> &renderAudio)
+    const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio)
     : renderAudio_(renderAudio) {
   AudioStreamBuilder builder;
 
@@ -29,7 +29,7 @@ AudioPlayer::AudioPlayer(
 }
 
 AudioPlayer::AudioPlayer(
-    const std::function<void(AudioBus *, int)> &renderAudio,
+    const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio,
     float sampleRate)
     : renderAudio_(renderAudio) {
   AudioStreamBuilder builder;
@@ -86,7 +86,7 @@ DataCallbackResult AudioPlayer::onAudioReady(
   while (processedFrames < numFrames) {
     int framesToProcess =
         std::min(numFrames - processedFrames, RENDER_QUANTUM_SIZE);
-    renderAudio_(mBus_.get(), framesToProcess);
+    renderAudio_(mBus_, framesToProcess);
 
     // TODO: optimize this with SIMD?
     for (int i = 0; i < framesToProcess; i++) {

package/android/src/main/cpp/core/AudioPlayer.h

@@ -13,9 +13,10 @@ class AudioBus;
 
 class AudioPlayer : public AudioStreamDataCallback {
  public:
-  explicit AudioPlayer(const std::function<void(AudioBus *, int)> &renderAudio);
+  explicit AudioPlayer(
+      const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio);
   AudioPlayer(
-      const std::function<void(AudioBus *, int)> &renderAudio,
+      const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio,
       float sampleRate);
 
   [[nodiscard]] float getSampleRate() const;
@@ -28,7 +29,7 @@ class AudioPlayer : public AudioStreamDataCallback {
       int32_t numFrames) override;
 
  private:
-  std::function<void(AudioBus *, int)> renderAudio_;
+  std::function<void(std::shared_ptr<AudioBus>, int)> renderAudio_;
   std::shared_ptr<AudioStream> mStream_;
   std::shared_ptr<AudioBus> mBus_;
   bool isInitialized_ = false;

package/common/cpp/core/AudioContext.cpp

@@ -48,12 +48,13 @@ void AudioContext::close() {
   audioPlayer_->stop();
 }
 
-std::function<void(AudioBus *, int)> AudioContext::renderAudio() {
+std::function<void(std::shared_ptr<AudioBus>, int)>
+AudioContext::renderAudio() {
   if (!isRunning() || !destination_) {
-    return [](AudioBus *, int) {};
+    return [](const std::shared_ptr<AudioBus> &, int) {};
   }
 
-  return [this](AudioBus *data, int frames) {
+  return [this](const std::shared_ptr<AudioBus> &data, int frames) {
     destination_->renderAudio(data, frames);
   };
 }

package/common/cpp/core/AudioContext.h

@@ -27,7 +27,7 @@ class AudioContext : public BaseAudioContext {
   std::shared_ptr<IOSAudioPlayer> audioPlayer_;
 #endif
 
-  std::function<void(AudioBus *, int)> renderAudio();
+  std::function<void(std::shared_ptr<AudioBus>, int)> renderAudio();
 };
 
 } // namespace audioapi

package/common/cpp/core/AudioDestinationNode.cpp

@@ -23,7 +23,7 @@ double AudioDestinationNode::getCurrentTime() const {
 }
 
 void AudioDestinationNode::renderAudio(
-    AudioBus *destinationBus,
+    const std::shared_ptr<AudioBus> &destinationBus,
     int numFrames) {
   if (numFrames < 0 || !destinationBus || !isInitialized_) {
     return;
@@ -33,10 +33,10 @@ void AudioDestinationNode::renderAudio(
 
   destinationBus->zero();
 
-  AudioBus *processedBus = processAudio(destinationBus, numFrames);
+  auto processedBus = processAudio(destinationBus, numFrames);
 
   if (processedBus && processedBus != destinationBus) {
-    destinationBus->copy(processedBus);
+    destinationBus->copy(processedBus.get());
   }
 
   destinationBus->normalize();

package/common/cpp/core/AudioDestinationNode.h

@@ -16,11 +16,11 @@ class AudioDestinationNode : public AudioNode {
  public:
   explicit AudioDestinationNode(BaseAudioContext *context);
 
-  void renderAudio(AudioBus *audioData, int numFrames);
-
   std::size_t getCurrentSampleFrame() const;
   double getCurrentTime() const;
 
+  void renderAudio(const std::shared_ptr<AudioBus>& audioData, int numFrames);
+
  protected:
   // DestinationNode is triggered by AudioContext using renderAudio
   // processNode function is not necessary and is never called.

package/common/cpp/core/AudioNode.cpp

@@ -97,17 +97,19 @@ std::string AudioNode::toString(ChannelInterpretation interpretation) {
   }
 }
 
-AudioBus *AudioNode::processAudio(AudioBus *outputBus, int framesToProcess) {
+std::shared_ptr<AudioBus> AudioNode::processAudio(
+    std::shared_ptr<AudioBus> outputBus,
+    int framesToProcess) {
   if (!isInitialized_) {
     return outputBus;
   }
 
   if (isAlreadyProcessed()) {
-    return audioBus_.get();
+    return audioBus_;
   }
 
   // Process inputs and return the bus with the most channels.
-  AudioBus *processingBus = processInputs(outputBus, framesToProcess);
+  auto processingBus = processInputs(outputBus, framesToProcess);
 
   // Apply channel count mode.
   processingBus = applyChannelCountMode(processingBus);
@@ -117,7 +119,7 @@ AudioBus *AudioNode::processAudio(AudioBus *outputBus, int framesToProcess) {
 
   assert(processingBus != nullptr);
   // Finally, process the node itself.
-  processNode(processingBus, framesToProcess);
+  processNode(processingBus.get(), framesToProcess);
 
   return processingBus;
 }
@@ -138,8 +140,10 @@ bool AudioNode::isAlreadyProcessed() {
   return false;
 }
 
-AudioBus *AudioNode::processInputs(AudioBus *outputBus, int framesToProcess) {
-  AudioBus *processingBus = audioBus_.get();
+std::shared_ptr<AudioBus> AudioNode::processInputs(
+    const std::shared_ptr<AudioBus> &outputBus,
+    int framesToProcess) {
+  auto processingBus = audioBus_;
   processingBus->zero();
 
   int maxNumberOfChannels = 0;
@@ -162,28 +166,29 @@ AudioBus *AudioNode::processInputs(AudioBus *outputBus, int framesToProcess) {
   return processingBus;
 }
 
-AudioBus *AudioNode::applyChannelCountMode(AudioBus *processingBus) {
+std::shared_ptr<AudioBus> AudioNode::applyChannelCountMode(
+    std::shared_ptr<AudioBus> processingBus) {
   // If the channelCountMode is EXPLICIT, the node should output the number of
   // channels specified by the channelCount.
   if (channelCountMode_ == ChannelCountMode::EXPLICIT) {
-    return audioBus_.get();
+    return audioBus_;
   }
 
   // If the channelCountMode is CLAMPED_MAX, the node should output the maximum
   // number of channels clamped to channelCount.
   if (channelCountMode_ == ChannelCountMode::CLAMPED_MAX &&
       processingBus->getNumberOfChannels() >= channelCount_) {
-    return audioBus_.get();
+    return audioBus_;
   }
 
   return processingBus;
 }
 
-void AudioNode::mixInputsBuses(AudioBus *processingBus) {
+void AudioNode::mixInputsBuses(const std::shared_ptr<AudioBus> &processingBus) {
   assert(processingBus != nullptr);
 
-  for (auto inputBus : inputBuses_) {
-    processingBus->sum(inputBus, channelInterpretation_);
+  for (const auto &inputBus : inputBuses_) {
+    processingBus->sum(inputBus.get(), channelInterpretation_);
   }
 
   inputBuses_.clear();

package/common/cpp/core/AudioNode.h

@@ -57,18 +57,18 @@ class AudioNode : public std::enable_shared_from_this<AudioNode> {
   std::size_t lastRenderedFrame_{SIZE_MAX};
 
  private:
-  std::vector<AudioBus*> inputBuses_;
+  std::vector<std::shared_ptr<AudioBus>> inputBuses_ = {};
 
   static std::string toString(ChannelCountMode mode);
   static std::string toString(ChannelInterpretation interpretation);
 
-  AudioBus *processAudio(AudioBus *outputBus, int framesToProcess);
+  std::shared_ptr<AudioBus> processAudio(std::shared_ptr<AudioBus> outputBus, int framesToProcess);
   virtual void processNode(AudioBus *processingBus, int framesToProcess) = 0;
 
   bool isAlreadyProcessed();
-  AudioBus *processInputs(AudioBus *outputBus, int framesToProcess);
-  AudioBus *applyChannelCountMode(AudioBus *processingBus);
-  void mixInputsBuses(AudioBus *processingBus);
+  std::shared_ptr<AudioBus> processInputs(const std::shared_ptr<AudioBus>& outputBus, int framesToProcess);
+  std::shared_ptr<AudioBus> applyChannelCountMode(std::shared_ptr<AudioBus> processingBus);
+  void mixInputsBuses(const std::shared_ptr<AudioBus>& processingBus);
 
   void connectNode(const std::shared_ptr<AudioNode> &node);
   void disconnectNode(const std::shared_ptr<AudioNode> &node);

package/ios/core/IOSAudioPlayer.h

@@ -15,15 +15,15 @@ class AudioBus;
 
 class IOSAudioPlayer {
  protected:
-  AudioBus *audioBus_;
+  std::shared_ptr<AudioBus> audioBus_;
   AudioPlayer *audioPlayer_;
-  std::function<void(AudioBus *, int)> renderAudio_;
+  std::function<void(std::shared_ptr<AudioBus>, int)> renderAudio_;
 
  public:
   explicit IOSAudioPlayer(
-      const std::function<void(AudioBus *, int)> &renderAudio);
+      const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio);
   IOSAudioPlayer(
-      const std::function<void(AudioBus *, int)> &renderAudio,
+      const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio,
       float sampleRate);
   ~IOSAudioPlayer();
 

package/ios/core/IOSAudioPlayer.mm

@@ -7,11 +7,9 @@
 
 namespace audioapi {
 
-IOSAudioPlayer::IOSAudioPlayer(const std::function<void(AudioBus *, int)> &renderAudio)
+IOSAudioPlayer::IOSAudioPlayer(const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio)
     : renderAudio_(renderAudio), audioBus_(0)
 {
-  audioBus_ = new AudioBus(RENDER_QUANTUM_SIZE, CHANNEL_COUNT, getSampleRate());
-
   RenderAudioBlock renderAudioBlock = ^(AudioBufferList *outputData, int numFrames) {
     int processedFrames = 0;
 
@@ -34,10 +32,10 @@ IOSAudioPlayer::IOSAudioPlayer(const std::function<void(AudioBus *, int)> &rende
   };
 
   audioPlayer_ = [[AudioPlayer alloc] initWithRenderAudioBlock:renderAudioBlock];
-  audioBus_ = new AudioBus(RENDER_QUANTUM_SIZE, CHANNEL_COUNT, [audioPlayer_ getSampleRate]);
+  audioBus_ = std::make_shared<AudioBus>(RENDER_QUANTUM_SIZE, CHANNEL_COUNT, getSampleRate());
 }
 
-IOSAudioPlayer::IOSAudioPlayer(const std::function<void(AudioBus *, int)> &renderAudio, float sampleRate)
+IOSAudioPlayer::IOSAudioPlayer(const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio, float sampleRate)
     : renderAudio_(renderAudio), audioBus_(0)
 {
   RenderAudioBlock renderAudioBlock = ^(AudioBufferList *outputData, int numFrames) {
@@ -62,7 +60,7 @@ IOSAudioPlayer::IOSAudioPlayer(const std::function<void(AudioBus *, int)> &rende
   };
 
   audioPlayer_ = [[AudioPlayer alloc] initWithRenderAudioBlock:renderAudioBlock sampleRate:sampleRate];
-  audioBus_ = new AudioBus(RENDER_QUANTUM_SIZE, CHANNEL_COUNT, [audioPlayer_ getSampleRate]);
+  audioBus_ = std::make_shared<AudioBus>(RENDER_QUANTUM_SIZE, CHANNEL_COUNT, getSampleRate());
 }
 
 IOSAudioPlayer::~IOSAudioPlayer()
@@ -71,7 +69,6 @@ IOSAudioPlayer::~IOSAudioPlayer()
   [audioPlayer_ cleanup];
 
   if (audioBus_) {
-    delete audioBus_;
     audioBus_ = 0;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-api",
-  "version": "0.4.10-rc.1",
+  "version": "0.4.10",
   "description": "react-native-audio-api provides system for controlling audio in React Native environment compatible with Web Audio API specification",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",