@@ -664,6 +664,8 @@ def change_sr2(sr2, if_f0_3, version19):
664
664
665
665
def change_version19 (sr2 , if_f0_3 , version19 ):
666
666
path_str = "" if version19 == "v1" else "_v2"
667
+ if (sr2 == "32k" and version19 == "v1" ):sr2 = "40k"
668
+ to_return_sr2 = {"choices" : ["40k" ,"48k" ], "__type__" : "update" } if version19 == "v1" else {"choices" : ["32k" ,"40k" ,"48k" ], "__type__" : "update" }
667
669
f0_str = "f0" if if_f0_3 else ""
668
670
if_pretrained_generator_exist = os .access (
669
671
"pretrained%s/%sG%s.pth" % (path_str , f0_str , sr2 ), os .F_OK
@@ -688,6 +690,7 @@ def change_version19(sr2, if_f0_3, version19):
688
690
"pretrained%s/%sD%s.pth" % (path_str , f0_str , sr2 )
689
691
if if_pretrained_discriminator_exist
690
692
else "" ,
693
+ to_return_sr2
691
694
)
692
695
693
696
@@ -1589,7 +1592,7 @@ def export_onnx(ModelPath, ExportedPath):
1589
1592
interactive = True ,
1590
1593
)
1591
1594
version19 = gr .Radio (
1592
- label = i18n ("版本(目前仅40k支持了v2) " ),
1595
+ label = i18n ("版本" ),
1593
1596
choices = ["v1" , "v2" ],
1594
1597
value = "v1" ,
1595
1598
interactive = True ,
@@ -1718,7 +1721,7 @@ def export_onnx(ModelPath, ExportedPath):
1718
1721
version19 .change (
1719
1722
change_version19 ,
1720
1723
[sr2 , if_f0_3 , version19 ],
1721
- [pretrained_G14 , pretrained_D15 ],
1724
+ [pretrained_G14 , pretrained_D15 , sr2 ],
1722
1725
)
1723
1726
if_f0_3 .change (
1724
1727
change_f0 ,
@@ -1795,7 +1798,7 @@ def export_onnx(ModelPath, ExportedPath):
1795
1798
with gr .Row ():
1796
1799
sr_ = gr .Radio (
1797
1800
label = i18n ("目标采样率" ),
1798
- choices = ["32k" , " 40k" , "48k" ],
1801
+ choices = ["40k" , "48k" ],
1799
1802
value = "40k" ,
1800
1803
interactive = True ,
1801
1804
)
0 commit comments