Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions rustortion-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ anyhow = "1.0"
rustfft = "6.4"
realfft = "3.5"
arc-swap = "1.8"
assert_no_alloc = { version = "1.1", features = ["warn_debug"] }

[dev-dependencies]
criterion = { version = "0.8", features = ["html_reports"] }
Expand Down
21 changes: 15 additions & 6 deletions rustortion-core/src/audio/engine.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use anyhow::Result;
use assert_no_alloc::permit_alloc;
use crossbeam::channel::{Receiver, Sender, bounded};
use log::{debug, error};

Expand Down Expand Up @@ -161,21 +162,27 @@ impl Engine {
}

if let Some(ref mut shifter) = self.pitch_shifter {
shifter.process_block(output);
// FIXME(no_alloc): PitchShifter::process_block uses Vec scratch
// buffers internally — see audio/pitch_shifter.rs.
Comment on lines +165 to +166
permit_alloc(|| shifter.process_block(output));
}

if let Some(ref mut cab) = self.ir_cabinet {
cab.process_block(output);
}

if let Some(ref mut peak_meter) = self.peak_meter {
peak_meter.process(output);
// FIXME(no_alloc): PeakMeter::process does Arc::new(PeakMeterInfo)
// every block — see audio/peak_meter.rs:62.
permit_alloc(|| peak_meter.process(output));
}

if !self.lightweight
&& let Some(recorder) = self.recorder.as_mut()
{
recorder.record_block(output)?;
// FIXME(no_alloc): Recorder::record_block does Vec::with_capacity
// per block — see audio/recorder.rs:47.
permit_alloc(|| recorder.record_block(output))?;
}

Ok(())
Expand Down Expand Up @@ -293,7 +300,7 @@ impl Engine {
if let Some(ref mut cab) = self.ir_cabinet {
debug!("IR convolver swapped: {}", prepared.name);
let old = cab.swap_convolver(prepared.convolver);
self.rt_drop.retire(Box::new(old));
permit_alloc(|| self.rt_drop.retire(Box::new(old)));
}
}
EngineMessage::ClearIr => {
Expand Down Expand Up @@ -330,7 +337,7 @@ impl Engine {
}
EngineMessage::SetSamplers(new_samplers) => {
let old = std::mem::replace(&mut self.samplers, *new_samplers);
self.rt_drop.retire(Box::new(old));
permit_alloc(|| self.rt_drop.retire(Box::new(old)));
debug!("Samplers swapped");
}
}
Expand Down Expand Up @@ -371,7 +378,9 @@ impl Engine {
shifter.set_semitones(semitones as f32);
debug!("Pitch shift set to {semitones} semitones");
} else {
self.pitch_shifter = Some(PitchShifter::new(semitones as f32));
// FIXME(no_alloc): PitchShifter::new allocates FFT scratch buffers
// — see audio/pitch_shifter.rs.
self.pitch_shifter = Some(permit_alloc(|| PitchShifter::new(semitones as f32)));
debug!("Pitch shift set to {semitones} semitones");
}
}
Expand Down
Loading