react-native-audio-api 0.5.1 → 0.5.3

package/android/src/main/cpp/audioapi/android/core/AudioDecoder.cpp

@@ -109,39 +109,4 @@ std::shared_ptr<AudioBus> AudioDecoder::decodeWithMemoryBlock(
   return audioBus;
 }
 
-// std::shared_ptr<AudioBus> AudioDecoder::decode(ma_decoder &decoder) const {
-// ma_uint64 totalFrameCount;
-// ma_decoder_get_length_in_pcm_frames(&decoder, &totalFrameCount);
-//
-// auto audioBus = std::make_shared<AudioBus>(
-//         static_cast<int>(totalFrameCount), 2, sampleRate_);
-// auto *buffer = new float[totalFrameCount * 2];
-//
-// ma_uint64 framesDecoded;
-// ma_decoder_read_pcm_frames(&decoder, buffer, totalFrameCount,
-// &framesDecoded); if (framesDecoded == 0) {
-//     __android_log_print(
-//             ANDROID_LOG_ERROR,
-//             "AudioDecoder",
-//             "Failed to decode");
-//
-//     delete[] buffer;
-//     ma_decoder_uninit(&decoder);
-//
-//     return nullptr;
-// }
-//
-// for (int i = 0; i < decoder.outputChannels; ++i) {
-//     auto channelData = audioBus->getChannel(i)->getData();
-//
-//     for (ma_uint64 j = 0; j < framesDecoded; ++j) {
-//         channelData[j] = buffer[j * decoder.outputChannels + i];
-//     }
-// }
-//
-// delete[] buffer;
-// ma_decoder_uninit(&decoder);
-//
-// return audioBus;
-// }
 } // namespace audioapi

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

@@ -14,7 +14,7 @@ AudioPlayer::AudioPlayer(
   builder.setSharingMode(SharingMode::Exclusive)
       ->setFormat(AudioFormat::Float)
       ->setFormatConversionAllowed(true)
-      ->setPerformanceMode(PerformanceMode::LowLatency)
+      ->setPerformanceMode(PerformanceMode::None)
       ->setChannelCount(channelCount_)
       ->setSampleRateConversionQuality(SampleRateConversionQuality::Medium)
       ->setDataCallback(this)
@@ -35,7 +35,7 @@ AudioPlayer::AudioPlayer(
   builder.setSharingMode(SharingMode::Exclusive)
       ->setFormat(AudioFormat::Float)
       ->setFormatConversionAllowed(true)
-      ->setPerformanceMode(PerformanceMode::LowLatency)
+      ->setPerformanceMode(PerformanceMode::None)
       ->setChannelCount(2)
       ->setSampleRateConversionQuality(SampleRateConversionQuality::Medium)
       ->setDataCallback(this)

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

@@ -31,6 +31,10 @@ class AudioBufferHostObject : public JsiHostObject {
         JSI_EXPORT_FUNCTION(AudioBufferHostObject, copyToChannel));
   }
 
+  [[nodiscard]] size_t getSizeInBytes() const {
+    return audioBuffer_->getLength() * audioBuffer_->getNumberOfChannels() * sizeof(float);
+  }
+
   JSI_PROPERTY_GETTER(sampleRate) {
     return {audioBuffer_->getSampleRate()};
   }
@@ -48,8 +52,6 @@ class AudioBufferHostObject : public JsiHostObject {
   }
 
   JSI_HOST_FUNCTION(getChannelData) {
-    // this method could cause a crash if channelData is already deallocated,
-    // but we handle deallocation internally so it should be safe
     auto channel = static_cast<int>(args[0].getNumber());
     auto channelData = reinterpret_cast<uint8_t *>(audioBuffer_->getChannelData(channel));
     auto length = static_cast<int>(audioBuffer_->getLength());

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

@@ -109,7 +109,11 @@ class BaseAudioContextHostObject : public JsiHostObject {
     auto sampleRate = static_cast<float>(args[2].getNumber());
     auto buffer = BaseAudioContext::createBuffer(numberOfChannels, length, sampleRate);
     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());
+
+    return jsiObject;
   }
 
   JSI_HOST_FUNCTION(createPeriodicWave) {
@@ -158,7 +162,9 @@ class BaseAudioContextHostObject : public JsiHostObject {
         }
 
         promise->resolve([audioBufferHostObject = std::move(audioBufferHostObject)](jsi::Runtime &runtime) {
-          return jsi::Object::createFromHostObject(runtime, audioBufferHostObject);
+          auto jsiObject = jsi::Object::createFromHostObject(runtime, audioBufferHostObject);
+          jsiObject.setExternalMemoryPressure(runtime, audioBufferHostObject->getSizeInBytes());
+          return jsiObject;
         });
       }).detach();
     });
