Refactor the JNI interface to make it more modular and maintainable (#802)

android/SherpaOnnxVad/app/src/main/AndroidManifest.xml

@@ -15,7 +15,7 @@
         android:theme="@style/Theme.SherpaOnnxVad"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name="com.k2fsa.sherpa.onnx.vad.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

android/SherpaOnnxVad/app/src/main/java/com/k2fsa/sherpa/onnx/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.k2fsa.sherpa.onnx
+package com.k2fsa.sherpa.onnx.vad
 
 import android.Manifest
 import android.content.pm.PackageManager
@@ -11,6 +11,9 @@ import android.view.View
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
+import com.k2fsa.sherpa.onnx.R
+import com.k2fsa.sherpa.onnx.Vad
+import com.k2fsa.sherpa.onnx.getVadModelConfig
 import kotlin.concurrent.thread
 
 
@@ -116,7 +119,7 @@ class MainActivity : AppCompatActivity() {
 
     private  fun initVadModel() {
         val type = 0
-        println("Select VAD model type ${type}")
+        Log.i(TAG, "Select VAD model type ${type}")
         val config = getVadModelConfig(type)
 
         vad = Vad(
@@ -171,4 +174,4 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
-}
+}

android/SherpaOnnxVad/app/src/main/java/com/k2fsa/sherpa/onnx/Vad.kt

@@ -1,104 +0,0 @@
-// Copyright (c)  2023  Xiaomi Corporation
-package com.k2fsa.sherpa.onnx
-
-import android.content.res.AssetManager
-
-data class SileroVadModelConfig(
-    var model: String,
-    var threshold: Float = 0.5F,
-    var minSilenceDuration: Float = 0.25F,
-    var minSpeechDuration: Float = 0.25F,
-    var windowSize: Int = 512,
-)
-
-data class VadModelConfig(
-    var sileroVadModelConfig: SileroVadModelConfig,
-    var sampleRate: Int = 16000,
-    var numThreads: Int = 1,
-    var provider: String = "cpu",
-    var debug: Boolean = false,
-)
-
-class Vad(
-    assetManager: AssetManager? = null,
-    var config: VadModelConfig,
-) {
-    private val ptr: Long
-
-    init {
-        if (assetManager != null) {
-            ptr = new(assetManager, config)
-        } else {
-            ptr = newFromFile(config)
-        }
-    }
-
-    protected fun finalize() {
-        delete(ptr)
-    }
-
-    fun acceptWaveform(samples: FloatArray) = acceptWaveform(ptr, samples)
-
-    fun empty(): Boolean = empty(ptr)
-    fun pop() = pop(ptr)
-
-    // return an array containing
-    // [start: Int, samples: FloatArray]
-    fun front() = front(ptr)
-
-    fun clear() = clear(ptr)
-
-    fun isSpeechDetected(): Boolean = isSpeechDetected(ptr)
-
-    fun reset() = reset(ptr)
-
-    private external fun delete(ptr: Long)
-
-    private external fun new(
-        assetManager: AssetManager,
-        config: VadModelConfig,
-    ): Long
-
-    private external fun newFromFile(
-        config: VadModelConfig,
-    ): Long
-
-    private external fun acceptWaveform(ptr: Long, samples: FloatArray)
-    private external fun empty(ptr: Long): Boolean
-    private external fun pop(ptr: Long)
-    private external fun clear(ptr: Long)
-    private external fun front(ptr: Long): Array<Any>
-    private external fun isSpeechDetected(ptr: Long): Boolean
-    private external fun reset(ptr: Long)
-
-    companion object {
-        init {
-            System.loadLibrary("sherpa-onnx-jni")
-        }
-    }
-}
-
-// Please visit
-// https://github.com/snakers4/silero-vad/blob/master/files/silero_vad.onnx
-// to download silero_vad.onnx
-// and put it inside the assets/
-// directory
-fun getVadModelConfig(type: Int): VadModelConfig? {
-    when (type) {
-        0 -> {
-            return VadModelConfig(
-                sileroVadModelConfig = SileroVadModelConfig(
-                    model = "silero_vad.onnx",
-                    threshold = 0.5F,
-                    minSilenceDuration = 0.25F,
-                    minSpeechDuration = 0.25F,
-                    windowSize = 512,
-                ),
-                sampleRate = 16000,
-                numThreads = 1,
-                provider = "cpu",
-            )
-        }
-    }
-    return null;
-}

android/SherpaOnnxVad/app/src/main/java/com/k2fsa/sherpa/onnx/Vad.kt

@@ -0,0 +1 @@
+../../../../../../../../../../sherpa-onnx/kotlin-api/Vad.kt

android/SherpaOnnxVad/app/src/main/res/layout/activity_main.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context="com.k2fsa.sherpa.onnx.vad.MainActivity">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -40,4 +40,4 @@
 
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>