From 764c7fa4a477d54762cf20d4d4d0ef26534e8a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eren=20G=C3=B6lge?= Date: Sun, 6 Mar 2022 12:09:54 +0100 Subject: [PATCH] Rename phoneme_cleaners --- TTS/tts/utils/synthesis.py | 4 ---- TTS/tts/utils/text/cleaners.py | 21 ++++++++++----------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/TTS/tts/utils/synthesis.py b/TTS/tts/utils/synthesis.py index 4ec84a3d..b6e19ab4 100644 --- a/TTS/tts/utils/synthesis.py +++ b/TTS/tts/utils/synthesis.py @@ -119,7 +119,6 @@ def synthesis( do_trim_silence=False, d_vector=None, language_id=None, - language_name=None, ): """Synthesize voice for the given text using Griffin-Lim vocoder or just compute output features to be passed to the vocoder model. @@ -154,9 +153,6 @@ def synthesis( language_id (int): Language ID passed to the language embedding layer in multi-langual model. Defaults to None. - - language_name (str): - Language name corresponding to the language code used by the phonemizer. Defaults to None. """ # GST processing style_mel = None diff --git a/TTS/tts/utils/text/cleaners.py b/TTS/tts/utils/text/cleaners.py index 0ff3e930..cdea3569 100644 --- a/TTS/tts/utils/text/cleaners.py +++ b/TTS/tts/utils/text/cleaners.py @@ -100,6 +100,16 @@ def english_cleaners(text): return text +def english_phoneme_cleaners(text): + """Pipeline for phonemes mode, including number and abbreviation expansion.""" + text = en_normalize_numbers(text) + text = expand_abbreviations(text) + text = replace_symbols(text) + text = remove_aux_symbols(text) + text = collapse_whitespace(text) + return text + + def french_cleaners(text): """Pipeline for French text. There is no need to expand numbers, phonemizer already does that""" text = expand_abbreviations(text, lang="fr") @@ -126,17 +136,6 @@ def chinese_mandarin_cleaners(text: str) -> str: return text -def phoneme_cleaners(text): - """Pipeline for phonemes mode, including number and abbreviation expansion.""" - text = en_normalize_numbers(text) - # text = convert_to_ascii(text) - text = expand_abbreviations(text) - text = replace_symbols(text) - text = remove_aux_symbols(text) - text = collapse_whitespace(text) - return text - - def multilingual_cleaners(text): """Pipeline for multilingual text""" text = lowercase(text)