whisper.rn 0.3.0-rc.3 → 0.3.0-rc.4

package/android/src/main/java/com/rnwhisper/WhisperContext.java

@@ -239,7 +239,19 @@ public class WhisperContext {
       !isCapturing &&
       nSamplesTranscribing == nSamplesOfIndex &&
       sliceIndex == transcribeSliceIndex;
-    if (isStopped) {
+
+    if (
+      // If no more samples on current slice, move to next slice
+      nSamplesTranscribing == sliceNSamples.get(transcribeSliceIndex) &&
+      transcribeSliceIndex != sliceIndex
+    ) {
+      transcribeSliceIndex++;
+      nSamplesTranscribing = 0;
+    }
+
+    boolean continueNeeded = !isCapturing && nSamplesTranscribing != nSamplesOfIndex;
+
+    if (isStopped && !continueNeeded) {
       payload.putBoolean("isCapturing", false);
       payload.putBoolean("isStoppedByAction", isStoppedByAction);
       emitTranscribeEvent("@RNWhisper_onRealtimeTranscribeEnd", payload);
@@ -251,16 +263,7 @@ public class WhisperContext {
       emitTranscribeEvent("@RNWhisper_onRealtimeTranscribe", payload);
     }
 
-    if (
-      // If no more samples on current slice, move to next slice
-      nSamplesTranscribing == sliceNSamples.get(transcribeSliceIndex) &&
-      transcribeSliceIndex != sliceIndex
-    ) {
-      transcribeSliceIndex++;
-      nSamplesTranscribing = 0;
-    }
-
-    if (!isCapturing && nSamplesTranscribing != nSamplesOfIndex) {
+    if (continueNeeded) {
       // If no more capturing, continue transcribing until all slices are transcribed
       fullTranscribeSamples(options, true);
     } else if (isStopped) {
@@ -368,7 +371,6 @@ public class WhisperContext {
   public void stopTranscribe(int jobId) {
     abortTranscribe(jobId);
     isCapturing = false;
-    isTranscribing = false;
     isStoppedByAction = true;
   }
 

package/ios/RNWhisperContext.mm

@@ -180,14 +180,26 @@ void AudioInputCallback(void * inUserData,
     }
 
     nSamplesOfIndex = [[state->sliceNSamples objectAtIndex:state->transcribeSliceIndex] intValue];
+
+    bool isStopped = state->isStoppedByAction || (
+        !state->isCapturing &&
+        state->nSamplesTranscribing == nSamplesOfIndex &&
+        state->sliceIndex == state->transcribeSliceIndex
+    );
+
     if (
-        state->isStoppedByAction ||
-        (
-            !state->isCapturing &&
-            state->nSamplesTranscribing == nSamplesOfIndex &&
-            state->sliceIndex == state->transcribeSliceIndex
-        )
+      // If no more samples on current slice, move to next slice
+      state->nSamplesTranscribing == nSamplesOfIndex &&
+      state->transcribeSliceIndex != state->sliceIndex
     ) {
+        state->transcribeSliceIndex++;
+        state->nSamplesTranscribing = 0;
+    }
+
+    bool continueNeeded = !state->isCapturing &&
+        state->nSamplesTranscribing != nSamplesOfIndex;
+
+    if (isStopped && !continueNeeded) {
         NSLog(@"[RNWhisper] Transcribe end");
         result[@"isStoppedByAction"] = @(state->isStoppedByAction);
         result[@"isCapturing"] = @(false);
@@ -200,19 +212,7 @@ void AudioInputCallback(void * inUserData,
         state->transcribeHandler(state->jobId, @"transcribe", result);
     }
 
-    if (
-      // If no more samples on current slice, move to next slice
-      state->nSamplesTranscribing == nSamplesOfIndex &&
-      state->transcribeSliceIndex != state->sliceIndex
-    ) {
-        state->transcribeSliceIndex++;
-        state->nSamplesTranscribing = 0;
-    }
-
-    if (
-        !state->isCapturing &&
-        state->nSamplesTranscribing != nSamplesOfIndex
-    ) {
+    if (continueNeeded) {
         state->isTranscribing = true;
         // Finish transcribing the rest of the samples
         [self fullTranscribeSamples:state];
@@ -285,7 +285,6 @@ void AudioInputCallback(void * inUserData,
     if (!self->recordState.isRealtime || !self->recordState.isCapturing) {
         return;
     }
-    self->recordState.isTranscribing = false;
     self->recordState.isCapturing = false;
     self->recordState.isStoppedByAction = true;
     [self stopAudio];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whisper.rn",
-  "version": "0.3.0-rc.3",
+  "version": "0.3.0-rc.4",
   "description": "React Native binding of whisper.cpp",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",