Fixed ChannelVolume size_hint and added tests #440
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
est31
reviewed
Sep 14, 2022
src/source/channel_volume.rs
Outdated
| // The input source provides a number of samples (input_hint / channels); | ||
| // We return 1 item per channel per sample => * channel_volumes | ||
| let input_provides = | ||
| input_hint / (self.input.channels() as usize) * self.channel_volumes.len(); |
There was a problem hiding this comment.
I'm wondering about this part, what happens if input_hint is not a multiple of the channel number? Maybe we should first multiply by channel_volumes.len and then do the division? Or is that wrong?
There was a problem hiding this comment.
Switching the order would be wrong, we have to ceil the division.
If we divide first, a hint of 5 when mapping from stereo to stereo would result in 5 again, but 6 values will be returned.
So I will change the division to ceil, thank you for noticing this mistake.
…lds an odd number of results
dvdsk
force-pushed
the
master
branch
3 times, most recently
from
b10961c
to
a7f67b3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The current implementation of size_hint for ChannelVolume is broken for two reasons:
1. The number of samples in input and result should be the same, but each sample may produce more or less elements if channel count differs
To fix this, the size hint is first divided by the source channel count, then multiplied by the result channel count.
2. The sample currently being emitted is not taken into account
To fix this, we add how many times we will emit self.current_sample (=> How many channels still remain for this sample).