From 1e94e007d5a139c4bf02b6594ecccc6c20a709e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?=
 <41315874+fumiama@users.noreply.github.com>
Date: Thu, 13 Jun 2024 00:51:22 +0900
Subject: [PATCH] optimize(rvc.f0): rename inner defs

---
 infer/modules/vc/pipeline.py | 1 -
 rvc/f0/dio.py                | 2 +-
 rvc/f0/f0.py                 | 4 ++--
 rvc/f0/harvest.py            | 2 +-
 rvc/f0/pm.py                 | 2 +-
 rvc/f0/rmvpe.py              | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/infer/modules/vc/pipeline.py b/infer/modules/vc/pipeline.py
index 39f20f6..1adc5ef 100644
--- a/infer/modules/vc/pipeline.py
+++ b/infer/modules/vc/pipeline.py
@@ -10,7 +10,6 @@ from time import time
 import faiss
 import librosa
 import numpy as np
-import pyworld
 import torch
 import torch.nn.functional as F
 import torchcrepe
diff --git a/rvc/f0/dio.py b/rvc/f0/dio.py
index 544b16a..d654d97 100644
--- a/rvc/f0/dio.py
+++ b/rvc/f0/dio.py
@@ -28,4 +28,4 @@ class Dio(F0Predictor):
         f0 = pyworld.stonemask(wav.astype(np.double), f0, t, self.sampling_rate)
         for index, pitch in enumerate(f0):
             f0[index] = round(pitch, 1)
-        return self.interpolate_f0(self.resize_f0(f0, p_len))[0]
+        return self._interpolate_f0(self._resize_f0(f0, p_len))[0]
diff --git a/rvc/f0/f0.py b/rvc/f0/f0.py
index 99b48c2..654213e 100644
--- a/rvc/f0/f0.py
+++ b/rvc/f0/f0.py
@@ -17,7 +17,7 @@ class F0Predictor(object):
         filter_radius: Optional[Union[int, float]] = None,
     ): ...
 
-    def interpolate_f0(self, f0: np.ndarray[Any, np.dtype]):
+    def _interpolate_f0(self, f0: np.ndarray[Any, np.dtype]):
         """
         对F0进行插值处理
         """
@@ -55,7 +55,7 @@ class F0Predictor(object):
 
         return ip_data[:, 0], vuv_vector[:, 0]
 
-    def resize_f0(self, x: np.ndarray[Any, np.dtype], target_len: int):
+    def _resize_f0(self, x: np.ndarray[Any, np.dtype], target_len: int):
         source = np.array(x)
         source[source < 0.001] = np.nan
         target = np.interp(
diff --git a/rvc/f0/harvest.py b/rvc/f0/harvest.py
index e1a051d..3ddae07 100644
--- a/rvc/f0/harvest.py
+++ b/rvc/f0/harvest.py
@@ -29,4 +29,4 @@ class Harvest(F0Predictor):
         f0 = pyworld.stonemask(wav.astype(np.double), f0, t, self.sampling_rate)
         if filter_radius is not None and filter_radius > 2:
             f0 = signal.medfilt(f0, 3)
-        return self.interpolate_f0(self.resize_f0(f0, p_len))[0]
+        return self._interpolate_f0(self._resize_f0(f0, p_len))[0]
diff --git a/rvc/f0/pm.py b/rvc/f0/pm.py
index 11feaf6..78cf1b5 100644
--- a/rvc/f0/pm.py
+++ b/rvc/f0/pm.py
@@ -36,4 +36,4 @@ class PM(F0Predictor):
         pad_size = (p_len - len(f0) + 1) // 2
         if pad_size > 0 or p_len - len(f0) - pad_size > 0:
             f0 = np.pad(f0, [[pad_size, p_len - len(f0) - pad_size]], mode="constant")
-        return self.interpolate_f0(f0)[0]
+        return self._interpolate_f0(f0)[0]
diff --git a/rvc/f0/rmvpe.py b/rvc/f0/rmvpe.py
index 475d684..c1a12f2 100644
--- a/rvc/f0/rmvpe.py
+++ b/rvc/f0/rmvpe.py
@@ -122,7 +122,7 @@ class RMVPE(F0Predictor):
 
         f0 = self._decode(hidden, thred=filter_radius)
 
-        return self.interpolate_f0(self.resize_f0(f0, p_len))[0]
+        return self._interpolate_f0(self._resize_f0(f0, p_len))[0]
 
     def _to_local_average_cents(self, salience, threshold=0.05):
         center = np.argmax(salience, axis=1)  # 帧长#index