diff --git a/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs256NSFsid_ONNX.py b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs256NSFsid_ONNX.py index 827a955c..19b19c65 100644 --- a/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs256NSFsid_ONNX.py +++ b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs256NSFsid_ONNX.py @@ -63,7 +63,7 @@ class SynthesizerTrnMs256NSFsid_ONNX(nn.Module): m_p, logs_p, x_mask = self.enc_p(phone, pitch, phone_lengths) z_p = (m_p + torch.exp(logs_p) * torch.randn_like(m_p) * 0.66666) * x_mask z = self.flow(z_p, x_mask, g=g, reverse=True) - o = self.dec.infer_realtime((z * x_mask)[:, :, :max_len], nsff0, g=g, convert_length=convert_length) - return o, x_mask, (z, z_p, m_p, logs_p) - - + # o = self.dec.infer_realtime((z * x_mask)[:, :, :max_len], nsff0, g=g, convert_length=convert_length) + o = self.dec((z * x_mask)[:, :, :max_len], nsff0, g=g) + o = torch.clip(o[0, 0], -1.0, 1.0) + return o diff --git a/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs256NSFsid_nono_ONNX.py b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs256NSFsid_nono_ONNX.py index db216d45..b341bbdf 100644 --- a/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs256NSFsid_nono_ONNX.py +++ b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs256NSFsid_nono_ONNX.py @@ -62,5 +62,6 @@ class SynthesizerTrnMs256NSFsid_nono_ONNX(nn.Module): m_p, logs_p, x_mask = self.enc_p(phone, None, phone_lengths) z_p = (m_p + torch.exp(logs_p) * torch.randn_like(m_p) * 0.66666) * x_mask z = self.flow(z_p, x_mask, g=g, reverse=True) - o = self.dec.infer_realtime((z * x_mask)[:, :, :max_len], g=g, convert_length=convert_length) - return o, x_mask, (z, z_p, m_p, logs_p) \ No newline at end of file + o = self.dec((z * x_mask)[:, :, :max_len], g=g) + o = torch.clip(o[0, 0], -1.0, 1.0) + return o diff --git a/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs768NSFsid_ONNX.py b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs768NSFsid_ONNX.py index 40ed3e5e..eb1f63d5 100644 --- a/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs768NSFsid_ONNX.py +++ b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs768NSFsid_ONNX.py @@ -67,4 +67,4 @@ class SynthesizerTrnMs768NSFsid_ONNX(nn.Module): # o = self.dec.infer_realtime((z * x_mask)[:, :, :max_len], nsff0, g=g, convert_length=convert_length) o = self.dec((z * x_mask)[:, :, :max_len], nsff0, g=g) o = torch.clip(o[0, 0], -1.0, 1.0) - return o \ No newline at end of file + return o diff --git a/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs768NSFsid_nono_ONNX.py b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs768NSFsid_nono_ONNX.py index d6d8365e..755d0081 100644 --- a/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs768NSFsid_nono_ONNX.py +++ b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs768NSFsid_nono_ONNX.py @@ -86,5 +86,6 @@ class SynthesizerTrnMs768NSFsid_nono_ONNX(nn.Module): m_p, logs_p, x_mask = self.enc_p(phone, None, phone_lengths) z_p = (m_p + torch.exp(logs_p) * torch.randn_like(m_p) * 0.66666) * x_mask z = self.flow(z_p, x_mask, g=g, reverse=True) - o = self.dec.infer_realtime((z * x_mask)[:, :, :max_len], g=g, convert_length=convert_length) - return o, x_mask, (z, z_p, m_p, logs_p) + o = self.dec((z * x_mask)[:, :, :max_len], g=g) + o = torch.clip(o[0, 0], -1.0, 1.0) + return o \ No newline at end of file diff --git a/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMsNSFsidNono_webui_ONNX.py b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMsNSFsidNono_webui_ONNX.py index 36ad2ebe..e4408437 100644 --- a/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMsNSFsidNono_webui_ONNX.py +++ b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMsNSFsidNono_webui_ONNX.py @@ -65,5 +65,7 @@ class SynthesizerTrnMsNSFsidNono_webui_ONNX(nn.Module): m_p, logs_p, x_mask = self.enc_p(phone, None, phone_lengths) z_p = (m_p + torch.exp(logs_p) * torch.randn_like(m_p) * 0.66666) * x_mask z = self.flow(z_p, x_mask, g=g, reverse=True) - o = self.dec.infer_realtime((z * x_mask)[:, :, :max_len], g=g, convert_length=convert_length) - return o, x_mask, (z, z_p, m_p, logs_p) + o = self.dec((z * x_mask)[:, :, :max_len], g=g) + o = torch.clip(o[0, 0], -1.0, 1.0) + return o + \ No newline at end of file diff --git a/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMsNSFsid_webui_ONNX.py b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMsNSFsid_webui_ONNX.py index 421f3ddd..890e0cb1 100644 --- a/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMsNSFsid_webui_ONNX.py +++ b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMsNSFsid_webui_ONNX.py @@ -66,6 +66,7 @@ class SynthesizerTrnMsNSFsid_webui_ONNX(nn.Module): m_p, logs_p, x_mask = self.enc_p(phone, pitch, phone_lengths) z_p = (m_p + torch.exp(logs_p) * torch.randn_like(m_p) * 0.66666) * x_mask z = self.flow(z_p, x_mask, g=g, reverse=True) - o = self.dec.infer_realtime((z * x_mask)[:, :, :max_len], nsff0, g=g, convert_length=convert_length) - return o, x_mask, (z, z_p, m_p, logs_p) + o = self.dec((z * x_mask)[:, :, :max_len], nsff0, g=g) + o = torch.clip(o[0, 0], -1.0, 1.0) + return o