Use aar in Android Java demo. (#1616)

This commit is contained in:
Fangjun Kuang
2024-12-12 18:26:54 +08:00
committed by GitHub
parent 4dc4f1a708
commit be87f866f3
22 changed files with 100 additions and 210 deletions

View File

@@ -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,
)

View File

@@ -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,

View File

@@ -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",

View File

@@ -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,

View File

@@ -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,
)

View File

@@ -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(),

View File

@@ -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",

View File

@@ -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",

View File

@@ -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,

View File

@@ -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
}