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

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

@@ -28,7 +28,9 @@ IOSAudioRecorder::IOSAudioRecorder(
     }
   };
 
-  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.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"