alex/nih-plug
1
0
Fork 0
Code Activity

Fix main IO for plugins with aux but no main IO

Browse source 
This would otherwise check and interact with the wrong buffers.
This commit is contained in:
Robbert van der Helm 2023-02-26 00:58:16 +01:00
parent 2580953b87
commit 20ad19fdc5
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/wrapper/clap/wrapper.rs
View file

@ -1928,14 +1928,10 @@ impl<P: ClapPlugin> Wrapper<P> {
// Before doing anything, clear out any auxiliary outputs since they may contain // Before doing anything, clear out any auxiliary outputs since they may contain
// uninitialized data when the host assumes that we'll always write something there // uninitialized data when the host assumes that we'll always write something there
let current_audio_io_layout = wrapper.current_audio_io_layout.load(); let current_audio_io_layout = wrapper.current_audio_io_layout.load();
let (aux_input_start_idx, aux_output_start_idx) = {
let has_main_input = current_audio_io_layout.main_input_channels.is_some(); let has_main_input = current_audio_io_layout.main_input_channels.is_some();
let has_main_output = current_audio_io_layout.main_output_channels.is_some(); let has_main_output = current_audio_io_layout.main_output_channels.is_some();
( let aux_input_start_idx = if has_main_input { 1 } else { 0 };
if has_main_input { 1 } else { 0 }, let aux_output_start_idx = if has_main_output { 1 } else { 0 };
if has_main_output { 1 } else { 0 },
)
};
if process.audio_outputs_count > 0 && !process.audio_outputs.is_null() { if process.audio_outputs_count > 0 && !process.audio_outputs.is_null() {
for output_idx in aux_output_start_idx..process.audio_outputs_count as usize { for output_idx in aux_output_start_idx..process.audio_outputs_count as usize {
let host_output = process.audio_outputs.add(output_idx); let host_output = process.audio_outputs.add(output_idx);
@ -2034,6 +2030,7 @@ impl<P: ClapPlugin> Wrapper<P> {
&& !process.audio_outputs.is_null() && !process.audio_outputs.is_null()
&& !(*process.audio_outputs).data32.is_null() && !(*process.audio_outputs).data32.is_null()
&& !output_slices.is_empty() && !output_slices.is_empty()
&& has_main_output
{ {
let audio_outputs = &*process.audio_outputs; let audio_outputs = &*process.audio_outputs;
let num_output_channels = audio_outputs.channel_count as usize; let num_output_channels = audio_outputs.channel_count as usize;
@ -2073,6 +2070,8 @@ impl<P: ClapPlugin> Wrapper<P> {
&& process.audio_inputs_count > 0 && process.audio_inputs_count > 0
&& !process.audio_inputs.is_null() && !process.audio_inputs.is_null()
&& !(*process.audio_inputs).data32.is_null() && !(*process.audio_inputs).data32.is_null()
&& has_main_input
&& has_main_output
{ {
// We currently don't support sidechain inputs // We currently don't support sidechain inputs
let audio_outputs = &*process.audio_outputs; let audio_outputs = &*process.audio_outputs;

9
src/wrapper/vst3/wrapper.rs
View file

@ -1025,6 +1025,7 @@ impl<P: Vst3Plugin> IAudioProcessor for Wrapper<P> {
// uninitialized data when the host assumes that we'll always write something there // uninitialized data when the host assumes that we'll always write something there
let current_audio_io_layout = self.inner.current_audio_io_layout.load(); let current_audio_io_layout = self.inner.current_audio_io_layout.load();
let has_main_input = current_audio_io_layout.main_input_channels.is_some(); let has_main_input = current_audio_io_layout.main_input_channels.is_some();
let has_main_output = current_audio_io_layout.main_output_channels.is_some();
if !data.outputs.is_null() { if !data.outputs.is_null() {
// HACK: Bitwig requires VST3 plugins to always have a main output. We'll however // HACK: Bitwig requires VST3 plugins to always have a main output. We'll however
// still use this variable here to maintain consistency between the backends. // still use this variable here to maintain consistency between the backends.
@ -1300,7 +1301,7 @@ impl<P: Vst3Plugin> IAudioProcessor for Wrapper<P> {
// Buffers for zero-channel plugins like note effects should always be allowed // Buffers for zero-channel plugins like note effects should always be allowed
buffer_is_valid = output_slices.is_empty(); buffer_is_valid = output_slices.is_empty();
if !data.outputs.is_null() { if !data.outputs.is_null() && has_main_output {
let num_output_channels = (*data.outputs).num_channels as usize; let num_output_channels = (*data.outputs).num_channels as usize;
// This ensures that we never feed dangling slices to the wrapped plugin // This ensures that we never feed dangling slices to the wrapped plugin
buffer_is_valid = num_output_channels == output_slices.len(); buffer_is_valid = num_output_channels == output_slices.len();
@ -1334,7 +1335,11 @@ impl<P: Vst3Plugin> IAudioProcessor for Wrapper<P> {
// Some hosts process data in place, in which case we don't need to do any copying // Some hosts process data in place, in which case we don't need to do any copying
// ourselves. If the pointers do not alias, then we'll do the copy here and then the // ourselves. If the pointers do not alias, then we'll do the copy here and then the
// plugin can just do normal in place processing. // plugin can just do normal in place processing.
if !data.outputs.is_null() && !data.inputs.is_null() { if !data.outputs.is_null()
&& !data.inputs.is_null()
&& has_main_input
&& has_main_output
{
let num_output_channels = (*data.outputs).num_channels as usize; let num_output_channels = (*data.outputs).num_channels as usize;
let num_input_channels = (*data.inputs).num_channels as usize; let num_input_channels = (*data.inputs).num_channels as usize;
nih_debug_assert!( nih_debug_assert!(