feat(ios): use sliceNSamples to concatShortBuffers

mybigday · Sep 23, 2023 · 1967ede · 1967ede
1 parent 5705f4f
commit 1967ede
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/ios/RNWhisperAudioUtils.h b/ios/RNWhisperAudioUtils.h
@@ -2,7 +2,7 @@
 
 @interface RNWhisperAudioUtils : NSObject
 
-+ (NSData *)concatShortBuffers:(NSMutableArray<NSValue *> *)buffers sliceSize:(int)sliceSize lastSliceSize:(int)lastSliceSize;
++ (NSData *)concatShortBuffers:(NSMutableArray<NSValue *> *)buffers sliceNSamples:(NSMutableArray<NSNumber *> *)sliceNSamples;
 + (void)saveWavFile:(NSData *)rawData audioOutputFile:(NSString *)audioOutputFile;
 
 @end
diff --git a/ios/RNWhisperAudioUtils.m b/ios/RNWhisperAudioUtils.m
@@ -3,13 +3,11 @@
 
 @implementation RNWhisperAudioUtils
 
-+ (NSData *)concatShortBuffers:(NSMutableArray<NSValue *> *)buffers sliceSize:(int)sliceSize lastSliceSize:(int)lastSliceSize {
++ (NSData *)concatShortBuffers:(NSMutableArray<NSValue *> *)buffers sliceNSamples:(NSMutableArray<NSNumber *> *)sliceNSamples {
     NSMutableData *outputData = [NSMutableData data];
-    for (NSValue *buffer in buffers) {
-        int size = sliceSize;
-        if (buffer == buffers.lastObject) {
-            size = lastSliceSize;
-        }
+    for (int i = 0; i < buffers.count; i++) {
+        int size = [sliceNSamples objectAtIndex:i].intValue;
+        NSValue *buffer = [buffers objectAtIndex:i];
         short *bufferPtr = buffer.pointerValue;
         [outputData appendBytes:bufferPtr length:size * sizeof(short)];
     }

diff --git a/ios/RNWhisperContext.mm b/ios/RNWhisperContext.mm
@@ -251,8 +251,7 @@ - (void)fullTranscribeSamples:(RNWhisperContextRecordState*) state {
         if (state->options[@"audioOutputPath"] != nil) {
             [RNWhisperAudioUtils
                 saveWavFile:[RNWhisperAudioUtils concatShortBuffers:state->shortBufferSlices
-                            sliceSize:state->audioSliceSec * WHISPER_SAMPLE_RATE
-                            lastSliceSize:nSamplesOfIndex]
+                                sliceNSamples:state->sliceNSamples]
                 audioOutputFile:state->options[@"audioOutputPath"]
             ];
         }