mirror of
https://github.com/RVC-Project/Retrieval-based-Voice-Conversion-WebUI.git
synced 2025-04-05 04:08:58 +08:00
Merge ec2ac37e43c10a47463f1044d96d5c26d670552e into 7ef19867780cf703841ebafb565a4e47d1ea86ff
This commit is contained in:
commit
c2de6615a1
28
infer-web.py
28
infer-web.py
@ -441,9 +441,9 @@ def change_version19(sr2, if_f0_3, version19):
|
|||||||
if sr2 == "32k" and version19 == "v1":
|
if sr2 == "32k" and version19 == "v1":
|
||||||
sr2 = "40k"
|
sr2 = "40k"
|
||||||
to_return_sr2 = (
|
to_return_sr2 = (
|
||||||
{"choices": ["40k", "48k"], "__type__": "update", "value": sr2}
|
{"choices": ["32k", "40k", "48k"], "__type__": "update", "value": sr2}
|
||||||
if version19 == "v1"
|
if version19 == "v1"
|
||||||
else {"choices": ["40k", "48k", "32k"], "__type__": "update", "value": sr2}
|
else {"choices": ["32k", "40k", "48k"], "__type__": "update", "value": sr2}
|
||||||
)
|
)
|
||||||
f0_str = "f0" if if_f0_3 else ""
|
f0_str = "f0" if if_f0_3 else ""
|
||||||
return (
|
return (
|
||||||
@ -552,7 +552,7 @@ def click_train(
|
|||||||
logger.info("No pretrained Generator")
|
logger.info("No pretrained Generator")
|
||||||
if pretrained_D15 == "":
|
if pretrained_D15 == "":
|
||||||
logger.info("No pretrained Discriminator")
|
logger.info("No pretrained Discriminator")
|
||||||
if version19 == "v1" or sr2 == "40k":
|
if version19 == "v1" or sr2 == "40k": # v2 40k falls back to v1
|
||||||
config_path = "v1/%s.json" % sr2
|
config_path = "v1/%s.json" % sr2
|
||||||
else:
|
else:
|
||||||
config_path = "v2/%s.json" % sr2
|
config_path = "v2/%s.json" % sr2
|
||||||
@ -1176,10 +1176,17 @@ with gr.Blocks(title="RVC WebUI") as app:
|
|||||||
)
|
)
|
||||||
with gr.Row():
|
with gr.Row():
|
||||||
exp_dir1 = gr.Textbox(label=i18n("输入实验名"), value="mi-test")
|
exp_dir1 = gr.Textbox(label=i18n("输入实验名"), value="mi-test")
|
||||||
|
version19 = gr.Radio(
|
||||||
|
label=i18n("版本"),
|
||||||
|
choices=["v1", "v2"],
|
||||||
|
value="v2",
|
||||||
|
interactive=True,
|
||||||
|
visible=True,
|
||||||
|
)
|
||||||
sr2 = gr.Radio(
|
sr2 = gr.Radio(
|
||||||
label=i18n("目标采样率"),
|
label=i18n("目标采样率"),
|
||||||
choices=["40k", "48k"],
|
choices=["32k", "40k", "48k"],
|
||||||
value="40k",
|
value="48k",
|
||||||
interactive=True,
|
interactive=True,
|
||||||
)
|
)
|
||||||
if_f0_3 = gr.Radio(
|
if_f0_3 = gr.Radio(
|
||||||
@ -1188,13 +1195,6 @@ with gr.Blocks(title="RVC WebUI") as app:
|
|||||||
value=True,
|
value=True,
|
||||||
interactive=True,
|
interactive=True,
|
||||||
)
|
)
|
||||||
version19 = gr.Radio(
|
|
||||||
label=i18n("版本"),
|
|
||||||
choices=["v1", "v2"],
|
|
||||||
value="v2",
|
|
||||||
interactive=True,
|
|
||||||
visible=True,
|
|
||||||
)
|
|
||||||
np7 = gr.Slider(
|
np7 = gr.Slider(
|
||||||
minimum=0,
|
minimum=0,
|
||||||
maximum=config.n_cpu,
|
maximum=config.n_cpu,
|
||||||
@ -1339,12 +1339,12 @@ with gr.Blocks(title="RVC WebUI") as app:
|
|||||||
with gr.Row():
|
with gr.Row():
|
||||||
pretrained_G14 = gr.Textbox(
|
pretrained_G14 = gr.Textbox(
|
||||||
label=i18n("加载预训练底模G路径"),
|
label=i18n("加载预训练底模G路径"),
|
||||||
value="assets/pretrained_v2/f0G40k.pth",
|
value="assets/pretrained_v2/f0G48k.pth",
|
||||||
interactive=True,
|
interactive=True,
|
||||||
)
|
)
|
||||||
pretrained_D15 = gr.Textbox(
|
pretrained_D15 = gr.Textbox(
|
||||||
label=i18n("加载预训练底模D路径"),
|
label=i18n("加载预训练底模D路径"),
|
||||||
value="assets/pretrained_v2/f0D40k.pth",
|
value="assets/pretrained_v2/f0D48k.pth",
|
||||||
interactive=True,
|
interactive=True,
|
||||||
)
|
)
|
||||||
sr2.change(
|
sr2.change(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user