aleleba/soundcraft
1
0
Fork 0
mirror of https://github.com/storytold/soundcraft.git synced 2026-10-24 02:26:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1009 from storytold/fix/996-followup

Browse Source 
audiosuite: saturating render budget, and a sharper budget test (follow-up to #996)
This commit is contained in:
Brandon Thomas
2026-10-24 01:03:54 -04:00
committed by GitHub
parent aa06d87410 7ae583895d
commit ef646cf626
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/cmd/audiosuite.rs
+4 -2
View File
@@ -148,7 +148,9 @@ fn generate(e: &mut Engine, p: &Value, name: &str, params: &[(String, f32)], r:
// Each track keeps its generated buffer for the life of the command (and undo holds it), so // Each track keeps its generated buffer for the life of the command (and undo holds it), so
// cap the total samples generated across tracks, not just each one. // cap the total samples generated across tracks, not just each one.
let frames = usize::try_from(r.len()).unwrap_or(0).min(crate::io::render_limit(channels)); let frames = usize::try_from(r.len()).unwrap_or(0).min(crate::io::render_limit(channels));
budget = budget.checked_sub(frames * channels).ok_or_else(|| bad("audiosuite.process", "too much audio to generate in one command"))?; budget = budget
.checked_sub(frames.saturating_mul(channels))
.ok_or_else(|| bad("audiosuite.process", "too much audio to generate in one command"))?;
} }
let mut clips = Vec::new(); let mut clips = Vec::new();
for track in tracks { for track in tracks {
@@ -299,7 +301,7 @@ mod tests {
"audiosuite.process", "audiosuite.process",
&serde_json::json!({"process": "signal_generator", "tracks": [t[0], t[1]], "params": {"freq": 440.0}, "start": 0, "end": len}), &serde_json::json!({"process": "signal_generator", "tracks": [t[0], t[1]], "params": {"freq": 440.0}, "start": 0, "end": len}),
); );
let ok = matches!(out, Err(crate::EngineError::BadParams(_, ref m)) if m.contains("too long to generate") || m.contains("too much audio")); let ok = matches!(out, Err(crate::EngineError::BadParams(_, ref m)) if m.contains("too much audio"));
assert!(ok, "two tracks over budget, but got: {out:?}"); assert!(ok, "two tracks over budget, but got: {out:?}");
} }
} }