1
0
Fork 0

Fix samples until next window calculation

This commit is contained in:
Robbert van der Helm 2022-03-06 14:48:41 +01:00
parent bf215ef88e
commit 592a908132
2 changed files with 6 additions and 2 deletions

View file

@ -7,6 +7,7 @@ struct Stft {
params: Pin<Box<StftParams>>, params: Pin<Box<StftParams>>,
stft: util::StftHelper, stft: util::StftHelper,
window_function: Vec<f32>,
} }
#[derive(Params)] #[derive(Params)]
@ -18,6 +19,7 @@ impl Default for Stft {
params: Box::pin(StftParams::default()), params: Box::pin(StftParams::default()),
stft: util::StftHelper::new(2, WINDOW_SIZE), stft: util::StftHelper::new(2, WINDOW_SIZE),
window_function: util::window::hann(WINDOW_SIZE),
} }
} }
} }

View file

@ -131,11 +131,13 @@ impl<const NUM_SIDECHAIN_INPUTS: usize> StftHelper<NUM_SIDECHAIN_INPUTS> {
let main_buffer_len = main_buffer.len(); let main_buffer_len = main_buffer.len();
let num_channels = main_buffer.channels(); let num_channels = main_buffer.channels();
let block_size = self.main_input_ring_buffers[0].len(); let block_size = self.main_input_ring_buffers[0].len();
let window_interval = block_size / overlap_times; let window_interval = (block_size / overlap_times) as i32;
let mut already_processed_samples = 0; let mut already_processed_samples = 0;
while already_processed_samples < main_buffer_len { while already_processed_samples < main_buffer_len {
let remaining_samples = main_buffer_len - already_processed_samples; let remaining_samples = main_buffer_len - already_processed_samples;
let samples_until_next_window = (window_interval - self.current_pos) % window_interval; let samples_until_next_window = ((window_interval - self.current_pos as i32 - 1)
.rem_euclid(window_interval)
+ 1) as usize;
let samples_to_process = samples_until_next_window.min(remaining_samples); let samples_to_process = samples_until_next_window.min(remaining_samples);
// Copy the input from `main_buffer` to the ring buffer while copying last block's // Copy the input from `main_buffer` to the ring buffer while copying last block's