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

package/android/src/main/CMakeLists.txt

@@ -9,6 +9,8 @@ set(
     SOURCE_FILES
     ${RNWHISPER_LIB_DIR}/ggml.c
     ${RNWHISPER_LIB_DIR}/ggml-alloc.c
+    ${RNWHISPER_LIB_DIR}/ggml-backend.c
+    ${RNWHISPER_LIB_DIR}/ggml-quants.c
     ${RNWHISPER_LIB_DIR}/whisper.cpp
     ${RNWHISPER_LIB_DIR}/rn-whisper.cpp
     ${CMAKE_SOURCE_DIR}/jni.cpp

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

@@ -13,6 +13,7 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.Arguments;
 
 import java.util.HashMap;
 import java.util.Random;
@@ -107,7 +108,11 @@ public class RNWhisper implements LifecycleEventListener {
           promise.reject(exception);
           return;
         }
-        promise.resolve(id);
+        WritableMap result = Arguments.createMap();
+        result.putInt("contextId", id);
+        result.putBoolean("gpu", false);
+        result.putString("reasonNoGPU", "Currently not supported");
+        promise.resolve(result);
         tasks.remove(this);
       }
     }.execute();

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

@@ -278,7 +278,7 @@ public class WhisperContext {
 
     if (code == 0) {
       payload.putMap("data", getTextSegments(0, getTextSegmentCount(context)));
-    } else {
+    } else if (code != -999) { // Not aborted
       payload.putString("error", "Transcribe failed with code " + code);
     }
 
@@ -297,7 +297,7 @@ public class WhisperContext {
       nSamplesTranscribing = 0;
     }
 
-    boolean continueNeeded = !isCapturing && nSamplesTranscribing != nSamplesOfIndex;
+    boolean continueNeeded = !isCapturing && nSamplesTranscribing != nSamplesOfIndex && code != -999;
 
     if (isStopped && !continueNeeded) {
       payload.putBoolean("isCapturing", false);
@@ -386,7 +386,7 @@ public class WhisperContext {
     int code = full(jobId, options, audioData, audioData.length);
     isTranscribing = false;
     this.jobId = -1;
-    if (code != 0) {
+    if (code != 0 && code != 999) {
       throw new Exception("Failed to transcribe the file. Code: " + code);
     }
     WritableMap result = getTextSegments(0, getTextSegmentCount(context));

package/android/src/main/jni.cpp

@@ -297,16 +297,17 @@ Java_com_rnwhisper_WhisperContext_fullTranscribe(
     }
 
     // abort handlers
+    bool* abort_ptr = rn_whisper_assign_abort_map(job_id);
     params.encoder_begin_callback = [](struct whisper_context * /*ctx*/, struct whisper_state * /*state*/, void * user_data) {
         bool is_aborted = *(bool*)user_data;
         return !is_aborted;
     };
-    params.encoder_begin_callback_user_data = rn_whisper_assign_abort_map(job_id);
+    params.encoder_begin_callback_user_data = abort_ptr;
     params.abort_callback = [](void * user_data) {
         bool is_aborted = *(bool*)user_data;
         return is_aborted;
     };
-    params.abort_callback_user_data = rn_whisper_assign_abort_map(job_id);
+    params.abort_callback_user_data = abort_ptr;
 
     if (callback_instance != nullptr) {
         callback_context *cb_ctx = new callback_context;
@@ -344,6 +345,9 @@ Java_com_rnwhisper_WhisperContext_fullTranscribe(
     }
     env->ReleaseFloatArrayElements(audio_data, audio_data_arr, JNI_ABORT);
     env->ReleaseStringUTFChars(language, language_chars);
+    if (rn_whisper_transcribe_is_aborted(job_id)) {
+        code = -999;
+    }
     rn_whisper_remove_abort_map(job_id);
     return code;
 }