react-native-audio-api 0.6.0-rc.3 → 0.6.0-rc.4

package/common/cpp/audioapi/core/analysis/AnalyserNode.cpp

@@ -154,9 +154,10 @@ void AnalyserNode::processNode(
   // Down mix the input bus to mono
   downMixBus_->copy(processingBus.get());
 
+  auto framesToCopy = 0;
+
   if (vWriteIndex_ + framesToProcess > inputBuffer_->getSize()) {
-    auto framesToCopy =
-        static_cast<int>(inputBuffer_->getSize()) - vWriteIndex_;
+    framesToCopy = static_cast<int>(inputBuffer_->getSize()) - vWriteIndex_;
     memcpy(
         inputBuffer_->getData() + vWriteIndex_,
         downMixBus_->getChannel(0)->getData(),
@@ -168,7 +169,7 @@ void AnalyserNode::processNode(
 
   memcpy(
       inputBuffer_->getData() + vWriteIndex_,
-      downMixBus_->getChannel(0)->getData(),
+      downMixBus_->getChannel(0)->getData() + framesToCopy,
       framesToProcess * sizeof(float));
 
   vWriteIndex_ += framesToProcess;

package/ios/audioapi/ios/core/IOSAudioRecorder.h

@@ -31,6 +31,10 @@ class IOSAudioRecorder : public AudioRecorder {
  private:
   NativeAudioRecorder *audioRecorder_;
   std::atomic<bool> isRunning_;
+
+  std::shared_ptr<AudioBus> circularBuffer_;
+  int writeIdx_ = 0;
+  int readIdx_ = 0;
 };
 
 } // namespace audioapi

package/ios/audioapi/ios/core/IOSAudioRecorder.mm

@@ -16,15 +16,59 @@ IOSAudioRecorder::IOSAudioRecorder(
     const std::function<void(std::shared_ptr<AudioBus>, int, double)> &onAudioReady)
     : AudioRecorder(sampleRate, bufferLength, onError, onStatusChange, onAudioReady)
 {
+  circularBuffer_ = std::make_shared<AudioBus>(std::max(2 * bufferLength, 2048), 1, sampleRate);
+
   AudioReceiverBlock audioReceiverBlock = ^(const AudioBufferList *inputBuffer, int numFrames, AVAudioTime *when) {
     if (isRunning_.load()) {
-      auto bus = std::make_shared<AudioBus>(numFrames, 1, sampleRate);
-
+      // copying to circularBuffer_
+      auto *circularBufferChannel = circularBuffer_->getChannel(0)->getData();
       auto *inputChannel = (float *)inputBuffer->mBuffers[0].mData;
-      auto *outputChannel = bus->getChannel(0)->getData();
 
-      memcpy(outputChannel, inputChannel, numFrames * sizeof(float));
-      onAudioReady_(bus, numFrames, [when sampleTime] / [when sampleRate]);
+      auto framesToProcess = numFrames;
+      auto framesToCopy = 0;
+
+      if (writeIdx_ + numFrames > circularBuffer_->getSize()) {
+        framesToCopy = circularBuffer_->getSize() - writeIdx_;
+        memcpy(circularBufferChannel + writeIdx_, inputChannel, framesToCopy * sizeof(float));
+        framesToProcess -= framesToCopy;
+        writeIdx_ = 0;
+      }
+
+      memcpy(circularBufferChannel + writeIdx_, inputChannel + framesToCopy, framesToProcess * sizeof(float));
+
+      writeIdx_ += framesToProcess;
+      if (writeIdx_ >= circularBuffer_->getSize()) {
+        writeIdx_ = 0;
+      }
+
+      // copying to output bus and invoking callback
+      auto availableFrames =
+          writeIdx_ >= readIdx_ ? writeIdx_ - readIdx_ : circularBuffer_->getSize() - (readIdx_ - writeIdx_);
+
+      while (availableFrames >= bufferLength_) {
+        auto bus = std::make_shared<AudioBus>(bufferLength_, 1, sampleRate_);
+        auto *outputChannel = bus->getChannel(0)->getData();
+
+        framesToProcess = bufferLength_;
+        framesToCopy = 0;
+        if (readIdx_ + bufferLength_ > circularBuffer_->getSize()) {
+          framesToCopy = circularBuffer_->getSize() - readIdx_;
+          memcpy(outputChannel, circularBufferChannel + readIdx_, framesToCopy * sizeof(float));
+          framesToProcess -= framesToCopy;
+          readIdx_ = 0;
+        }
+
+        memcpy(outputChannel + framesToCopy, circularBufferChannel + readIdx_, framesToProcess * sizeof(float));
+
+        readIdx_ += framesToProcess;
+        if (readIdx_ >= circularBuffer_->getSize()) {
+          readIdx_ = 0;
+        }
+
+        onAudioReady_(bus, bufferLength_, [when sampleTime] / [when sampleRate]);
+
+        availableFrames -= bufferLength_;
+      }
     }
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-api",
-  "version": "0.6.0-rc.3",
+  "version": "0.6.0-rc.4",
   "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"