From 324b166c5293323082e2c326d728618fd05fcac0 Mon Sep 17 00:00:00 2001
From: WongLaw <95171490+WongLaw@users.noreply.github.com>
Date: Wed, 14 Sep 2022 16:11:12 +0800
Subject: [PATCH] Removed useless spk_id in speech_server and
 streaming_tts_server from demos, and support bilingual server engine,
 test=tts (#2380)

* Removed useless spk_id in speech_server and streaming_tts_server from demos, and support bilingual server engine.
---
 demos/speech_server/conf/application.yaml                     | 4 ++--
 demos/streaming_tts_server/conf/tts_online_application.yaml   | 3 +--
 .../streaming_tts_server/conf/tts_online_ws_application.yaml  | 3 +--
 paddlespeech/server/engine/engine_warmup.py                   | 4 +++-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/demos/speech_server/conf/application.yaml b/demos/speech_server/conf/application.yaml
index 9c171c47..b5ee8009 100644
--- a/demos/speech_server/conf/application.yaml
+++ b/demos/speech_server/conf/application.yaml
@@ -61,7 +61,7 @@ tts_python:
     phones_dict: 
     tones_dict: 
     speaker_dict: 
-    spk_id: 0
+
 
     # voc (vocoder) choices=['pwgan_csmsc', 'pwgan_ljspeech', 'pwgan_aishell3',
     #                        'pwgan_vctk', 'mb_melgan_csmsc', 'style_melgan_csmsc',
@@ -87,7 +87,7 @@ tts_inference:
     phones_dict: 
     tones_dict: 
     speaker_dict: 
-    spk_id: 0
+
 
     am_predictor_conf:
         device:  # set 'gpu:id' or 'cpu'
diff --git a/demos/streaming_tts_server/conf/tts_online_application.yaml b/demos/streaming_tts_server/conf/tts_online_application.yaml
index e617912f..f5ec9dc8 100644
--- a/demos/streaming_tts_server/conf/tts_online_application.yaml
+++ b/demos/streaming_tts_server/conf/tts_online_application.yaml
@@ -29,7 +29,7 @@ tts_online:
     phones_dict: 
     tones_dict: 
     speaker_dict: 
-    spk_id: 0
+    
 
     # voc (vocoder) choices=['mb_melgan_csmsc, hifigan_csmsc']
     # Both mb_melgan_csmsc and hifigan_csmsc support streaming voc inference
@@ -70,7 +70,6 @@ tts_online-onnx:
     phones_dict: 
     tones_dict: 
     speaker_dict: 
-    spk_id: 0
     am_sample_rate: 24000
     am_sess_conf:
         device: "cpu" # set 'gpu:id' or 'cpu'
diff --git a/demos/streaming_tts_server/conf/tts_online_ws_application.yaml b/demos/streaming_tts_server/conf/tts_online_ws_application.yaml
index 329f882c..c6563391 100644
--- a/demos/streaming_tts_server/conf/tts_online_ws_application.yaml
+++ b/demos/streaming_tts_server/conf/tts_online_ws_application.yaml
@@ -29,7 +29,7 @@ tts_online:
     phones_dict: 
     tones_dict: 
     speaker_dict: 
-    spk_id: 0
+        
 
     # voc (vocoder) choices=['mb_melgan_csmsc, hifigan_csmsc']
     # Both mb_melgan_csmsc and hifigan_csmsc support streaming voc inference
@@ -70,7 +70,6 @@ tts_online-onnx:
     phones_dict: 
     tones_dict: 
     speaker_dict: 
-    spk_id: 0
     am_sample_rate: 24000
     am_sess_conf:
         device: "cpu" # set 'gpu:id' or 'cpu'
diff --git a/paddlespeech/server/engine/engine_warmup.py b/paddlespeech/server/engine/engine_warmup.py
index 3751554c..ff65dff9 100644
--- a/paddlespeech/server/engine/engine_warmup.py
+++ b/paddlespeech/server/engine/engine_warmup.py
@@ -27,8 +27,10 @@ def warm_up(engine_and_type: str, warm_up_time: int=3) -> bool:
             sentence = "您好，欢迎使用语音合成服务。"
         elif tts_engine.lang == 'en':
             sentence = "Hello and welcome to the speech synthesis service."
+        elif tts_engine.lang == 'mix':
+            sentence = "您好，欢迎使用TTS多语种服务。"
         else:
-            logger.error("tts engine only support lang: zh or en.")
+            logger.error("tts engine only support lang: zh or en or mix.")
             sys.exit(-1)
 
         if engine_and_type == "tts_python":
-- 
GitLab