mirror of
https://github.com/fumiama/Retrieval-based-Voice-Conversion-WebUI.git
synced 2026-06-11 05:30:30 +08:00
optimize(infer): move onnx into rvc
This commit is contained in:
@@ -23,7 +23,7 @@ class DioF0Predictor(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]
|
||||
|
||||
def compute_f0_uv(
|
||||
self, wav: np.ndarray[Any, np.dtype], p_len: Optional[int] = None
|
||||
@@ -40,4 +40,4 @@ class DioF0Predictor(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))
|
||||
return self.interpolate_f0(self.resize_f0(f0, p_len))
|
||||
|
||||
@@ -18,7 +18,7 @@ class F0Predictor(object):
|
||||
self, wav: np.ndarray[Any, np.dtype], p_len: Optional[int] = None
|
||||
): ...
|
||||
|
||||
def __interpolate_f0(self, f0: np.ndarray[Any, np.dtype]):
|
||||
def interpolate_f0(self, f0: np.ndarray[Any, np.dtype]):
|
||||
"""
|
||||
对F0进行插值处理
|
||||
"""
|
||||
@@ -56,7 +56,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(
|
||||
|
||||
@@ -21,7 +21,7 @@ class HarvestF0Predictor(F0Predictor):
|
||||
frame_period=1000 * self.hop_length / self.sampling_rate,
|
||||
)
|
||||
f0 = pyworld.stonemask(wav.astype(np.double), f0, t, self.fs)
|
||||
return self.__interpolate_f0(self.__resize_f0(f0, p_len))[0]
|
||||
return self.interpolate_f0(self.resize_f0(f0, p_len))[0]
|
||||
|
||||
def compute_f0_uv(
|
||||
self, wav: np.ndarray[Any, np.dtype], p_len: Optional[int] = None
|
||||
@@ -36,4 +36,4 @@ class HarvestF0Predictor(F0Predictor):
|
||||
frame_period=1000 * self.hop_length / self.sampling_rate,
|
||||
)
|
||||
f0 = pyworld.stonemask(wav.astype(np.double), f0, t, self.sampling_rate)
|
||||
return self.__interpolate_f0(self.__resize_f0(f0, p_len))
|
||||
return self.interpolate_f0(self.resize_f0(f0, p_len))
|
||||
|
||||
@@ -31,7 +31,7 @@ class PMF0Predictor(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")
|
||||
f0, uv = self.__interpolate_f0(f0)
|
||||
f0, uv = self.interpolate_f0(f0)
|
||||
return f0
|
||||
|
||||
def compute_f0_uv(
|
||||
@@ -57,5 +57,5 @@ class PMF0Predictor(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")
|
||||
f0, uv = self.__interpolate_f0(f0)
|
||||
f0, uv = self.interpolate_f0(f0)
|
||||
return f0, uv
|
||||
|
||||
Reference in New Issue
Block a user