EngineX-Iluvatar/enginex-mr_series-sherpa-onnx
Archived
16
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Fix android tts audio buffer size and fix CI. (#478)

Browse Source
This commit is contained in:
Fangjun Kuang
2023-12-10 18:25:50 +08:00
committed by GitHub
parent 0f053d8040
commit 80d0192325
11 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/apk-tts.yaml vendored
View File

@@ -26,8 +26,8 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-latest] os: [ubuntu-latest]
total: ["30"] total: ["40"]
index: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29"] index: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39"]
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

2
.github/workflows/test-build-wheel.yaml vendored
View File

@@ -74,7 +74,7 @@ jobs:
export PATH=/c/hostedtoolcache/windows/Python/3.8.10/x64/bin:$PATH export PATH=/c/hostedtoolcache/windows/Python/3.8.10/x64/bin:$PATH
export PATH=/c/hostedtoolcache/windows/Python/3.9.13/x64/bin:$PATH export PATH=/c/hostedtoolcache/windows/Python/3.9.13/x64/bin:$PATH
export PATH=/c/hostedtoolcache/windows/Python/3.10.11/x64/bin:$PATH export PATH=/c/hostedtoolcache/windows/Python/3.10.11/x64/bin:$PATH
export PATH=/c/hostedtoolcache/windows/Python/3.11.6/x64/bin:$PATH export PATH=/c/hostedtoolcache/windows/Python/3.11.7/x64/bin:$PATH
which sherpa-onnx which sherpa-onnx
sherpa-onnx --help sherpa-onnx --help

5
.github/workflows/test-go.yaml vendored
View File

@@ -65,8 +65,6 @@ jobs:
run: | run: |
mkdir tts-waves mkdir tts-waves
cp -v go-api-examples/non-streaming-tts/*.sh scripts/go/_internal/non-streaming-tts/
cd scripts/go/_internal/non-streaming-tts/ cd scripts/go/_internal/non-streaming-tts/
ls -lh ls -lh
go mod tidy go mod tidy
@@ -106,8 +104,6 @@ jobs:
- name: Test non-streaming decoding files (macOS) - name: Test non-streaming decoding files (macOS)
shell: bash shell: bash
run: | run: |
cp -v go-api-examples/non-streaming-decode-files/*.sh scripts/go/_internal/non-streaming-decode-files/
cd scripts/go/_internal/non-streaming-decode-files/ cd scripts/go/_internal/non-streaming-decode-files/
ls -lh ls -lh
go mod tidy go mod tidy
@@ -148,7 +144,6 @@ jobs:
- name: Test streaming decoding files - name: Test streaming decoding files
shell: bash shell: bash
run: | run: |
cp -v go-api-examples/streaming-decode-files/*.sh scripts/go/_internal/streaming-decode-files
cd scripts/go/_internal/streaming-decode-files cd scripts/go/_internal/streaming-decode-files
ls -lh ls -lh
go mod tidy go mod tidy

2
.github/workflows/test-pip-install.yaml vendored
View File

@@ -66,7 +66,7 @@ jobs:
export PATH=/c/hostedtoolcache/windows/Python/3.8.10/x64/bin:$PATH export PATH=/c/hostedtoolcache/windows/Python/3.8.10/x64/bin:$PATH
export PATH=/c/hostedtoolcache/windows/Python/3.9.13/x64/bin:$PATH export PATH=/c/hostedtoolcache/windows/Python/3.9.13/x64/bin:$PATH
export PATH=/c/hostedtoolcache/windows/Python/3.10.11/x64/bin:$PATH export PATH=/c/hostedtoolcache/windows/Python/3.10.11/x64/bin:$PATH
export PATH=/c/hostedtoolcache/windows/Python/3.11.6/x64/bin:$PATH export PATH=/c/hostedtoolcache/windows/Python/3.11.7/x64/bin:$PATH
sherpa-onnx --help sherpa-onnx --help

6
android/SherpaOnnxTts/app/src/main/java/com/k2fsa/sherpa/onnx/MainActivity.kt
View File

@@ -61,7 +61,11 @@ class MainActivity : AppCompatActivity() {
private fun initAudioTrack() { private fun initAudioTrack() {
val sampleRate = tts.sampleRate() val sampleRate = tts.sampleRate()
val bufLength = (sampleRate * 0.1).toInt() val bufLength = AudioTrack.getMinBufferSize(
sampleRate,
AudioFormat.CHANNEL_OUT_MONO,
AudioFormat.ENCODING_PCM_FLOAT
)
Log.i(TAG, "sampleRate: ${sampleRate}, buffLength: ${bufLength}") Log.i(TAG, "sampleRate: ${sampleRate}, buffLength: ${bufLength}")
val attr = AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SPEECH) val attr = AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)

9
scripts/apk/generate-tts-apk-script.py
View File

@@ -250,11 +250,16 @@ def main():
start = index * num_per_runner start = index * num_per_runner
end = start + num_per_runner end = start + num_per_runner
if index == args.total - 1:
end = num_models remaining = num_models - args.total * num_per_runner
print(f"{index}/{total}: {start}-{end}/{num_models}") print(f"{index}/{total}: {start}-{end}/{num_models}")
d["tts_model_list"] = all_model_list[start:end] d["tts_model_list"] = all_model_list[start:end]
if index < remaining:
s = args.total * num_per_runner + index
d["tts_model_list"].append(all_model_list[s])
print(f"{s}/{num_models}")
s = template.render(**d) s = template.render(**d)
with open("./build-apk-tts.sh", "w") as f: with open("./build-apk-tts.sh", "w") as f:
print(s, file=f) print(s, file=f)

1
scripts/go/_internal/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
!*.sh

1
scripts/go/_internal/non-streaming-tts/run-vits-ljs.sh Symbolic link
View File

@@ -0,0 +1 @@
../../../../go-api-examples/non-streaming-tts/run-vits-ljs.sh

1
scripts/go/_internal/non-streaming-tts/run-vits-piper-en_US-lessac-medium.sh Symbolic link
View File

@@ -0,0 +1 @@
../../../../go-api-examples/non-streaming-tts/run-vits-piper-en_US-lessac-medium.sh

1
scripts/go/_internal/non-streaming-tts/run-vits-vctk.sh Symbolic link
View File

@@ -0,0 +1 @@
../../../../go-api-examples/non-streaming-tts/run-vits-vctk.sh

1
scripts/go/_internal/non-streaming-tts/run-vits-zh-aishell3.sh Symbolic link
View File

@@ -0,0 +1 @@
../../../../go-api-examples/non-streaming-tts/run-vits-zh-aishell3.sh