From 8d68d9f0c47419adf32e7a345b72914e1c199448 Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Thu, 12 Dec 2024 17:08:50 +0800 Subject: [PATCH 1/5] Remove the sherpa module --- android/SherpaOnnxJavaDemo/app/build.gradle | 3 --- android/SherpaOnnxJavaDemo/settings.gradle | 1 - 2 files changed, 4 deletions(-) diff --git a/android/SherpaOnnxJavaDemo/app/build.gradle b/android/SherpaOnnxJavaDemo/app/build.gradle index 500de341f..f1956d683 100644 --- a/android/SherpaOnnxJavaDemo/app/build.gradle +++ b/android/SherpaOnnxJavaDemo/app/build.gradle @@ -31,11 +31,8 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'com.google.android.material:material:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'pub.devrel:easypermissions:3.0.0' - implementation project(path: ':sherpa') - } \ No newline at end of file diff --git a/android/SherpaOnnxJavaDemo/settings.gradle b/android/SherpaOnnxJavaDemo/settings.gradle index a1c973b67..042a7539c 100644 --- a/android/SherpaOnnxJavaDemo/settings.gradle +++ b/android/SherpaOnnxJavaDemo/settings.gradle @@ -14,4 +14,3 @@ dependencyResolutionManagement { } rootProject.name = "SherpaOnnxJavaDemo" include ':app' -include ':sherpa' From 76de56718c03c2eaec77b39f6fc09dcd8419fcc8 Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Thu, 12 Dec 2024 17:09:28 +0800 Subject: [PATCH 2/5] remove the sherpa directory --- android/SherpaOnnxJavaDemo/sherpa/.gitignore | 1 - .../SherpaOnnxJavaDemo/sherpa/build.gradle | 43 ------------------- .../sherpa/proguard-rules.pro | 21 --------- .../sherpa/src/main/AndroidManifest.xml | 9 ---- .../sherpa/src/main/java/com | 1 - .../sherpa/src/main/res/values/strings.xml | 3 -- 6 files changed, 78 deletions(-) delete mode 100644 android/SherpaOnnxJavaDemo/sherpa/.gitignore delete mode 100644 android/SherpaOnnxJavaDemo/sherpa/build.gradle delete mode 100644 android/SherpaOnnxJavaDemo/sherpa/proguard-rules.pro delete mode 100644 android/SherpaOnnxJavaDemo/sherpa/src/main/AndroidManifest.xml delete mode 120000 android/SherpaOnnxJavaDemo/sherpa/src/main/java/com delete mode 100644 android/SherpaOnnxJavaDemo/sherpa/src/main/res/values/strings.xml diff --git a/android/SherpaOnnxJavaDemo/sherpa/.gitignore b/android/SherpaOnnxJavaDemo/sherpa/.gitignore deleted file mode 100644 index 42afabfd2..000000000 --- a/android/SherpaOnnxJavaDemo/sherpa/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/android/SherpaOnnxJavaDemo/sherpa/build.gradle b/android/SherpaOnnxJavaDemo/sherpa/build.gradle deleted file mode 100644 index a171d3e45..000000000 --- a/android/SherpaOnnxJavaDemo/sherpa/build.gradle +++ /dev/null @@ -1,43 +0,0 @@ -plugins { - id 'com.android.library' -} - -android { - namespace 'com.k2fsa.sherpa' - compileSdk 34 - - defaultConfig { - minSdk 26 - targetSdk 27 - versionCode 1 - versionName "1.0" - missingDimensionStrategy 'base', 'feature1' - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } -} - -dependencies { - -// implementation "androidx.appcompat" -// implementation libs.material -// testImplementation libs.junit -// androidTestImplementation libs.androidx.test.ext.junit -// androidTestImplementation libs.espresso.core - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.9.0' - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - -} \ No newline at end of file diff --git a/android/SherpaOnnxJavaDemo/sherpa/proguard-rules.pro b/android/SherpaOnnxJavaDemo/sherpa/proguard-rules.pro deleted file mode 100644 index 481bb4348..000000000 --- a/android/SherpaOnnxJavaDemo/sherpa/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/android/SherpaOnnxJavaDemo/sherpa/src/main/AndroidManifest.xml b/android/SherpaOnnxJavaDemo/sherpa/src/main/AndroidManifest.xml deleted file mode 100644 index 1aab3af56..000000000 --- a/android/SherpaOnnxJavaDemo/sherpa/src/main/AndroidManifest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/SherpaOnnxJavaDemo/sherpa/src/main/java/com b/android/SherpaOnnxJavaDemo/sherpa/src/main/java/com deleted file mode 120000 index 4b54cb296..000000000 --- a/android/SherpaOnnxJavaDemo/sherpa/src/main/java/com +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../sherpa-onnx/sherpa-onnx/java-api/src/com \ No newline at end of file diff --git a/android/SherpaOnnxJavaDemo/sherpa/src/main/res/values/strings.xml b/android/SherpaOnnxJavaDemo/sherpa/src/main/res/values/strings.xml deleted file mode 100644 index 7c5b69c5f..000000000 --- a/android/SherpaOnnxJavaDemo/sherpa/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - sherpa - \ No newline at end of file From 7bd09939b15e267ceac29b4d9334ecb89957a15a Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Thu, 12 Dec 2024 17:19:49 +0800 Subject: [PATCH 3/5] depend on sherpa-onnx aar --- android/SherpaOnnxJavaDemo/app/build.gradle | 3 ++- android/SherpaOnnxJavaDemo/settings.gradle | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/android/SherpaOnnxJavaDemo/app/build.gradle b/android/SherpaOnnxJavaDemo/app/build.gradle index f1956d683..729186579 100644 --- a/android/SherpaOnnxJavaDemo/app/build.gradle +++ b/android/SherpaOnnxJavaDemo/app/build.gradle @@ -8,7 +8,7 @@ android { defaultConfig { applicationId "com.k2fsa.sherpa.onnx" minSdk 28 - targetSdk 32 + targetSdk 34 versionCode 1 versionName "1.0" @@ -35,4 +35,5 @@ dependencies { implementation 'com.google.android.material:material:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'pub.devrel:easypermissions:3.0.0' + implementation 'com.github.k2-fsa:sherpa-onnx:master-SNAPSHOT' } \ No newline at end of file diff --git a/android/SherpaOnnxJavaDemo/settings.gradle b/android/SherpaOnnxJavaDemo/settings.gradle index 042a7539c..e552eb689 100644 --- a/android/SherpaOnnxJavaDemo/settings.gradle +++ b/android/SherpaOnnxJavaDemo/settings.gradle @@ -10,6 +10,7 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven { url 'https://jitpack.io' } } } rootProject.name = "SherpaOnnxJavaDemo" From cfbc24f4f16a05e9c6a6d4a5ac51eaeb6e648ad7 Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Thu, 12 Dec 2024 18:10:49 +0800 Subject: [PATCH 4/5] first working version --- android/SherpaOnnxJavaDemo/app/build.gradle | 3 + .../app/src/main/assets/.gitkeep | 0 .../k2fsa/sherpa/onnx/OnlineRecognizer.java | 84 ------------------- .../SpeechSherpaRecognitionService.java | 43 ++++++---- sherpa-onnx/kotlin-api/AudioTagging.kt | 4 +- sherpa-onnx/kotlin-api/KeywordSpotter.kt | 2 +- sherpa-onnx/kotlin-api/OfflinePunctuation.kt | 2 +- sherpa-onnx/kotlin-api/OfflineRecognizer.kt | 4 +- .../kotlin-api/OfflineSpeakerDiarization.kt | 10 +-- sherpa-onnx/kotlin-api/OnlineRecognizer.kt | 4 +- .../SpeakerEmbeddingExtractorConfig.kt | 2 +- .../SpokenLanguageIdentification.kt | 6 +- sherpa-onnx/kotlin-api/Tts.kt | 8 +- sherpa-onnx/kotlin-api/Vad.kt | 6 +- 14 files changed, 54 insertions(+), 124 deletions(-) create mode 100644 android/SherpaOnnxJavaDemo/app/src/main/assets/.gitkeep delete mode 100644 android/SherpaOnnxJavaDemo/app/src/main/java/com/k2fsa/sherpa/onnx/OnlineRecognizer.java diff --git a/android/SherpaOnnxJavaDemo/app/build.gradle b/android/SherpaOnnxJavaDemo/app/build.gradle index 729186579..595e011bf 100644 --- a/android/SherpaOnnxJavaDemo/app/build.gradle +++ b/android/SherpaOnnxJavaDemo/app/build.gradle @@ -35,5 +35,8 @@ dependencies { implementation 'com.google.android.material:material:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'pub.devrel:easypermissions:3.0.0' + implementation 'androidx.core:core-ktx:1.7.0' + // implementation files('/Users/fangjun/open-source/sherpa-onnx/android/SherpaOnnxAar/sherpa_onnx/build/outputs/aar/sherpa_onnx-release.aar') implementation 'com.github.k2-fsa:sherpa-onnx:master-SNAPSHOT' + } \ No newline at end of file diff --git a/android/SherpaOnnxJavaDemo/app/src/main/assets/.gitkeep b/android/SherpaOnnxJavaDemo/app/src/main/assets/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/android/SherpaOnnxJavaDemo/app/src/main/java/com/k2fsa/sherpa/onnx/OnlineRecognizer.java b/android/SherpaOnnxJavaDemo/app/src/main/java/com/k2fsa/sherpa/onnx/OnlineRecognizer.java deleted file mode 100644 index 3f6faf338..000000000 --- a/android/SherpaOnnxJavaDemo/app/src/main/java/com/k2fsa/sherpa/onnx/OnlineRecognizer.java +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright 2022-2023 by zhaoming -// Copyright 2024 Xiaomi Corporation - -package com.k2fsa.sherpa.onnx; - -import android.content.res.AssetManager; - -public class OnlineRecognizer { - static { - System.loadLibrary("sherpa-onnx-jni"); - } - - private long ptr = 0; - - public OnlineRecognizer(OnlineRecognizerConfig config) { - ptr = newFromFile(config); - } - - public OnlineRecognizer(AssetManager assetManager, OnlineRecognizerConfig config) { - ptr = newFromAsset(assetManager, config); - } - - public void decode(OnlineStream s) { - decode(ptr, s.getPtr()); - } - - public boolean isReady(OnlineStream s) { - return isReady(ptr, s.getPtr()); - } - - public boolean isEndpoint(OnlineStream s) { - return isEndpoint(ptr, s.getPtr()); - } - - public void reset(OnlineStream s) { - reset(ptr, s.getPtr()); - } - - public OnlineStream createStream() { - long p = createStream(ptr, ""); - return new OnlineStream(p); - } - - @Override - protected void finalize() throws Throwable { - release(); - } - - // You'd better call it manually if it is not used anymore - public void release() { - if (this.ptr == 0) { - return; - } - delete(this.ptr); - this.ptr = 0; - } - - public OnlineRecognizerResult getResult(OnlineStream s) { - Object[] arr = getResult(ptr, s.getPtr()); - String text = (String) arr[0]; - String[] tokens = (String[]) arr[1]; - float[] timestamps = (float[]) arr[2]; - return new OnlineRecognizerResult(text, tokens, timestamps); - } - - - private native void delete(long ptr); - - private native long newFromFile(OnlineRecognizerConfig config); - - private native long newFromAsset(AssetManager assetManager, OnlineRecognizerConfig config); - - private native long createStream(long ptr, String hotwords); - - private native void reset(long ptr, long streamPtr); - - private native void decode(long ptr, long streamPtr); - - private native boolean isEndpoint(long ptr, long streamPtr); - - private native boolean isReady(long ptr, long streamPtr); - - private native Object[] getResult(long ptr, long streamPtr); -} \ No newline at end of file diff --git a/android/SherpaOnnxJavaDemo/app/src/main/java/com/k2fsa/sherpa/onnx/service/SpeechSherpaRecognitionService.java b/android/SherpaOnnxJavaDemo/app/src/main/java/com/k2fsa/sherpa/onnx/service/SpeechSherpaRecognitionService.java index 9326ffdeb..02ad4a15d 100644 --- a/android/SherpaOnnxJavaDemo/app/src/main/java/com/k2fsa/sherpa/onnx/service/SpeechSherpaRecognitionService.java +++ b/android/SherpaOnnxJavaDemo/app/src/main/java/com/k2fsa/sherpa/onnx/service/SpeechSherpaRecognitionService.java @@ -1,6 +1,7 @@ package com.k2fsa.sherpa.onnx.service; import android.Manifest; +import android.annotation.SuppressLint; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; @@ -67,6 +68,16 @@ public void onCreate() { appViewModel = Application.getInstance().getViewModel(); int numBytes = AudioRecord.getMinBufferSize(sampleRateInHz, channelConfig, audioFormat); + if (ActivityCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) { + // TODO: Consider calling + // ActivityCompat#requestPermissions + // here to request the missing permissions, and then overriding + // public void onRequestPermissionsResult(int requestCode, String[] permissions, + // int[] grantResults) + // to handle the case where the user grants the permission. See the documentation + // for ActivityCompat#requestPermissions for more details. + return; + } audioRecord = new AudioRecord( audioSource, sampleRateInHz, @@ -81,22 +92,21 @@ public void onCreate() { private void initializeSherpa() { Log.d("Current Directory", System.getProperty("user.dir")); - String modelDir = "sherpa-onnx-streaming-zipformer-zh-14M-2023-02-23"; + String modelDir = "sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20"; initializeSherpaDir(modelDir, modelDir); - OnlineTransducerModelConfig onlineTransducerModelConfig = OnlineTransducerModelConfig.builder() - .setEncoder(modelDir + "/encoder-epoch-99-avg-1.int8.onnx") - .setDecoder(modelDir + "/decoder-epoch-99-avg-1.onnx") - .setJoiner(modelDir + "/joiner-epoch-99-avg-1.int8.onnx") - .build(); - - OnlineModelConfig onlineModelConfig = OnlineModelConfig.builder() - .setTransducer(onlineTransducerModelConfig) - .setTokens(modelDir + "/tokens.txt") - .setModelType("zipformer") - .build(); - OnlineRecognizerConfig config = OnlineRecognizerConfig.builder() - .setOnlineModelConfig(onlineModelConfig) - .build(); + OnlineTransducerModelConfig onlineTransducerModelConfig = new OnlineTransducerModelConfig(); + onlineTransducerModelConfig.setEncoder(modelDir + "/encoder-epoch-99-avg-1.int8.onnx"); + onlineTransducerModelConfig.setDecoder(modelDir + "/decoder-epoch-99-avg-1.onnx"); + onlineTransducerModelConfig.setJoiner(modelDir + "/joiner-epoch-99-avg-1.int8.onnx"); + + OnlineModelConfig onlineModelConfig = new OnlineModelConfig(); + onlineModelConfig.setTransducer(onlineTransducerModelConfig); + onlineModelConfig.setTokens(modelDir + "/tokens.txt"); + onlineModelConfig.setModelType("zipformer"); + onlineModelConfig.setDebug(true); + + OnlineRecognizerConfig config = new OnlineRecognizerConfig(); + config.setModelConfig(onlineModelConfig); recognizer = new OnlineRecognizer(getAssets(), config); audioRecord.startRecording(); @@ -110,7 +120,7 @@ private void startRecognition() { } private void processSamples() { - OnlineStream stream = recognizer.createStream(); + OnlineStream stream = recognizer.createStream(""); double interval = 0.1; int bufferSize = (int) (interval * sampleRateInHz); short[] buffer = new short[bufferSize]; @@ -182,6 +192,7 @@ public IBinder onBind(Intent intent) { } + @SuppressLint("ForegroundServiceType") private void startForegroundService() { String channelId = createNotificationChannel(); diff --git a/sherpa-onnx/kotlin-api/AudioTagging.kt b/sherpa-onnx/kotlin-api/AudioTagging.kt index 9b241ee56..beec31e6a 100644 --- a/sherpa-onnx/kotlin-api/AudioTagging.kt +++ b/sherpa-onnx/kotlin-api/AudioTagging.kt @@ -15,8 +15,8 @@ data class AudioTaggingModelConfig( ) data class AudioTaggingConfig( - var model: AudioTaggingModelConfig, - var labels: String, + var model: AudioTaggingModelConfig = AudioTaggingModelConfig(), + var labels: String = "", var topK: Int = 5, ) diff --git a/sherpa-onnx/kotlin-api/KeywordSpotter.kt b/sherpa-onnx/kotlin-api/KeywordSpotter.kt index ea2143613..3801d32a8 100644 --- a/sherpa-onnx/kotlin-api/KeywordSpotter.kt +++ b/sherpa-onnx/kotlin-api/KeywordSpotter.kt @@ -5,7 +5,7 @@ import android.content.res.AssetManager data class KeywordSpotterConfig( var featConfig: FeatureConfig = FeatureConfig(), - var modelConfig: OnlineModelConfig, + var modelConfig: OnlineModelConfig = OnlineModelConfig(), var maxActivePaths: Int = 4, var keywordsFile: String = "keywords.txt", var keywordsScore: Float = 1.5f, diff --git a/sherpa-onnx/kotlin-api/OfflinePunctuation.kt b/sherpa-onnx/kotlin-api/OfflinePunctuation.kt index 8dfcbd63c..3b6013495 100644 --- a/sherpa-onnx/kotlin-api/OfflinePunctuation.kt +++ b/sherpa-onnx/kotlin-api/OfflinePunctuation.kt @@ -3,7 +3,7 @@ package com.k2fsa.sherpa.onnx import android.content.res.AssetManager data class OfflinePunctuationModelConfig( - var ctTransformer: String, + var ctTransformer: String = "", var numThreads: Int = 1, var debug: Boolean = false, var provider: String = "cpu", diff --git a/sherpa-onnx/kotlin-api/OfflineRecognizer.kt b/sherpa-onnx/kotlin-api/OfflineRecognizer.kt index 647f2447c..b0f35462d 100644 --- a/sherpa-onnx/kotlin-api/OfflineRecognizer.kt +++ b/sherpa-onnx/kotlin-api/OfflineRecognizer.kt @@ -58,14 +58,14 @@ data class OfflineModelConfig( var debug: Boolean = false, var provider: String = "cpu", var modelType: String = "", - var tokens: String, + var tokens: String = "", var modelingUnit: String = "", var bpeVocab: String = "", ) data class OfflineRecognizerConfig( var featConfig: FeatureConfig = FeatureConfig(), - var modelConfig: OfflineModelConfig, + var modelConfig: OfflineModelConfig = OfflineModelConfig(), // var lmConfig: OfflineLMConfig(), // TODO(fangjun): enable it var decodingMethod: String = "greedy_search", var maxActivePaths: Int = 4, diff --git a/sherpa-onnx/kotlin-api/OfflineSpeakerDiarization.kt b/sherpa-onnx/kotlin-api/OfflineSpeakerDiarization.kt index 9190f8ae5..55113e833 100644 --- a/sherpa-onnx/kotlin-api/OfflineSpeakerDiarization.kt +++ b/sherpa-onnx/kotlin-api/OfflineSpeakerDiarization.kt @@ -3,11 +3,11 @@ package com.k2fsa.sherpa.onnx import android.content.res.AssetManager data class OfflineSpeakerSegmentationPyannoteModelConfig( - var model: String, + var model: String = "", ) data class OfflineSpeakerSegmentationModelConfig( - var pyannote: OfflineSpeakerSegmentationPyannoteModelConfig, + var pyannote: OfflineSpeakerSegmentationPyannoteModelConfig = OfflineSpeakerSegmentationPyannoteModelConfig(), var numThreads: Int = 1, var debug: Boolean = false, var provider: String = "cpu", @@ -19,9 +19,9 @@ data class FastClusteringConfig( ) data class OfflineSpeakerDiarizationConfig( - var segmentation: OfflineSpeakerSegmentationModelConfig, - var embedding: SpeakerEmbeddingExtractorConfig, - var clustering: FastClusteringConfig, + var segmentation: OfflineSpeakerSegmentationModelConfig = OfflineSpeakerSegmentationModelConfig(), + var embedding: SpeakerEmbeddingExtractorConfig = SpeakerEmbeddingExtractorConfig(), + var clustering: FastClusteringConfig = FastClusteringConfig(), var minDurationOn: Float = 0.2f, var minDurationOff: Float = 0.5f, ) diff --git a/sherpa-onnx/kotlin-api/OnlineRecognizer.kt b/sherpa-onnx/kotlin-api/OnlineRecognizer.kt index 7ddefdf32..15476f995 100644 --- a/sherpa-onnx/kotlin-api/OnlineRecognizer.kt +++ b/sherpa-onnx/kotlin-api/OnlineRecognizer.kt @@ -38,7 +38,7 @@ data class OnlineModelConfig( var paraformer: OnlineParaformerModelConfig = OnlineParaformerModelConfig(), var zipformer2Ctc: OnlineZipformer2CtcModelConfig = OnlineZipformer2CtcModelConfig(), var neMoCtc: OnlineNeMoCtcModelConfig = OnlineNeMoCtcModelConfig(), - var tokens: String, + var tokens: String = "", var numThreads: Int = 1, var debug: Boolean = false, var provider: String = "cpu", @@ -60,7 +60,7 @@ data class OnlineCtcFstDecoderConfig( data class OnlineRecognizerConfig( var featConfig: FeatureConfig = FeatureConfig(), - var modelConfig: OnlineModelConfig, + var modelConfig: OnlineModelConfig = OnlineModelConfig(), var lmConfig: OnlineLMConfig = OnlineLMConfig(), var ctcFstDecoderConfig: OnlineCtcFstDecoderConfig = OnlineCtcFstDecoderConfig(), var endpointConfig: EndpointConfig = EndpointConfig(), diff --git a/sherpa-onnx/kotlin-api/SpeakerEmbeddingExtractorConfig.kt b/sherpa-onnx/kotlin-api/SpeakerEmbeddingExtractorConfig.kt index 4977ac029..0ae2bb9b1 100644 --- a/sherpa-onnx/kotlin-api/SpeakerEmbeddingExtractorConfig.kt +++ b/sherpa-onnx/kotlin-api/SpeakerEmbeddingExtractorConfig.kt @@ -1,7 +1,7 @@ package com.k2fsa.sherpa.onnx data class SpeakerEmbeddingExtractorConfig( - val model: String, + val model: String = "", var numThreads: Int = 1, var debug: Boolean = false, var provider: String = "cpu", diff --git a/sherpa-onnx/kotlin-api/SpokenLanguageIdentification.kt b/sherpa-onnx/kotlin-api/SpokenLanguageIdentification.kt index 00caca281..07ddafc4d 100644 --- a/sherpa-onnx/kotlin-api/SpokenLanguageIdentification.kt +++ b/sherpa-onnx/kotlin-api/SpokenLanguageIdentification.kt @@ -3,13 +3,13 @@ package com.k2fsa.sherpa.onnx import android.content.res.AssetManager data class SpokenLanguageIdentificationWhisperConfig( - var encoder: String, - var decoder: String, + var encoder: String = "", + var decoder: String = "", var tailPaddings: Int = -1, ) data class SpokenLanguageIdentificationConfig( - var whisper: SpokenLanguageIdentificationWhisperConfig, + var whisper: SpokenLanguageIdentificationWhisperConfig = SpokenLanguageIdentificationWhisperConfig(), var numThreads: Int = 1, var debug: Boolean = false, var provider: String = "cpu", diff --git a/sherpa-onnx/kotlin-api/Tts.kt b/sherpa-onnx/kotlin-api/Tts.kt index 4f9c4b6f6..6152cd914 100644 --- a/sherpa-onnx/kotlin-api/Tts.kt +++ b/sherpa-onnx/kotlin-api/Tts.kt @@ -4,9 +4,9 @@ package com.k2fsa.sherpa.onnx import android.content.res.AssetManager data class OfflineTtsVitsModelConfig( - var model: String, + var model: String = "", var lexicon: String = "", - var tokens: String, + var tokens: String = "", var dataDir: String = "", var dictDir: String = "", var noiseScale: Float = 0.667f, @@ -15,14 +15,14 @@ data class OfflineTtsVitsModelConfig( ) data class OfflineTtsModelConfig( - var vits: OfflineTtsVitsModelConfig, + var vits: OfflineTtsVitsModelConfig = OfflineTtsVitsModelConfig(), var numThreads: Int = 1, var debug: Boolean = false, var provider: String = "cpu", ) data class OfflineTtsConfig( - var model: OfflineTtsModelConfig, + var model: OfflineTtsModelConfig = OfflineTtsModelConfig(), var ruleFsts: String = "", var ruleFars: String = "", var maxNumSentences: Int = 1, diff --git a/sherpa-onnx/kotlin-api/Vad.kt b/sherpa-onnx/kotlin-api/Vad.kt index 08a458505..cdecc3ca2 100644 --- a/sherpa-onnx/kotlin-api/Vad.kt +++ b/sherpa-onnx/kotlin-api/Vad.kt @@ -4,7 +4,7 @@ package com.k2fsa.sherpa.onnx import android.content.res.AssetManager data class SileroVadModelConfig( - var model: String, + var model: String = "", var threshold: Float = 0.5F, var minSilenceDuration: Float = 0.25F, var minSpeechDuration: Float = 0.25F, @@ -13,7 +13,7 @@ data class SileroVadModelConfig( ) data class VadModelConfig( - var sileroVadModelConfig: SileroVadModelConfig, + var sileroVadModelConfig: SileroVadModelConfig = SileroVadModelConfig(), var sampleRate: Int = 16000, var numThreads: Int = 1, var provider: String = "cpu", @@ -112,5 +112,5 @@ fun getVadModelConfig(type: Int): VadModelConfig? { ) } } - return null; + return null } From 1493ed67885d1d256a40ff41b0c6067053c0dc8d Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Thu, 12 Dec 2024 18:19:27 +0800 Subject: [PATCH 5/5] Add readme --- android/SherpaOnnxJavaDemo/README.md | 44 +++++++++++++++++++++ android/SherpaOnnxJavaDemo/app/build.gradle | 6 +-- 2 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 android/SherpaOnnxJavaDemo/README.md diff --git a/android/SherpaOnnxJavaDemo/README.md b/android/SherpaOnnxJavaDemo/README.md new file mode 100644 index 000000000..cf7d41557 --- /dev/null +++ b/android/SherpaOnnxJavaDemo/README.md @@ -0,0 +1,44 @@ +# Introduction + +Please run the following commands to download model files before you run this Android demo: + +```bash +# Assume we are inside +# /Users/fangjun/open-source/sherpa-onnx/android/SherpaOnnxJavaDemo + +cd app/src/main/assets/ +wget https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20.tar.bz2 + +tar xvf sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20.tar.bz2 +rm sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20.tar.bz2 + +mv sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20/encoder-epoch-99-avg-1.int8.onnx ./ +mv sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20/decoder-epoch-99-avg-1.onnx ./ +mv sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20/joiner-epoch-99-avg-1.int8.onnx ./ +mv sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20/tokens.txt ./ + +rm -rf sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20/* + +mv encoder-epoch-99-avg-1.int8.onnx ./ +mv decoder-epoch-99-avg-1.onnx ./ +mv joiner-epoch-99-avg-1.int8.onnx ./ +mv tokens.txt ./ +``` + +You should have the following directory structure: +``` +(py38) fangjuns-MacBook-Pro:assets fangjun$ pwd +/Users/fangjun/open-source/sherpa-onnx/android/SherpaOnnxJavaDemo/app/src/main/assets + +(py38) fangjuns-MacBook-Pro:assets fangjun$ tree . +. +└── sherpa-onnx-streaming-zipformer-bilingual-zh-en-2023-02-20 + ├── decoder-epoch-99-avg-1.onnx + ├── encoder-epoch-99-avg-1.int8.onnx + ├── joiner-epoch-99-avg-1.int8.onnx + └── tokens.txt + +1 directory, 4 files +``` + +Remember to remove unused files to reduce the file size of the final APK. diff --git a/android/SherpaOnnxJavaDemo/app/build.gradle b/android/SherpaOnnxJavaDemo/app/build.gradle index 595e011bf..a2ee27997 100644 --- a/android/SherpaOnnxJavaDemo/app/build.gradle +++ b/android/SherpaOnnxJavaDemo/app/build.gradle @@ -25,9 +25,6 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - sourceSets.main{ - jniLibs.srcDirs = ['jniLibs'] - } } dependencies { @@ -38,5 +35,4 @@ dependencies { implementation 'androidx.core:core-ktx:1.7.0' // implementation files('/Users/fangjun/open-source/sherpa-onnx/android/SherpaOnnxAar/sherpa_onnx/build/outputs/aar/sherpa_onnx-release.aar') implementation 'com.github.k2-fsa:sherpa-onnx:master-SNAPSHOT' - -} \ No newline at end of file +}