Skip to content

Commit 0884d28

Browse files
committed
fix: resolve inconsistent sample rates
ref RVC-Project/Retrieval-based-Voice-Conversion-WebUI#2234
1 parent bf41d8b commit 0884d28

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

web.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ def change_version19(sr2, if_f0_3, version19):
449449
to_return_sr2 = (
450450
{"choices": ["40k", "48k"], "__type__": "update", "value": sr2}
451451
if version19 == "v1"
452-
else {"choices": ["40k", "48k", "32k"], "__type__": "update", "value": sr2}
452+
else {"choices": ["32k", "40k", "48k"], "__type__": "update", "value": sr2}
453453
)
454454
f0_str = "f0" if if_f0_3 else ""
455455
return (
@@ -557,7 +557,7 @@ def click_train(
557557
logger.info("No pretrained Generator")
558558
if pretrained_D15 == "":
559559
logger.info("No pretrained Discriminator")
560-
if version19 == "v1" or sr2 == "40k":
560+
if version19 == "v1" or sr2 == "40k": # v2 40k falls back to v1
561561
config_path = "v1/%s.json" % sr2
562562
else:
563563
config_path = "v2/%s.json" % sr2
@@ -1201,8 +1201,8 @@ def change_f0_method(f0method8):
12011201
with gr.Row():
12021202
sr2 = gr.Radio(
12031203
label=i18n("Target sample rate"),
1204-
choices=["40k", "48k"],
1205-
value="40k",
1204+
choices=["32k", "40k", "48k"],
1205+
value="48k",
12061206
interactive=True,
12071207
)
12081208
if_f0_3 = gr.Radio(
@@ -1363,12 +1363,12 @@ def change_f0_method(f0method8):
13631363
with gr.Column():
13641364
pretrained_G14 = gr.Textbox(
13651365
label=i18n("Load pre-trained base model G path"),
1366-
value="assets/pretrained_v2/f0G40k.pth",
1366+
value="assets/pretrained_v2/f0G48k.pth",
13671367
interactive=True,
13681368
)
13691369
pretrained_D15 = gr.Textbox(
13701370
label=i18n("Load pre-trained base model D path"),
1371-
value="assets/pretrained_v2/f0D40k.pth",
1371+
value="assets/pretrained_v2/f0D48k.pth",
13721372
interactive=True,
13731373
)
13741374
gpus16 = gr.Textbox(
@@ -1497,8 +1497,8 @@ def change_f0_method(f0method8):
14971497
with gr.Column():
14981498
sr_ = gr.Radio(
14991499
label=i18n("Target sample rate"),
1500-
choices=["40k", "48k"],
1501-
value="40k",
1500+
choices=["32k", "40k", "48k"],
1501+
value="48k",
15021502
interactive=True,
15031503
)
15041504
if_f0_ = gr.Radio(
@@ -1609,7 +1609,7 @@ def change_f0_method(f0method8):
16091609
sr__ = gr.Radio(
16101610
label=i18n("Target sample rate"),
16111611
choices=["32k", "40k", "48k"],
1612-
value="40k",
1612+
value="48k",
16131613
interactive=True,
16141614
)
16151615
if_f0__ = gr.Radio(

0 commit comments

Comments
 (0)