alex/nih-plug
1
0
Fork 0
Code Activity

Fix buffer adapter size hints for zero channels

Browse source 
And the SamplesIter one was simply not correct when yielded by the block
iterator.
This commit is contained in:
Robbert van der Helm 2023-01-05 16:10:56 +01:00
parent cb827d18dd
commit cb2824021b
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/buffer/blocks.rs
View file

@ -45,7 +45,7 @@ impl<'slice, 'sample> Iterator for BlocksIter<'slice, 'sample> {
#[inline]
fn next(&mut self) -> Option<Self::Item> {
let buffer_len = unsafe { (*self.buffers)[0].len() };
let buffer_len = unsafe { (*self.buffers).first().map(|b| b.len()).unwrap_or(0) };
if self.current_block_start < buffer_len {
let current_block_start = self.current_block_start;
let current_block_end =
@ -67,9 +67,9 @@ impl<'slice, 'sample> Iterator for BlocksIter<'slice, 'sample> {
#[inline]
fn size_hint(&self) -> (usize, Option<usize>) {
let remaining = ((unsafe { (*self.buffers)[0].len() } - self.current_block_start) as f32
/ self.max_block_size as f32)
.ceil() as usize;
let buffer_len = unsafe { (*self.buffers).first().map(|b| b.len()).unwrap_or(0) };
let remaining = (buffer_len as f32 / self.max_block_size as f32).ceil() as usize;
(remaining, Some(remaining))
}
}
@ -116,6 +116,7 @@ impl<'slice, 'sample> Iterator for BlockChannelsIter<'slice, 'sample> {
#[inline]
fn size_hint(&self) -> (usize, Option<usize>) {
let remaining = unsafe { (*self.buffers).len() } - self.current_channel;
(remaining, Some(remaining))
}
}

4
src/buffer/samples.rs
View file

@ -61,7 +61,8 @@ impl<'slice, 'sample> Iterator for SamplesIter<'slice, 'sample> {
#[inline]
fn size_hint(&self) -> (usize, Option<usize>) {
let remaining = unsafe { (*self.buffers)[0].len() } - self.current_sample;
let remaining = self.samples_end - self.current_sample;
(remaining, Some(remaining))
}
}
@ -107,6 +108,7 @@ impl<'slice, 'sample> Iterator for ChannelSamplesIter<'slice, 'sample> {
#[inline]
fn size_hint(&self) -> (usize, Option<usize>) {
let remaining = unsafe { (*self.buffers).len() } - self.current_channel;
(remaining, Some(remaining))
}
}