Skip to content

ALSA: Keep the active input channels in sync with the callback's channel array #1706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
emezeske wants to merge 1 commit into
base: develop
Choose a base branch
from
+7 −2
Draft

ALSA: Keep the active input channels in sync with the callback's channel array #1706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions modules/juce_audio_devices/native/juce_ALSA_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,13 @@ class ALSAThread final : public Thread
sampleRate = newSampleRate;
bufferSize = newBufferSize;

// Widened before the loop below fills currentInputChans and
// inputChannelDataForCallback, which have to agree: getActiveInputChannels()
// must not report more channels than the callback is given pointers for.
// A request for no inputs at all stays empty rather than being widened.
if (inputChannels.getHighestBit() >= 0)
ensureMinimumNumBitsSet (inputChannels, (int) minChansIn);

int maxInputsRequested = inputChannels.getHighestBit() + 1;
maxInputsRequested = jmax ((int) minChansIn, jmin ((int) maxChansIn, maxInputsRequested));

Expand Down Expand Up @@ -565,8 +572,6 @@ class ALSAThread final : public Thread
return;
}

ensureMinimumNumBitsSet (currentInputChans, (int) minChansIn);

if (! inputDevice->setParameters ((unsigned int) sampleRate,
jlimit ((int) minChansIn, (int) maxChansIn, currentInputChans.getHighestBit() + 1),
bufferSize))
Expand Down