mirror of
https://github.com/RVC-Boss/GPT-SoVITS.git
synced 2025-10-08 16:00:01 +08:00
Adjust get name dict logic
This commit is contained in:
parent
2fbd8754f4
commit
87fd05b260
@ -286,12 +286,9 @@ class en_G2p(G2p):
|
|||||||
pron = pron1
|
pron = pron1
|
||||||
else:
|
else:
|
||||||
pron = pron2
|
pron = pron2
|
||||||
# 单词仅首字母大写时查找姓名字典
|
|
||||||
elif o_word.istitle() and word in self.namedict:
|
|
||||||
pron = self.namedict[word][0]
|
|
||||||
else:
|
else:
|
||||||
# 递归查找预测
|
# 递归查找预测
|
||||||
pron = self.qryword(word)
|
pron = self.qryword(o_word)
|
||||||
|
|
||||||
prons.extend(pron)
|
prons.extend(pron)
|
||||||
prons.extend([" "])
|
prons.extend([" "])
|
||||||
@ -299,11 +296,17 @@ class en_G2p(G2p):
|
|||||||
return prons[:-1]
|
return prons[:-1]
|
||||||
|
|
||||||
|
|
||||||
def qryword(self, word):
|
def qryword(self, o_word):
|
||||||
|
word = o_word.lower()
|
||||||
|
|
||||||
# 查字典, 单字母除外
|
# 查字典, 单字母除外
|
||||||
if len(word) > 1 and word in self.cmu: # lookup CMU dict
|
if len(word) > 1 and word in self.cmu: # lookup CMU dict
|
||||||
return self.cmu[word][0]
|
return self.cmu[word][0]
|
||||||
|
|
||||||
|
# 单词仅首字母大写时查找姓名字典
|
||||||
|
if o_word.istitle() and word in self.namedict:
|
||||||
|
return self.namedict[word][0]
|
||||||
|
|
||||||
# oov 长度小于等于 3 直接读字母
|
# oov 长度小于等于 3 直接读字母
|
||||||
if len(word) <= 3:
|
if len(word) <= 3:
|
||||||
phones = []
|
phones = []
|
||||||
@ -333,6 +336,7 @@ class en_G2p(G2p):
|
|||||||
|
|
||||||
# 尝试进行分词,应对复合词
|
# 尝试进行分词,应对复合词
|
||||||
comps = wordsegment.segment(word.lower())
|
comps = wordsegment.segment(word.lower())
|
||||||
|
|
||||||
# 无法分词的送回去预测
|
# 无法分词的送回去预测
|
||||||
if len(comps)==1:
|
if len(comps)==1:
|
||||||
return self.predict(word)
|
return self.predict(word)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user