ALSA: Keep the active input channels in sync with the callback's channel array - #1706
Draft
emezeske wants to merge 1 commit into
Draft
ALSA: Keep the active input channels in sync with the callback's channel array#1706emezeske wants to merge 1 commit into
emezeske wants to merge 1 commit into
Conversation
This file contains hidden or 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
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.
Opening an ALSA capture device whose minimum channel count is higher than the number of input channels selected crashes on the audio thread, in the input level meter. To reproduce, open a capture device whose ALSA minimum is 2 channels (a dsnoop device in my case) with only the first input channel enabled.
getActiveInputChannels() ends up reporting more channels than the audio callback is actually handed pointers for. open() fills inputChannelDataForCallback and currentInputChans together in one loop, and then widens currentInputChans to minChansIn afterwards, so the bitset gains a bit with no matching entry in the channel array. AudioDeviceManager sizes CallbackMaxSizeEnforcer's stored channel vectors from getActiveInputChannels(), fills in only the channels the device passes, and forwards the rest as null pointers, which is what then crashes in the meter.
This moves the widening up so that it applies to inputChannels before the loop runs, which is how the output path a few lines below already does it, and the two stay in agreement. A request for no input channels at all is left alone rather than being widened to the minimum.