mirror of
https://github.com/RVC-Boss/GPT-SoVITS.git
synced 2025-08-28 18:05:36 +08:00
fix _merge_yi crash
This commit is contained in:
parent
62431b1eae
commit
0aa82e9201
@ -654,18 +654,19 @@ class ToneSandhi:
|
|||||||
# function 1
|
# function 1
|
||||||
while i < len(seg):
|
while i < len(seg):
|
||||||
word, pos = seg[i]
|
word, pos = seg[i]
|
||||||
|
merged = False
|
||||||
if (
|
if (
|
||||||
i - 1 >= 0
|
i - 1 >= 0
|
||||||
and word == "一"
|
and word == "一"
|
||||||
and i + 1 < len(seg)
|
and i + 1 < len(seg)
|
||||||
and seg[i - 1][0] == seg[i + 1][0]
|
|
||||||
and seg[i - 1][1] == "v"
|
|
||||||
and seg[i + 1][1] == "v"
|
|
||||||
):
|
):
|
||||||
merged = seg[i - 1][0] + "一" + seg[i + 1][0]
|
last = new_seg[-1] if new_seg else seg[i - 1]
|
||||||
new_seg[-1] = [merged, seg[i - 1][1]]
|
if last[0] == seg[i + 1][0] and last[1] == "v" and seg[i + 1][1] == "v":
|
||||||
|
combined = last[0] + "一" + seg[i + 1][0]
|
||||||
|
new_seg[-1] = [combined, last[1]]
|
||||||
i += 2
|
i += 2
|
||||||
else:
|
merged = True
|
||||||
|
if not merged:
|
||||||
new_seg.append([word, pos])
|
new_seg.append([word, pos])
|
||||||
i += 1
|
i += 1
|
||||||
seg = new_seg
|
seg = new_seg
|
||||||
|
Loading…
x
Reference in New Issue
Block a user