@@ -182,7 +188,9 @@ class BaseAudioContextHostObject : public JsiHostObject {
           }
 
           promise->resolve([audioBufferHostObject = std::move(audioBufferHostObject)](jsi::Runtime &runtime) {
-            return jsi::Object::createFromHostObject(runtime, audioBufferHostObject);
+            auto jsiObject = jsi::Object::createFromHostObject(runtime, audioBufferHostObject);
+            jsiObject.setExternalMemoryPressure(runtime, audioBufferHostObject->getSizeInBytes());
+            return jsiObject;
           });
         }).detach();
       });

package/common/cpp/audioapi/core/AudioNode.cpp

@@ -254,7 +254,9 @@ void AudioNode::cleanup() {
   }
 
   for (const auto &inputNode : inputNodes_) {
-    inputNode->disconnectNode(shared_from_this());
+    if (inputNode) {
+      inputNode->disconnectNode(shared_from_this());
+    }
   }
 
   outputNodes_.clear();

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

@@ -32,7 +32,7 @@ class AudioNode : public std::enable_shared_from_this<AudioNode> {
 
   bool isEnabled() const;
   void enable();
-  void disable();
+  virtual void disable();
 
  protected:
   friend class AudioNodeManager;

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

@@ -121,7 +121,7 @@ int PeriodicWave::getNumberOfPartialsPerRange(int rangeIndex) const {
 
   // The very top range will have all the partials culled.
   int numberOfPartials =
-      floor(static_cast<float>(getMaxNumberOfPartials()) * cullingScale);
+      int(static_cast<float>(getMaxNumberOfPartials()) * cullingScale);
 
   return numberOfPartials;
 }

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

@@ -109,6 +109,11 @@ void AudioBufferSourceNode::start(double when, double offset, double duration) {
   vReadIndex_ = static_cast<double>(buffer_->getSampleRate() * offset);
 }
 
+void AudioBufferSourceNode::disable() {
+  AudioNode::disable();
+  buffer_ = nullptr;
+}
+
 std::mutex &AudioBufferSourceNode::getBufferLock() {
   return bufferLock_;
 }
@@ -160,9 +165,19 @@ void AudioBufferSourceNode::processNode(
     updatePlaybackInfo(
         playbackRateBus_, framesNeededToStretch, startOffset, offsetLength);
 
+    if (playbackRate == 0.0f || !isPlaying() || !buffer_) {
+      processingBus->zero();
+      return;
+    }
+
     processWithoutInterpolation(
         playbackRateBus_, startOffset, offsetLength, playbackRate);
 
+    if (!buffer_) {
+      processingBus->zero();
+      return;
+    }
+
     auto stretch = buffer_->stretch_;
 
     stretch->process(
@@ -171,7 +186,9 @@ void AudioBufferSourceNode::processNode(
         processingBus.get()[0],
         framesToProcess);
 
-    stretch->setTransposeSemitones(detune);
+    if (detune != 0.0f) {
+      stretch->setTransposeSemitones(detune);
+    }
   }
 
   handleStopScheduled();
@@ -233,6 +250,10 @@ void AudioBufferSourceNode::processWithoutInterpolation(
 
       if (!loop_) {
         processingBus->zero(writeIndex, framesLeft);
+
+        if (onendedCallback_) {
+          onendedCallback_(getStopTime());
+        }
         playbackState_ = PlaybackState::FINISHED;
         disable();
         break;

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

@@ -30,6 +30,7 @@ class AudioBufferSourceNode : public AudioScheduledSourceNode {
   void setBuffer(const std::shared_ptr<AudioBuffer> &buffer);
 
   void start(double when, double offset, double duration = -1);
+  void disable() override;
 
  protected:
   std::mutex &getBufferLock();

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

@@ -36,6 +36,8 @@ class AudioScheduledSourceNode : public AudioNode {
  protected:
   PlaybackState playbackState_;
 
+  std::function<void(double)> onendedCallback_;
+
   void updatePlaybackInfo(
       const std::shared_ptr<AudioBus>& processingBus,
       int framesToProcess,
@@ -47,8 +49,6 @@ class AudioScheduledSourceNode : public AudioNode {
  private:
   double startTime_;
   double stopTime_;
-
-  std::function<void(double)> onendedCallback_;
 };
 
 } // namespace audioapi

package/common/cpp/audioapi/dsp/VectorMath.cpp

@@ -698,4 +698,5 @@ void linearToDecibels(
     outputVector[i] = dsp::linearToDecibels(inputVector[i]);
   }
 }
+
 } // namespace audioapi::dsp

package/common/cpp/audioapi/dsp/VectorMath.h

@@ -46,4 +46,5 @@ void multiply(const float *inputVector1, const float *inputVector2, float *outpu
 float maximumMagnitude(const float *inputVector, size_t numberOfElementsToProcess);
 
 void linearToDecibels(const float *inputVector, float *outputVector, size_t numberOfElementsToProcess);
+
 } // namespace audioapi::dsp

package/common/cpp/audioapi/jsi/JsiHostObject.cpp

@@ -1,6 +1,15 @@
 #include <audioapi/jsi/JsiHostObject.h>
 
+//  set this value to 1 in order to debug the construction/destruction
+#define JSI_DEBUG_ALLOCATIONS 1
+
 namespace audioapi {
+
+#if JSI_DEBUG_ALLOCATIONS
+int objCounter = 0;
+std::vector<JsiHostObject *> objects;
+#endif
+
 JsiHostObject::JsiHostObject() {
   getters_ = std::make_unique<std::unordered_map<
       std::string,
@@ -12,6 +21,23 @@ JsiHostObject::JsiHostObject() {
   setters_ = std::make_unique<std::unordered_map<
       std::string,
       void (JsiHostObject::*)(jsi::Runtime &, const jsi::Value &)>>();
+
+#if JSI_DEBUG_ALLOCATIONS
+  objects.push_back(this);
+  objCounter++;
+#endif
+}
+
+JsiHostObject::~JsiHostObject() {
+#if JSI_DEBUG_ALLOCATIONS
+  for (size_t i = 0; i < objects.size(); ++i) {
+    if (objects.at(i) == this) {
+      objects.erase(objects.begin() + i);
+      break;
+    }
+  }
+  objCounter--;
+#endif
 }
 
 std::vector<jsi::PropNameID> JsiHostObject::getPropertyNames(jsi::Runtime &rt) {

package/common/cpp/audioapi/jsi/JsiHostObject.h

@@ -48,6 +48,7 @@ using namespace facebook;
 class JsiHostObject : public jsi::HostObject {
  public:
   JsiHostObject();
+  ~JsiHostObject() override;
 
   std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) override;
 

package/ios/audioapi/ios/core/AudioPlayer.h

@@ -16,6 +16,8 @@ typedef void (^RenderAudioBlock)(AudioBufferList *outputBuffer, int numFrames);
 @property (nonatomic, assign) float sampleRate;
 @property (nonatomic, assign) int channelCount;
 @property (nonatomic, assign) bool isRunning;
+@property (nonatomic, assign) bool isInterrupted;
+@property (nonatomic, assign) bool configurationChanged;
 
 - (instancetype)initWithRenderAudioBlock:(RenderAudioBlock)renderAudio channelCount:(int)channelCount;
 
@@ -42,5 +44,6 @@ typedef void (^RenderAudioBlock)(AudioBufferList *outputBuffer, int numFrames);
 - (void)connectAudioEngine;
 
 - (void)handleEngineConfigurationChange:(NSNotification *)notification;
+- (void)handleInterruption:(NSNotification *)notification;
 
 @end

package/ios/audioapi/ios/core/AudioPlayer.m

@@ -9,6 +9,8 @@
     self.audioEngine = [[AVAudioEngine alloc] init];
     self.audioEngine.mainMixerNode.outputVolume = 1;
     self.isRunning = true;
+    self.isInterrupted = false;
+    self.configurationChanged = false;
 
     [self setupAndInitAudioSession];
     [self setupAndInitNotificationHandlers];
@@ -44,6 +46,8 @@
     self.audioEngine = [[AVAudioEngine alloc] init];
     self.audioEngine.mainMixerNode.outputVolume = 1;
     self.isRunning = true;
+    self.isInterrupted = false;
+    self.configurationChanged = false;
 
     [self setupAndInitAudioSession];
     [self setupAndInitNotificationHandlers];
@@ -94,7 +98,7 @@
   [self.audioSession setActive:false error:&error];
 
   if (error != nil) {
-    @throw error;
+    NSLog(@"Error while deactivating audio session: %@", [error debugDescription]);
   }
 }
 
@@ -140,21 +144,28 @@
     self.audioSession = [AVAudioSession sharedInstance];
   }
 
-  [self.audioSession setCategory:AVAudioSessionCategoryPlayback
-                            mode:AVAudioSessionModeDefault
-                         options:AVAudioSessionCategoryOptionDuckOthers | AVAudioSessionCategoryOptionAllowBluetooth |
-                         AVAudioSessionCategoryOptionAllowAirPlay
-                           error:&error];
+  [self.audioSession setPreferredIOBufferDuration:0.022 error:&error];
 
   if (error != nil) {
-    NSLog(@"Error while configuring audio session: %@", [error localizedDescription]);
+    NSLog(@"Error while setting buffer size in audio session: %@", [error debugDescription]);
+    return;
+  }
+
+  [self.audioSession setCategory:AVAudioSessionCategoryPlayback error:&error];
+
+  if (error != nil) {
+    NSLog(@"Error while configuring audio session: %@", [error debugDescription]);
+    return;
   }
 
   [self.audioSession setActive:true error:&error];
 
   if (error != nil) {
-    NSLog(@"Error while activating audio session: %@", [error localizedDescription]);
+    NSLog(@"Error while activating audio session: %@", [error debugDescription]);
+    return;
   }
+
+  self.isInterrupted = false;
 }
 
 - (void)setupAndInitNotificationHandlers
@@ -167,6 +178,10 @@
                               selector:@selector(handleEngineConfigurationChange:)
                                   name:AVAudioEngineConfigurationChangeNotification
                                 object:nil];
+  [self.notificationCenter addObserver:self
+                              selector:@selector(handleInterruption:)
+                                  name:AVAudioSessionInterruptionNotification
+                                object:nil];
 }
 
 - (void)connectAudioEngine
@@ -182,18 +197,47 @@
     NSError *error = nil;
 
     if (![self.audioEngine startAndReturnError:&error]) {
-      NSLog(@"Error starting audio engine: %@", [error localizedDescription]);
+      NSLog(@"Error starting audio engine: %@", [error debugDescription]);
     }
   }
+
+  self.configurationChanged = false;
 }
 
 - (void)handleEngineConfigurationChange:(NSNotification *)notification
 {
-  if (!self.isRunning) {
+  if (!self.isRunning || self.isInterrupted) {
+    self.configurationChanged = true;
     return;
   }
 
-  [self connectAudioEngine];
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self connectAudioEngine];
+  });
+}
+
+- (void)handleInterruption:(NSNotification *)notification
+{
+  NSError *error;
+  UInt8 type = [[notification.userInfo valueForKey:AVAudioSessionInterruptionTypeKey] intValue];
+  UInt8 option = [[notification.userInfo valueForKey:AVAudioSessionInterruptionOptionKey] intValue];
+
+  if (type == AVAudioSessionInterruptionTypeBegan) {
+    self.isInterrupted = true;
+    return;
+  }
+
+  if (type != AVAudioSessionInterruptionTypeEnded || option != AVAudioSessionInterruptionOptionShouldResume) {
+    return;
+  }
+
+  [self setupAndInitAudioSession];
+
+  if (self.configurationChanged && self.isRunning) {
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [self connectAudioEngine];
+    });
+  }
 }
 
 @end

