Format code (#384)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
This commit is contained in:
github-actions[bot]
2023-05-30 15:22:53 +08:00
committed by GitHub
parent 5284e38c3d
commit 89afd017ba
7 changed files with 181 additions and 133 deletions

View File

@@ -2,26 +2,27 @@ from infer_pack.modules.F0Predictor.F0Predictor import F0Predictor
import pyworld
import numpy as np
class DioF0Predictor(F0Predictor):
def __init__(self,hop_length=512,f0_min=50,f0_max=1100,sampling_rate=44100):
def __init__(self, hop_length=512, f0_min=50, f0_max=1100, sampling_rate=44100):
self.hop_length = hop_length
self.f0_min = f0_min
self.f0_max = f0_max
self.sampling_rate = sampling_rate
def interpolate_f0(self,f0):
'''
def interpolate_f0(self, f0):
"""
对F0进行插值处理
'''
"""
data = np.reshape(f0, (f0.size, 1))
vuv_vector = np.zeros((data.size, 1), dtype=np.float32)
vuv_vector[data > 0.0] = 1.0
vuv_vector[data <= 0.0] = 0.0
ip_data = data
frame_number = data.size
last_value = 0.0
for i in range(frame_number):
@@ -42,21 +43,25 @@ class DioF0Predictor(F0Predictor):
for k in range(i, frame_number):
ip_data[k] = last_value
else:
ip_data[i] = data[i] #这里可能存在一个没有必要的拷贝
ip_data[i] = data[i] # 这里可能存在一个没有必要的拷贝
last_value = data[i]
return ip_data[:,0], vuv_vector[:,0]
def resize_f0(self,x, target_len):
return ip_data[:, 0], vuv_vector[:, 0]
def resize_f0(self, x, target_len):
source = np.array(x)
source[source<0.001] = np.nan
target = np.interp(np.arange(0, len(source)*target_len, len(source))/ target_len, np.arange(0, len(source)), source)
source[source < 0.001] = np.nan
target = np.interp(
np.arange(0, len(source) * target_len, len(source)) / target_len,
np.arange(0, len(source)),
source,
)
res = np.nan_to_num(target)
return res
def compute_f0(self,wav,p_len=None):
def compute_f0(self, wav, p_len=None):
if p_len is None:
p_len = wav.shape[0]//self.hop_length
p_len = wav.shape[0] // self.hop_length
f0, t = pyworld.dio(
wav.astype(np.double),
fs=self.sampling_rate,
@@ -69,9 +74,9 @@ class DioF0Predictor(F0Predictor):
f0[index] = round(pitch, 1)
return self.interpolate_f0(self.resize_f0(f0, p_len))[0]
def compute_f0_uv(self,wav,p_len=None):
def compute_f0_uv(self, wav, p_len=None):
if p_len is None:
p_len = wav.shape[0]//self.hop_length
p_len = wav.shape[0] // self.hop_length
f0, t = pyworld.dio(
wav.astype(np.double),
fs=self.sampling_rate,