blackteay/GPT-SoVITS
1
0
Fork 0
mirror of https://github.com/RVC-Boss/GPT-SoVITS.git synced 2025-08-22 11:15:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix _merge_yi crash

Browse Source
This commit is contained in:
wangzeyuan 2025-06-05 17:57:39 +08:00
parent dbf7702b54
commit 62431b1eae
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
GPT_SoVITS/text/tone_sandhi.py
View File

@ -650,8 +650,10 @@ class ToneSandhi:
# output seg: [['听一听', 'v']] # output seg: [['听一听', 'v']]
def _merge_yi(self, seg: List[Tuple[str, str]]) -> List[Tuple[str, str]]: def _merge_yi(self, seg: List[Tuple[str, str]]) -> List[Tuple[str, str]]:
new_seg = [] new_seg = []
i = 0
# function 1 # function 1
for i, (word, pos) in enumerate(seg): while i < len(seg):
word, pos = seg[i]
if ( if (
i - 1 >= 0 i - 1 >= 0
and word == "一" and word == "一"
@ -660,22 +662,16 @@ class ToneSandhi:
and seg[i - 1][1] == "v" and seg[i - 1][1] == "v"
and seg[i + 1][1] == "v" and seg[i + 1][1] == "v"
): ):
new_seg[i - 1][0] = new_seg[i - 1][0] + "一" + new_seg[i - 1][0] merged = seg[i - 1][0] + "一" + seg[i + 1][0]
else: new_seg[-1] = [merged, seg[i - 1][1]]
if ( i += 2
i - 2 >= 0
and seg[i - 1][0] == "一"
and seg[i - 2][0] == word
and pos == "v"
and seg[i - 2][1] == "v"
):
continue
else: else:
new_seg.append([word, pos]) new_seg.append([word, pos])
i += 1
seg = new_seg seg = new_seg
new_seg = [] new_seg = []
# function 2 # function 2
for i, (word, pos) in enumerate(seg): for word, pos in seg:
if new_seg and new_seg[-1][0] == "一": if new_seg and new_seg[-1][0] == "一":
new_seg[-1][0] = new_seg[-1][0] + word new_seg[-1][0] = new_seg[-1][0] + word
else: else: