diff --git a/.github/workflows/apk-vad-asr-simulated-streaming.yaml b/.github/workflows/apk-vad-asr-simulated-streaming.yaml index 5b2783c2..7b96b284 100644 --- a/.github/workflows/apk-vad-asr-simulated-streaming.yaml +++ b/.github/workflows/apk-vad-asr-simulated-streaming.yaml @@ -4,7 +4,6 @@ on: push: branches: - apk - - apk-android-simulate-streaming-asr workflow_dispatch: diff --git a/scripts/apk/build-apk-vad-asr-simulate-streaming.sh.in b/scripts/apk/build-apk-vad-asr-simulate-streaming.sh.in index 751150da..d315c973 100644 --- a/scripts/apk/build-apk-vad-asr-simulate-streaming.sh.in +++ b/scripts/apk/build-apk-vad-asr-simulate-streaming.sh.in @@ -43,6 +43,22 @@ short_name={{ model.short_name }} curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/${model_name}.tar.bz2 tar xvf ${model_name}.tar.bz2 +{% if model.use_hr %} + if [ ! -d dict ]; then + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/hr-files/dict.tar.bz2 + tar xvf dict.tar.bz2 + rm dict.tar.bz2 + fi + + if [ ! -f lexicon.txt ]; then + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/hr-files/lexicon.txt + fi + + if [ ! -f replace.fst ]; then + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/hr-files/replace.fst + fi +{% endif %} + {{ model.cmd }} rm -rf *.tar.bz2 @@ -57,6 +73,10 @@ git checkout . pushd android/SherpaOnnxSimulateStreamingAsr/app/src/main/java/com/k2fsa/sherpa/onnx/simulate/streaming/asr sed -i.bak s/"asrModelType = 15/asrModelType = $type/" ./SimulateStreamingAsr.kt +{% if model.use_hr %} + sed -i.bak s/"useHr = false/useHr = true/" ./SimulateStreamingAsr.kt +{% endif %} + {% if model.rule_fsts %} rule_fsts={{ model.rule_fsts }} sed -i.bak s%"asrRuleFsts = null"%"asrRuleFsts = \"$rule_fsts\""% ./MainActivity.kt @@ -92,6 +112,10 @@ for arch in arm64-v8a armeabi-v7a x86_64 x86; do done rm -rf ./android/SherpaOnnxSimulateStreamingAsr/app/src/main/assets/$model_name +rm -rf ./android/SherpaOnnxSimulateStreamingAsr/app/src/main/assets/dict +rm -rf ./android/SherpaOnnxSimulateStreamingAsr/app/src/main/assets/lexicon.txt +rm -rf ./android/SherpaOnnxSimulateStreamingAsr/app/src/main/assets/replace.fst + {% endfor %} git checkout . diff --git a/scripts/apk/generate-vad-asr-apk-script.py b/scripts/apk/generate-vad-asr-apk-script.py index c22304cc..8f81b084 100755 --- a/scripts/apk/generate-vad-asr-apk-script.py +++ b/scripts/apk/generate-vad-asr-apk-script.py @@ -45,6 +45,8 @@ class Model: rule_fsts: str = "" + use_hr: bool = False + # See get_2nd_models() in ./generate-asr-2pass-apk-script.py def get_models(): @@ -98,6 +100,7 @@ def get_models(): lang="zh_en_ko_ja_yue", lang2="中英粤日韩", short_name="sense_voice", + use_hr=True, cmd=""" pushd $model_name diff --git a/sherpa-onnx/csrc/offline-source-separation-impl.cc b/sherpa-onnx/csrc/offline-source-separation-impl.cc index d58218d9..74e11d76 100644 --- a/sherpa-onnx/csrc/offline-source-separation-impl.cc +++ b/sherpa-onnx/csrc/offline-source-separation-impl.cc @@ -5,6 +5,7 @@ #include "sherpa-onnx/csrc/offline-source-separation-impl.h" #include + #if __ANDROID_API__ >= 9 #include "android/asset_manager.h" #include "android/asset_manager_jni.h"