react-native-audio-api 0.4.17 → 0.4.18

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

@@ -227,6 +227,7 @@ void AudioNode::disconnectNode(const std::shared_ptr<AudioNode> &node) {
       });
 
   if (position != outputNodes_.end()) {
+    node->onInputDisconnected(this);
     outputNodes_.erase(position);
   }
 }

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

@@ -63,7 +63,7 @@ void AudioScheduledSourceNode::updatePlaybackInfo(
   size_t stopFrame = stopTime_ == -1.0
       ? std::numeric_limits<size_t>::max()
       : std::max(
-            AudioUtils::timeToSampleFrame(stopTime_, sampleRate), firstFrame);
+            AudioUtils::timeToSampleFrame(stopTime_, sampleRate), lastFrame);
 
   if (isUnscheduled() || isFinished()) {
     startOffset = 0;
@@ -85,7 +85,10 @@ void AudioScheduledSourceNode::updatePlaybackInfo(
     startOffset = std::max(startFrame, firstFrame) - firstFrame > 0
         ? std::max(startFrame, firstFrame) - firstFrame
         : 0;
-    nonSilentFramesToProcess = std::min(lastFrame, stopFrame) - startFrame;
+    nonSilentFramesToProcess = std::max(std::min(lastFrame, stopFrame), startFrame) - startFrame;
+
+    assert(startOffset < framesToProcess);
+    assert(nonSilentFramesToProcess <= framesToProcess);
     processingBus->zero(0, startOffset);
     return;
   }
@@ -97,6 +100,9 @@ void AudioScheduledSourceNode::updatePlaybackInfo(
   if (stopFrame < lastFrame && stopFrame >= firstFrame) {
     startOffset = 0;
     nonSilentFramesToProcess = stopFrame - firstFrame;
+
+    assert(startOffset < framesToProcess);
+    assert(nonSilentFramesToProcess <= framesToProcess);
     processingBus->zero(stopFrame - firstFrame, lastFrame - stopFrame);
     return;
   }

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

@@ -16,6 +16,7 @@ typedef void (^RenderAudioBlock)(AudioBufferList *outputBuffer, int numFrames);
 @property (nonatomic, assign) float sampleRate;
 @property (nonatomic, assign) bool isRunning;
 @property (nonatomic, strong) AVAudioSourceNodeRenderBlock renderBlock;
+@property (nonatomic, assign) bool isAudioSessionActive;
 
 - (instancetype)initWithRenderAudioBlock:(RenderAudioBlock)renderAudio;
 

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

@@ -9,6 +9,7 @@
     self.audioEngine = [[AVAudioEngine alloc] init];
     self.audioEngine.mainMixerNode.outputVolume = 1;
     self.isRunning = true;
+    self.isAudioSessionActive = false;
 
     [self setupAndInitAudioSession];
 
@@ -39,6 +40,7 @@
     self.audioEngine = [[AVAudioEngine alloc] init];
     self.audioEngine.mainMixerNode.outputVolume = 1;
     self.isRunning = true;
+    self.isAudioSessionActive = false;
 
     [self setupAndInitAudioSession];
 
@@ -87,7 +89,9 @@
   [self.audioSession setActive:false error:&error];
 
   if (error != nil) {
-    @throw error;
+    NSLog(@"Error while de-activating audio session: %@", [error debugDescription]);
+  } else {
+    self.isAudioSessionActive = false;
   }
 }
 
@@ -119,20 +123,52 @@
     self.audioSession = [AVAudioSession sharedInstance];
   }
 
-  [self.audioSession setCategory:AVAudioSessionCategoryPlayback
-                            mode:AVAudioSessionModeDefault
-                         options:AVAudioSessionCategoryOptionDuckOthers | AVAudioSessionCategoryOptionAllowBluetooth |
-                         AVAudioSessionCategoryOptionAllowAirPlay
-                           error:&error];
+  AVAudioSessionCategory desiredCategory = AVAudioSessionCategoryPlayback;
+  AVAudioSessionMode desiredMode = AVAudioSessionModeDefault;
+  AVAudioSessionCategoryOptions desiredOptions = AVAudioSessionCategoryOptionAllowBluetooth | AVAudioSessionCategoryOptionAllowAirPlay;
 
-  if (error != nil) {
-    NSLog(@"Error while configuring audio session: %@", [error localizedDescription]);
+  if (self.audioSession.category != desiredCategory || self.audioSession.mode != desiredMode || self.audioSession.categoryOptions != desiredOptions) {
+    [self.audioSession setCategory:desiredCategory mode:desiredMode options:desiredOptions error:&error];
+
+    if (error != nil) {
+      NSLog(@"Error while configuring audio session: %@", [error debugDescription]);
+    }
+  } else {
+    NSLog(@"AVAudioSession category mode and options are valid, skipping configuration");
   }
 
-  [self.audioSession setActive:true error:&error];
+  if (self.sampleRate) {
+    if (self.audioSession.preferredSampleRate != self.sampleRate) {
+      [self.audioSession setPreferredSampleRate:self.sampleRate error:&error];
 
-  if (error != nil) {
-    NSLog(@"Error while activating audio session: %@", [error localizedDescription]);
+      if (error != nil) {
+        NSLog(@"Error while setting preferred sample rate buffer duration: %@", [error debugDescription]);
+      }
+    } else {
+      NSLog(@"AVAudioSession preferred sample rate is valid, skipping configuration");
+    }
+  }
+
+  if (self.audioSession.preferredIOBufferDuration != 0.02) {
+    [self.audioSession setPreferredIOBufferDuration:0.02 error:&error];
+
+    if (error != nil) {
+      NSLog(@"Error while setting preferred IO buffer duration: %@", [error debugDescription]);
+    }
+  } else {
+    NSLog(@"AVAudioSession preferred IO buffer duration is valid, skipping configuration");
+  }
+
+  if (!self.isAudioSessionActive) {
+    [self.audioSession setActive:true error:&error];
+
+    if (error != nil) {
+      NSLog(@"Error while activating audio session: %@", [error debugDescription]);
+    } else {
+      self.isAudioSessionActive = true;
+    }
+  } else {
+    NSLog(@"AVAudioSession was active, skipping unnecessary activation");
   }
 }
 

package/package.json

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