mirror of
https://github.com/fumiama/Retrieval-based-Voice-Conversion-WebUI.git
synced 2026-06-08 03:55:47 +08:00
chore(format): run black on dev (#101)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
5969314e8d
commit
51c85fcc49
@@ -142,7 +142,7 @@ def load_audio(
|
|||||||
|
|
||||||
np.copyto(decoded_audio[..., offset:end_index], frame_data)
|
np.copyto(decoded_audio[..., offset:end_index], frame_data)
|
||||||
offset += len(frame_data[0])
|
offset += len(frame_data[0])
|
||||||
|
|
||||||
container.close()
|
container.close()
|
||||||
|
|
||||||
# Truncate the array to the actual size
|
# Truncate the array to the actual size
|
||||||
@@ -188,7 +188,6 @@ def resample_audio(
|
|||||||
output_container.close()
|
output_container.close()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def get_audio_properties(input_path: str) -> Tuple[int, int]:
|
def get_audio_properties(input_path: str) -> Tuple[int, int]:
|
||||||
container = av.open(input_path)
|
container = av.open(input_path)
|
||||||
audio_stream = next(s for s in container.streams if s.type == "audio")
|
audio_stream = next(s for s in container.streams if s.type == "audio")
|
||||||
|
|||||||
@@ -104,7 +104,13 @@ def summarize(
|
|||||||
|
|
||||||
def latest_checkpoint_path(dir_path, regex="G_*.pth"):
|
def latest_checkpoint_path(dir_path, regex="G_*.pth"):
|
||||||
f_list = glob.glob(os.path.join(dir_path, regex))
|
f_list = glob.glob(os.path.join(dir_path, regex))
|
||||||
f_list.sort(key=lambda f: 999999999999 if isinstance(f, str) and f == "latest" else int("0"+"".join(filter(str.isdigit, f))))
|
f_list.sort(
|
||||||
|
key=lambda f: (
|
||||||
|
999999999999
|
||||||
|
if isinstance(f, str) and f == "latest"
|
||||||
|
else int("0" + "".join(filter(str.isdigit, f)))
|
||||||
|
)
|
||||||
|
)
|
||||||
x = f_list[-1]
|
x = f_list[-1]
|
||||||
logger.debug(x)
|
logger.debug(x)
|
||||||
return x
|
return x
|
||||||
|
|||||||
@@ -24,9 +24,7 @@ def crop_center(h1, h2):
|
|||||||
return h1
|
return h1
|
||||||
|
|
||||||
|
|
||||||
def split_lr_waves(
|
def split_lr_waves(wave, mid_side=False, mid_side_b2=False, reverse=False):
|
||||||
wave, mid_side=False, mid_side_b2=False, reverse=False
|
|
||||||
):
|
|
||||||
if reverse:
|
if reverse:
|
||||||
wave_left = np.flip(np.asfortranarray(wave[0]))
|
wave_left = np.flip(np.asfortranarray(wave[0]))
|
||||||
wave_right = np.flip(np.asfortranarray(wave[1]))
|
wave_right = np.flip(np.asfortranarray(wave[1]))
|
||||||
@@ -48,17 +46,23 @@ def run_librosa_stft(wv, n_fft, hop_length, reverse):
|
|||||||
return librosa.stft(wv, n_fft=n_fft, hop_length=hop_length)
|
return librosa.stft(wv, n_fft=n_fft, hop_length=hop_length)
|
||||||
return librosa.stft(np.asfortranarray(wv), n_fft=n_fft, hop_length=hop_length)
|
return librosa.stft(np.asfortranarray(wv), n_fft=n_fft, hop_length=hop_length)
|
||||||
|
|
||||||
|
|
||||||
def wave_to_spectrogram_mt(
|
def wave_to_spectrogram_mt(
|
||||||
wave, hop_length, n_fft, mid_side=False, mid_side_b2=False, reverse=False
|
wave, hop_length, n_fft, mid_side=False, mid_side_b2=False, reverse=False
|
||||||
):
|
):
|
||||||
|
|
||||||
with ThreadPoolExecutor(max_workers=2) as tp:
|
with ThreadPoolExecutor(max_workers=2) as tp:
|
||||||
spec = np.asfortranarray(
|
spec = np.asfortranarray(
|
||||||
[spec for spec in tp.map(
|
[
|
||||||
run_librosa_stft,
|
spec
|
||||||
split_lr_waves(wave, mid_side, mid_side_b2, reverse),
|
for spec in tp.map(
|
||||||
[n_fft, n_fft], [hop_length, hop_length], [reverse, reverse]
|
run_librosa_stft,
|
||||||
)]
|
split_lr_waves(wave, mid_side, mid_side_b2, reverse),
|
||||||
|
[n_fft, n_fft],
|
||||||
|
[hop_length, hop_length],
|
||||||
|
[reverse, reverse],
|
||||||
|
)
|
||||||
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
return spec
|
return spec
|
||||||
@@ -144,10 +148,13 @@ def mask_silence(mag, ref, thres=0.2, min_range=64, fade_size=32):
|
|||||||
def run_librosa_istft(specx, hop_length):
|
def run_librosa_istft(specx, hop_length):
|
||||||
return librosa.istft(np.asfortranarray(specx), hop_length=hop_length)
|
return librosa.istft(np.asfortranarray(specx), hop_length=hop_length)
|
||||||
|
|
||||||
|
|
||||||
def spectrogram_to_wave(spec, hop_length, mid_side, mid_side_b2, reverse):
|
def spectrogram_to_wave(spec, hop_length, mid_side, mid_side_b2, reverse):
|
||||||
|
|
||||||
with ThreadPoolExecutor(max_workers=2) as tp:
|
with ThreadPoolExecutor(max_workers=2) as tp:
|
||||||
wave_left, wave_right = tp.map(run_librosa_istft, spec, [hop_length, hop_length])
|
wave_left, wave_right = tp.map(
|
||||||
|
run_librosa_istft, spec, [hop_length, hop_length]
|
||||||
|
)
|
||||||
|
|
||||||
if reverse:
|
if reverse:
|
||||||
return np.asfortranarray([np.flip(wave_left), np.flip(wave_right)])
|
return np.asfortranarray([np.flip(wave_left), np.flip(wave_right)])
|
||||||
|
|||||||
@@ -207,12 +207,21 @@ class Predictor:
|
|||||||
sources = self.demix(mix.T)
|
sources = self.demix(mix.T)
|
||||||
opt = sources[0].T
|
opt = sources[0].T
|
||||||
save_audio(
|
save_audio(
|
||||||
"%s/vocal_%s.%s" % (vocal_root, basename, format), mix - opt, rate, True, format=format,
|
"%s/vocal_%s.%s" % (vocal_root, basename, format),
|
||||||
|
mix - opt,
|
||||||
|
rate,
|
||||||
|
True,
|
||||||
|
format=format,
|
||||||
)
|
)
|
||||||
save_audio(
|
save_audio(
|
||||||
"%s/instrument_%s.%s" % (others_root, basename, format), opt, rate, True, format=format,
|
"%s/instrument_%s.%s" % (others_root, basename, format),
|
||||||
|
opt,
|
||||||
|
rate,
|
||||||
|
True,
|
||||||
|
format=format,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class MDXNetDereverb:
|
class MDXNetDereverb:
|
||||||
def __init__(self, chunks, device):
|
def __init__(self, chunks, device):
|
||||||
self.onnx = "assets/uvr5_weights/onnx_dereverb_By_FoxJoy"
|
self.onnx = "assets/uvr5_weights/onnx_dereverb_By_FoxJoy"
|
||||||
|
|||||||
@@ -119,7 +119,10 @@ class AudioPre:
|
|||||||
if ins_root is not None:
|
if ins_root is not None:
|
||||||
if self.data["high_end_process"].startswith("mirroring"):
|
if self.data["high_end_process"].startswith("mirroring"):
|
||||||
input_high_end_ = spec_utils.mirroring(
|
input_high_end_ = spec_utils.mirroring(
|
||||||
self.data["high_end_process"], y_spec_m, input_high_end, self.mp.param["pre_filter_start"]
|
self.data["high_end_process"],
|
||||||
|
y_spec_m,
|
||||||
|
input_high_end,
|
||||||
|
self.mp.param["pre_filter_start"],
|
||||||
)
|
)
|
||||||
wav_instrument = spec_utils.cmb_spectrogram_to_wave(
|
wav_instrument = spec_utils.cmb_spectrogram_to_wave(
|
||||||
y_spec_m, self.mp, input_high_end_h, input_high_end_
|
y_spec_m, self.mp, input_high_end_h, input_high_end_
|
||||||
@@ -139,7 +142,7 @@ class AudioPre:
|
|||||||
wav_instrument,
|
wav_instrument,
|
||||||
self.mp.param["sr"],
|
self.mp.param["sr"],
|
||||||
f32=True,
|
f32=True,
|
||||||
format=format
|
format=format,
|
||||||
)
|
)
|
||||||
if vocal_root is not None:
|
if vocal_root is not None:
|
||||||
if self.is_reverse:
|
if self.is_reverse:
|
||||||
@@ -148,7 +151,10 @@ class AudioPre:
|
|||||||
head = "vocal_"
|
head = "vocal_"
|
||||||
if self.data["high_end_process"].startswith("mirroring"):
|
if self.data["high_end_process"].startswith("mirroring"):
|
||||||
input_high_end_ = spec_utils.mirroring(
|
input_high_end_ = spec_utils.mirroring(
|
||||||
self.data["high_end_process"], v_spec_m, input_high_end, self.mp.param["pre_filter_start"]
|
self.data["high_end_process"],
|
||||||
|
v_spec_m,
|
||||||
|
input_high_end,
|
||||||
|
self.mp.param["pre_filter_start"],
|
||||||
)
|
)
|
||||||
wav_vocals = spec_utils.cmb_spectrogram_to_wave(
|
wav_vocals = spec_utils.cmb_spectrogram_to_wave(
|
||||||
v_spec_m, self.mp, input_high_end_h, input_high_end_
|
v_spec_m, self.mp, input_high_end_h, input_high_end_
|
||||||
@@ -164,5 +170,5 @@ class AudioPre:
|
|||||||
wav_vocals,
|
wav_vocals,
|
||||||
self.mp.param["sr"],
|
self.mp.param["sr"],
|
||||||
f32=True,
|
f32=True,
|
||||||
format=format
|
format=format,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -252,8 +252,7 @@ class VC:
|
|||||||
try:
|
try:
|
||||||
tgt_sr, audio_opt = opt
|
tgt_sr, audio_opt = opt
|
||||||
save_audio(
|
save_audio(
|
||||||
"%s/%s.%s"
|
"%s/%s.%s" % (opt_root, os.path.basename(path), format1),
|
||||||
% (opt_root, os.path.basename(path), format1),
|
|
||||||
audio_opt,
|
audio_opt,
|
||||||
tgt_sr,
|
tgt_sr,
|
||||||
f32=True,
|
f32=True,
|
||||||
|
|||||||
Reference in New Issue
Block a user