react-native-audio-api 0.6.0-rc.2 → 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,19 +16,65 @@ 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_;
+      }
     }
   };
 
-  audioRecorder_ = [[NativeAudioRecorder alloc] initWithReceiverBlock:audioReceiverBlock bufferLength:bufferLength];
+  audioRecorder_ = [[NativeAudioRecorder alloc] initWithReceiverBlock:audioReceiverBlock
+                                                         bufferLength:bufferLength
+                                                           sampleRate:sampleRate];
 }
 
 IOSAudioRecorder::~IOSAudioRecorder()

package/ios/audioapi/ios/core/NativeAudioRecorder.h

@@ -8,13 +8,19 @@ typedef void (^AudioReceiverBlock)(const AudioBufferList *inputBuffer, int numFr
 @interface NativeAudioRecorder : NSObject
 
 @property (nonatomic, assign) int bufferLength;
-@property (nonatomic, assign) double sampleRate;
+@property (nonatomic, assign) float sampleRate;
 
 @property (nonatomic, strong) AVAudioSinkNode *sinkNode;
 @property (nonatomic, copy) AVAudioSinkNodeReceiverBlock receiverSinkBlock;
 @property (nonatomic, copy) AudioReceiverBlock receiverBlock;
 
-- (instancetype)initWithReceiverBlock:(AudioReceiverBlock)receiverBlock bufferLength:(int)bufferLength;
+@property (nonatomic, strong) AVAudioConverter *audioConverter;
+@property (nonatomic, strong) AVAudioFormat *inputFormat;
+@property (nonatomic, strong) AVAudioFormat *outputFormat;
+
+- (instancetype)initWithReceiverBlock:(AudioReceiverBlock)receiverBlock
+                         bufferLength:(int)bufferLength
+                           sampleRate:(float)sampleRate;
 
 - (void)start;
 

package/ios/audioapi/ios/core/NativeAudioRecorder.m

@@ -4,23 +4,34 @@
 
 @implementation NativeAudioRecorder
 
-- (instancetype)initWithReceiverBlock:(AudioReceiverBlock)receiverBlock bufferLength:(int)bufferLength
+- (instancetype)initWithReceiverBlock:(AudioReceiverBlock)receiverBlock
+                         bufferLength:(int)bufferLength
+                           sampleRate:(float)sampleRate
 {
   if (self = [super init]) {
     self.bufferLength = bufferLength;
-    self.sampleRate = [[[AudioSessionManager sharedInstance] getDevicePreferredSampleRate] doubleValue];
+    self.sampleRate = sampleRate;
 
     self.receiverBlock = [receiverBlock copy];
 
+    float devicePrefferedSampleRate = [[[AudioSessionManager sharedInstance] getDevicePreferredSampleRate] floatValue];
+
+    self.inputFormat = [[AVAudioFormat alloc] initWithCommonFormat:AVAudioPCMFormatFloat32
+                                                        sampleRate:devicePrefferedSampleRate
+                                                          channels:1
+                                                       interleaved:NO];
+    self.outputFormat = [[AVAudioFormat alloc] initWithCommonFormat:AVAudioPCMFormatFloat32
+                                                         sampleRate:sampleRate
+                                                           channels:1
+                                                        interleaved:NO];
+    self.audioConverter = [[AVAudioConverter alloc] initFromFormat:self.inputFormat toFormat:self.outputFormat];
+
     __weak typeof(self) weakSelf = self;
     self.receiverSinkBlock = ^OSStatus(
         const AudioTimeStamp *_Nonnull timestamp,
         AVAudioFrameCount frameCount,
         const AudioBufferList *_Nonnull inputData) {
-      AVAudioTime *time = [[AVAudioTime alloc] initWithAudioTimeStamp:timestamp sampleRate:weakSelf.sampleRate];
-      weakSelf.receiverBlock(inputData, frameCount, time);
-
-      return kAudioServicesNoError;
+      return [weakSelf processAudioInput:inputData withFrameCount:frameCount atTimestamp:timestamp];
     };
 
     self.sinkNode = [[AVAudioSinkNode alloc] initWithReceiverBlock:self.receiverSinkBlock];
@@ -29,6 +40,55 @@
   return self;
 }
 
+- (OSStatus)processAudioInput:(const AudioBufferList *)inputData
+               withFrameCount:(AVAudioFrameCount)frameCount
+                  atTimestamp:(const AudioTimeStamp *)timestamp
+{
+  float inputSampleRate = self.inputFormat.sampleRate;
+  float outputSampleRate = self.outputFormat.sampleRate;
+
+  AVAudioTime *time = [[AVAudioTime alloc] initWithAudioTimeStamp:timestamp sampleRate:outputSampleRate];
+
+  if (inputSampleRate != outputSampleRate) {
+    AVAudioPCMBuffer *inputBuffer = [[AVAudioPCMBuffer alloc] initWithPCMFormat:self.inputFormat
+                                                                  frameCapacity:frameCount];
+
+    memcpy(
+        inputBuffer.mutableAudioBufferList->mBuffers[0].mData,
+        inputData->mBuffers[0].mData,
+        inputData->mBuffers[0].mDataByteSize);
+    inputBuffer.frameLength = frameCount;
+
+    int outputFrameCount = frameCount * outputSampleRate / inputSampleRate;
+
+    AVAudioPCMBuffer *outputBuffer = [[AVAudioPCMBuffer alloc] initWithPCMFormat:self.audioConverter.outputFormat
+                                                                   frameCapacity:outputFrameCount];
+
+    NSError *error = nil;
+    AVAudioConverterInputBlock inputBlock =
+        ^AVAudioBuffer *_Nullable(AVAudioPacketCount inNumberOfPackets, AVAudioConverterInputStatus *outStatus)
+    {
+      *outStatus = AVAudioConverterInputStatus_HaveData;
+      return inputBuffer;
+    };
+
+    [self.audioConverter convertToBuffer:outputBuffer error:&error withInputFromBlock:inputBlock];
+
+    if (error) {
+      NSLog(@"Error during audio conversion: %@", error.localizedDescription);
+      return kAudioServicesBadSpecifierSizeError;
+    }
+
+    self.receiverBlock(outputBuffer.audioBufferList, outputBuffer.frameLength, time);
+
+    return kAudioServicesNoError;
+  }
+
+  self.receiverBlock(inputData, frameCount, time);
+
+  return kAudioServicesNoError;
+}
+
 - (void)start
 {
   [[AudioEngine sharedInstance] attachInputNode:self.sinkNode];

package/package.json

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