diff --git a/ios-swift/SherpaOnnx/SherpaOnnx/ViewController.swift b/ios-swift/SherpaOnnx/SherpaOnnx/ViewController.swift index 200f6a20..969ee63c 100644 --- a/ios-swift/SherpaOnnx/SherpaOnnx/ViewController.swift +++ b/ios-swift/SherpaOnnx/SherpaOnnx/ViewController.swift @@ -85,10 +85,10 @@ class ViewController: UIViewController { // You can also modify Model.swift to add new pre-trained models from // https://k2-fsa.github.io/sherpa/onnx/pretrained_models/index.html - // let modelConfig = getBilingualStreamZhEnZipformer20230220() + let modelConfig = getBilingualStreamZhEnZipformer20230220() // let modelConfig = getZhZipformer20230615() // let modelConfig = getEnZipformer20230626() - let modelConfig = getBilingualStreamingZhEnParaformer() + // let modelConfig = getBilingualStreamingZhEnParaformer() let featConfig = sherpaOnnxFeatureConfig( sampleRate: 16000, diff --git a/scripts/apk/generate-tts-apk-script.py b/scripts/apk/generate-tts-apk-script.py index 60881031..578384d1 100755 --- a/scripts/apk/generate-tts-apk-script.py +++ b/scripts/apk/generate-tts-apk-script.py @@ -109,8 +109,9 @@ def get_piper_models() -> List[TtsModel]: TtsModel(model_dir="vits-piper-ca_ES-upc_ona-medium"), TtsModel(model_dir="vits-piper-ca_ES-upc_ona-x_low"), TtsModel(model_dir="vits-piper-ca_ES-upc_pau-x_low"), - TtsModel(model_dir="vits-piper-ca_ES-upc_pau-x_low"), + TtsModel(model_dir="vits-piper-cs_CZ-jirka-low"), TtsModel(model_dir="vits-piper-cs_CZ-jirka-medium"), + TtsModel(model_dir="vits-piper-cy_GB-bu_tts-medium"), TtsModel(model_dir="vits-piper-cy_GB-gwryw_gogleddol-medium"), TtsModel(model_dir="vits-piper-da_DK-talesyntese-medium"), TtsModel(model_dir="vits-piper-de_DE-eva_k-x_low"), @@ -123,6 +124,12 @@ def get_piper_models() -> List[TtsModel]: TtsModel(model_dir="vits-piper-de_DE-thorsten-low"), TtsModel(model_dir="vits-piper-de_DE-thorsten-medium"), TtsModel(model_dir="vits-piper-de_DE-thorsten_emotional-medium"), + TtsModel(model_dir="vits-piper-de_DE-glados-high"), + TtsModel(model_dir="vits-piper-de_DE-glados-low"), + TtsModel(model_dir="vits-piper-de_DE-glados-medium"), + TtsModel(model_dir="vits-piper-de_DE-glados_turret-high"), + TtsModel(model_dir="vits-piper-de_DE-glados_turret-low"), + TtsModel(model_dir="vits-piper-de_DE-glados_turret-medium"), TtsModel(model_dir="vits-piper-el_GR-rapunzelina-low"), TtsModel(model_dir="vits-piper-en_GB-alan-low"), TtsModel(model_dir="vits-piper-en_GB-alan-medium"), @@ -144,6 +151,7 @@ def get_piper_models() -> List[TtsModel]: TtsModel(model_dir="vits-piper-en_US-bryce-medium"), TtsModel(model_dir="vits-piper-en_US-danny-low"), TtsModel(model_dir="vits-piper-en_US-glados"), + TtsModel(model_dir="vits-piper-en_US-glados-high"), TtsModel(model_dir="vits-piper-en_US-hfc_female-medium"), TtsModel(model_dir="vits-piper-en_US-hfc_male-medium"), TtsModel(model_dir="vits-piper-en_US-joe-medium"), @@ -163,18 +171,22 @@ def get_piper_models() -> List[TtsModel]: TtsModel(model_dir="vits-piper-en_US-ryan-high"), TtsModel(model_dir="vits-piper-en_US-ryan-low"), TtsModel(model_dir="vits-piper-en_US-ryan-medium"), - TtsModel(model_dir="vits-piper-es-glados-medium"), TtsModel(model_dir="vits-piper-es_ES-carlfm-x_low"), TtsModel(model_dir="vits-piper-es_ES-davefx-medium"), + TtsModel(model_dir="vits-piper-es_ES-glados-medium"), TtsModel(model_dir="vits-piper-es_ES-sharvard-medium"), TtsModel(model_dir="vits-piper-es_MX-ald-medium"), TtsModel(model_dir="vits-piper-es_MX-claude-high"), TtsModel(model_dir="vits-piper-fa_IR-amir-medium"), + TtsModel(model_dir="vits-piper-fa_IR-ganji-medium"), + TtsModel(model_dir="vits-piper-fa_IR-ganji_adabi-medium"), TtsModel(model_dir="vits-piper-fa_IR-gyro-medium"), + TtsModel(model_dir="vits-piper-fa_IR-reza_ibrahim-medium"), TtsModel(model_dir="vits-piper-fa_en-rezahedayatfar-ibrahimwalk-medium"), TtsModel(model_dir="vits-piper-fi_FI-harri-low"), TtsModel(model_dir="vits-piper-fi_FI-harri-medium"), # TtsModel(model_dir="vits-piper-fr_FR-mls-medium"), + TtsModel(model_dir="vits-piper-fr_FR-gilles-low"), TtsModel(model_dir="vits-piper-fr_FR-siwis-low"), TtsModel(model_dir="vits-piper-fr_FR-siwis-medium"), TtsModel(model_dir="vits-piper-fr_FR-tom-medium"), @@ -194,6 +206,7 @@ def get_piper_models() -> List[TtsModel]: TtsModel(model_dir="vits-piper-kk_KZ-raya-x_low"), TtsModel(model_dir="vits-piper-lv_LV-aivars-medium"), TtsModel(model_dir="vits-piper-lb_LU-marylux-medium"), + TtsModel(model_dir="vits-piper-ne_NP-chitwan-medium"), TtsModel(model_dir="vits-piper-ne_NP-google-medium"), TtsModel(model_dir="vits-piper-ne_NP-google-x_low"), TtsModel(model_dir="vits-piper-nl_BE-nathalie-medium"), @@ -207,8 +220,10 @@ def get_piper_models() -> List[TtsModel]: TtsModel(model_dir="vits-piper-pl_PL-darkman-medium"), TtsModel(model_dir="vits-piper-pl_PL-gosia-medium"), TtsModel(model_dir="vits-piper-pl_PL-mc_speech-medium"), + TtsModel(model_dir="vits-piper-pt_BR-cadu-medium"), TtsModel(model_dir="vits-piper-pt_BR-edresson-low"), TtsModel(model_dir="vits-piper-pt_BR-faber-medium"), + TtsModel(model_dir="vits-piper-pt_BR-jeff-medium"), TtsModel(model_dir="vits-piper-pt_PT-tugao-medium"), TtsModel(model_dir="vits-piper-ro_RO-mihai-medium"), TtsModel(model_dir="vits-piper-ru_RU-denis-medium"), @@ -218,6 +233,7 @@ def get_piper_models() -> List[TtsModel]: TtsModel(model_dir="vits-piper-sk_SK-lili-medium"), TtsModel(model_dir="vits-piper-sl_SI-artur-medium"), TtsModel(model_dir="vits-piper-sr_RS-serbski_institut-medium"), + TtsModel(model_dir="vits-piper-sv_SE-lisa-medium"), TtsModel(model_dir="vits-piper-sv_SE-nst-medium"), TtsModel(model_dir="vits-piper-sw_CD-lanfrica-medium"), TtsModel(model_dir="vits-piper-tr_TR-dfki-medium"), diff --git a/scripts/piper/generate.py b/scripts/piper/generate.py index b86dca76..98bb07c9 100755 --- a/scripts/piper/generate.py +++ b/scripts/piper/generate.py @@ -230,6 +230,25 @@ def get_es_models(): PiperModel(name="sharvard", kind="medium", sr=22050, ns=2), ] + es_ES.extend( + [ + # https://github.com/rhasspy/piper/issues/187#issuecomment-1802216304 + # https://drive.google.com/file/d/12tNCCyd0Hf5jsyqCw8828kLSHHx5LOw9/view + PiperModel( + name="glados", + kind="medium", + sr=22050, + ns=1, + cmd=""" + wget -qq https://huggingface.co/csukuangfj/vits-piper-es_ES-glados-medium/resolve/main/es_ES-glados-medium.onnx + wget -qq https://huggingface.co/csukuangfj/vits-piper-es_ES-glados-medium/resolve/main/es_ES-glados-medium.onnx.json + wget -qq https://huggingface.co/csukuangfj/vits-piper-es_ES-glados-medium/resolve/main/README.md + """, + url="https://github.com/rhasspy/piper/issues/187#issuecomment-1802216304", + ), + ] + ) + es_MX = [ PiperModel(name="ald", kind="medium", sr=22050, ns=1), PiperModel(name="claude", kind="high", sr=22050, ns=1),