package/ios/audioapi/ios/core/IOSAudioPlayer.mm

@@ -1,6 +1,7 @@
 #import <AVFoundation/AVFoundation.h>
 
 #include <audioapi/core/Constants.h>
+#include <audioapi/dsp/VectorMath.h>
 #include <audioapi/ios/core/IOSAudioPlayer.h>
 #include <audioapi/utils/AudioArray.h>
 #include <audioapi/utils/AudioBus.h>
@@ -17,14 +18,11 @@ IOSAudioPlayer::IOSAudioPlayer(const std::function<void(std::shared_ptr<AudioBus
       int framesToProcess = std::min(numFrames - processedFrames, RENDER_QUANTUM_SIZE);
       renderAudio_(audioBus_, framesToProcess);
 
-      // TODO: optimize this with SIMD?
       for (int channel = 0; channel < channelCount_; channel += 1) {
         float *outputChannel = (float *)outputData->mBuffers[channel].mData;
         auto *inputChannel = audioBus_->getChannel(channel)->getData();
 
-        for (int i = 0; i < framesToProcess; i++) {
-          outputChannel[processedFrames + i] = inputChannel[i];
-        }
+        memcpy(outputChannel + processedFrames, inputChannel, framesToProcess * sizeof(float));
       }
 
       processedFrames += framesToProcess;
@@ -45,14 +43,11 @@ IOSAudioPlayer::IOSAudioPlayer(const std::function<void(std::shared_ptr<AudioBus
       int framesToProcess = std::min(numFrames - processedFrames, RENDER_QUANTUM_SIZE);
       renderAudio_(audioBus_, framesToProcess);
 
-      // TODO: optimize this with SIMD?
       for (int channel = 0; channel < channelCount_; channel += 1) {
         float *outputChannel = (float *)outputData->mBuffers[channel].mData;
         auto *inputChannel = audioBus_->getChannel(channel)->getData();
 
-        for (int i = 0; i < framesToProcess; i++) {
-          outputChannel[processedFrames + i] = inputChannel[i];
-        }
+        memcpy(outputChannel + processedFrames, inputChannel, framesToProcess * sizeof(float));
       }
 
       processedFrames += framesToProcess;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-api",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "react-native-audio-api provides system for controlling audio in React Native environment compatible with Web Audio API specification",
   "bin": {
     "setup-rn-audio-api-web": "./scripts/setup-rn-audio-api-web.js"