vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-08 12:30:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change audio SHM buffer offsets to be in bytes

Browse Source 
CLAP allows mixed precision ports. For instance, the main IO ports can
be 32-bit only, while some CV ports allow 64-bit audio. The plugin only
knows the sample format it receives when the process call happens, so
we'll always need to allocate enough space for that to work.
This commit is contained in:
Robbert van der Helm
2022-09-15 17:33:48 +02:00
parent cead56c9aa
commit 7f07d5f29f
3 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/audio-shm.h
+18 -13
View File
@@ -75,17 +75,22 @@ class AudioShmBuffer {
uint32_t size;
/**
* Offsets **in samples** within the shared memory object for an input
* Offsets **in bytes** within the shared memory object for an input
* audio channel, indexed by `[bus][channel]`. For VST2 plugins the bus
* will always be 0. This can be used later to retrieve a pointer to the
* audio channel.
*
* The offsets are in bytes rather than in samples to accommodate mixed
* 32-bit and 64-bit IO. This is allowed in CLAP. If a port can do
* either 32-bit or 64-bit audio, we'll reserve enough space for 64-bit
* samples and then just not use the latter half if the host ends up
* using 32-bit samples.
*/
std::vector<std::vector<uint32_t>> input_offsets;
/**
* Offsets **in samples** within the shared memory object for an output
* audio channel, indexed by `[bus][channel]`. For VST2 plugins the bus
* will always be 0. This can be used later to retrieve a pointer to the
* audio channel.
* Offsets **in bytes** within the shared memory object for an output
* audio channel, indexed by `[bus][channel]`. See `input_offsets` for
* more details.
*/
std::vector<std::vector<uint32_t>> output_offsets;
@@ -151,16 +156,16 @@ class AudioShmBuffer {
template <typename T>
// NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
T* input_channel_ptr(const uint32_t bus, const uint32_t channel) noexcept {
return reinterpret_cast<T*>(shm_bytes_) +
config_.input_offsets[bus][channel];
return reinterpret_cast<T*>(shm_bytes_ +
config_.input_offsets[bus][channel]);
}
template <typename T>
// NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
const T* input_channel_ptr(const uint32_t bus,
const uint32_t channel) const noexcept {
return reinterpret_cast<const T*>(shm_bytes_) +
config_.input_offsets[bus][channel];
return reinterpret_cast<const T*>(shm_bytes_ +
config_.input_offsets[bus][channel]);
}
/**
@@ -171,16 +176,16 @@ class AudioShmBuffer {
template <typename T>
// NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
T* output_channel_ptr(const uint32_t bus, const uint32_t channel) noexcept {
return reinterpret_cast<T*>(shm_bytes_) +
config_.output_offsets[bus][channel];
return reinterpret_cast<T*>(shm_bytes_ +
config_.output_offsets[bus][channel]);
}
template <typename T>
// NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
const T* output_channel_ptr(const uint32_t bus,
const uint32_t channel) const noexcept {
return reinterpret_cast<const T*>(shm_bytes_) +
config_.output_offsets[bus][channel];
return reinterpret_cast<const T*>(shm_bytes_ +
config_.output_offsets[bus][channel]);
}
Config config_;