From 81fe3cd6a048a902a22f423e91e21ed1ede76a3a Mon Sep 17 00:00:00 2001 From: nadare <1na2da0re3@gmail.com> Date: Thu, 6 Jul 2023 05:53:46 +0900 Subject: [PATCH] =?UTF-8?q?hotfix:=20RVCquality=3Dhigh=E3=81=AE=E6=99=82?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/voice_changer/RVC/pipeline/Pipeline.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/server/voice_changer/RVC/pipeline/Pipeline.py b/server/voice_changer/RVC/pipeline/Pipeline.py index 4c321f26..fbb8f23f 100644 --- a/server/voice_changer/RVC/pipeline/Pipeline.py +++ b/server/voice_changer/RVC/pipeline/Pipeline.py @@ -103,7 +103,8 @@ class Pipeline(object): # RVC QualityがOnのときにはsilence_frontをオフに。 silence_front = silence_front if repeat == 0 else 0 - pitchf = pitchf if repeat == 0 else torch.zeros([pitchf.shape[0], pitchf.shape[1] * 2]) + pitchf = pitchf if repeat == 0 else np.zeros(p_len) + out_size = out_size if repeat == 0 else None # ピッチ検出 try: @@ -116,8 +117,8 @@ class Pipeline(object): self.window, silence_front=silence_front, ) - pitch = pitch[:p_len] - pitchf = pitchf[:p_len] + # pitch = pitch[:p_len] + # pitchf = pitchf[:p_len] pitch = torch.tensor(pitch, device=self.device).unsqueeze(0).long() pitchf = torch.tensor(pitchf, device=self.device, dtype=torch.float).unsqueeze(0) else: @@ -209,11 +210,12 @@ class Pipeline(object): if type(self.inferencer) in [OnnxRVCInferencer, OnnxRVCInferencerNono]: npyOffset = math.floor(silence_front * 16000) // 360 feats = feats[:, npyOffset * 2 :, :] - feats_len = feats.shape[1] - if pitch is not None and pitchf is not None: - pitch = pitch[:, -feats_len:] - pitchf = pitchf[:, -feats_len:] - p_len = torch.tensor([feats_len], device=self.device).long() + + feats_len = feats.shape[1] + if pitch is not None and pitchf is not None: + pitch = pitch[:, -feats_len:] + pitchf = pitchf[:, -feats_len:] + p_len = torch.tensor([feats_len], device=self.device).long() # 推論実行