mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-14 00:14:18 +00:00
Code Activity

VST3 Client: Handle null channels provided by host

Browse source
This commit is contained in:
reuk 2022-05-20 20:24:18 +01:00
parent 560e75da27
commit 61b26e4e35
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
2 changed files with 53 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/juce_audio_processors/format_types/juce_VST3Common.h
View file

@ -703,7 +703,8 @@ private:
auto** busPtr = getAudioBusPointer (detail::Tag<FloatType>{}, *it);
const auto anyChannelIsNull = std::any_of (busPtr, busPtr + it->numChannels, [] (auto* ptr) { return ptr == nullptr; });
if (anyChannelIsNull || ((int) mapIterator->size() != it->numChannels))
// Null channels are allowed if the bus is inactive
if ((mapIterator->isActive() && anyChannelIsNull) || ((int) mapIterator->size() != it->numChannels))
return false;
}

51
modules/juce_audio_processors/format_types/juce_VST3PluginFormat_test.cpp
View file

@ -388,6 +388,57 @@ public:
expect (remapped.getReadPointer (17) == testBuffers.get (18));
}
beginTest ("Null pointers are allowed on inactive buses provided to clients");
{
ClientBufferMapperData<float> remapper;
remapper.prepare (4, blockSize * 2);
const std::vector<ChannelMapping> emptyBuses;
const std::vector<ChannelMapping> stereoBus { ChannelMapping { AudioChannelSet::stereo() } };
const Config config { { ChannelMapping { AudioChannelSet::stereo() },
ChannelMapping { AudioChannelSet::quadraphonic(), false },
ChannelMapping { AudioChannelSet::stereo() } },
{ ChannelMapping { AudioChannelSet::quadraphonic() },
ChannelMapping { AudioChannelSet::stereo(), false },
ChannelMapping { AudioChannelSet::quadraphonic() } } };
TestBuffers testBuffers { blockSize };
// The host doesn't need to provide trailing buses that are inactive
auto ins = MultiBusBuffers{}.withBus (testBuffers, 2).withBus (testBuffers, 4).withBus (testBuffers, 2);
auto outs = MultiBusBuffers{}.withBus (testBuffers, 4).withBus (testBuffers, 2).withBus (testBuffers, 4);
auto data = makeProcessData (blockSize, ins, outs);
for (auto i = 0; i < 4; ++i)
data.inputs [1].channelBuffers32[i] = nullptr;
for (auto i = 0; i < 2; ++i)
data.outputs[1].channelBuffers32[i] = nullptr;
testBuffers.init();
const auto remapped = remapper.getMappedBuffer (data, config.ins, config.outs);
expect (remapped.getNumChannels() == 8);
expect (allMatch (remapped, 0, 1.0f));
expect (allMatch (remapped, 1, 2.0f));
// skip 4 inactive channels
expect (allMatch (remapped, 2, 7.0f));
expect (allMatch (remapped, 3, 8.0f));
expect (remapped.getReadPointer (0) == testBuffers.get ( 8));
expect (remapped.getReadPointer (1) == testBuffers.get ( 9));
expect (remapped.getReadPointer (2) == testBuffers.get (10));
expect (remapped.getReadPointer (3) == testBuffers.get (11));
// skip 2 inactive channels
expect (remapped.getReadPointer (4) == testBuffers.get (14));
expect (remapped.getReadPointer (5) == testBuffers.get (15));
expect (remapped.getReadPointer (6) == testBuffers.get (16));
expect (remapped.getReadPointer (7) == testBuffers.get (17));
}
beginTest ("HostBufferMapper reorders channels correctly");
{
HostBufferMapper mapper;