From fe5e15f206432cb9f288ca22a9c1cd7d007fadca Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 21 Oct 2019 03:23:01 -0400 Subject: [PATCH] This sounds good coming back down the pipe... --- cycle_gan/sidecar.py | 18 ++++++++++-------- src/main.rs | 6 +++--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cycle_gan/sidecar.py b/cycle_gan/sidecar.py index 4b08855230..43700a463b 100755 --- a/cycle_gan/sidecar.py +++ b/cycle_gan/sidecar.py @@ -205,16 +205,18 @@ def convert(audio, vocode_params=None, print('results.type', type(results)) print('results.len', len(results)) - """ - if output_rate != 16000: - print("Resampling output audio from {} Hz to 16000 Hz".format(vocode_params.source_rate)) + if vocode_params.post_convert_resample: + print("Resampling output audio from {} Hz to {} Hz".format(vocode_params.model_hyperparameter_sampling_rate, + vocode_params.post_convert_resample_rate)) #consume_rate = 68000 # Experimentally determined for Rust lib 'CPAL' - results = librosa.resample(results, 16000, output_rate) - if save_files: - filename = temp_file_name('.wav') + results = librosa.resample(results, + vocode_params.model_hyperparameter_sampling_rate, + vocode_params.post_convert_resample_rate) + if vocode_params.post_convert_resample_save_file: + #filename = temp_file_name('.wav') + filename = 'debug/{}_post_convert_resample.wav'.format(request_batch_number) print('----- Upsampled (transformed) file out: {}'.format(filename)) - scipy.io.wavfile.write(filename, output_rate, results) - """ + scipy.io.wavfile.write(filename, vocode_params.post_convert_resample_rate, results) if discard_vocoded_audio: return audio diff --git a/src/main.rs b/src/main.rs index f0de6f0afd..e28b17e0fa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -132,9 +132,9 @@ fn run_cpal_audio() -> Result<(), failure::Error> { vocode_params.model_hyperparameter_sampling_rate = 16000; vocode_params.model_save_file = true; - vocode_params.post_convert_resample = false; - vocode_params.post_convert_resample_rate = 16000; - vocode_params.post_convert_resample_save_file = false; + vocode_params.post_convert_resample = true; + vocode_params.post_convert_resample_rate = 88000; + vocode_params.post_convert_resample_save_file = true; vocode_request.vocode_params = Some(vocode_params);