Skip to content

Commit 6ced730

Browse files
committed
Update split_languages for Bert-VITS2
1 parent 894e635 commit 6ced730

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

bert_vits2/bert_vits2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ def infer(self, text, id, lang, sdp_ratio, noise, noisew, length, reference_audi
327327

328328
def infer_multilang(self, text, id, lang, sdp_ratio, noise, noisew, length, reference_audio=None, emotion=None,
329329
text_prompt=None, style_text=None, style_weigth=0.7, **kwargs):
330-
sentences_list = split_languages(text, self.lang)
330+
sentences_list = split_languages(text, self.lang, expand_abbreviations=True, expand_hyphens=True)
331331

332332
emo = None
333333
if self.hps_ms.model.emotion_embedding == 1:

manager/TTSManager.py

+13-11
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,8 @@ def bert_vits2_infer(self, state, encode=True):
364364
# if state["lang"] == "auto":
365365
# state["lang"] = classify_language(state["text"], target_languages=model.lang)
366366
if state["lang"] == "auto":
367-
sentences_list = split_languages(state["text"], state["speaker_lang"])
367+
sentences_list = split_languages(state["text"], state["speaker_lang"], expand_abbreviations=True,
368+
expand_hyphens=True)
368369
else:
369370
sentences_list = [(state["text"], state["lang"])]
370371
audios = []
@@ -404,7 +405,8 @@ def stream_bert_vits2_infer(self, state, fname=None):
404405
state["text"] = re.sub(r'\s+', ' ', state["text"]).strip()
405406
sampling_rate = model.sampling_rate
406407

407-
sentences_list = split_languages(state["text"], state["speaker_lang"])
408+
sentences_list = split_languages(state["text"], state["speaker_lang"], expand_abbreviations=True,
409+
expand_hyphens=True)
408410

409411
# audios = []
410412

@@ -499,15 +501,15 @@ def gpt_sovits_infer(self, state, encode=True):
499501
infer_func = model.infer
500502

501503
audio = infer_func(text=state.get("text"),
502-
lang=state.get("lang"),
503-
reference_audio=state.get("reference_audio"),
504-
reference_audio_sr=state.get("reference_audio_sr"),
505-
prompt_text=state.get("prompt_text"),
506-
prompt_lang=state.get("prompt_lang"),
507-
top_k=state.get("top_k"),
508-
top_p=state.get("top_p"),
509-
temperature=state.get("temperature"),
510-
)
504+
lang=state.get("lang"),
505+
reference_audio=state.get("reference_audio"),
506+
reference_audio_sr=state.get("reference_audio_sr"),
507+
prompt_text=state.get("prompt_text"),
508+
prompt_lang=state.get("prompt_lang"),
509+
top_k=state.get("top_k"),
510+
top_p=state.get("top_p"),
511+
temperature=state.get("temperature"),
512+
)
511513
sampling_rate = model.sampling_rate
512514

513515
return self.encode(sampling_rate, audio, state["format"]) if encode else audio

0 commit comments

Comments
 (0)