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

k2-fsa · Dec 10, 2023 · 80d0192 · 80d0192
1 parent 0f053d8
commit 80d0192
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 12 deletions.
diff --git a/.github/workflows/apk-tts.yaml b/.github/workflows/apk-tts.yaml
@@ -26,8 +26,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        total: ["30"]
-        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"]
+        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", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39"]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/test-build-wheel.yaml b/.github/workflows/test-build-wheel.yaml
@@ -74,7 +74,7 @@ jobs:
           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.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
           sherpa-onnx --help
diff --git a/.github/workflows/test-go.yaml b/.github/workflows/test-go.yaml
@@ -65,8 +65,6 @@ jobs:
         run: |
           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/
           ls -lh
           go mod tidy
@@ -106,8 +104,6 @@ jobs:
       - name: Test non-streaming decoding files (macOS)
         shell: bash
         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/
           ls -lh
           go mod tidy
@@ -148,7 +144,6 @@ jobs:
       - name: Test streaming decoding files
         shell: bash
         run: |
-          cp -v go-api-examples/streaming-decode-files/*.sh scripts/go/_internal/streaming-decode-files
           cd scripts/go/_internal/streaming-decode-files
           ls -lh
           go mod tidy

diff --git a/.github/workflows/test-pip-install.yaml b/.github/workflows/test-pip-install.yaml
@@ -66,7 +66,7 @@ jobs:
           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.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

diff --git a/android/SherpaOnnxTts/app/src/main/java/com/k2fsa/sherpa/onnx/MainActivity.kt b/android/SherpaOnnxTts/app/src/main/java/com/k2fsa/sherpa/onnx/MainActivity.kt
@@ -61,7 +61,11 @@ class MainActivity : AppCompatActivity() {
 
     private fun initAudioTrack() {
         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}")
 
         val attr = AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)

diff --git a/scripts/apk/generate-tts-apk-script.py b/scripts/apk/generate-tts-apk-script.py
@@ -250,11 +250,16 @@ def main():
 
     start = index * 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}")
     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)
     with open("./build-apk-tts.sh", "w") as f:
         print(s, file=f)

diff --git a/scripts/go/_internal/.gitignore b/scripts/go/_internal/.gitignore
@@ -0,0 +1 @@
+!*.sh
diff --git a/scripts/go/_internal/non-streaming-tts/run-vits-ljs.sh b/scripts/go/_internal/non-streaming-tts/run-vits-ljs.sh
@@ -0,0 +1 @@
+../../../../go-api-examples/non-streaming-tts/run-vits-ljs.sh
diff --git a/scripts/go/_internal/non-streaming-tts/run-vits-piper-en_US-lessac-medium.sh b/scripts/go/_internal/non-streaming-tts/run-vits-piper-en_US-lessac-medium.sh
@@ -0,0 +1 @@
+../../../../go-api-examples/non-streaming-tts/run-vits-piper-en_US-lessac-medium.sh
diff --git a/scripts/go/_internal/non-streaming-tts/run-vits-vctk.sh b/scripts/go/_internal/non-streaming-tts/run-vits-vctk.sh
@@ -0,0 +1 @@
+../../../../go-api-examples/non-streaming-tts/run-vits-vctk.sh
diff --git a/scripts/go/_internal/non-streaming-tts/run-vits-zh-aishell3.sh b/scripts/go/_internal/non-streaming-tts/run-vits-zh-aishell3.sh
@@ -0,0 +1 @@
+../../../../go-api-examples/non-streaming-tts/run-vits-zh-aishell3.sh