EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Scale the timeline waveform by the layer's Audio Levels (#974)
MarekSpodBiedry25be439a0b11
diff --git a/crates/render/src/audio.rs b/crates/render/src/audio.rsindex d221ac596..4f2ffc52e 100644--- a/crates/render/src/audio.rs+++ b/crates/render/src/audio.rs@@ -74,7 +74,8 @@ pub fn audible(project: &Project, l: &Layer) -> bool {})}-fn db_to_gain(db: f64) -> f32 {+/// Linear gain of an Audio Levels value in dB; -96 dB and below is silence.+pub fn db_to_gain(db: f64) -> f32 {if db <= -96.0 { 0.0 } else { 10f64.powf(db / 20.0) as f32 }}diff --git a/crates/ui-egui/src/panels/waveform.rs b/crates/ui-egui/src/panels/waveform.rsindex ab3fbd790..6fc42ed3f 100644--- a/crates/ui-egui/src/panels/waveform.rs+++ b/crates/ui-egui/src/panels/waveform.rs@@ -7,7 +7,8 @@use std::collections::HashMap;use std::sync::{Arc, Mutex};-use effectcraft_engine::project::{ItemId, ItemKind, Layer, LayerSource, Project};+use effectcraft_engine::project::{ItemId, ItemKind, Layer, LayerSource, Project, Property};+use effectcraft_engine::render::audio::db_to_gain;use effectcraft_engine::time::Tick;use egui::{Color32, Painter, Rect, Stroke, pos2};@@ -75,6 +76,17 @@ pub fn summary(app: &EffectcraftApp, ctx: &egui::Context, item: ItemId) -> OptioNone}+/// Left/right gain of the layer's Audio Levels (dB) at comp time `t`; unity without the property.+fn level_gains(levels: Option<&Property>, t: Tick) -> [f32; 2] {+ match levels {+ Some(p) => {+ let [l, r] = p.value_at(t).as_vec2();+ [db_to_gain(l), db_to_gain(r)]+ }+ None => [1.0, 1.0],+ }+}+/// Draw `layer`'s waveform in `rect` (left channel above right), columns mapped through the/// timeline's time map and the layer's time mapping, limited to its [in, out) span.pub(crate) fn draw(p: &Painter, rect: Rect, tm: &TMap, layer: &Layer, s: &Summary, color: Color32) {@@ -83,6 +95,7 @@ pub(crate) fn draw(p: &Painter, rect: Rect, tm: &TMap, layer: &Layer, s: &Summarlet x0 = tm.x(layer.in_point.seconds()).max(rect.min.x).floor() as i32;let x1 = tm.x(layer.out_point.seconds()).min(rect.max.x).ceil() as i32;let n = s.peaks.len() as i64;+ let levels = layer.props.sub("audio").and_then(|g| g.get("levels"));for c in 0..2 {p.line_segment([pos2(x0 as f32, mid[c]), pos2(x1 as f32, mid[c])], Stroke::new(1.0, color.gamma_multiply(0.5)));}@@ -101,10 +114,26 @@ pub(crate) fn draw(p: &Painter, rect: Rect, tm: &TMap, layer: &Layer, s: &Summaragg[2] = agg[2].min(b[2]);agg[3] = agg[3].max(b[3]);}+ let gain = level_gains(levels, Tick::from_seconds_f64((ta + tb) * 0.5));for c in 0..2 {- let (lo, hi) = (agg[c * 2].clamp(-1.0, 1.0), agg[c * 2 + 1].clamp(-1.0, 1.0));+ let (lo, hi) = ((agg[c * 2] * gain[c]).clamp(-1.0, 1.0), (agg[c * 2 + 1] * gain[c]).clamp(-1.0, 1.0));let (ya, yb) = (mid[c] - hi * half, mid[c] - lo * half);p.line_segment([pos2(x as f32 + 0.5, ya), pos2(x as f32 + 0.5, yb.max(ya + 1.0))], Stroke::new(1.0, color));}}}++#[cfg(test)]+mod tests {+ use super::*;+ use effectcraft_engine::project::Value;++ #[test]+ fn waveform_follows_audio_levels() {+ let p = Property::new(1, "levels", "Audio Levels", Value::Vec2([-6.0206, -96.0]));+ let g = level_gains(Some(&p), Tick::ZERO);+ assert!((g[0] - 0.5).abs() < 1e-3, "{}", g[0]);+ assert_eq!(g[1], 0.0);+ assert_eq!(level_gains(None, Tick::ZERO), [1.0, 1.0]);+ }+}