From 26dc7b3a5e6a40e13c83665dffaf5fc41aedf7bf Mon Sep 17 00:00:00 2001 From: vangel76 Date: Sat, 7 Nov 2026 12:40:04 +0100 Subject: [PATCH 01/25] CC Ball Action: add Coloring, Shading, Scatter Motion, Displace and Displace Property (#3197) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After Effects 24.2 reworked CC Ball Action's controls. EffectCraft now lists them in After Effects' order with its defaults: Grid Spacing (5), Ball Size (100), Coloring (Medium), Shading (-75), Scatter, Scatter Motion, Displace, Displace Property (Brightness), Twist Angle, Twist Property, Rotation Axis, Rotation. Grid Spacing and Ball Size used to default to 4 and 40; saved projects keep their values. - Shading scales the balls' light and shine. -75 is the lit sphere as before, 0 draws flat balls in the layer's colour, larger magnitudes shade more, and the sign mirrors the light's direction. The value is clamped to -100..100 (an assumed range) so huge values stay finite on the GPU. Values other than -75 and 0 use a new sprite shape (Shape::Ball), drawn the same way on the CPU and the GPU. - Coloring is an approximation: Crisp takes the nearest pixel, Medium keeps EffectCraft's earlier smooth sample (for compatibility), Smooth averages 16 samples over the ball's cell. - Scatter Motion is treated as the renamed Instability State, since 24.2 shows no Instability State. Old projects are upgraded through PARAM_ID_ALIASES. - Displace and Displace Property (Red, Green, Blue, Brightness, Saturation, RGB, Radius, Diamond, Spherize) move each ball towards or away from the camera. The scale, direction, pivot and range, and what Radius, Diamond and Spherize compute, are EffectCraft's own choice pending a comparison with After Effects. Displace is clamped to -1000..1000. With the old Grid Spacing and Ball Size, every CC Ball Action golden hash is unchanged, so the new controls at their defaults draw what was drawn before. Only the golden cases that use the default Grid Spacing and Ball Size were reblessed. CC Ball Action has no .aep mapping yet. Sources (behaviour and public descriptions only): - After Effects February 2024 (24.2) feature summary: "Ball Action: Rearranged effect controls with new controls, such as Displacement, Shading, and Coloring" https://helpx.adobe.com/ae_en/after-effects/using/whats-new/2024-2.html - The After Effects screenshot in #3197: control order and defaults. - 163.com, "Ae 效果详解:CC Ball Action": option lists, defaults, and that Shading 0 is flat https://www.163.com/dy/article/JOICG6E10536FE6V.html - Adobe community, "CC Ball Action is broken in update 24.4": the Coloring options Crisp, Medium and Smooth - Mike Murphy, "How To Use CC Ball Action": Shading 0 with Displace on Brightness https://mikemurphy.ai/tutorials/ccballaction/ Fixes #3197 --- crates/effects/src/migrate.rs | 3 + crates/effects/src/sim/sprites.rs | 22 ++++ crates/effects/src/sim2/pixels.rs | 118 +++++++++++++++++- crates/effects/src/sim2/registry.rs | 21 +++- crates/effects/src/sim2/tests.rs | 132 +++++++++++++++++++++ crates/effects/tests/it/particle_golden.rs | 42 +++---- crates/gpu/src/fx_sim.rs | 2 + crates/gpu/src/shaders/fx_sim.wgsl | 21 ++++ crates/gpu/src/tests/fx_particles.rs | 17 ++- docs/effects.md | 4 +- 10 files changed, 347 insertions(+), 35 deletions(-) diff --git a/crates/effects/src/migrate.rs b/crates/effects/src/migrate.rs index 59daca49d..6529e658d 100644 --- a/crates/effects/src/migrate.rs +++ b/crates/effects/src/migrate.rs @@ -44,6 +44,9 @@ pub const PARAM_ID_ALIASES: &[(&str, &str, &str)] = &[ ("ec.key.innerouter", "additionalBackground", "additionalBackground/background1"), // Generate: Radio Waves' growth speed was called Velocity; Velocity now moves the wave. ("ec.generate.radiowaves", "velocity", "waveMotion/expansion"), + // Simulation: CC Ball Action's Instability State is treated as the control After Effects + // 24.2 calls Scatter Motion (#3197; an assumption: 24.2 shows no Instability State). + ("ec.sim.ccballaction", "instabilityState", "scatterMotion"), ]; /// Popup option labels renamed since they were first saved: diff --git a/crates/effects/src/sim/sprites.rs b/crates/effects/src/sim/sprites.rs index 55ba594b4..031bee978 100644 --- a/crates/effects/src/sim/sprites.rs +++ b/crates/effects/src/sim/sprites.rs @@ -93,6 +93,10 @@ pub enum Shape { Disc, /// Lit sphere (upper-left light, specular). Sphere, + /// CC Ball Action's ball: [`Shape::Sphere`]'s light and shine scaled by `|shade|` (1 is the + /// sphere's look, 0 a flat disc; callers keep it finite, the GPU draws the same); a negative + /// `shade` mirrors the light's direction (lit from the lower right). + Ball { shade: f32 }, /// Disc fading linearly to its rim. Faded, /// Thin ring with a highlight. @@ -277,6 +281,24 @@ fn sprite_shade(s: &Sprite, x: f32, y: f32) -> Option { rgb = [rgb[0] * k + spec, rgb[1] * k + spec, rgb[2] * k + spec]; cv } + Shape::Ball { shade } => { + let d = (dx * dx + dy * dy).sqrt(); + let cv = aa(r - d); + if cv <= 0.0 { + return None; + } + let (nx, ny) = (dx / r, dy / r); + let nz = (1.0 - nx * nx - ny * ny).max(0.0).sqrt(); + let m = if shade < 0.0 { -1.0 } else { 1.0 }; + let (lx, ly, lz) = (-0.48 * m, -0.58 * m, 0.66); + let diff = (nx * lx + ny * ly + nz * lz).max(0.0); + let rz = 2.0 * diff * nz - lz; + let st = shade.abs(); + let spec = rz.max(0.0).powi(20) * 0.6 * st; + let k = (1.0 - st * 0.8 * (1.0 - diff)).max(0.0); + rgb = [rgb[0] * k + spec, rgb[1] * k + spec, rgb[2] * k + spec]; + cv + } Shape::Bubble => { let d = (dx * dx + dy * dy).sqrt() / r; if d > 1.0 + 1.0 / r { diff --git a/crates/effects/src/sim2/pixels.rs b/crates/effects/src/sim2/pixels.rs index 2cda428db..4fed8da59 100644 --- a/crates/effects/src/sim2/pixels.rs +++ b/crates/effects/src/sim2/pixels.rs @@ -4,10 +4,91 @@ use super::{Acc, Buf, EffectCtx, IntoParallelIterator, ParallelIterator, Post, S // ------------------------------------------------------------------ CC Ball Action +/// CC Ball Action's Coloring: how a ball takes its colour from the layer under its grid cell. +/// An approximation: After Effects' own meaning is not published beyond "how smooth the +/// balls look". Crisp takes the nearest pixel, Medium keeps EffectCraft's earlier smooth +/// sample at the cell centre (for compatibility), Smooth averages 16 samples over the cell. +pub(super) const BALL_COLORING: &[&str] = &["Crisp", "Medium", "Smooth"]; +pub(super) const BALL_COLORING_MEDIUM: u32 = 1; +/// CC Ball Action's default Shading: the lit sphere (`Shape::Sphere`); 0 draws flat discs. +pub(super) const BALL_SHADING_DEFAULT: f64 = -75.0; +/// CC Ball Action's Displace Property: what pushes a ball towards (high values) or away from +/// (low values) the camera. The option names come from public descriptions; what Radius, +/// Diamond and Spherize compute here is an assumption pending a comparison with After Effects. +pub(super) const BALL_DISPLACE_PROPERTIES: &[&str] = &["Red", "Green", "Blue", "Brightness", "Saturation", "RGB", "Radius", "Diamond", "Spherize"]; +pub(super) const BALL_DISPLACE_BRIGHTNESS: u32 = 3; + pub(super) fn ball_action(ctx: &EffectCtx, b: Buf) -> Buf { ball_action_plan(ctx, &b).finish(b) } +/// A parameter's number, or `default` when the instance does not carry it. +fn f_or(ctx: &EffectCtx, id: &str, default: f64) -> f64 { + ctx.params.values.get(id).map(|v| v.as_f64()).unwrap_or(default) +} + +/// The layer's straight colour and alpha for the ball of the grid cell centred on (`sx`, `sy`) +/// (buffer pixels, cell `cell` buffer pixels wide), by Coloring `coloring`. +fn ball_color(src: &effectcraft_raster::Image, sx: f64, sy: f64, cell: f64, coloring: u32) -> ([f32; 3], f32) { + match coloring { + // Crisp: the pixel under the cell centre. + 0 => unpremul(src.get(sx.floor() as i64, sy.floor() as i64)), + // Smooth: the cell's average (4 × 4 samples, premultiplied). + 2 => { + const N: u32 = 4; + let mut acc = [0.0f32; 4]; + for j in 0..N { + for i in 0..N { + let ox = (f64::from(i) + 0.5) / f64::from(N) - 0.5; + let oy = (f64::from(j) + 0.5) / f64::from(N) - 0.5; + let p = src.sample_bilinear(sx + ox * cell, sy + oy * cell); + for (a, v) in acc.iter_mut().zip(p) { + *a += v; + } + } + } + let n = (N * N) as f32; + unpremul([acc[0] / n, acc[1] / n, acc[2] / n, acc[3] / n]) + } + // Medium: a smooth sample at the cell centre. + _ => unpremul(src.sample_bilinear(sx, sy)), + } +} + +/// CC Ball Action's Displace Property `prop` (0..1) for a ball of straight colour `c` at +/// (`gx`, `gy`) on a `lw` × `lh` layer (`maxr`: half its diagonal). Assumed meanings (not +/// compared with After Effects yet): Radius, Diamond and Spherize are shapes that peak at the +/// layer centre. +fn ball_displace_value(prop: u32, c: [f32; 3], gx: f32, gy: f32, lw: f32, lh: f32, maxr: f32) -> f32 { + let (cx, cy) = (lw * 0.5, lh * 0.5); + let v = match prop { + 0 => c[0], + 1 => c[1], + 2 => c[2], + // Brightness: the brightest channel (HSB brightness). + 3 => c[0].max(c[1]).max(c[2]), + // Saturation: HSB saturation. + 4 => { + let mx = c[0].max(c[1]).max(c[2]); + let mn = c[0].min(c[1]).min(c[2]); + if mx > 0.0 { (mx - mn) / mx } else { 0.0 } + } + // RGB: the channels' mean. + 5 => (c[0] + c[1] + c[2]) / 3.0, + // Radius: high at the centre, low at the corners. + 6 => 1.0 - (gx - cx).hypot(gy - cy) / maxr.max(1.0), + // Diamond: high at the centre, falling linearly to the edge midpoints' diamond. + 7 => 1.0 - ((gx - cx).abs() / cx.max(0.5) + (gy - cy).abs() / cy.max(0.5)) * 0.5, + // Spherize: a hemisphere over the largest centred circle. + _ => { + let rr = cx.min(cy).max(0.5); + let d = (gx - cx).hypot(gy - cy) / rr; + (1.0 - d * d).max(0.0).sqrt() + } + }; + if v.is_finite() { v.clamp(0.0, 1.0) } else { 0.0 } +} + /// CC Ball Action's balls (far to near), coloured by the layer's pixels. fn ball_action_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan { let pr = ctx.params; @@ -18,7 +99,29 @@ fn ball_action_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan { let twist = pr.f("twistAngle").to_radians(); let spacing = pr.f("gridSpacing").max(1.0) as f32; let size = pr.f("ballSize") as f32 / 100.0; - let instab = pr.f("instabilityState").to_radians() as f32; + // Scatter Motion, treated as the renamed Instability State (an assumption: After Effects + // 24.2 shows Scatter Motion and no Instability State): turns each ball's scatter direction. + let instab = pr.f("scatterMotion").to_radians() as f32; + let coloring = pr.values.get("coloring").map(|v| v.as_enum()).unwrap_or(BALL_COLORING_MEDIUM); + let shading = f_or(ctx, "shading", BALL_SHADING_DEFAULT); + // Shading: -75 is the lit sphere as it always was, 0 flat discs; the magnitude scales the + // light and shine (strength 1 at 75) and the sign mirrors the light's direction (positive + // lights the balls from the lower right). How this compares with After Effects' sign + // (described as concave versus convex) is unverified, as is the -100..100 range. + let shape = if shading == BALL_SHADING_DEFAULT || !shading.is_finite() { + Shape::Sphere + } else if shading == 0.0 { + Shape::Disc + } else { + // Clamped: a huge value would reach the GPU as an infinite strength (and NaN colours). + Shape::Ball { shade: (-shading.clamp(-100.0, 100.0) / 75.0) as f32 } + }; + // Displace: pushes each ball along z by its Displace Property (high values towards the + // camera, pivoting at the property's middle value); 100 moves the extremes by half the + // layer's diagonal. Scale, direction, pivot and range are EffectCraft's own choice, + // pending a comparison with After Effects. Clamped so huge values stay finite. + let displace = pr.f("displace").clamp(-1000.0, 1000.0) as f32; + let displace_prop = pr.values.get("displaceProperty").map(|v| v.as_enum()).unwrap_or(BALL_DISPLACE_BRIGHTNESS); let seed = ctx.seed.wrapping_mul(0x2545f491); let (lw, lh) = (ctx.layer_size[0] as f32, ctx.layer_size[1] as f32); let s = b.scale as f32; @@ -43,7 +146,7 @@ fn ball_action_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan { let gx = (i % nx) as f32 * spacing + spacing * 0.5; let gy = (i / nx) as f32 * spacing + spacing * 0.5; let (sx, sy) = b.to_px([gx as f64, gy as f64]); - let (c, a) = unpremul(src.sample_bilinear(sx, sy)); + let (c, a) = ball_color(src, sx, sy, f64::from(spacing * s), coloring); if a <= 0.0 || size <= 0.0 { return None; } @@ -54,11 +157,16 @@ fn ball_action_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan { _ => crate::util::rgb3([c[0], c[1], c[2], 0.0]).iter().sum::() / 3.0, } as f64; let ang = rot + twist * tp; - // Scatter: random 3D offsets whose direction drifts with the instability state. + // Scatter: random 3D offsets whose direction drifts with Scatter Motion. let ph = h(i, 1, seed) * std::f32::consts::TAU + instab; let sc = scatter * h(i, 2, seed); let off = [(sc * ph.cos()) as f64, (sc * ph.sin()) as f64, (scatter * hs(i, 3, seed)) as f64]; - let p0 = [gx as f64 - cx + off[0], gy as f64 - cy + off[1], off[2]]; + let mut p0 = [gx as f64 - cx + off[0], gy as f64 - cy + off[1], off[2]]; + // Only when set, so Displace 0 leaves every depth (and the far-to-near order) as is. + if displace != 0.0 && displace.is_finite() { + let v = ball_displace_value(displace_prop, c, gx, gy, lw, lh, maxr); + p0[2] -= f64::from(displace / 100.0 * (v - 0.5) * 2.0 * maxr); + } let m = rot_axis(ax, ang); let q: [f64; 3] = std::array::from_fn(|k| m[k][0] * p0[0] + m[k][1] * p0[1] + m[k][2] * p0[2]); if d + q[2] <= d * 0.05 { @@ -67,7 +175,7 @@ fn ball_action_plan(ctx: &EffectCtx, b: &Buf) -> SpritePlan { let persp = d / (d + q[2]); let (bx, by) = b.to_px([cx + q[0] * persp, cy + q[1] * persp]); let r = spacing * 0.5 * size * persp as f32 * s; - Some((q[2], Sprite::new(bx as f32, by as f32, r, [c[0], c[1], c[2], a], Shape::Sphere))) + Some((q[2], Sprite::new(bx as f32, by as f32, r, [c[0], c[1], c[2], a], shape))) }) .collect(); balls.sort_by(|a, b| b.0.total_cmp(&a.0)); diff --git a/crates/effects/src/sim2/registry.rs b/crates/effects/src/sim2/registry.rs index 333916a16..28eb8e808 100644 --- a/crates/effects/src/sim2/registry.rs +++ b/crates/effects/src/sim2/registry.rs @@ -1,5 +1,7 @@ use super::foam::{FOAM_TEXTURES, foam}; -use super::pixels::{ball_action, pixel_polly, scatterize}; +use super::pixels::{ + BALL_COLORING, BALL_COLORING_MEDIUM, BALL_DISPLACE_BRIGHTNESS, BALL_DISPLACE_PROPERTIES, BALL_SHADING_DEFAULT, ball_action, pixel_polly, scatterize, +}; use super::shatter::{CD_PROPS, CD_SOURCES, SHATTER_PATTERNS, SHATTER_TEXTURE_MODES, card_dance, shatter}; use super::surfaces::{caustics, wave_world}; use super::{EffectSpec, ParamUi, Value, col, num, p, pct, popup, pt, slider, spec}; @@ -80,15 +82,22 @@ pub fn specs() -> Vec { spec( "ec.sim.ccballaction", "CC Ball Action", + // After Effects' order and defaults since 24.2 (#3197). Scatter Motion is treated as + // the renamed Instability State (an assumption, `migrate::PARAM_ID_ALIASES`). The + // Shading range is not published; -100..100 is an assumption. vec![ + p("gridSpacing", "Grid Spacing", num(5.0), slider(1.0, 200.0, 1.0, 50.0, 0)), + p("ballSize", "Ball Size", num(100.0), slider(0.0, 400.0, 0.0, 200.0, 1)), + p("coloring", "Coloring", Value::Enum(BALL_COLORING_MEDIUM), popup(BALL_COLORING)), + p("shading", "Shading", num(BALL_SHADING_DEFAULT), slider(-100.0, 100.0, -100.0, 100.0, 1)), p("scatter", "Scatter", num(0.0), slider(0.0, 2000.0, 0.0, 300.0, 1)), + p("scatterMotion", "Scatter Motion", num(0.0), ParamUi::Angle), + p("displace", "Displace", num(0.0), slider(-1000.0, 1000.0, 0.0, 100.0, 1)), + p("displaceProperty", "Displace Property", Value::Enum(BALL_DISPLACE_BRIGHTNESS), popup(BALL_DISPLACE_PROPERTIES)), + p("twistAngle", "Twist Angle", num(0.0), ParamUi::Angle), + p("twistProperty", "Twist Property", Value::Enum(0), popup(&["X Axis", "Y Axis", "Radius", "Brightness"])), p("rotationAxis", "Rotation Axis", Value::Enum(0), popup(&["X Axis", "Y Axis", "Z Axis", "XY Axis", "XZ Axis", "YZ Axis", "XYZ Axis"])), p("rotation", "Rotation", num(0.0), ParamUi::Angle), - p("twistProperty", "Twist Property", Value::Enum(0), popup(&["X Axis", "Y Axis", "Radius", "Brightness"])), - p("twistAngle", "Twist Angle", num(0.0), ParamUi::Angle), - p("gridSpacing", "Grid Spacing", num(4.0), slider(1.0, 200.0, 1.0, 50.0, 0)), - p("ballSize", "Ball Size", num(40.0), slider(0.0, 400.0, 0.0, 200.0, 1)), - p("instabilityState", "Instability State", num(0.0), ParamUi::Angle), ], ball_action, ), diff --git a/crates/effects/src/sim2/tests.rs b/crates/effects/src/sim2/tests.rs index 2ef35b122..6ad6eb21c 100644 --- a/crates/effects/src/sim2/tests.rs +++ b/crates/effects/src/sim2/tests.rs @@ -46,6 +46,138 @@ fn ball_action_draws_balls() { assert!(sum_diff(&a, &sc) > 1.0); } +/// #3197: CC Ball Action has After Effects' controls (since 24.2), in its order, with its +/// defaults: Coloring, Shading, Scatter Motion (formerly Instability State), Displace and +/// Displace Property were missing. +#[test] +fn ball_action_has_after_effects_controls() { + let spec = crate::find("ec.sim.ccballaction").unwrap(); + let names: Vec<&str> = spec.params.iter().map(|p| p.name).collect(); + assert_eq!( + names, + [ + "Grid Spacing", + "Ball Size", + "Coloring", + "Shading", + "Scatter", + "Scatter Motion", + "Displace", + "Displace Property", + "Twist Angle", + "Twist Property", + "Rotation Axis", + "Rotation" + ] + ); + let sp = |id: &str| spec.params.iter().find(|p| p.id == id).unwrap_or_else(|| panic!("no {id}")); + assert_eq!(sp("gridSpacing").default, num(5.0)); + assert_eq!(sp("ballSize").default, num(100.0)); + assert_eq!(sp("coloring").default, Value::Enum(1)); + assert_eq!(sp("coloring").ui, ParamUi::Popup { options: vec!["Crisp".into(), "Medium".into(), "Smooth".into()] }); + assert_eq!(sp("shading").default, num(-75.0)); + assert!(matches!(sp("shading").ui, ParamUi::Slider { min, max, .. } if min <= -100.0 && max >= 100.0)); + assert_eq!(sp("scatterMotion").default, num(0.0)); + assert_eq!(sp("scatterMotion").ui, ParamUi::Angle); + assert_eq!(sp("displace").default, num(0.0)); + let ParamUi::Popup { options } = &sp("displaceProperty").ui else { panic!("Displace Property is a popup") }; + let Value::Enum(d) = sp("displaceProperty").default else { panic!("Displace Property defaults to an option") }; + assert_eq!(options.get(d as usize).map(String::as_str), Some("Brightness")); + // Old projects' Instability State becomes Scatter Motion through `PARAM_ID_ALIASES`; the + // engine test `opening_an_old_project_upgrades_effect_instances` covers every alias. +} + +/// #3197: the new controls at After Effects' defaults draw exactly what CC Ball Action drew +/// before (the lit sphere, a smooth colour sample, no displacement). +#[test] +fn ball_action_new_controls_at_defaults_keep_the_render() { + let base = [("ballSize", num(80.0)), ("scatter", num(6.0)), ("rotationAxis", Value::Enum(1)), ("rotation", num(25.0))]; + let a = run("ec.sim.ccballaction", &base, ramp(32, 32), 0.0); + let mut explicit = base.to_vec(); + explicit.extend([ + ("coloring", Value::Enum(1)), + ("shading", num(-75.0)), + ("scatterMotion", num(0.0)), + ("displace", num(0.0)), + ("displaceProperty", Value::Enum(3)), + ]); + assert_eq!(a, run("ec.sim.ccballaction", &explicit, ramp(32, 32), 0.0)); +} + +/// #3197: Shading 0 removes the built-in light: every ball is the layer's flat colour. The +/// default (-75) shades it; a smaller magnitude shades less, a positive value lights the balls +/// from the other side. +#[test] +fn ball_action_shading_zero_is_flat() { + let c = [0.6, 0.3, 0.2, 1.0]; + let shade = |v: f64| run("ec.sim.ccballaction", &[("ballSize", num(100.0)), ("gridSpacing", num(8.0)), ("shading", num(v))], Image::filled(32, 32, c), 0.0); + let flat = shade(0.0); + let covered: Vec<&[f32; 4]> = flat.data.iter().filter(|p| p[3] > 0.999).collect(); + assert!(!covered.is_empty(), "balls drawn"); + for p in &covered { + for k in 0..3 { + assert!((p[k] / p[3] - c[k]).abs() < 1e-4, "flat colour: {p:?}"); + } + } + let lit = shade(-75.0); + assert!(lit.data.iter().any(|p| p[3] > 0.999 && (0..3).any(|k| (p[k] / p[3] - c[k]).abs() > 0.05)), "the default shading lights and darkens the balls"); + let soft = shade(-30.0); + assert!(sum_diff(&flat, &soft) > 0.1 && sum_diff(&flat, &soft) < sum_diff(&flat, &lit), "less shading, closer to flat"); + assert!(sum_diff(&shade(75.0), &lit) > 1.0, "the sign moves the light"); +} + +/// #3197: Coloring Crisp takes the pixel under each ball's cell centre; Medium samples +/// smoothly between pixels. Grid Spacing 4 puts the cell centres on pixel corners (with the +/// default 5 they fall on pixel centres, where Medium's sample equals Crisp's). +#[test] +fn ball_action_coloring_crisp_takes_the_pixel() { + let mut src = Image::new(32, 32); + for y in 0..32u32 { + for x in 0..32u32 { + src.set(x, y, [x as f32 / 32.0, y as f32 / 32.0, ((x * 7 + y * 3) % 5) as f32 / 4.0, 1.0]); + } + } + let col = |m: u32| { + let v = [("gridSpacing", num(4.0)), ("ballSize", num(100.0)), ("shading", num(0.0)), ("coloring", Value::Enum(m))]; + run("ec.sim.ccballaction", &v, src.clone(), 0.0) + }; + let crisp = col(0); + // Flat, opaque balls of radius 2 centred on (4i + 2, 4j + 2): the pixel to the lower right + // of each centre is fully covered by its ball alone. + for j in 0..8i64 { + for i in 0..8i64 { + let (x, y) = (4 * i + 2, 4 * j + 2); + let (got, want) = (crisp.get(x, y), src.get(x, y)); + assert!((0..4).all(|k| (got[k] - want[k]).abs() < 1e-5), "ball ({i}, {j}): {got:?} vs the pixel {want:?}"); + } + } + assert!(sum_diff(&crisp, &col(1)) > 1.0, "medium blends the pixels"); +} + +/// #3197: a huge Shading (typed or from an expression) is clamped, so the balls stay finite. +#[test] +fn ball_action_huge_shading_stays_finite() { + for v in [1e45, -1e45, f64::MAX] { + let o = run("ec.sim.ccballaction", &[("gridSpacing", num(8.0)), ("shading", num(v))], ramp(32, 32), 0.0); + assert!(o.data.iter().all(|p| p.iter().all(|c| c.is_finite())), "shading {v}"); + assert!(o.data.iter().any(|p| p[3] > 0.0), "shading {v}: balls drawn"); + } +} + +/// #3197: Displace pushes the balls along z by the chosen property (Radius: the centre comes +/// towards the camera and grows); 0 leaves them in the layer's plane. +#[test] +fn ball_action_displace_moves_balls_in_depth() { + let flat = run("ec.sim.ccballaction", &[("ballSize", num(80.0))], ramp(32, 32), 0.0); + let d = run("ec.sim.ccballaction", &[("ballSize", num(80.0)), ("displace", num(60.0)), ("displaceProperty", Value::Enum(6))], ramp(32, 32), 0.0); + assert_eq!(d, run("ec.sim.ccballaction", &[("ballSize", num(80.0)), ("displace", num(60.0)), ("displaceProperty", Value::Enum(6))], ramp(32, 32), 0.0)); + assert!(sum_diff(&flat, &d) > 1.0); + for prop in 0..9 { + let o = run("ec.sim.ccballaction", &[("ballSize", num(80.0)), ("displace", num(400.0)), ("displaceProperty", Value::Enum(prop))], ramp(32, 32), 0.0); + assert!(o.data.iter().all(|p| p.iter().all(|v| v.is_finite())), "property {prop}"); + } +} + #[test] fn pixel_polly_breaks_after_start() { let v = [("forceCenter", pt(16.0, 16.0)), ("gridSpacing", num(4.0))]; diff --git a/crates/effects/tests/it/particle_golden.rs b/crates/effects/tests/it/particle_golden.rs index 0dbf19d76..5d0b255b1 100644 --- a/crates/effects/tests/it/particle_golden.rs +++ b/crates/effects/tests/it/particle_golden.rs @@ -192,7 +192,7 @@ fn cases() -> Vec<(&'static str, Vec)> { vec![ vec![], vec![("scatter", n(20.0)), ("rotationAxis", e(6)), ("rotation", n(40.0)), ("twistProperty", e(3)), ("twistAngle", n(90.0))], - vec![("gridSpacing", n(2.0)), ("ballSize", n(80.0)), ("instabilityState", n(45.0)), ("twistProperty", e(2)), ("twistAngle", n(30.0))], + vec![("gridSpacing", n(2.0)), ("ballSize", n(80.0)), ("scatterMotion", n(45.0)), ("twistProperty", e(2)), ("twistAngle", n(30.0))], ], ), ( @@ -538,26 +538,26 @@ const GOLDEN: &[(&str, u64)] = &[ ("ec.sim.particleplayground/8/32bpc/t1.5", 0xb5b7f0281f26baad), ("ec.sim.particleplayground/8/32bpc/t0.8", 0x8b6934363ef4dcfd), ("ec.sim.particleplayground/8/32bpc/t2.2", 0x0a31c17e8e34b9f5), - ("ec.sim.ccballaction/0/8bpc/t0.5", 0x12698ec8353be38c), - ("ec.sim.ccballaction/0/8bpc/t1.5", 0x12698ec8353be38c), - ("ec.sim.ccballaction/0/8bpc/t0.8", 0x12698ec8353be38c), - ("ec.sim.ccballaction/0/8bpc/t2.2", 0x12698ec8353be38c), - ("ec.sim.ccballaction/0/32bpc/t0.5", 0x3fb733487e120261), - ("ec.sim.ccballaction/0/32bpc/t1.5", 0x3fb733487e120261), - ("ec.sim.ccballaction/0/32bpc/t0.8", 0x3fb733487e120261), - ("ec.sim.ccballaction/0/32bpc/t2.2", 0x3fb733487e120261), - ("ec.sim.ccballaction/0/8bpc/half/t0.5", 0x4946070917cc0945), - ("ec.sim.ccballaction/0/8bpc/half/t1.5", 0x4946070917cc0945), - ("ec.sim.ccballaction/0/8bpc/half/t0.8", 0x4946070917cc0945), - ("ec.sim.ccballaction/0/8bpc/half/t2.2", 0x4946070917cc0945), - ("ec.sim.ccballaction/1/8bpc/t0.5", 0xf34b3be38a4dd468), - ("ec.sim.ccballaction/1/8bpc/t1.5", 0xf34b3be38a4dd468), - ("ec.sim.ccballaction/1/8bpc/t0.8", 0xf34b3be38a4dd468), - ("ec.sim.ccballaction/1/8bpc/t2.2", 0xf34b3be38a4dd468), - ("ec.sim.ccballaction/1/32bpc/t0.5", 0x503b7238edf2912c), - ("ec.sim.ccballaction/1/32bpc/t1.5", 0x503b7238edf2912c), - ("ec.sim.ccballaction/1/32bpc/t0.8", 0x503b7238edf2912c), - ("ec.sim.ccballaction/1/32bpc/t2.2", 0x503b7238edf2912c), + ("ec.sim.ccballaction/0/8bpc/t0.5", 0x5f7401d3d1e5a513), + ("ec.sim.ccballaction/0/8bpc/t1.5", 0x5f7401d3d1e5a513), + ("ec.sim.ccballaction/0/8bpc/t0.8", 0x5f7401d3d1e5a513), + ("ec.sim.ccballaction/0/8bpc/t2.2", 0x5f7401d3d1e5a513), + ("ec.sim.ccballaction/0/32bpc/t0.5", 0x9cf15a7756ab88ed), + ("ec.sim.ccballaction/0/32bpc/t1.5", 0x9cf15a7756ab88ed), + ("ec.sim.ccballaction/0/32bpc/t0.8", 0x9cf15a7756ab88ed), + ("ec.sim.ccballaction/0/32bpc/t2.2", 0x9cf15a7756ab88ed), + ("ec.sim.ccballaction/0/8bpc/half/t0.5", 0xe2e3a624434f8e88), + ("ec.sim.ccballaction/0/8bpc/half/t1.5", 0xe2e3a624434f8e88), + ("ec.sim.ccballaction/0/8bpc/half/t0.8", 0xe2e3a624434f8e88), + ("ec.sim.ccballaction/0/8bpc/half/t2.2", 0xe2e3a624434f8e88), + ("ec.sim.ccballaction/1/8bpc/t0.5", 0x07382912d068a625), + ("ec.sim.ccballaction/1/8bpc/t1.5", 0x07382912d068a625), + ("ec.sim.ccballaction/1/8bpc/t0.8", 0x07382912d068a625), + ("ec.sim.ccballaction/1/8bpc/t2.2", 0x07382912d068a625), + ("ec.sim.ccballaction/1/32bpc/t0.5", 0xa1e843936e72815f), + ("ec.sim.ccballaction/1/32bpc/t1.5", 0xa1e843936e72815f), + ("ec.sim.ccballaction/1/32bpc/t0.8", 0xa1e843936e72815f), + ("ec.sim.ccballaction/1/32bpc/t2.2", 0xa1e843936e72815f), ("ec.sim.ccballaction/2/8bpc/t0.5", 0x0b6bf26753ee4582), ("ec.sim.ccballaction/2/8bpc/t1.5", 0x0b6bf26753ee4582), ("ec.sim.ccballaction/2/8bpc/t0.8", 0x0b6bf26753ee4582), diff --git a/crates/gpu/src/fx_sim.rs b/crates/gpu/src/fx_sim.rs index 944ca6c07..a3f0f7a0c 100644 --- a/crates/gpu/src/fx_sim.rs +++ b/crates/gpu/src/fx_sim.rs @@ -228,6 +228,8 @@ pub(crate) fn sprite_layer(e: &mut Enc, src: &GpuImage, plan: &SpritePlan) -> Op Shape::Square => (6.0, 0.0, 0.0), Shape::Tri => (7.0, 0.0, 0.0), Shape::Line { dx, dy } => (8.0, dx, dy), + // The strength rides in the (otherwise unused) first segment slot. + Shape::Ball { shade } => (9.0, shade, 0.0), }; let mut rec = [kind, s.x, s.y, s.r, s.c[0], s.c[1], s.c[2], s.c[3], s.rot, dx, dy, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]; match plan.tints.get(i).copied().unwrap_or(Tint::Fixed) { diff --git a/crates/gpu/src/shaders/fx_sim.wgsl b/crates/gpu/src/shaders/fx_sim.wgsl index 7deeac048..cf4a14a03 100644 --- a/crates/gpu/src/shaders/fx_sim.wgsl +++ b/crates/gpu/src/shaders/fx_sim.wgsl @@ -145,6 +145,27 @@ fn fxm_sprite(at: u32, x: f32, y: f32) -> FxmShade { } cov = fxm_aa(m); } + // sim::Shape::Ball (CC Ball Action's Shading): the sphere's light and shine scaled by + // |shade| (data[at + 9]), lit from the lower right when shade < 0. + case 9u: { + let d = sqrt(dx * dx + dy * dy); + let cv = fxm_aa(r - d); + if (cv <= 0.0) { + return fxm_none(); + } + let shade = data[at + 9u]; + let nx = dx / r; + let ny = dy / r; + let nz = sqrt(max(1.0 - nx * nx - ny * ny, 0.0)); + let m = select(1.0, -1.0, shade < 0.0); + let diff = max(nx * (-0.48 * m) + ny * (-0.58 * m) + nz * 0.66, 0.0); + let rz = 2.0 * diff * nz - 0.66; + let st = abs(shade); + let spec = powz(max(rz, 0.0), 20.0) * 0.6 * st; + let k = max(1.0 - st * 0.8 * (1.0 - diff), 0.0); + rgb = rgb * k + spec; + cov = cv; + } default: { let lx = data[at + 9u]; let ly = data[at + 10u]; diff --git a/crates/gpu/src/tests/fx_particles.rs b/crates/gpu/src/tests/fx_particles.rs index e8c3a7ce6..a4d531a37 100644 --- a/crates/gpu/src/tests/fx_particles.rs +++ b/crates/gpu/src/tests/fx_particles.rs @@ -141,7 +141,22 @@ fn ball_action_pixel_polly_scatterize() { 0.0, 0.0, ); - case("ec.sim.ccballaction", &[("gridSpacing", n(2.0)), ("ballSize", n(80.0)), ("instabilityState", n(45.0)), ("twistProperty", e(2))], 0.0, 0.0); + case("ec.sim.ccballaction", &[("gridSpacing", n(2.0)), ("ballSize", n(80.0)), ("scatterMotion", n(45.0)), ("twistProperty", e(2))], 0.0, 0.0); + // #3197: Shading (flat, weaker, stronger, lit from the other side), Coloring, Displace. + for shading in [0.0, -30.0, -100.0, 60.0, 1e45] { + case("ec.sim.ccballaction", &[("ballSize", n(80.0)), ("shading", n(shading))], 0.0, 0.0); + } + for coloring in [0, 2] { + case("ec.sim.ccballaction", &[("ballSize", n(80.0)), ("coloring", e(coloring))], 0.0, 0.0); + } + for prop in [3, 6, 8] { + case( + "ec.sim.ccballaction", + &[("ballSize", n(80.0)), ("rotationAxis", e(1)), ("rotation", n(30.0)), ("displace", n(40.0)), ("displaceProperty", e(prop))], + 0.0, + 0.0, + ); + } for object in 0..4 { case("ec.sim.ccpixelpolly", &[("object", e(object)), ("gridSpacing", n(6.0))], 0.6, 0.0); } diff --git a/docs/effects.md b/docs/effects.md index d9f726481..130d00a90 100644 --- a/docs/effects.md +++ b/docs/effects.md @@ -3,7 +3,7 @@ -EffectCraft ships 308 effects with 2988 parameters in total, grouped into the same categories as the Effects & Presets panel. Every effect is our own implementation, written from public behaviour descriptions and standard image-processing literature. Parameter names, order, popup options, units, defaults and ranges follow the reference application so that projects, expressions and muscle memory carry over. +EffectCraft ships 308 effects with 2992 parameters in total, grouped into the same categories as the Effects & Presets panel. Every effect is our own implementation, written from public behaviour descriptions and standard image-processing literature. Parameter names, order, popup options, units, defaults and ranges follow the reference application so that projects, expressions and muscle memory carry over. - **GPU**: 280 effects also run on the GPU compositor with identical results. - **32**: 308 effects process 32-bit float (HDR, overbright) pixels without clamping. @@ -319,7 +319,7 @@ Effects are addressed by id (`ec..`) or display name in commands | Effect | Id | Params | GPU | 32 | Status | |---|---|---:|:-:|:-:|---| -| CC Ball Action | `ec.sim.ccballaction` | 8 | GPU | 32 | Implemented | +| CC Ball Action | `ec.sim.ccballaction` | 12 | GPU | 32 | Implemented | | CC Bubbles | `ec.sim.ccbubbles` | 7 | GPU | 32 | Implemented | | CC Drizzle | `ec.sim.ccdrizzle` | 14 | GPU | 32 | Implemented | | CC Hair | `ec.sim.cchair` | 20 | GPU | 32 | Implemented | From a2728fbf094d79ef92d164b2769228dc938487b2 Mon Sep 17 00:00:00 2001 From: vangel76 Date: Sat, 7 Nov 2026 15:29:46 +0100 Subject: [PATCH 02/25] Timeline waveform: draw what the mix plays for reversed layers and Backwards (#3238) A time-reversed layer (negative stretch) is silent in the audio mix, but the Timeline drew its waveform; with the Backwards audio effect the mix plays the layer's [in, out) span reversed, but the waveform was drawn forwards. The render crate now exposes the mix's rules as stretch_is_mixed and plays_backwards, and the mix uses them. The waveform uses the same rules, decided once per layer: only the baselines for a layer the mix leaves silent, and comp time mirrored over [in, out) under Backwards, as the mix maps it. Columns are limited to [in, out) so an edge column draws no audio past the out point. Fixes #3238 --- crates/render/src/audio.rs | 15 ++- crates/ui-egui/src/panels/waveform.rs | 177 ++++++++++++++++++++++++-- 2 files changed, 180 insertions(+), 12 deletions(-) diff --git a/crates/render/src/audio.rs b/crates/render/src/audio.rs index e2861340c..b715c5efe 100644 --- a/crates/render/src/audio.rs +++ b/crates/render/src/audio.rs @@ -66,6 +66,17 @@ fn generates(l: &Layer) -> bool { audio_effect_groups(l).any(|(id, _)| audio_fx::generates_audio(id)) } +/// Does the mix play the layer at its time stretch? Reversed layers (negative stretch) are +/// silent for now; the Timeline waveform shares this rule so it draws what is heard. +pub fn stretch_is_mixed(l: &Layer) -> bool { + l.stretch > 0.0 +} + +/// Does an enabled audio effect (Backwards) play the layer's [in, out) span reversed? +pub fn plays_backwards(l: &Layer) -> bool { + audio_effect_groups(l).any(|(id, _)| audio_fx::reverses(id)) +} + /// Does the layer contribute to the mix (Audio switch on and something to hear)? pub fn audible(project: &Project, l: &Layer) -> bool { l.switches.audio @@ -210,7 +221,7 @@ impl MixEnv<'_> { if fx.is_empty() { return self.layer_raw(l, i0, n, false); } - let reversed = fx.iter().any(|(id, _, _)| audio_fx::reverses(id)); + let reversed = plays_backwards(l); let pre_s: f64 = fx.iter().map(|(id, _, p)| audio_fx::preroll(id, p)).sum(); let pre = (pre_s * self.rate as f64).ceil() as usize; let b0 = i0 - pre as i64; @@ -291,7 +302,7 @@ fn mix_into(sources: &AudioSources<'_>, comp_id: ItemId, start: Tick, out: &mut let any_solo = comp.layers.iter().any(|l| l.switches.solo && audible(project, l)); let s0 = start.to_units_floor(rate as i64); for l in &comp.layers { - if !audible(project, l) || (any_solo && !l.switches.solo) || l.stretch <= 0.0 { + if !audible(project, l) || (any_solo && !l.switches.solo) || !stretch_is_mixed(l) { continue; } // Sample range of the block that falls inside the layer's [in, out). diff --git a/crates/ui-egui/src/panels/waveform.rs b/crates/ui-egui/src/panels/waveform.rs index 4e355f951..aa4c218e5 100644 --- a/crates/ui-egui/src/panels/waveform.rs +++ b/crates/ui-egui/src/panels/waveform.rs @@ -8,7 +8,7 @@ use std::collections::HashMap; use std::sync::{Arc, Mutex}; use effectcraft_engine::project::{ItemId, ItemKind, Layer, LayerSource, Project, Property}; -use effectcraft_engine::render::audio::db_to_gain; +use effectcraft_engine::render::audio::{self, db_to_gain}; use effectcraft_engine::time::Tick; use egui::{Color32, Painter, Rect, Stroke, pos2}; @@ -39,6 +39,39 @@ pub fn audio_item(project: &Project, l: &Layer) -> Option { } } +/// How the layer plays its audio, as far as its waveform goes: `None` when it is silent +/// (reversed, see [`audio::stretch_is_mixed`]), else whether the Backwards effect plays its +/// [in, out) span mirrored ([`audio::plays_backwards`]). The Audio switch and solo are not +/// followed: a muted layer still shows its waveform. +fn played(layer: &Layer) -> Option { + audio::stretch_is_mixed(layer).then(|| audio::plays_backwards(layer)) +} + +/// The summary bins under the Timeline column for comp times `ta .. tb` (seconds, limited to +/// the layer's [in, out) span), as the layer plays them: mirrored over that span when `mirror` +/// (see [`played`]), so the first column shows the last samples. +fn column_bins<'a>(layer: &Layer, s: &'a Summary, ta: f64, tb: f64, mirror: bool) -> Option<&'a [[f32; 4]]> { + let (i, o) = (layer.in_point.seconds(), layer.out_point.seconds()); + let (ta, tb) = (ta.max(i).min(o), tb.max(i).min(o)); + if tb <= ta { + return None; + } + let span = i + o; + let src = |t: f64| { + let t = if mirror { span - t } else { t }; + layer.layer_time(Tick::from_seconds_f64(t)).seconds() * s.bins_per_sec as f64 + }; + let (u, v) = (src(ta), src(tb)); + let n = s.peaks.len() as i64; + let ba = u.min(v).floor() as i64; + let bb = (u.max(v).ceil() as i64).max(ba.saturating_add(1)); + let (ba, bb) = (ba.clamp(0, n), bb.clamp(0, n)); + if ba >= bb { + return None; + } + s.peaks.get(ba as usize..bb as usize) +} + /// The summary for `item`, starting its computation on first request. pub fn summary(app: &EffectcraftApp, ctx: &egui::Context, item: ItemId) -> Option> { let mut m = app.waveforms.map.lock().ok()?; @@ -88,27 +121,23 @@ fn level_gains(levels: Option<&Property>, t: Tick) -> [f32; 2] { } /// 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. +/// timeline's time map and the layer's time mapping, limited to its [in, out) span and drawn as +/// the layer plays (see [`played`]): only the baselines for a silent layer. pub(crate) fn draw(p: &Painter, rect: Rect, tm: &TMap, layer: &Layer, s: &Summary, color: Color32) { let mid = [rect.min.y + rect.height() * 0.25, rect.min.y + rect.height() * 0.75]; let half = rect.height() * 0.25 - 1.0; let 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))); } + let Some(mirror) = played(layer) else { return }; for x in x0..x1 { let (ta, tb) = (tm.t(x as f32), tm.t(x as f32 + 1.0)); - let src = |t: f64| layer.layer_time(Tick::from_seconds_f64(t)).seconds() * s.bins_per_sec as f64; - let (ba, bb) = (src(ta).floor() as i64, src(tb).ceil() as i64); - let (ba, bb) = (ba.min(bb).clamp(0, n), ba.max(bb).max(ba + 1).clamp(0, n)); - if ba >= bb { - continue; - } + let Some(bins) = column_bins(layer, s, ta, tb, mirror) else { continue }; let mut agg = [0.0f32; 4]; - for b in &s.peaks[ba as usize..bb as usize] { + for b in bins { agg[0] = agg[0].min(b[0]); agg[1] = agg[1].max(b[1]); agg[2] = agg[2].min(b[2]); @@ -137,3 +166,131 @@ mod tests { assert_eq!(level_gains(None, Tick::ZERO), [1.0, 1.0]); } } + +#[cfg(test)] +mod played_tests { + use super::*; + use effectcraft_engine::color::Label; + use effectcraft_engine::project::{Comp, Footage, FootageKind, GroupKind, build}; + use effectcraft_engine::render::audio::{footage_peaks, mix_comp}; + use effectcraft_engine::render::{FootageSource, Image}; + use effectcraft_engine::time::FrameRate; + + /// Footage audio equal to its source time (seconds) on both channels over [0, 2) s. + struct Ramp; + impl FootageSource for Ramp { + fn frame(&self, _: ItemId, _: &Footage, _: Tick) -> Option> { + None + } + fn audio(&self, _: ItemId, _: &Footage, start: Tick, frames: usize, rate: u32) -> Option> { + let t0 = start.seconds(); + Some( + (0..frames) + .flat_map(|k| { + let t = t0 + k as f64 / rate as f64; + let v = if (0.0..2.0).contains(&t) { t as f32 } else { 0.0 }; + [v, v] + }) + .collect(), + ) + } + } + + /// A project with a 2 s ramp clip and a comp holding one layer of it (start and in 0 s, + /// out 1 s) changed by `edit`, and the clip's peak summary. + fn setup(edit: &dyn Fn(&mut Layer)) -> (Project, ItemId, Layer, Summary) { + let mut p = Project::default(); + let f = Footage { + path: "ramp.wav".into(), + kind: FootageKind::Audio, + has_audio: true, + frame_rate: FrameRate::new(25, 1), + duration: Tick::from_seconds_f64(2.0), + ..Default::default() + }; + let fid = p.add_item("ramp.wav", Label::SeaFoam, None, ItemKind::Footage(f.clone())); + let mut comp = Comp::new(64, 64, FrameRate::new(25, 1), Tick::from_seconds_f64(2.0)); + let mut l = build::layer(&mut p, &comp, "a", LayerSource::Footage { item: fid }, (0, 0), None); + (l.start_time, l.in_point, l.out_point) = (Tick::ZERO, Tick::ZERO, Tick::from_seconds_f64(1.0)); + edit(&mut l); + comp.layers = vec![l.clone()].into(); + let cid = p.add_item("C", Label::Sandstone, None, ItemKind::Comp(comp.into())); + let peaks = footage_peaks(&Ramp, fid, &f, f.duration, BINS_PER_SEC); + (p, cid, l, Summary { bins_per_sec: BINS_PER_SEC, peaks }) + } + + fn add_backwards(l: &mut Layer, enabled: bool) { + let mut n = 1_000_000; + let mut g = build::Ids(&mut n).group("backwards", "Backwards"); + g.kind = GroupKind::Effect { effect: "ec.audio.backwards".into() }; + g.enabled = enabled; + l.props.group_mut("effects").expect("effects group").children.push(g.into()); + } + + /// The loudest left-channel peak drawn in the column for comp times `ta .. tb`. + fn drawn(l: &Layer, s: &Summary, ta: f64, tb: f64) -> Option { + played(l).and_then(|mirror| column_bins(l, s, ta, tb, mirror)).map(|bins| bins.iter().fold(f32::MIN, |m, b| m.max(b[1]))) + } + + /// The left-channel sample the mix plays at comp time `t`. + fn heard(p: &Project, cid: ItemId, t: f64) -> f32 { + mix_comp(p, &Ramp, None, cid, Tick::from_seconds_f64(t), 1, 8000).first().copied().unwrap_or(f32::NAN) + } + + /// #3238: a time-reversed layer (Time-Reverse Layer: stretch -100 %, start time at its out + /// point) is silent in the mix, so the Timeline draws no waveform columns for it. + #[test] + fn a_reversed_layer_draws_no_waveform_as_the_mix_is_silent() { + let (p, cid, l, s) = setup(&|l| { + l.stretch = -100.0; + l.start_time = Tick::from_seconds_f64(1.0); + }); + for k in 0..200 { + let (ta, tb) = (k as f64 / 200.0, (k + 1) as f64 / 200.0); + assert_eq!(drawn(&l, &s, ta, tb), None, "column at {ta} s"); + } + for t in [0.1, 0.5, 0.9] { + assert_eq!(heard(&p, cid, t), 0.0, "the mix plays the reversed layer at {t} s"); + } + } + + /// #3238: with the Backwards audio effect the first column shows the clip's last samples + /// and the last column its first, matching what the mix plays there. + #[test] + fn backwards_draws_the_waveform_mirrored_as_the_mix_plays_it() { + let (p, cid, l, s) = setup(&|l| add_backwards(l, true)); + let first = drawn(&l, &s, 0.0, 0.005).expect("first column"); + let h = heard(&p, cid, 0.0); + assert!(first > 0.98, "first column draws {first}, not the clip's last samples"); + assert!((first - h).abs() < 0.01, "first column {first}, heard {h}"); + let last = drawn(&l, &s, 0.995, 1.0).expect("last column"); + let h = heard(&p, cid, 0.995); + assert!(last < 0.02, "last column draws {last}, not the clip's first samples"); + assert!((last - h).abs() < 0.01, "last column {last}, heard {h}"); + } + + /// No Backwards effect, a disabled one, or the layer's Effects switch off: the mix plays + /// forwards, and so the waveform is drawn. + #[test] + fn without_an_active_backwards_effect_the_waveform_runs_forwards() { + let edits: [(&str, &dyn Fn(&mut Layer)); 3] = [ + ("no effect", &|_| {}), + ("effect disabled", &|l| add_backwards(l, false)), + ("effects switch off", &|l| { + add_backwards(l, true); + l.switches.effects = false; + }), + ]; + for (name, edit) in edits { + let (p, cid, l, s) = setup(edit); + let first = drawn(&l, &s, 0.0, 0.005).expect("first column"); + let h = heard(&p, cid, 0.004); + assert!(first < 0.02, "{name}: first column draws {first}"); + assert!((first - h).abs() < 0.01, "{name}: first column {first}, heard {h}"); + // A column reaching past the out point draws only up to it. + let edge = drawn(&l, &s, 0.998, 1.003).expect("edge column"); + assert!(edge < 1.001, "{name}: the edge column draws {edge}, past the out point"); + assert_eq!(drawn(&l, &s, 1.0, 1.005), None, "{name}: a column after the out point"); + } + } +} From f0ab5f107fb671146f5b68242dbe6d7f1d759843 Mon Sep 17 00:00:00 2001 From: vangel76 Date: Mon, 9 Nov 2026 22:16:24 +0100 Subject: [PATCH 03/25] Opening an old project: a renamed effect parameter keeps its place among the parameters (#3197) Ball Grid's Instability State becomes Scatter Motion; it used to move to the end, after the new controls, so an expression reading the parameter by index (the 8th) read Coloring afterwards. A parameter renamed within its own group is now renamed where it is; new parameters are still added after it. --- crates/effects/src/migrate.rs | 43 +++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/crates/effects/src/migrate.rs b/crates/effects/src/migrate.rs index 6529e658d..ccd3d11b1 100644 --- a/crates/effects/src/migrate.rs +++ b/crates/effects/src/migrate.rs @@ -192,6 +192,14 @@ fn take_at(g: &mut PropGroup, id: &str) -> Option { } } +/// The position of the property at spec id `id` (`a/b/param`) among its siblings. +fn index_at(g: &PropGroup, id: &str) -> Option { + match id.split_once('/') { + None => g.children.iter().position(|c| matches!(c, Node::Prop(p) if p.match_id == id)), + Some((first, rest)) => index_at(g.sub(first)?, rest), + } +} + fn prop_at<'a>(g: &'a mut PropGroup, id: &str) -> Option<&'a mut Property> { match id.split_once('/') { None => g.get_mut(id), @@ -279,6 +287,12 @@ pub fn upgrade_instance(spec: &EffectSpec, g: &mut PropGroup, ids: &mut Ids, lay // before it moved into a twirl-down group. let found = prop_at(g, ps.id).is_some(); if !found { + // A parameter renamed within its group keeps its place, so expressions that address + // it by index still read it. + let slot = PARAM_ID_ALIASES + .iter() + .filter(|(e, old, new)| *e == spec.id && *new == ps.id && old.rsplit_once('/').map(|(p, _)| p) == new.rsplit_once('/').map(|(p, _)| p)) + .find_map(|(_, old, _)| index_at(g, old)); let moved = PARAM_ID_ALIASES.iter().filter(|(e, _, new)| *e == spec.id && *new == ps.id).find_map(|(_, old, _)| take_at(g, old)).or_else(|| { let leaf = ps.id.rsplit('/').next().unwrap_or(ps.id); // Not when the top-level leaf is an old id of another parameter (Radio @@ -300,9 +314,13 @@ pub fn upgrade_instance(spec: &EffectSpec, g: &mut PropGroup, ids: &mut Ids, lay pr } }; + let at = |sub: &mut PropGroup| match slot { + Some(i) if i <= sub.children.len() => sub.children.insert(i, pr.into()), + _ => sub.children.push(pr.into()), + }; match path.and_then(|path| group_at(g, ids, path)) { - Some(sub) => sub.children.push(pr.into()), - None => g.children.push(pr.into()), + Some(sub) => at(sub), + None => at(g), } } if let Some(pr) = prop_at(g, ps.id) { @@ -584,6 +602,27 @@ mod tests { assert_eq!((&pr.ui, &pr.value), (&ParamUi::Point, &Value::Vec2([20.0, -5.0]))); } + /// #3197 review: an old CC Ball Action saved Instability State as its 8th property; renamed to + /// Scatter Motion it keeps that place, so an expression that reads `effect(..)(8)` still gets + /// the same control (new controls are appended after it). + #[test] + fn upgrade_renames_a_param_in_place_and_keeps_its_index() { + let spec = find("ec.sim.ccballaction").unwrap(); + let mut next = 1; + let mut g = instantiate(spec, &mut Ids(&mut next), "Ball Grid", [100.0, 50.0]); + // The layout an earlier version saved: eight parameters, Instability State last. + let old = ["scatter", "rotationAxis", "rotation", "twistProperty", "twistAngle", "gridSpacing", "ballSize", "scatterMotion"]; + let mut kept: Vec = old.iter().map(|id| take_prop(&mut g, id).unwrap()).collect(); + g.children.clear(); + kept[7].match_id = "instabilityState".into(); + kept[7].value = Value::Scalar(33.0); + g.children.extend(kept.into_iter().map(Node::from)); + assert!(upgrade_instance(spec, &mut g, &mut Ids(&mut next), [100.0, 50.0])); + let ids: Vec<&str> = g.children.iter().take(8).map(|c| c.match_id()).collect(); + assert_eq!(ids, ["scatter", "rotationAxis", "rotation", "twistProperty", "twistAngle", "gridSpacing", "ballSize", "scatterMotion"]); + assert_eq!(g.get("scatterMotion").unwrap().value, Value::Scalar(33.0)); + } + #[test] fn upgrade_moves_params_into_twirl_down_groups() { let spec = find(crate::warp_stab::ID).unwrap(); From ff245aabc74885ac58260ee6e99470dba7762276 Mon Sep 17 00:00:00 2001 From: vangel76 Date: Tue, 10 Nov 2026 22:12:13 +0100 Subject: [PATCH 04/25] Expressions: a renamed effect parameter keeps answering to its old name (#3197) Old projects can name CC Ball Action's Instability State in an expression. The name now resolves to Scatter Motion, through the same alias table the project migration uses, and only after every current name has been tried. --- crates/effects/src/catalog.rs | 2 +- crates/expr/Cargo.toml | 2 +- crates/expr/src/host.rs | 17 ++++++- crates/expr/src/tests.rs | 83 +++++++++++++++++++++++++++++++++++ docs/effects.md | 2 +- 5 files changed, 102 insertions(+), 4 deletions(-) diff --git a/crates/effects/src/catalog.rs b/crates/effects/src/catalog.rs index 7fcb024bf..c7eecaaf3 100644 --- a/crates/effects/src/catalog.rs +++ b/crates/effects/src/catalog.rs @@ -147,7 +147,7 @@ pub fn effects_markdown() -> String { - **Status**: {} implemented in full, {partial} partial (what is missing is listed).\n\n", r.len() - partial )); - s.push_str("Effects are addressed by id (`ec..`) or display name in commands, scripts and the control channel, and every parameter by its id (`effects/#1/blurriness`).\n\n"); + s.push_str("Effects are addressed by id (`ec..`) or display name in commands, scripts and the control channel, and every parameter by its id (`effects/#1/blurriness`). A parameter that was renamed keeps its old name working in expressions of older projects: `effect(\"CC Ball Action\")(\"Instability State\")` still reads Scatter Motion.\n\n"); for cat in CATEGORIES { let list: Vec<_> = r.iter().filter(|e| e.category == *cat).collect(); if list.is_empty() { diff --git a/crates/expr/Cargo.toml b/crates/expr/Cargo.toml index 6f157698b..a0cb29945 100644 --- a/crates/expr/Cargo.toml +++ b/crates/expr/Cargo.toml @@ -11,6 +11,7 @@ workspace = true [dependencies] effectcraft-time = { workspace = true } +effectcraft-effects = { workspace = true } effectcraft-geom = { workspace = true } effectcraft-keyframe = { workspace = true } serde_json = { workspace = true } @@ -25,5 +26,4 @@ boa_engine = { workspace = true, features = ["js"] } [dev-dependencies] effectcraft-color = { workspace = true } -effectcraft-effects = { workspace = true } effectcraft-text = { workspace = true } diff --git a/crates/expr/src/host.rs b/crates/expr/src/host.rs index 43400ea1d..52dca5823 100644 --- a/crates/expr/src/host.rs +++ b/crates/expr/src/host.rs @@ -7,9 +7,10 @@ //! the answers and runs the script again. Expressions are pure functions of these answers, so //! re-running is exact, and the runtime stays free of borrowed state. +use effectcraft_effects::migrate::PARAM_ID_ALIASES; use effectcraft_geom::{Mat3, Mat4}; use effectcraft_keyframe::Value; -use effectcraft_project::{Comp, ItemId, ItemKind, Layer, LayerId, LayerSource, Node, PropGroup, Property}; +use effectcraft_project::{Comp, GroupKind, ItemId, ItemKind, Layer, LayerId, LayerSource, Node, PropGroup, Property}; use effectcraft_render::EvalCtx; use effectcraft_time::Tick; @@ -283,10 +284,24 @@ fn find_child<'g>(g: &'g PropGroup, key: &Key) -> Option<&'g Node> { .find(|n| n.match_id() == m) .or_else(|| g.children.iter().find(|n| n.name().eq_ignore_ascii_case(name))) .or_else(|| g.children.iter().find(|n| compact(n.name()) == c || compact(n.match_id()) == c)) + // Last, so a legacy name never shadows a current one. + .or_else(|| legacy_effect_child(g, &c)) } } } +/// A parameter of an effect instance addressed by a name it had when the project was saved +/// ([`PARAM_ID_ALIASES`]): `effect("CC Ball Action")("Instability State")` keeps reading the +/// parameter that is now Scatter Motion. `c` is the compacted (lowercase, no spaces) name. Only +/// renames inside the instance's own top-level group count; moves into twirl-downs do not. +fn legacy_effect_child<'g>(g: &'g PropGroup, c: &str) -> Option<&'g Node> { + let GroupKind::Effect { effect } = &g.kind else { return None }; + PARAM_ID_ALIASES + .iter() + .filter(|(e, old, new)| e == effect && !old.contains('/') && !new.contains('/') && compact(old) == c) + .find_map(|(_, _, new)| g.children.iter().find(|n| n.match_id() == *new)) +} + impl<'a> Resolver<'a> { fn comp(&self, c: u64) -> Option<&'a Comp> { if c == self.ctx.comp_id.0 { Some(self.ctx.comp) } else { self.ctx.project.comp(ItemId(c)) } diff --git a/crates/expr/src/tests.rs b/crates/expr/src/tests.rs index 050a5a550..22ce60ca0 100644 --- a/crates/expr/src/tests.rs +++ b/crates/expr/src/tests.rs @@ -2070,3 +2070,86 @@ fn bench_evaluation() { println!("BENCH {best:>9} ns/eval {label} (min of 3 x {iters})"); } } + +/// Layer A with an old-format CC Ball Action: Scatter Motion saved as `instabilityState` +/// ("Instability State"), opened through the migration (#3197). Scatter Motion is 37 and keyed +/// 10 at 0 s, 50 at 2 s. +fn old_ball_action() -> Fx { + let mut f = fx(); + let spec = effectcraft_effects::find("ec.sim.ccballaction").unwrap(); + let mut g = group_push(&mut f.p, |ids| effectcraft_effects::instantiate(spec, ids, "CC Ball Action", [20.0, 20.0])); + let sm = g.prop_mut("scatterMotion").unwrap(); + sm.value = Value::Scalar(37.0); + sm.keys = vec![Keyframe::new(Tick::ZERO, Value::Scalar(10.0)), Keyframe::new(secs(2.0), Value::Scalar(50.0))]; + sm.match_id = "instabilityState".into(); + sm.name = "Instability State".into(); + let mut next = f.p.next_id; + assert!(effectcraft_effects::migrate::upgrade_instance(spec, &mut g, &mut Ids(&mut next), [20.0, 20.0])); + f.p.next_id = next; + assert!(g.prop("scatterMotion").is_some(), "the migration renamed the parameter"); + f.p.comp_mut(f.cid).unwrap().layers[0].props.sub_mut("effects").unwrap().children.push(g.into()); + f +} + +#[test] +fn old_parameter_names_still_resolve_in_expressions() { + let f = old_ball_action(); + for name in ["Instability State", "instabilityState", "instability state", "InstabilityState"] { + // Keyframes still apply: the keyed value at 0 s, not the stored 37. + assert_close!(f.num(&format!("effect('CC Ball Action')('{name}')"), 0.0), 10.0); + assert_close!(f.num(&format!("effect('CC Ball Action')('{name}')"), 2.0), 50.0); + assert_close!(f.num(&format!("effect('CC Ball Action')('{name}').valueAtTime(2)"), 0.0), 50.0); + } + // Current names read the same property, unchanged. + for name in ["Scatter Motion", "scatterMotion"] { + assert_close!(f.num(&format!("effect('CC Ball Action')('{name}')"), 0.0), 10.0); + } +} + +#[test] +fn old_parameter_name_follows_the_parameter_expression() { + let mut f = old_ball_action(); + let p = f.p.comp_mut(f.cid).unwrap().layers[0].props.prop_mut("effects/#2/scatterMotion"); + let p = match p { + Some(p) => p, + None => panic!("scatterMotion at effects/#2"), + }; + p.expr = Some(Expression { text: "123".into(), enabled: true }); + assert_close!(f.num("effect('CC Ball Action')('Instability State')", 0.0), 123.0); +} + +#[test] +fn unknown_parameter_names_still_fail() { + let f = old_ball_action(); + assert!(f.ev(f.a, ROT, "effect('CC Ball Action')('No Such Thing')", 0.0).is_err()); + // Old names only exist on the effect they were renamed on. + assert!(f.ev(f.a, ROT, "effect('Slider Control')('Instability State')", 0.0).is_err()); +} + +/// Every in-group rename in the alias table keeps resolving by its old id and display name. +#[test] +fn every_in_group_alias_resolves_by_its_old_name() { + let mut n = 0; + for (effect, old, new) in effectcraft_effects::migrate::PARAM_ID_ALIASES { + if old.contains('/') || new.contains('/') { + continue; + } + let Some(spec) = effectcraft_effects::find(effect) else { continue }; + let mut f = fx(); + let g = group_push(&mut f.p, |ids| effectcraft_effects::instantiate(spec, ids, "Probe", [20.0, 20.0])); + f.p.comp_mut(f.cid).unwrap().layers[0].props.sub_mut("effects").unwrap().children.push(g.into()); + let (new_name, kind) = { + let l = &f.p.comp(f.cid).unwrap().layers[0]; + let p = l.props.prop(&format!("effects/#2/{new}")).unwrap(); + (p.name.clone(), p.value.clone()) + }; + if !matches!(kind, Value::Scalar(_)) { + continue; + } + let a = f.ev(f.a, ROT, &format!("effect('Probe')('{old}')"), 0.0).unwrap(); + let b = f.ev(f.a, ROT, &format!("effect('Probe')('{new_name}')"), 0.0).unwrap(); + assert_eq!(a, b, "{effect}: {old}"); + n += 1; + } + assert!(n >= 1); +} diff --git a/docs/effects.md b/docs/effects.md index 83ee80223..903d26113 100644 --- a/docs/effects.md +++ b/docs/effects.md @@ -9,7 +9,7 @@ EffectCraft ships 308 effects with 2992 parameters in total, grouped into the sa - **32**: 308 effects process 32-bit float (HDR, overbright) pixels without clamping. - **Status**: 308 implemented in full, 0 partial (what is missing is listed). -Effects are addressed by id (`ec..`) or display name in commands, scripts and the control channel, and every parameter by its id (`effects/#1/blurriness`). +Effects are addressed by id (`ec..`) or display name in commands, scripts and the control channel, and every parameter by its id (`effects/#1/blurriness`). A parameter that was renamed keeps its old name working in expressions of older projects: `effect("CC Ball Action")("Instability State")` still reads Scatter Motion. ## 3D Channel From cf94d1a9809b96d4eede176733f85e4a234a46fd Mon Sep 17 00:00:00 2001 From: vangel76 Date: Sat, 14 Nov 2026 18:50:35 +0100 Subject: [PATCH 05/25] ui-egui tests: the file.import dialog answers carry paths as Ok, as DialogAnswer.paths is a Result now (#3304 met the tests of #3103 on main) --- crates/ui-egui/src/menus/tests.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/crates/ui-egui/src/menus/tests.rs b/crates/ui-egui/src/menus/tests.rs index 0acab9ef9..8c5091691 100644 --- a/crates/ui-egui/src/menus/tests.rs +++ b/crates/ui-egui/src/menus/tests.rs @@ -823,7 +823,7 @@ fn import_file_dialog_offers_and_imports_after_effects_projects() { assert!(many && exts.iter().any(|e| e == "aep") && exts.iter().any(|e| e == "aepx"), "{exts:?}"); assert!(exts.iter().any(|e| e == "png"), "footage too"); - super::frontend::dialog_answered(&mut app, crate::DialogAnswer { command: "file.import".into(), key: "paths", params: json!({}), paths: vec![aep] }); + super::frontend::dialog_answered(&mut app, crate::DialogAnswer { command: "file.import".into(), key: "paths", params: json!({}), paths: Ok(vec![aep]) }); let comp = app.session.project.item(app.session.active_comp_id().expect("a composition is open")).unwrap(); assert_eq!(comp.name, "Intro"); assert_eq!(app.session.project.item(comp.parent.expect("in a folder")).unwrap().name, "Intro.aep"); @@ -884,7 +884,10 @@ fn picked_projects_report_every_error() { std::fs::write(&aep, b"not an aep").unwrap(); std::fs::write(&ecproj, b"not a project").unwrap(); let paths = vec![aep.to_string_lossy().to_string(), ecproj.to_string_lossy().to_string()]; - super::frontend::dialog_answered(&mut app, crate::DialogAnswer { command: "file.import".into(), key: "paths", params: json!({}), paths: paths.clone() }); + super::frontend::dialog_answered( + &mut app, + crate::DialogAnswer { command: "file.import".into(), key: "paths", params: json!({}), paths: Ok(paths.clone()) }, + ); let status = &app.ui.status; assert!(status.contains("broken.aep") && status.contains("broken.ecproj"), "{status}"); assert!(!status.contains('"'), "messages, not quoted JSON: {status}"); @@ -915,7 +918,7 @@ fn a_picked_project_with_losses_asks_and_the_next_waits() { source.execute("comp.new", json!({"name": "Intro", "width": 64, "height": 36, "frameRate": 30, "duration": 1})).unwrap(); source.execute("file.exportAep", json!({"path": intro, "allowLosses": true})).unwrap(); let paths = vec![lossy.to_string_lossy().to_string(), intro.clone()]; - super::frontend::dialog_answered(&mut app, crate::DialogAnswer { command: "file.import".into(), key: "paths", params: json!({}), paths }); + super::frontend::dialog_answered(&mut app, crate::DialogAnswer { command: "file.import".into(), key: "paths", params: json!({}), paths: Ok(paths) }); assert_eq!(app.dialog, Some(crate::Dialog::AepLosses)); assert_eq!(app.dialog_state.aep_losses.queue, [intro]); assert!(app.session.project.items.is_empty(), "nothing imported before the answer"); From ddebf3d71ab90809b3617a786ee86d2448a0328e Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 08:17:16 -0500 Subject: [PATCH 06/25] refactor(interchange): stage coherent Film dependency refresh for shared formats --- Cargo.lock | 979 ++++++++++++++++++++++++++++++++++++++++------------- Cargo.toml | 16 +- 2 files changed, 749 insertions(+), 246 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae7f294a7..83cba5a3f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -129,6 +129,15 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "aligned" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee4508988c62edf04abd8d92897fca0c2995d907ce1dfeaf369dac3716a40685" +dependencies = [ + "as-slice", +] + [[package]] name = "aligned-vec" version = "0.6.4" @@ -215,6 +224,18 @@ dependencies = [ "libc", ] +[[package]] +name = "anyhow" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" + +[[package]] +name = "arbitrary" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bc62ac97cc33321f50863d514c3bc38a453947a8f9e781137e47c7401020aed" + [[package]] name = "arboard" version = "3.6.1" @@ -236,6 +257,17 @@ dependencies = [ "x11rb", ] +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "arrayref" version = "0.3.9" @@ -257,6 +289,15 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" +[[package]] +name = "as-slice" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516b6b4f0e40d50dcda9365d53964ec74560ad4284da2e7fc97122cd83174516" +dependencies = [ + "stable_deref_trait", +] + [[package]] name = "ash" version = "0.38.0+1.3.281" @@ -446,6 +487,40 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" +[[package]] +name = "av-scenechange" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f321d77c20e19b92c39e7471cf986812cbb46659d2af674adc4331ef3f18394" +dependencies = [ + "aligned", + "anyhow", + "arg_enum_proc_macro", + "arrayvec", + "log", + "num-rational", + "num-traits", + "pastey 0.1.1", + "rayon", + "thiserror 2.0.21", + "v_frame", + "y4m", +] + +[[package]] +name = "av1-grain" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cfddb07216410377231960af4fcab838eaa12e013417781b78bd95ee22077f8" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + [[package]] name = "base64" version = "0.23.1" @@ -504,6 +579,15 @@ version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" +[[package]] +name = "bitstream-io" +version = "4.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eff00be299a18769011411c9def0d827e8f2d7bf0c3dbf53633147a8867fd1f" +dependencies = [ + "no_std_io2", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -555,7 +639,7 @@ dependencies = [ "boa_macros", "boa_string", "indexmap", - "num-bigint", + "num-bigint 0.5.1", "rustc-hash 2.1.3", "strum", ] @@ -589,13 +673,13 @@ dependencies = [ "icu_normalizer", "indexmap", "intrusive-collections", - "itertools", - "num-bigint", + "itertools 0.15.0", + "num-bigint 0.5.1", "num-integer", "num-traits", "num_enum", "oneshot", - "pastey", + "pastey 0.2.3", "portable-atomic", "rand 0.10.3", "regress", @@ -668,7 +752,7 @@ dependencies = [ "boa_macros", "fast-float2", "icu_properties", - "num-bigint", + "num-bigint 0.5.1", "num-traits", "regress", "rustc-hash 2.1.3", @@ -682,7 +766,7 @@ checksum = "30bf86c2bcff5bf2547acbfc516c5d3108ca527cb131511d749bf6fbef762c0e" dependencies = [ "fast-float2", "itoa", - "pastey", + "pastey 0.2.3", "rustc-hash 2.1.3", "ryu-js", "static_assertions", @@ -722,6 +806,12 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "built" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c0e531d93d39c34eef561e929e8a7f86d77a5af08aac4f6d6e39976c51858e9" + [[package]] name = "bumpalo" version = "3.20.3" @@ -1114,6 +1204,17 @@ dependencies = [ "libc", ] +[[package]] +name = "craft-aaf" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=b3643af6477326e840f86be78c89357f5308ba1d#b3643af6477326e840f86be78c89357f5308ba1d" +dependencies = [ + "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3643af6477326e840f86be78c89357f5308ba1d)", + "craft-cfb 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3643af6477326e840f86be78c89357f5308ba1d)", + "craft-timeline 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3643af6477326e840f86be78c89357f5308ba1d)", + "thiserror 2.0.21", +] + [[package]] name = "craft-aep" version = "0.1.0" @@ -1128,6 +1229,40 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-audio" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab#82062077bba679ba5236e2d1a391f02d1533cbab" +dependencies = [ + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", + "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", + "log", + "rayon", + "symphonia 0.6.1", + "thiserror 2.0.21", +] + +[[package]] +name = "craft-audio" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=b3643af6477326e840f86be78c89357f5308ba1d#b3643af6477326e840f86be78c89357f5308ba1d" +dependencies = [ + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3643af6477326e840f86be78c89357f5308ba1d)", + "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3643af6477326e840f86be78c89357f5308ba1d)", + "log", + "thiserror 2.0.21", +] + +[[package]] +name = "craft-cfb" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=7f3fdc0dfebd03f33a241f91f916e9a78d3e5c93#7f3fdc0dfebd03f33a241f91f916e9a78d3e5c93" + +[[package]] +name = "craft-cfb" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=b3643af6477326e840f86be78c89357f5308ba1d#b3643af6477326e840f86be78c89357f5308ba1d" + [[package]] name = "craft-cms" version = "0.1.0" @@ -1169,6 +1304,14 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-dpx" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab#82062077bba679ba5236e2d1a391f02d1533cbab" +dependencies = [ + "thiserror 2.0.21", +] + [[package]] name = "craft-ecproj-format" version = "0.1.0" @@ -1238,7 +1381,7 @@ name = "craft-image-codecs" version = "0.1.0" source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" dependencies = [ - "craft-jpeg", + "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", "craft-metadata", "crc32fast", "exr", @@ -1266,6 +1409,14 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-jpeg" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=937ac93c5cf3cd4b6a81e195b078fe161eb081b9#937ac93c5cf3cd4b6a81e195b078fe161eb081b9" +dependencies = [ + "thiserror 2.0.21", +] + [[package]] name = "craft-lottie" version = "0.1.0" @@ -1287,7 +1438,16 @@ dependencies = [ [[package]] name = "craft-media" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=f0ad6c1e1d297908915f4be315b0fcfc9be7b5d4#f0ad6c1e1d297908915f4be315b0fcfc9be7b5d4" +source = "git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab#82062077bba679ba5236e2d1a391f02d1533cbab" +dependencies = [ + "chrono", + "thiserror 2.0.21", +] + +[[package]] +name = "craft-media" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=b3643af6477326e840f86be78c89357f5308ba1d#b3643af6477326e840f86be78c89357f5308ba1d" dependencies = [ "thiserror 2.0.21", ] @@ -1308,7 +1468,7 @@ source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c dependencies = [ "brotli-decompressor", "chrono", - "craft-tiff", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", "quick-xml 0.41.0", "serde", ] @@ -1378,13 +1538,24 @@ dependencies = [ "objc2-app-kit 0.3.2", ] +[[package]] +name = "craft-raw" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=7738cc6c689060475cb6947a6e3db6ed78fb3419#7738cc6c689060475cb6947a6e3db6ed78fb3419" +dependencies = [ + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=7738cc6c689060475cb6947a6e3db6ed78fb3419)", + "rayon", + "serde", + "thiserror 2.0.21", +] + [[package]] name = "craft-svg" version = "0.1.0" source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" dependencies = [ "craft-image-codecs", - "craft-xml", + "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", "flate2", "kurbo", "quick-xml 0.41.0", @@ -1394,6 +1565,23 @@ dependencies = [ "vectorcraft-pathops", ] +[[package]] +name = "craft-tga" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab#82062077bba679ba5236e2d1a391f02d1533cbab" +dependencies = [ + "thiserror 2.0.21", +] + +[[package]] +name = "craft-tiff" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=0eaafeb5054f2113523c8844822a830865cf45f2#0eaafeb5054f2113523c8844822a830865cf45f2" +dependencies = [ + "serde", + "thiserror 2.0.21", +] + [[package]] name = "craft-tiff" version = "0.1.0" @@ -1403,6 +1591,52 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-tiff" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=7738cc6c689060475cb6947a6e3db6ed78fb3419#7738cc6c689060475cb6947a6e3db6ed78fb3419" +dependencies = [ + "serde", + "thiserror 2.0.21", +] + +[[package]] +name = "craft-time" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=57288edafdc45552e30481cc649021de446abfa0#57288edafdc45552e30481cc649021de446abfa0" +dependencies = [ + "serde", + "thiserror 2.0.21", +] + +[[package]] +name = "craft-time" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=b3643af6477326e840f86be78c89357f5308ba1d#b3643af6477326e840f86be78c89357f5308ba1d" +dependencies = [ + "serde", + "thiserror 2.0.21", +] + +[[package]] +name = "craft-timeline" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=57288edafdc45552e30481cc649021de446abfa0#57288edafdc45552e30481cc649021de446abfa0" +dependencies = [ + "craft-time 0.1.0 (git+https://github.com/storytold/craft-libs?rev=57288edafdc45552e30481cc649021de446abfa0)", + "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=57288edafdc45552e30481cc649021de446abfa0)", + "serde", + "serde_json", +] + +[[package]] +name = "craft-timeline" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=b3643af6477326e840f86be78c89357f5308ba1d#b3643af6477326e840f86be78c89357f5308ba1d" +dependencies = [ + "craft-time 0.1.0 (git+https://github.com/storytold/craft-libs?rev=b3643af6477326e840f86be78c89357f5308ba1d)", +] + [[package]] name = "craft-ui" version = "0.1.0" @@ -1472,6 +1706,17 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-video" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab#82062077bba679ba5236e2d1a391f02d1533cbab" +dependencies = [ + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", + "rav1e", + "rayon", + "thiserror 2.0.21", +] + [[package]] name = "craft-webp" version = "0.1.0" @@ -1481,6 +1726,16 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-xml" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=57288edafdc45552e30481cc649021de446abfa0#57288edafdc45552e30481cc649021de446abfa0" +dependencies = [ + "quick-xml 0.41.0", + "serde", + "thiserror 2.0.21", +] + [[package]] name = "craft-xml" version = "0.1.0" @@ -1491,6 +1746,34 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-xml" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab#82062077bba679ba5236e2d1a391f02d1533cbab" +dependencies = [ + "quick-xml 0.41.0", + "serde", + "thiserror 2.0.21", +] + +[[package]] +name = "craft-xml" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=b3643af6477326e840f86be78c89357f5308ba1d#b3643af6477326e840f86be78c89357f5308ba1d" +dependencies = [ + "quick-xml 0.41.0", + "serde", + "thiserror 2.0.21", +] + +[[package]] +name = "craft-y4m" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=25c7a8959cf70cf8c3f076d05baadb0990710569#25c7a8959cf70cf8c3f076d05baadb0990710569" +dependencies = [ + "thiserror 2.0.21", +] + [[package]] name = "craft-zip" version = "0.1.0" @@ -1862,10 +2145,10 @@ dependencies = [ name = "effectcraft-export" version = "0.24.1" dependencies = [ - "craft-audio", + "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", "craft-gif", "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", - "craft-video", + "craft-video 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", "effectcraft-color", "effectcraft-effects", "effectcraft-keyframe", @@ -2025,9 +2308,9 @@ dependencies = [ name = "effectcraft-media" version = "0.24.1" dependencies = [ - "craft-audio", + "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", "craft-docpath", - "craft-dpx", + "craft-dpx 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", "craft-exr", "craft-gif", "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", @@ -2370,7 +2653,7 @@ dependencies = [ "bitflags 2.13.2", "emath", "epaint", - "itertools", + "itertools 0.15.0", "log", "nohash-hasher", "profiling", @@ -2432,7 +2715,7 @@ dependencies = [ "ahash", "egui", "enum-map", - "itertools", + "itertools 0.15.0", "log", "profiling", ] @@ -2722,129 +3005,70 @@ dependencies = [ "libc", ] -[[package]] -name = "filmcraft-aac" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "filmcraft-bitstream", - "thiserror 2.0.21", -] - -[[package]] -name = "filmcraft-ac3" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "thiserror 2.0.21", -] - -[[package]] -name = "filmcraft-apv" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "filmcraft-bitstream", - "rayon", - "thiserror 2.0.21", -] - -[[package]] -name = "filmcraft-av1" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "filmcraft-bitstream", - "rayon", - "thiserror 2.0.21", -] - -[[package]] -name = "filmcraft-avi" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" - [[package]] name = "filmcraft-bitstream" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" +version = "0.20.1" +source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" dependencies = [ - "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0ad6c1e1d297908915f4be315b0fcfc9be7b5d4)", + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", ] [[package]] name = "filmcraft-cfb" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" +version = "0.20.1" +source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +dependencies = [ + "craft-cfb 0.1.0 (git+https://github.com/storytold/craft-libs?rev=7f3fdc0dfebd03f33a241f91f916e9a78d3e5c93)", +] [[package]] name = "filmcraft-codecs" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" +version = "0.20.1" +source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" dependencies = [ - "filmcraft-aac", - "filmcraft-ac3", - "filmcraft-apv", - "filmcraft-av1", - "filmcraft-avi", + "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", + "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=937ac93c5cf3cd4b6a81e195b078fe161eb081b9)", + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", + "craft-video 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", + "craft-y4m", "filmcraft-bitstream", "filmcraft-color", - "filmcraft-dnx", "filmcraft-frame", - "filmcraft-h264", - "filmcraft-hevc", "filmcraft-isobmff", "filmcraft-matroska", "filmcraft-media", - "filmcraft-mpa", - "filmcraft-mpeg2v", - "filmcraft-mpegts", - "filmcraft-mxf", - "filmcraft-ogg", - "filmcraft-opus", - "filmcraft-prores", "filmcraft-time", - "filmcraft-vp8", - "filmcraft-vp9", - "image", "log", "rayon", - "symphonia", + "symphonia 0.5.5", "thiserror 2.0.21", "web-time", ] [[package]] name = "filmcraft-color" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" +version = "0.20.1" +source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" dependencies = [ "serde", ] [[package]] name = "filmcraft-dng" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" +version = "0.20.1" +source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" dependencies = [ - "rayon", - "thiserror 2.0.21", -] - -[[package]] -name = "filmcraft-dnx" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "filmcraft-bitstream", + "craft-raw", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0eaafeb5054f2113523c8844822a830865cf45f2)", + "image", "rayon", "thiserror 2.0.21", ] [[package]] name = "filmcraft-frame" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" +version = "0.20.1" +source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" dependencies = [ "filmcraft-color", "filmcraft-time", @@ -2854,44 +3078,26 @@ dependencies = [ [[package]] name = "filmcraft-geom" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" +version = "0.20.1" +source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" dependencies = [ "serde", ] -[[package]] -name = "filmcraft-h264" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "filmcraft-bitstream", - "rayon", - "thiserror 2.0.21", -] - -[[package]] -name = "filmcraft-hevc" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "filmcraft-bitstream", - "rayon", - "thiserror 2.0.21", -] - [[package]] name = "filmcraft-interchange" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" +version = "0.20.1" +source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" dependencies = [ + "craft-aaf", + "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", + "craft-timeline 0.1.0 (git+https://github.com/storytold/craft-libs?rev=57288edafdc45552e30481cc649021de446abfa0)", "filmcraft-cfb", "filmcraft-color", "filmcraft-geom", "filmcraft-media", "filmcraft-project", "filmcraft-time", - "roxmltree", "serde", "serde_json", "thiserror 2.0.21", @@ -2899,25 +3105,29 @@ dependencies = [ [[package]] name = "filmcraft-isobmff" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" +version = "0.20.1" +source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" dependencies = [ - "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0ad6c1e1d297908915f4be315b0fcfc9be7b5d4)", + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", ] [[package]] name = "filmcraft-matroska" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" +version = "0.20.1" +source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" dependencies = [ - "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=f0ad6c1e1d297908915f4be315b0fcfc9be7b5d4)", + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", ] [[package]] name = "filmcraft-media" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" +version = "0.20.1" +source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" dependencies = [ + "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", + "craft-dpx 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", + "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", + "craft-tga", "filmcraft-color", "filmcraft-dng", "filmcraft-frame", @@ -2928,54 +3138,10 @@ dependencies = [ "thiserror 2.0.21", ] -[[package]] -name = "filmcraft-mpa" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "filmcraft-bitstream", - "thiserror 2.0.21", -] - -[[package]] -name = "filmcraft-mpeg2v" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "rayon", - "thiserror 2.0.21", -] - -[[package]] -name = "filmcraft-mpegts" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "thiserror 2.0.21", -] - -[[package]] -name = "filmcraft-mxf" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "chrono", -] - -[[package]] -name = "filmcraft-ogg" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" - -[[package]] -name = "filmcraft-opus" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" - [[package]] name = "filmcraft-project" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" +version = "0.20.1" +source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" dependencies = [ "filmcraft-color", "filmcraft-geom", @@ -2984,42 +3150,15 @@ dependencies = [ "serde", "serde_json", "thiserror 2.0.21", -] - -[[package]] -name = "filmcraft-prores" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "filmcraft-bitstream", - "rayon", - "thiserror 2.0.21", + "url", ] [[package]] name = "filmcraft-time" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" +version = "0.20.1" +source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" dependencies = [ - "serde", -] - -[[package]] -name = "filmcraft-vp8" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "thiserror 2.0.21", -] - -[[package]] -name = "filmcraft-vp9" -version = "0.12.0" -source = "git+https://github.com/storytold/filmcraft?rev=d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5#d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" -dependencies = [ - "filmcraft-bitstream", - "rayon", - "thiserror 2.0.21", + "craft-timeline 0.1.0 (git+https://github.com/storytold/craft-libs?rev=57288edafdc45552e30481cc649021de446abfa0)", ] [[package]] @@ -3899,12 +4038,32 @@ dependencies = [ "hashbrown 0.17.1", ] +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "intrusive-collections" version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4275b20e6057cd7733fd8df8a5a31701e4fe44497dad0f3fa0e1c4fb971506be" +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.15.0" @@ -4095,6 +4254,16 @@ version = "0.2.189" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" +[[package]] +name = "libfuzzer-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9fd2f41a1cba099f79a0b6b6c35656cf7c03351a7bae8ff0f28f25270f929d2" +dependencies = [ + "arbitrary", + "cc", +] + [[package]] name = "libloading" version = "0.8.9" @@ -4209,6 +4378,16 @@ dependencies = [ "rawpointer", ] +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] + [[package]] name = "md-5" version = "0.10.6" @@ -4391,6 +4570,12 @@ dependencies = [ "jni-sys 0.3.1", ] +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + [[package]] name = "nix" version = "0.31.3" @@ -4403,6 +4588,15 @@ dependencies = [ "libc", ] +[[package]] +name = "no_std_io2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418abd1b6d34fbf6cae440dc874771b0525a604428704c76e48b29a5e67b8003" +dependencies = [ + "memchr", +] + [[package]] name = "nohash-hasher" version = "0.2.0" @@ -4418,6 +4612,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + [[package]] name = "ntapi" version = "0.4.3" @@ -4436,6 +4636,16 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "num-bigint" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367" +dependencies = [ + "num-integer", + "num-traits", +] + [[package]] name = "num-bigint" version = "0.5.1" @@ -4483,6 +4693,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint 0.4.8", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -4990,6 +5211,12 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "pastey" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec" + [[package]] name = "pastey" version = "0.2.3" @@ -5271,6 +5498,19 @@ name = "profiling" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4488a4a36b9a4ba6b9334a32a39971f77c1436ec82c38707bce707699cc3bbcb" +dependencies = [ + "quote", + "syn 2.0.119", +] [[package]] name = "proptest" @@ -5452,6 +5692,40 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca45419789ae5a7899559e9512e58ca889e41f04f1f2445e9f4b290ceccd1d08" +[[package]] +name = "rav1e" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b6dd56e85d9483277cde964fd1bdb0428de4fec5ebba7540995639a21cb32b" +dependencies = [ + "aligned-vec", + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av-scenechange", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools 0.14.0", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "paste", + "profiling", + "rand 0.9.5", + "rand_chacha", + "simd_helpers", + "thiserror 2.0.21", + "v_frame", +] + [[package]] name = "raw-cpuid" version = "11.6.0" @@ -5560,6 +5834,12 @@ dependencies = [ "bitflags 2.13.2", ] +[[package]] +name = "regex-lite" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973" + [[package]] name = "regex-syntax" version = "0.8.11" @@ -5991,6 +6271,15 @@ dependencies = [ "simdutf8", ] +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + [[package]] name = "simdutf8" version = "0.1.5" @@ -6226,17 +6515,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5773a4c030a19d9bfaa090f49746ff35c75dfddfa700df7a5939d5e076a57039" dependencies = [ "lazy_static", - "symphonia-bundle-flac", - "symphonia-bundle-mp3", - "symphonia-codec-aac", - "symphonia-codec-alac", - "symphonia-codec-pcm", - "symphonia-codec-vorbis", - "symphonia-core", - "symphonia-format-isomp4", - "symphonia-format-ogg", - "symphonia-format-riff", - "symphonia-metadata", + "symphonia-bundle-flac 0.5.5", + "symphonia-bundle-mp3 0.5.5", + "symphonia-codec-aac 0.5.5", + "symphonia-codec-alac 0.5.5", + "symphonia-codec-pcm 0.5.5", + "symphonia-codec-vorbis 0.5.5", + "symphonia-core 0.5.5", + "symphonia-format-isomp4 0.5.5", + "symphonia-format-ogg 0.5.5", + "symphonia-format-riff 0.5.5", + "symphonia-metadata 0.5.5", +] + +[[package]] +name = "symphonia" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7edef6a96b696d4e0cab5ee9ebb7ca155ed95f30a6b45bbb8b97d2727f02424" +dependencies = [ + "lazy_static", + "symphonia-bundle-flac 0.6.1", + "symphonia-bundle-mp3 0.6.1", + "symphonia-codec-aac 0.6.1", + "symphonia-codec-adpcm", + "symphonia-codec-alac 0.6.1", + "symphonia-codec-pcm 0.6.1", + "symphonia-codec-vorbis 0.6.1", + "symphonia-core 0.6.1", + "symphonia-format-caf", + "symphonia-format-isomp4 0.6.1", + "symphonia-format-mkv", + "symphonia-format-ogg 0.6.1", + "symphonia-format-riff 0.6.1", + "symphonia-metadata 0.6.1", ] [[package]] @@ -6246,11 +6558,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c91565e180aea25d9b80a910c546802526ffd0072d0b8974e3ebe59b686c9976" dependencies = [ "log", - "symphonia-core", - "symphonia-metadata", + "symphonia-core 0.5.5", + "symphonia-metadata 0.5.5", "symphonia-utils-xiph", ] +[[package]] +name = "symphonia-bundle-flac" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6405d5c34ff6f8f7ca08a4101efe66d21e180f7322ef9359900a0e55698a7892" +dependencies = [ + "log", + "symphonia-common", + "symphonia-core 0.6.1", + "symphonia-metadata 0.6.1", +] + [[package]] name = "symphonia-bundle-mp3" version = "0.5.5" @@ -6259,8 +6583,19 @@ checksum = "4872dd6bb56bf5eac799e3e957aa1981086c3e613b27e0ac23b176054f7c57ed" dependencies = [ "lazy_static", "log", - "symphonia-core", - "symphonia-metadata", + "symphonia-core 0.5.5", + "symphonia-metadata 0.5.5", +] + +[[package]] +name = "symphonia-bundle-mp3" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ea5ffc8716bff677dfb3b01b420c7b758de901a72b8c330bf2040ab74b4add" +dependencies = [ + "lazy_static", + "log", + "symphonia-core 0.6.1", ] [[package]] @@ -6271,7 +6606,29 @@ checksum = "4c263845aa86881416849c1729a54c7f55164f8b96111dba59de46849e73a790" dependencies = [ "lazy_static", "log", - "symphonia-core", + "symphonia-core 0.5.5", +] + +[[package]] +name = "symphonia-codec-aac" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5bf8e39552d34a3c4c98333370e62f48c92456d2e814f273b5c3ad7c4a5f45c" +dependencies = [ + "lazy_static", + "log", + "symphonia-common", + "symphonia-core 0.6.1", +] + +[[package]] +name = "symphonia-codec-adpcm" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445932ecb0c59362fde9c082dd63a75380650c5077fdb8b80b8cac850442a74c" +dependencies = [ + "log", + "symphonia-core 0.6.1", ] [[package]] @@ -6281,7 +6638,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8413fa754942ac16a73634c9dfd1500ed5c61430956b33728567f667fdd393ab" dependencies = [ "log", - "symphonia-core", + "symphonia-core 0.5.5", +] + +[[package]] +name = "symphonia-codec-alac" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "920a78f96f3cf62932d0c497959c0cc2100ef36b03c7ca1417b260f432a482d8" +dependencies = [ + "log", + "symphonia-common", + "symphonia-core 0.6.1", ] [[package]] @@ -6291,7 +6659,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e89d716c01541ad3ebe7c91ce4c8d38a7cf266a3f7b2f090b108fb0cb031d95" dependencies = [ "log", - "symphonia-core", + "symphonia-core 0.5.5", +] + +[[package]] +name = "symphonia-codec-pcm" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e04ba75686acbe43542fdd374571195f0530c0b7785ca25cc6840e9c6c4b6eea" +dependencies = [ + "log", + "symphonia-core 0.6.1", ] [[package]] @@ -6301,10 +6679,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f025837c309cd69ffef572750b4a2257b59552c5399a5e49707cc5b1b85d1c73" dependencies = [ "log", - "symphonia-core", + "symphonia-core 0.5.5", "symphonia-utils-xiph", ] +[[package]] +name = "symphonia-codec-vorbis" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73d90b4fcf796137cc683c538282804ff9629f8ad9dbfd881fcbba331ac4e986" +dependencies = [ + "log", + "symphonia-common", + "symphonia-core 0.6.1", +] + +[[package]] +name = "symphonia-common" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acc3fcc18ec9b8cdd48614e259c4cf0d27b71d41e5d9b120b42c5adab12d7c4" +dependencies = [ + "log", + "symphonia-core 0.6.1", + "symphonia-metadata 0.6.1", +] + [[package]] name = "symphonia-core" version = "0.5.5" @@ -6318,6 +6718,31 @@ dependencies = [ "log", ] +[[package]] +name = "symphonia-core" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c412864d599d4750d0c3d684d7e093ec05e5309681ef5252cc1096a437f6e0" +dependencies = [ + "bitflags 2.13.2", + "bytemuck", + "lazy_static", + "log", + "num-complex", + "smallvec", +] + +[[package]] +name = "symphonia-format-caf" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab64327ee1920531c5bf86cf7e9cd1a599d57013ddc30691da62683cefc65191" +dependencies = [ + "log", + "symphonia-common", + "symphonia-core 0.6.1", +] + [[package]] name = "symphonia-format-isomp4" version = "0.5.5" @@ -6326,11 +6751,35 @@ checksum = "243739585d11f81daf8dac8d9f3d18cc7898f6c09a259675fc364b382c30e0a5" dependencies = [ "encoding_rs", "log", - "symphonia-core", - "symphonia-metadata", + "symphonia-core 0.5.5", + "symphonia-metadata 0.5.5", "symphonia-utils-xiph", ] +[[package]] +name = "symphonia-format-isomp4" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e681a70e1870d34e02abf1dbc51e4267c3f1827801474e8870be8c689fc4dc3" +dependencies = [ + "log", + "symphonia-common", + "symphonia-core 0.6.1", + "symphonia-metadata 0.6.1", +] + +[[package]] +name = "symphonia-format-mkv" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d015c5c0558864665894b3f4cbd95e10abb01b9c868e751c72670f326a56360e" +dependencies = [ + "lazy_static", + "log", + "symphonia-common", + "symphonia-core 0.6.1", +] + [[package]] name = "symphonia-format-ogg" version = "0.5.5" @@ -6338,11 +6787,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b4955c67c1ed3aa8ae8428d04ca8397fbef6a19b2b051e73b5da8b1435639cb" dependencies = [ "log", - "symphonia-core", - "symphonia-metadata", + "symphonia-core 0.5.5", + "symphonia-metadata 0.5.5", "symphonia-utils-xiph", ] +[[package]] +name = "symphonia-format-ogg" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5495e7f7e3c7035328d82b6d6e377eef289bb0c4105bdeb557fc93a833f994" +dependencies = [ + "log", + "symphonia-common", + "symphonia-core 0.6.1", + "symphonia-metadata 0.6.1", +] + [[package]] name = "symphonia-format-riff" version = "0.5.5" @@ -6351,8 +6812,20 @@ checksum = "c2d7c3df0e7d94efb68401d81906eae73c02b40d5ec1a141962c592d0f11a96f" dependencies = [ "extended", "log", - "symphonia-core", - "symphonia-metadata", + "symphonia-core 0.5.5", + "symphonia-metadata 0.5.5", +] + +[[package]] +name = "symphonia-format-riff" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ff70929083a8c1a5f6cd7c904b6071c7914ad04739b510c2f7239dfc9b7dabe" +dependencies = [ + "extended", + "log", + "symphonia-core 0.6.1", + "symphonia-metadata 0.6.1", ] [[package]] @@ -6364,7 +6837,20 @@ dependencies = [ "encoding_rs", "lazy_static", "log", - "symphonia-core", + "symphonia-core 0.5.5", +] + +[[package]] +name = "symphonia-metadata" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83713a97705d77bdef7cdbc0768fd6e5a54e4cd7e48d60a806ae85639e2c87c6" +dependencies = [ + "lazy_static", + "log", + "regex-lite", + "smallvec", + "symphonia-core 0.6.1", ] [[package]] @@ -6373,8 +6859,8 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27c85ab799a338446b68eec77abf42e1a6f1bb490656e121c6e27bfbab9f16" dependencies = [ - "symphonia-core", - "symphonia-metadata", + "symphonia-core 0.5.5", + "symphonia-metadata 0.5.5", ] [[package]] @@ -6928,6 +7414,17 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "v_frame" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "666b7727c8875d6ab5db9533418d7c764233ac9c0cff1d469aec8fa127597be2" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + [[package]] name = "vectorcraft-geom" version = "0.18.0" @@ -8209,6 +8706,12 @@ dependencies = [ "tempfile", ] +[[package]] +name = "y4m" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448" + [[package]] name = "yoke" version = "0.8.3" diff --git a/Cargo.toml b/Cargo.toml index 21f47439c..b4d81bc21 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,15 +98,15 @@ craft-video = { version = "0.1.0", git = "https://github.com/storytold/craft-lib # footage decoding: FilmCraft's pure-Rust crates, pinned to a revision (plan/adr/0001). # Only `crates/media`, `crates/export` and `crates/interchange` may depend on these. -filmcraft-codecs = { git = "https://github.com/storytold/filmcraft", rev = "d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" } -filmcraft-media = { git = "https://github.com/storytold/filmcraft", rev = "d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" } -filmcraft-frame = { git = "https://github.com/storytold/filmcraft", rev = "d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" } -filmcraft-color = { git = "https://github.com/storytold/filmcraft", rev = "d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" } -filmcraft-time = { git = "https://github.com/storytold/filmcraft", rev = "d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" } +filmcraft-codecs = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } +filmcraft-media = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } +filmcraft-frame = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } +filmcraft-color = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } +filmcraft-time = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } # timeline interchange (EDL, FCP7 XML, FCPXML, OTIO) for Premiere Pro interop (crates/interchange only) -filmcraft-interchange = { git = "https://github.com/storytold/filmcraft", rev = "d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" } -filmcraft-project = { git = "https://github.com/storytold/filmcraft", rev = "d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" } -filmcraft-geom = { git = "https://github.com/storytold/filmcraft", rev = "d5ead4ba1ee2f1cd13cb86a4239aee2730a3d9f5" } +filmcraft-interchange = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } +filmcraft-project = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } +filmcraft-geom = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } # gpu (the same wgpu eframe / egui-wgpu use) wgpu = { version = "30.0.1", features = ["fragile-send-sync-non-atomic-wasm"] } From cb29f77eafbe804d8421e1d7537e5332de40ccab Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 08:42:06 -0500 Subject: [PATCH 07/25] interchange: adapt export to current Film media and marker APIs --- crates/interchange/src/export.rs | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/crates/interchange/src/export.rs b/crates/interchange/src/export.rs index fd396b00b..371c3a3d3 100644 --- a/crates/interchange/src/export.rs +++ b/crates/interchange/src/export.rs @@ -365,7 +365,7 @@ impl Exporter<'_> { let mut clip = media_clip(fp::MediaRef::File { path: path.clone() }, info); clip.offline = f.missing; let bin = self.bin(it.and_then(|i| i.parent)); - let id = self.fp.add_item(&name, fp::Label::Iris, fp::ItemKind::Media(clip), bin); + let id = self.fp.add_item(&name, fp::Label::Iris, fp::ItemKind::Media(Box::new(clip)), bin); self.media.insert(path, id); id } @@ -384,7 +384,7 @@ impl Exporter<'_> { Some(b) } }; - let id = self.fp.add_item(name, fp::Label::Violet, fp::ItemKind::Media(clip), bin); + let id = self.fp.add_item(name, fp::Label::Violet, fp::ItemKind::Media(Box::new(clip)), bin); self.media.insert(r.path.clone(), id); id } @@ -405,7 +405,7 @@ impl Exporter<'_> { ); let clip = media_clip(fp::MediaRef::Generator(Generator::ColorMatte { color: [color[0], color[1], color[2], 1.0] }), info); let bin = self.bin(it.and_then(|i| i.parent)); - let id = self.fp.add_item(&name, fp::Label::Rose, fp::ItemKind::Media(clip), bin); + let id = self.fp.add_item(&name, fp::Label::Rose, fp::ItemKind::Media(Box::new(clip)), bin); self.media.insert(key, id); id } @@ -540,6 +540,9 @@ impl Exporter<'_> { comment: if m.chapter.is_empty() { String::new() } else { m.comment.clone() }, kind: if m.chapter.is_empty() { fp::MarkerKind::Comment } else { fp::MarkerKind::Chapter }, color: fp::Label::Green, + custom_color: None, + author: String::new(), + url: m.url.clone(), }) .collect(); if let Some(seq) = self.fp.sequence_mut(sid) { @@ -733,6 +736,7 @@ fn media_info(name: &str, kind: MediaKind, duration: Tick, video: Option fp::MediaClip { mod tests { use super::*; + #[test] + fn synthesized_video_metadata_does_not_claim_an_inferred_color_profile() { + let info = media_info("clip", MediaKind::Video, Tick::ZERO, Some((1920, 1080, FrameRate::new(24, 1), 1.0, "raw".into(), true)), false); + let video = info.video.unwrap(); + assert_eq!((video.width, video.height), (1920, 1080)); + assert!(video.color_assumed.is_none()); + assert!(video.has_alpha); + } + /// A folder's bin is the same one each time it is asked for (a cached folder once answered /// `None`, so a folder's second item went to the project root); a non-item has no bin. #[test] From adb120c32768637a53a519b1a6e3bfaead6bc0c4 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 09:41:59 -0500 Subject: [PATCH 08/25] interchange: update test fixtures and adopt merged shared AAF route --- Cargo.lock | 46 +++++++++++------------- Cargo.toml | 16 ++++----- crates/host/tests/it/timeline_interop.rs | 3 +- crates/interchange/src/export.rs | 2 +- crates/interchange/src/tests.rs | 3 +- 5 files changed, 33 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83cba5a3f..a38c653da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1541,12 +1541,15 @@ dependencies = [ [[package]] name = "craft-raw" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=7738cc6c689060475cb6947a6e3db6ed78fb3419#7738cc6c689060475cb6947a6e3db6ed78fb3419" +source = "git+https://github.com/storytold/craft-libs?rev=402dfe46ad568a97f660bcbe30e3a80429b9e1fe#402dfe46ad568a97f660bcbe30e3a80429b9e1fe" dependencies = [ - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=7738cc6c689060475cb6947a6e3db6ed78fb3419)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=402dfe46ad568a97f660bcbe30e3a80429b9e1fe)", + "miniz_oxide 0.9.1", "rayon", "serde", "thiserror 2.0.21", + "zune-core", + "zune-jpeg", ] [[package]] @@ -1576,7 +1579,7 @@ dependencies = [ [[package]] name = "craft-tiff" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=0eaafeb5054f2113523c8844822a830865cf45f2#0eaafeb5054f2113523c8844822a830865cf45f2" +source = "git+https://github.com/storytold/craft-libs?rev=402dfe46ad568a97f660bcbe30e3a80429b9e1fe#402dfe46ad568a97f660bcbe30e3a80429b9e1fe" dependencies = [ "serde", "thiserror 2.0.21", @@ -1591,15 +1594,6 @@ dependencies = [ "thiserror 2.0.21", ] -[[package]] -name = "craft-tiff" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=7738cc6c689060475cb6947a6e3db6ed78fb3419#7738cc6c689060475cb6947a6e3db6ed78fb3419" -dependencies = [ - "serde", - "thiserror 2.0.21", -] - [[package]] name = "craft-time" version = "0.1.0" @@ -3008,7 +3002,7 @@ dependencies = [ [[package]] name = "filmcraft-bitstream" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" dependencies = [ "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", ] @@ -3016,7 +3010,7 @@ dependencies = [ [[package]] name = "filmcraft-cfb" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" dependencies = [ "craft-cfb 0.1.0 (git+https://github.com/storytold/craft-libs?rev=7f3fdc0dfebd03f33a241f91f916e9a78d3e5c93)", ] @@ -3024,7 +3018,7 @@ dependencies = [ [[package]] name = "filmcraft-codecs" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" dependencies = [ "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=937ac93c5cf3cd4b6a81e195b078fe161eb081b9)", @@ -3048,7 +3042,7 @@ dependencies = [ [[package]] name = "filmcraft-color" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" dependencies = [ "serde", ] @@ -3056,10 +3050,10 @@ dependencies = [ [[package]] name = "filmcraft-dng" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" dependencies = [ "craft-raw", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0eaafeb5054f2113523c8844822a830865cf45f2)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=402dfe46ad568a97f660bcbe30e3a80429b9e1fe)", "image", "rayon", "thiserror 2.0.21", @@ -3068,7 +3062,7 @@ dependencies = [ [[package]] name = "filmcraft-frame" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" dependencies = [ "filmcraft-color", "filmcraft-time", @@ -3079,7 +3073,7 @@ dependencies = [ [[package]] name = "filmcraft-geom" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" dependencies = [ "serde", ] @@ -3087,7 +3081,7 @@ dependencies = [ [[package]] name = "filmcraft-interchange" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" dependencies = [ "craft-aaf", "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", @@ -3106,7 +3100,7 @@ dependencies = [ [[package]] name = "filmcraft-isobmff" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" dependencies = [ "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", ] @@ -3114,7 +3108,7 @@ dependencies = [ [[package]] name = "filmcraft-matroska" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" dependencies = [ "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", ] @@ -3122,7 +3116,7 @@ dependencies = [ [[package]] name = "filmcraft-media" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" dependencies = [ "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", "craft-dpx 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", @@ -3141,7 +3135,7 @@ dependencies = [ [[package]] name = "filmcraft-project" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" dependencies = [ "filmcraft-color", "filmcraft-geom", @@ -3156,7 +3150,7 @@ dependencies = [ [[package]] name = "filmcraft-time" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=baeca9db89e54723a86e02e0e3a550e5ea2b16d2#baeca9db89e54723a86e02e0e3a550e5ea2b16d2" +source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" dependencies = [ "craft-timeline 0.1.0 (git+https://github.com/storytold/craft-libs?rev=57288edafdc45552e30481cc649021de446abfa0)", ] diff --git a/Cargo.toml b/Cargo.toml index b4d81bc21..6c0fc585d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,15 +98,15 @@ craft-video = { version = "0.1.0", git = "https://github.com/storytold/craft-lib # footage decoding: FilmCraft's pure-Rust crates, pinned to a revision (plan/adr/0001). # Only `crates/media`, `crates/export` and `crates/interchange` may depend on these. -filmcraft-codecs = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } -filmcraft-media = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } -filmcraft-frame = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } -filmcraft-color = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } -filmcraft-time = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } +filmcraft-codecs = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } +filmcraft-media = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } +filmcraft-frame = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } +filmcraft-color = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } +filmcraft-time = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } # timeline interchange (EDL, FCP7 XML, FCPXML, OTIO) for Premiere Pro interop (crates/interchange only) -filmcraft-interchange = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } -filmcraft-project = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } -filmcraft-geom = { git = "https://github.com/storytold/filmcraft", rev = "baeca9db89e54723a86e02e0e3a550e5ea2b16d2" } +filmcraft-interchange = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } +filmcraft-project = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } +filmcraft-geom = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } # gpu (the same wgpu eframe / egui-wgpu use) wgpu = { version = "30.0.1", features = ["fragile-send-sync-non-atomic-wasm"] } diff --git a/crates/host/tests/it/timeline_interop.rs b/crates/host/tests/it/timeline_interop.rs index 9688a409f..8cdc2a4d1 100644 --- a/crates/host/tests/it/timeline_interop.rs +++ b/crates/host/tests/it/timeline_interop.rs @@ -54,6 +54,7 @@ fn still(p: &mut fp::Project, path: &str) -> fp::ItemId { codec: "png".into(), pixel_format: String::new(), color: Default::default(), + color_assumed: None, has_alpha: false, bitrate: None, hdr: None, @@ -75,7 +76,7 @@ fn still(p: &mut fp::Project, path: &str) -> fp::ItemId { identity: None, }; let name = path.rsplit('/').next().unwrap().to_string(); - p.add_item(&name, fp::Label::Iris, fp::ItemKind::Media(clip), None) + p.add_item(&name, fp::Label::Iris, fp::ItemKind::Media(Box::new(clip)), None) } /// V1: red for 2 s; V2: blue at 50 % opacity and 50 % scale; a cross dissolve from red to green diff --git a/crates/interchange/src/export.rs b/crates/interchange/src/export.rs index 371c3a3d3..69ab38aa4 100644 --- a/crates/interchange/src/export.rs +++ b/crates/interchange/src/export.rs @@ -761,7 +761,7 @@ mod tests { #[test] fn synthesized_video_metadata_does_not_claim_an_inferred_color_profile() { - let info = media_info("clip", MediaKind::Video, Tick::ZERO, Some((1920, 1080, FrameRate::new(24, 1), 1.0, "raw".into(), true)), false); + let info = media_info("clip", MediaKind::Movie, Tick::ZERO, Some((1920, 1080, FrameRate::new(24, 1), 1.0, "raw".into(), true)), false); let video = info.video.unwrap(); assert_eq!((video.width, video.height), (1920, 1080)); assert!(video.color_assumed.is_none()); diff --git a/crates/interchange/src/tests.rs b/crates/interchange/src/tests.rs index 4ce892c15..ec61c5848 100644 --- a/crates/interchange/src/tests.rs +++ b/crates/interchange/src/tests.rs @@ -34,6 +34,7 @@ fn info(kind: filmcraft_media::MediaKind, video: bool, audio: bool) -> filmcraft codec: "png".into(), pixel_format: String::new(), color: Default::default(), + color_assumed: None, has_alpha: false, bitrate: None, hdr: None, @@ -60,7 +61,7 @@ fn media(p: &mut fp::Project, name: &str, path: &str, kind: filmcraft_media::Med proxy: None, identity: None, }; - p.add_item(name, fp::Label::Iris, fp::ItemKind::Media(clip), bin) + p.add_item(name, fp::Label::Iris, fp::ItemKind::Media(Box::new(clip)), bin) } fn rate() -> filmcraft_time::FrameRate { From 9da73e9cf3e15cda59e732401c94dfe23e4c52f9 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 09:47:19 -0500 Subject: [PATCH 09/25] psd: delegate ZIP prediction reversal with budgeted scratch --- Cargo.lock | 2 +- Cargo.toml | 2 +- crates/psd/src/pixels.rs | 68 ++++++++++++++++--------------------- crates/psd/src/tests/opt.rs | 18 ++++++++++ 4 files changed, 49 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1284590d6..5d5411483 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1359,7 +1359,7 @@ dependencies = [ [[package]] name = "craft-psd" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=e836b6fd893eca3fbe5880f000dbf446c3a32fcc#e836b6fd893eca3fbe5880f000dbf446c3a32fcc" +source = "git+https://github.com/storytold/craft-libs?rev=c864e1e8c9e0f7e2c9f24fca1faa6f298a068bca#c864e1e8c9e0f7e2c9f24fca1faa6f298a068bca" dependencies = [ "encoding_rs", "flate2", diff --git a/Cargo.toml b/Cargo.toml index 0ed32db9a..55ba9d0c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ craft-dpx = { version = "0.1.0", git = "https://github.com/storytold/craft-libs" craft-ps = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "808730f49b9637b7909fe2ae56f9d63fdb100cae", default-features = false, features = ["read"] } craft-exr = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-gif = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } -craft-psd = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "e836b6fd893eca3fbe5880f000dbf446c3a32fcc" } +craft-psd = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "c864e1e8c9e0f7e2c9f24fca1faa6f298a068bca" } craft-svg = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-webp = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-lottie = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } diff --git a/crates/psd/src/pixels.rs b/crates/psd/src/pixels.rs index 4907e21f7..f9b7ca6f3 100644 --- a/crates/psd/src/pixels.rs +++ b/crates/psd/src/pixels.rs @@ -134,46 +134,36 @@ impl Psd { /// Undo ZIP prediction in place; the 32-bit scratch row is charged to `budget`. pub(crate) fn unpredict(&self, v: &mut [u8], w: usize, h: usize, budget: &mut Budget) -> Result<()> { - match self.depth { - 16 => { - for row in v.chunks_exact_mut(w * 2).take(h) { - let mut prev = 0u16; - for c in row.as_chunks_mut::<2>().0 { - let x = u16::from_be_bytes([c[0], c[1]]).wrapping_add(prev); - c.copy_from_slice(&x.to_be_bytes()); - prev = x; - } - } - } - 32 => { - // One scratch row for the whole plane, charged: a wide, short layer passes the - // decode's peak check and would otherwise allocate it on top. - let mut planar = budget.filled(w.checked_mul(4).ok_or_else(|| too_large(w, h))?, 0u8)?; - #[cfg(test)] - counters::bump(&counters::SCRATCH); - for row in v.chunks_exact_mut(w * 4).take(h) { - for i in 1..row.len() { - row[i] = row[i].wrapping_add(row[i - 1]); - } - // Bytes are stored plane by plane (all first bytes, then all second bytes…). - planar.copy_from_slice(row); - for x in 0..w { - for b in 0..4 { - row[x * 4 + b] = planar[b * w + x]; - } - } - } - budget.release(planar.len() as u64); - } - _ => { - for row in v.chunks_exact_mut(w).take(h) { - for i in 1..row.len() { - row[i] = row[i].wrapping_add(row[i - 1]); - } - } - } + // Preserve the reader's recovery behavior: decode only complete rows, at most h. + // The fallback depths historically used byte-wise prediction rather than packed bits. + let depth = match self.depth { + 16 => 16, + 32 => 32, + _ => 8, + }; + let rowb = w.checked_mul(usize::from(depth / 8)).ok_or_else(|| too_large(w, h))?; + if rowb == 0 { + return Ok(()); } - Ok(()) + let rows = (v.len() / rowb).min(h); + let layout = craft_psd::compression::PlaneLayout { + planes: 1, + width: w, + height: rows, + depth, + version: if self.psb { craft_psd::Version::Psb } else { craft_psd::Version::Psd }, + }; + let mut scratch = if depth == 32 { + let scratch = budget.filled(rowb, 0u8)?; + #[cfg(test)] + counters::bump(&counters::SCRATCH); + scratch + } else { + Vec::new() + }; + let result = craft_psd::compression::unpredict_with_scratch(&mut v[..rows * rowb], &layout, &mut scratch); + budget.release(scratch.len() as u64); + result.map_err(|e| Error::Invalid(e.to_string())) } /// Hand every sample of `raw` (`w`×`h`, row-major, in order) to `f` as a float. Samples a short diff --git a/crates/psd/src/tests/opt.rs b/crates/psd/src/tests/opt.rs index 241af0069..79e05a41b 100644 --- a/crates/psd/src/tests/opt.rs +++ b/crates/psd/src/tests/opt.rs @@ -650,3 +650,21 @@ fn placed_bake_solves_the_quad_once() { so.map([1.0, 1.0], 20.0, 10.0); assert_eq!(counters::take(&QUAD), 1); } + +#[test] +fn shared_unpredict_keeps_tail_bytes_and_refuses_unbudgeted_scratch() { + for depth in [8u16, 16, 32] { + let p = Psd { depth, ..base() }; + let (w, h) = (3, 2); + let row = w * usize::from(depth / 8); + let mut actual: Vec = (0..row * 3 + 1).map(|i| (i * 31 % 251) as u8).collect(); + let mut expected = actual.clone(); + ref_unpredict(depth, &mut expected, w, h); + p.unpredict(&mut actual, w, h, &mut Budget::new(u64::MAX)).unwrap(); + assert_eq!(actual, expected, "complete extra rows and partial tails stay untouched"); + } + let p = Psd { depth: 32, ..base() }; + let mut bytes = vec![0x31; 24]; + assert!(p.unpredict(&mut bytes, 3, 2, &mut Budget::new(11)).is_err()); + assert_eq!(bytes, vec![0x31; 24], "budget refusal precedes mutation"); +} From b842402a83710367af9f9b6e6cab76f339c2d2ac Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 11:04:56 -0500 Subject: [PATCH 10/25] interchange: retain EDL guessed-path bounds with current Film metadata --- crates/interchange/src/import.rs | 8 +++++--- crates/interchange/src/tests.rs | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/crates/interchange/src/import.rs b/crates/interchange/src/import.rs index 6faadd91a..5dd5642ac 100644 --- a/crates/interchange/src/import.rs +++ b/crates/interchange/src/import.rs @@ -201,8 +201,8 @@ const EDL_MEDIA_TIME_NOTE: &str = "EDL source timecodes were imported as media t /// The largest start timecode, in frames, a file may have: a day at 1000 fps. const MAX_FILE_TIMECODE: i64 = 24 * 3600 * 1000; -/// The paths an EDL reader guessed (media it flags offline: a line without `SOURCE FILE` names -/// only its clip) that are not inside the list's folder: a clip name of `../x.mov` or an absolute +/// The paths an EDL reader guessed (identified by its `Tape Name` metadata: a line without +/// `SOURCE FILE` names only its clip) that are not inside the list's folder: a clip name of `../x.mov` or an absolute /// one would link a file elsewhere on the disk. They stay placeholders. A `SOURCE FILE` path is /// the list's own choice and is kept, also when another clip guesses the same path. fn guessed_outside(project: &fp::Project, base_dir: Option<&str>) -> HashSet { @@ -219,7 +219,9 @@ fn guessed_outside(project: &fp::Project, base_dir: Option<&str>) -> HashSet Date: Mon, 16 Nov 2026 11:09:24 -0500 Subject: [PATCH 11/25] test: use valid encoded PCE layout for AAC downmix parity --- ATTRIBUTION.md | 8 ++- crates/media/tests/fixtures/README.md | 31 +++++++++ .../tests/fixtures/pce61-ffmpeg.aac-fixture | Bin 0 -> 170569 bytes .../pce61-ffmpeg.aac-fixture.attribution | 7 ++ crates/media/tests/it/aac_layout.rs | 63 ++++++++++-------- 5 files changed, 82 insertions(+), 27 deletions(-) create mode 100644 crates/media/tests/fixtures/README.md create mode 100644 crates/media/tests/fixtures/pce61-ffmpeg.aac-fixture create mode 100644 crates/media/tests/fixtures/pce61-ffmpeg.aac-fixture.attribution diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index 2f78b6b5e..7043e6128 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -155,4 +155,10 @@ under [`docs/brand/LICENSE-brand.txt`](docs/brand/LICENSE-brand.txt). Forks and | `docs/brand/artcraft-mark.png` | ArtCraft Team | Original work: first-party ArtCraft brand mark (ArtCraft symbol ("A" mark), blue) | ArtCraft brand terms, not open source (`docs/brand/LICENSE-brand.txt`) | | `docs/brand/artcraft-mark.svg` | ArtCraft Team | Original work: first-party ArtCraft brand mark (ArtCraft symbol ("A" mark), blue) | ArtCraft brand terms, not open source (`docs/brand/LICENSE-brand.txt`) | -- Appearance theme previews, drawn procedurally from original shapes: `crates/ui-egui/src/panels/settings.rs` (original work, MIT OR Apache-2.0). +- Appearance theme previews, drawn procedurally from original shapes: `crates/ui-egui/src/panels/settings.rs` (original work, MIT OR Apache-2.0). + +## Synthetic test audio + +| Asset | Author | Source | Licence | +|---|---|---|---| +| `crates/media/tests/fixtures/pce61-ffmpeg.aac-fixture` | Dylan M. Taylor | Original sine waves; reproducible recipe in `crates/media/tests/fixtures/README.md` | MIT OR Apache-2.0 | diff --git a/crates/media/tests/fixtures/README.md b/crates/media/tests/fixtures/README.md new file mode 100644 index 000000000..1e9b6bf45 --- /dev/null +++ b/crates/media/tests/fixtures/README.md @@ -0,0 +1,31 @@ +# Synthetic AAC layout fixture + +`pce61-ffmpeg.aac-fixture` contains only original mathematical sine tones generated for these tests by Dylan M. Taylor. No recorded audio or third-party source/assets were copied; the generated fixture is covered by this repository's license. FFmpeg is a generation tool, not a runtime test dependency. + +Generator: FFmpeg 7.1.5 (Debian 7.1.5-0+deb13u1, AAC encoder Lavc61.19.101). +SHA-256: `07c460636dce4aa4163df8ef35f3b76f1214c38bf217aacd23243e608d87071e`. + +The seven PCM inputs are FL500Hz, FR700Hz, FC300Hz, LFE60Hz, BC900Hz, SL1100Hz, SR1300Hz, each amplitude0.25 at48kHz for2seconds. The real encoder emits its own PCE and matching element tags; unlike the previous synthetic configuration rewrite, no LFE element is mislabeled as an unlisted SCE. + +Reproduce using FFmpeg/ffprobe and Python3: + +```sh +ffmpeg -hide_banner -loglevel error -f lavfi -i 'aevalsrc=0.25*sin(2*PI*500*t)|0.25*sin(2*PI*700*t)|0.25*sin(2*PI*300*t)|0.25*sin(2*PI*60*t)|0.25*sin(2*PI*900*t)|0.25*sin(2*PI*1100*t)|0.25*sin(2*PI*1300*t):s=48000:d=2:c=6.1' -c:a aac -b:a 672k pce61.m4a +ffprobe -v error -show_streams -show_packets -show_data -of json pce61.m4a > pce61.json +python3 - <<'PY' +import json, struct +x = json.load(open('pce61.json')) +def raw(text): + return bytes.fromhex(''.join(line.split(': ', 1)[1].split(' ', 1)[0].replace(' ', '') + for line in text.strip().splitlines())) +asc = raw(x['streams'][0]['extradata']) +units = [raw(p['data']) for p in x['packets']] +assert len(units) == 95 +output = bytearray(b'PCE1') +for record in [asc, *units]: + output += struct.pack('>I', len(record)) + record +open('pce61-ffmpeg.aac-fixture', 'wb').write(output) +PY +``` + +Envelope: ASCII `PCE1`, then a big-endian32-bit length and ASC bytes, then95 length-prefixed raw AAC access units. Container priming trim is deliberately not retained, matching the existing tests' encoder units; measurements start0.5seconds into decoded audio. Other encoder versions can yield different bytes; preserve actual PCE/AU consistency and all existing tone-gain assertions. diff --git a/crates/media/tests/fixtures/pce61-ffmpeg.aac-fixture b/crates/media/tests/fixtures/pce61-ffmpeg.aac-fixture new file mode 100644 index 0000000000000000000000000000000000000000..d2894ff82c3e9a2329bcae81f34447a1af78a1cf GIT binary patch literal 170569 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

xy;iMsxRNT%zw4l0v=V6 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

Nb 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%0AC6R@Fh4NzBFyIQW$;-SM@zK;jWr+ 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 literal 0 HcmV?d00001 diff --git a/crates/media/tests/fixtures/pce61-ffmpeg.aac-fixture.attribution b/crates/media/tests/fixtures/pce61-ffmpeg.aac-fixture.attribution new file mode 100644 index 000000000..3f385a1e4 --- /dev/null +++ b/crates/media/tests/fixtures/pce61-ffmpeg.aac-fixture.attribution @@ -0,0 +1,7 @@ +asset: pce61-ffmpeg.aac-fixture +title: Synthetic seven-channel AAC PCE tone fixture +author: Dylan M. Taylor +source: crates/media/tests/fixtures/README.md (reproducible generation recipe) +license: MIT OR Apache-2.0 +added: 2026-11-16 +notes: Original sine-wave signals, no recorded audio or copied assets. Encoded using FFmpeg 7.1.5. SHA-256 07c460636dce4aa4163df8ef35f3b76f1214c38bf217aacd23243e608d87071e. diff --git a/crates/media/tests/it/aac_layout.rs b/crates/media/tests/it/aac_layout.rs index 896e4f0a7..5adf762b2 100644 --- a/crates/media/tests/it/aac_layout.rs +++ b/crates/media/tests/it/aac_layout.rs @@ -1,7 +1,8 @@ //! Multichannel AAC reaches stereo by where each channel plays, whatever order its channel -//! configuration decodes in (#1701). Fixtures are tones encoded with craft-audio's AAC encoder (no -//! ffmpeg needed, so nothing is skipped), with the configuration rewritten where the coded -//! elements fit another: configurations 11 and 12 code the same elements as the encoder's 7- and +//! configuration decodes in (#1701). Fixtures are tones encoded with craft-audio's AAC encoder, +//! plus a checked-in genuine FFmpeg-generated 6.1-channel fixture (no external tool at test time, nothing skipped). +//! The configuration is rewritten only where the coded elements fit another: configurations 11 +//! and 12 code the same elements as the encoder's 7- and //! 8-channel output, and a program config element can name any of them. use std::f64::consts::PI; @@ -9,7 +10,7 @@ use std::io::Cursor; use std::path::PathBuf; use std::sync::Arc; -use craft_audio::aac::{AudioSpecificConfig, Encoder, EncoderConfig, ProgramConfig}; +use craft_audio::aac::{AudioSpecificConfig, Encoder, EncoderConfig}; use effectcraft_media::{MediaPool, probe, probe_bytes}; use effectcraft_time::Tick; @@ -59,13 +60,6 @@ fn lc(config: u8) -> Option { Some(AudioSpecificConfig::lc(3, config)) } -fn pce(front: Vec<(bool, u8)>, side: Vec<(bool, u8)>, back: Vec<(bool, u8)>, lfe: Vec, comment: &[u8]) -> Option { - let pce = ProgramConfig { object_type: 1, sf_index: 3, front, side, back, lfe, comment: comment.to_vec(), ..Default::default() }; - let mut asc = AudioSpecificConfig::lc(3, 0); - asc.pce = Some(pce); - Some(asc) -} - use Ch::*; fn cases() -> Vec { @@ -80,15 +74,9 @@ fn cases() -> Vec { Case { name: "config12", content: &[C, L, R, Ls, Rs, Ls, Rs, Lfe], asc: lc(12) }, // the encoder's own 6.1: a PCE listing the centre first Case { name: "pce61-centre-first", content: &[C, L, R, Ls, Rs, Cs, Lfe], asc: None }, - // ffmpeg's 6.1 PCE: front pair and centre, a side SCE, a back pair and SCE, no LFE - // element, its channels in ffmpeg's order L R C LFE Cs Ls Rs. The decoder places the - // encoder's SCE 0 in the front SCE, pair 0 front, pair 1 back, SCE 1 in the back SCE (tag - // 1) and the LFE in the side SCE left over (tag 5). - Case { - name: "pce61-ffmpeg", - content: &[C, L, R, Cs, Ls, Rs, Lfe], - asc: pce(vec![(true, 0), (false, 0)], vec![(false, 5)], vec![(true, 1), (false, 1)], vec![], b"Lavc62.28.102"), - }, + // A genuine FFmpeg-generated 6.1-channel PCE and matching coded elements; rewriting only the ASC of + // our encoder's LFE0 stream to claim a side SCE5 would make an invalid access unit. + Case { name: "pce61-ffmpeg", content: &[C, L, R, Cs, Ls, Rs, Lfe], asc: None }, ] } @@ -110,6 +98,32 @@ fn encode(content: &[Ch], adts: bool) -> (Vec, Vec>) { (enc.audio_specific_config(), units) } +/// Preserve the fixture's real element types/tags instead of changing only its ASC. +/// The envelope and reproducible tone-generation recipe are in `tests/fixtures/README.md`. +fn encode_case(case: &Case) -> (Vec, Vec>) { + if case.name == "pce61-ffmpeg" { + let bytes = include_bytes!("../fixtures/pce61-ffmpeg.aac-fixture"); + assert_eq!(&bytes[..4], b"PCE1"); + let mut rest = &bytes[4..]; + let mut record = || { + let len = u32::from_be_bytes(rest[..4].try_into().unwrap()) as usize; + let (data, tail) = rest[4..].split_at(len); + rest = tail; + data.to_vec() + }; + let asc = record(); + let mut units = Vec::new(); + // The generated fixture contains 95 access units (including encoder priming). + for _ in 0..95 { + units.push(record()); + } + assert!(rest.is_empty(), "fixture has no unparsed records"); + return (asc, units); + } + let (asc, units) = encode(case.content, false); + (case.asc.as_ref().map_or(asc, |a| a.to_bytes().expect("ASC")), units) +} + fn mp4(asc: Vec, channels: u32, units: &[Vec]) -> Vec { mp4_after(None, asc, channels, units) } @@ -211,8 +225,7 @@ fn lfe_is_coded(case: &Case, bytes: Vec) { #[test] fn every_aac_layout_mixes_by_speaker_in_mp4() { for case in cases() { - let (asc, units) = encode(case.content, false); - let asc = case.asc.as_ref().map_or(asc, |a| a.to_bytes().expect("ASC")); + let (asc, units) = encode_case(&case); let bytes = mp4(asc, case.content.len() as u32, &units); lfe_is_coded(&case, bytes.clone()); let p = write(&format!("{}.mp4", case.name), &bytes); @@ -228,8 +241,7 @@ fn every_aac_layout_mixes_by_speaker_in_mp4() { #[test] fn matroska_aac_layouts_mix_by_speaker() { for case in cases().into_iter().filter(|c| matches!(c.name, "config12" | "pce61-centre-first" | "pce61-ffmpeg")) { - let (asc, units) = encode(case.content, false); - let asc = case.asc.as_ref().map_or(asc, |a| a.to_bytes().expect("ASC")); + let (asc, units) = encode_case(&case); let p = write(&format!("{}.mkv", case.name), &mkv(asc, case.content.len() as u32, &units)); check(case.name, case.content, &mix(&MediaPool::new(), &probe(&p).expect("probe"))); } @@ -254,8 +266,7 @@ fn an_empty_audio_track_lends_its_configuration_to_no_other() { let case = cases().into_iter().find(|c| c.name == name).expect("case"); let n = case.content.len() as u32; let empty = Some((AudioSpecificConfig::lc(3, empty).to_bytes().expect("ASC"), n)); - let (asc, units) = encode(case.content, false); - let asc = case.asc.as_ref().map_or(asc, |a| a.to_bytes().expect("ASC")); + let (asc, units) = encode_case(&case); let p = write(&format!("{name}-after-empty.mp4"), &mp4_after(empty.clone(), asc.clone(), n, &units)); check(&format!("{name} MP4"), case.content, &mix(&MediaPool::new(), &probe(&p).expect("probe"))); let p = write(&format!("{name}-after-empty.mkv"), &mkv_after(empty, asc, n, &units)); From b6d2598b3f217b2bbeb8b6ec86302941cfe21bc5 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 11:27:30 -0500 Subject: [PATCH 12/25] interchange: delegate lexical depth preflight to craft-timeline --- Cargo.lock | 18 ++++++++ Cargo.toml | 1 + crates/interchange/Cargo.toml | 1 + crates/interchange/src/import.rs | 73 +------------------------------- 4 files changed, 21 insertions(+), 72 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a38c653da..397da745e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1603,6 +1603,15 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-time" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=a2560df05b4c58631f53a57e65fb05f0e0e6cf76#a2560df05b4c58631f53a57e65fb05f0e0e6cf76" +dependencies = [ + "serde", + "thiserror 2.0.21", +] + [[package]] name = "craft-time" version = "0.1.0" @@ -1623,6 +1632,14 @@ dependencies = [ "serde_json", ] +[[package]] +name = "craft-timeline" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=a2560df05b4c58631f53a57e65fb05f0e0e6cf76#a2560df05b4c58631f53a57e65fb05f0e0e6cf76" +dependencies = [ + "craft-time 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a2560df05b4c58631f53a57e65fb05f0e0e6cf76)", +] + [[package]] name = "craft-timeline" version = "0.1.0" @@ -2252,6 +2269,7 @@ dependencies = [ name = "effectcraft-interchange" version = "0.24.1" dependencies = [ + "craft-timeline 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a2560df05b4c58631f53a57e65fb05f0e0e6cf76)", "effectcraft-color", "effectcraft-keyframe", "effectcraft-project", diff --git a/Cargo.toml b/Cargo.toml index 6c0fc585d..a7441a26b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,7 @@ rust-version = "1.95" repository = "https://github.com/storytold/effectcraft" [workspace.dependencies] +craft-timeline = { git = "https://github.com/storytold/craft-libs", rev = "a2560df05b4c58631f53a57e65fb05f0e0e6cf76", default-features = false } craft-mime = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "808730f49b9637b7909fe2ae56f9d63fdb100cae", version = "=0.1.0", default-features = false, features = ["read"] } craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } diff --git a/crates/interchange/Cargo.toml b/crates/interchange/Cargo.toml index 11dfec333..e2caa613d 100644 --- a/crates/interchange/Cargo.toml +++ b/crates/interchange/Cargo.toml @@ -10,6 +10,7 @@ rust-version.workspace = true workspace = true [dependencies] +craft-timeline = { workspace = true } effectcraft-time = { workspace = true } effectcraft-color = { workspace = true } effectcraft-keyframe = { workspace = true } diff --git a/crates/interchange/src/import.rs b/crates/interchange/src/import.rs index 5dd5642ac..a5336f406 100644 --- a/crates/interchange/src/import.rs +++ b/crates/interchange/src/import.rs @@ -49,78 +49,7 @@ pub struct ImportResult { /// a few levels per nested sequence; parsing several thousand levels overflowed the stack. pub const MAX_DEPTH: usize = 256; -/// The deepest element nesting of an XML document (a quick scan that skips comments, CDATA, -/// processing instructions, declarations and quoted attribute values). -pub(crate) fn xml_depth(b: &[u8]) -> usize { - let (mut i, mut depth, mut max) = (0usize, 0usize, 0usize); - let skip_to = |from: usize, end: &[u8]| b.get(from..).and_then(|r| r.windows(end.len()).position(|w| w == end)).map_or(b.len(), |p| from + p + end.len()); - while let Some(&c) = b.get(i) { - if c != b'<' { - i += 1; - continue; - } - let rest = b.get(i..).unwrap_or_default(); - if rest.starts_with(b""); - } else if rest.starts_with(b""); - } else if rest.starts_with(b""); - } else if rest.starts_with(b""); - } else if rest.starts_with(b""); - } else { - // A start tag: find its end outside quotes; `/>` closes it at once. - let mut j = i + 1; - let mut quote = None; - while let Some(&c) = b.get(j) { - match quote { - Some(q) if c == q => quote = None, - Some(_) => {} - None if c == b'"' || c == b'\'' => quote = Some(c), - None if c == b'>' => break, - None => {} - } - j += 1; - } - if b.get(j.wrapping_sub(1)) != Some(&b'/') { - depth += 1; - max = max.max(depth); - } - i = j + 1; - } - } - max -} - -/// The deepest array / object nesting of a JSON document (strings skipped). -pub(crate) fn json_depth(b: &[u8]) -> usize { - let (mut depth, mut max, mut in_str, mut esc) = (0usize, 0usize, false, false); - for &c in b { - if in_str { - if esc { - esc = false; - } else if c == b'\\' { - esc = true; - } else if c == b'"' { - in_str = false; - } - continue; - } - match c { - b'"' => in_str = true, - b'[' | b'{' => { - depth += 1; - max = max.max(depth); - } - b']' | b'}' => depth = depth.saturating_sub(1), - _ => {} - } - } - max -} +pub(crate) use craft_timeline::preflight::{json_depth, xml_depth}; pub fn import( project: &mut Project, From ee6f04c4fc7e62c79db0c1b00add1b70b4cdc356 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 11:40:58 -0500 Subject: [PATCH 13/25] refactor: pin merged PSD prediction scratch API --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5d5411483..121b3b510 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1359,7 +1359,7 @@ dependencies = [ [[package]] name = "craft-psd" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=c864e1e8c9e0f7e2c9f24fca1faa6f298a068bca#c864e1e8c9e0f7e2c9f24fca1faa6f298a068bca" +source = "git+https://github.com/storytold/craft-libs?rev=ce2ec507c2e6a6a078a5f450f641487f8931816d#ce2ec507c2e6a6a078a5f450f641487f8931816d" dependencies = [ "encoding_rs", "flate2", diff --git a/Cargo.toml b/Cargo.toml index 55ba9d0c2..34da549e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ craft-dpx = { version = "0.1.0", git = "https://github.com/storytold/craft-libs" craft-ps = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "808730f49b9637b7909fe2ae56f9d63fdb100cae", default-features = false, features = ["read"] } craft-exr = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-gif = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } -craft-psd = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "c864e1e8c9e0f7e2c9f24fca1faa6f298a068bca" } +craft-psd = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "ce2ec507c2e6a6a078a5f450f641487f8931816d" } craft-svg = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-webp = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-lottie = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } From de0843b193fa68708504161275f57c2eca418604 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 12:32:32 -0500 Subject: [PATCH 14/25] interchange: pin merged optional marker-color parity fix --- Cargo.lock | 36 ++++++++++++++++++------------------ Cargo.toml | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a38c653da..3a070ac11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1541,9 +1541,9 @@ dependencies = [ [[package]] name = "craft-raw" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=402dfe46ad568a97f660bcbe30e3a80429b9e1fe#402dfe46ad568a97f660bcbe30e3a80429b9e1fe" +source = "git+https://github.com/storytold/craft-libs?rev=bea91b1861eea3889bec9d26338076f2ff31c4ac#bea91b1861eea3889bec9d26338076f2ff31c4ac" dependencies = [ - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=402dfe46ad568a97f660bcbe30e3a80429b9e1fe)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=bea91b1861eea3889bec9d26338076f2ff31c4ac)", "miniz_oxide 0.9.1", "rayon", "serde", @@ -1579,7 +1579,7 @@ dependencies = [ [[package]] name = "craft-tiff" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=402dfe46ad568a97f660bcbe30e3a80429b9e1fe#402dfe46ad568a97f660bcbe30e3a80429b9e1fe" +source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" dependencies = [ "serde", "thiserror 2.0.21", @@ -1588,7 +1588,7 @@ dependencies = [ [[package]] name = "craft-tiff" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" +source = "git+https://github.com/storytold/craft-libs?rev=bea91b1861eea3889bec9d26338076f2ff31c4ac#bea91b1861eea3889bec9d26338076f2ff31c4ac" dependencies = [ "serde", "thiserror 2.0.21", @@ -3002,7 +3002,7 @@ dependencies = [ [[package]] name = "filmcraft-bitstream" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" +source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", ] @@ -3010,7 +3010,7 @@ dependencies = [ [[package]] name = "filmcraft-cfb" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" +source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "craft-cfb 0.1.0 (git+https://github.com/storytold/craft-libs?rev=7f3fdc0dfebd03f33a241f91f916e9a78d3e5c93)", ] @@ -3018,7 +3018,7 @@ dependencies = [ [[package]] name = "filmcraft-codecs" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" +source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=937ac93c5cf3cd4b6a81e195b078fe161eb081b9)", @@ -3042,7 +3042,7 @@ dependencies = [ [[package]] name = "filmcraft-color" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" +source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "serde", ] @@ -3050,10 +3050,10 @@ dependencies = [ [[package]] name = "filmcraft-dng" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" +source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "craft-raw", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=402dfe46ad568a97f660bcbe30e3a80429b9e1fe)", + "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=bea91b1861eea3889bec9d26338076f2ff31c4ac)", "image", "rayon", "thiserror 2.0.21", @@ -3062,7 +3062,7 @@ dependencies = [ [[package]] name = "filmcraft-frame" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" +source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "filmcraft-color", "filmcraft-time", @@ -3073,7 +3073,7 @@ dependencies = [ [[package]] name = "filmcraft-geom" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" +source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "serde", ] @@ -3081,7 +3081,7 @@ dependencies = [ [[package]] name = "filmcraft-interchange" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" +source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "craft-aaf", "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", @@ -3100,7 +3100,7 @@ dependencies = [ [[package]] name = "filmcraft-isobmff" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" +source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", ] @@ -3108,7 +3108,7 @@ dependencies = [ [[package]] name = "filmcraft-matroska" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" +source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", ] @@ -3116,7 +3116,7 @@ dependencies = [ [[package]] name = "filmcraft-media" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" +source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", "craft-dpx 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", @@ -3135,7 +3135,7 @@ dependencies = [ [[package]] name = "filmcraft-project" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" +source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "filmcraft-color", "filmcraft-geom", @@ -3150,7 +3150,7 @@ dependencies = [ [[package]] name = "filmcraft-time" version = "0.20.1" -source = "git+https://github.com/storytold/filmcraft?rev=6e561687f0efc9a674c4bfb1c8251da178d1fb55#6e561687f0efc9a674c4bfb1c8251da178d1fb55" +source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "craft-timeline 0.1.0 (git+https://github.com/storytold/craft-libs?rev=57288edafdc45552e30481cc649021de446abfa0)", ] diff --git a/Cargo.toml b/Cargo.toml index 6c0fc585d..35d8d78ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,15 +98,15 @@ craft-video = { version = "0.1.0", git = "https://github.com/storytold/craft-lib # footage decoding: FilmCraft's pure-Rust crates, pinned to a revision (plan/adr/0001). # Only `crates/media`, `crates/export` and `crates/interchange` may depend on these. -filmcraft-codecs = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } -filmcraft-media = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } -filmcraft-frame = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } -filmcraft-color = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } -filmcraft-time = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } +filmcraft-codecs = { git = "https://github.com/storytold/filmcraft", rev = "3f137a7ed420cac79b32145f5243b7f98b31f71c" } +filmcraft-media = { git = "https://github.com/storytold/filmcraft", rev = "3f137a7ed420cac79b32145f5243b7f98b31f71c" } +filmcraft-frame = { git = "https://github.com/storytold/filmcraft", rev = "3f137a7ed420cac79b32145f5243b7f98b31f71c" } +filmcraft-color = { git = "https://github.com/storytold/filmcraft", rev = "3f137a7ed420cac79b32145f5243b7f98b31f71c" } +filmcraft-time = { git = "https://github.com/storytold/filmcraft", rev = "3f137a7ed420cac79b32145f5243b7f98b31f71c" } # timeline interchange (EDL, FCP7 XML, FCPXML, OTIO) for Premiere Pro interop (crates/interchange only) -filmcraft-interchange = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } -filmcraft-project = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } -filmcraft-geom = { git = "https://github.com/storytold/filmcraft", rev = "6e561687f0efc9a674c4bfb1c8251da178d1fb55" } +filmcraft-interchange = { git = "https://github.com/storytold/filmcraft", rev = "3f137a7ed420cac79b32145f5243b7f98b31f71c" } +filmcraft-project = { git = "https://github.com/storytold/filmcraft", rev = "3f137a7ed420cac79b32145f5243b7f98b31f71c" } +filmcraft-geom = { git = "https://github.com/storytold/filmcraft", rev = "3f137a7ed420cac79b32145f5243b7f98b31f71c" } # gpu (the same wgpu eframe / egui-wgpu use) wgpu = { version = "30.0.1", features = ["fragile-send-sync-non-atomic-wasm"] } From e57aa567b9fa408c7506917607eb3d2dbb0cba91 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 13:33:08 -0500 Subject: [PATCH 15/25] interchange: pin merged shared nesting preflight --- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f1bb26e5..73d74ecb5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1597,7 +1597,7 @@ dependencies = [ [[package]] name = "craft-time" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=57288edafdc45552e30481cc649021de446abfa0#57288edafdc45552e30481cc649021de446abfa0" +source = "git+https://github.com/storytold/craft-libs?rev=0d6dd8bed815b8366869a800d2bf22588ca62dcb#0d6dd8bed815b8366869a800d2bf22588ca62dcb" dependencies = [ "serde", "thiserror 2.0.21", @@ -1606,7 +1606,7 @@ dependencies = [ [[package]] name = "craft-time" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a2560df05b4c58631f53a57e65fb05f0e0e6cf76#a2560df05b4c58631f53a57e65fb05f0e0e6cf76" +source = "git+https://github.com/storytold/craft-libs?rev=57288edafdc45552e30481cc649021de446abfa0#57288edafdc45552e30481cc649021de446abfa0" dependencies = [ "serde", "thiserror 2.0.21", @@ -1621,6 +1621,14 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-timeline" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=0d6dd8bed815b8366869a800d2bf22588ca62dcb#0d6dd8bed815b8366869a800d2bf22588ca62dcb" +dependencies = [ + "craft-time 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0d6dd8bed815b8366869a800d2bf22588ca62dcb)", +] + [[package]] name = "craft-timeline" version = "0.1.0" @@ -1632,14 +1640,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "craft-timeline" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a2560df05b4c58631f53a57e65fb05f0e0e6cf76#a2560df05b4c58631f53a57e65fb05f0e0e6cf76" -dependencies = [ - "craft-time 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a2560df05b4c58631f53a57e65fb05f0e0e6cf76)", -] - [[package]] name = "craft-timeline" version = "0.1.0" @@ -2269,7 +2269,7 @@ dependencies = [ name = "effectcraft-interchange" version = "0.24.1" dependencies = [ - "craft-timeline 0.1.0 (git+https://github.com/storytold/craft-libs?rev=a2560df05b4c58631f53a57e65fb05f0e0e6cf76)", + "craft-timeline 0.1.0 (git+https://github.com/storytold/craft-libs?rev=0d6dd8bed815b8366869a800d2bf22588ca62dcb)", "effectcraft-color", "effectcraft-keyframe", "effectcraft-project", diff --git a/Cargo.toml b/Cargo.toml index 62d4d6287..2889bdc34 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ rust-version = "1.95" repository = "https://github.com/storytold/effectcraft" [workspace.dependencies] -craft-timeline = { git = "https://github.com/storytold/craft-libs", rev = "a2560df05b4c58631f53a57e65fb05f0e0e6cf76", default-features = false } +craft-timeline = { git = "https://github.com/storytold/craft-libs", rev = "0d6dd8bed815b8366869a800d2bf22588ca62dcb", default-features = false } craft-mime = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "808730f49b9637b7909fe2ae56f9d63fdb100cae", version = "=0.1.0", default-features = false, features = ["read"] } craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } From fa542829e93005433b353f5f42b6be5eb2a0649c Mon Sep 17 00:00:00 2001 From: vangel76 Date: Mon, 16 Nov 2026 22:05:56 +0100 Subject: [PATCH 16/25] #3793: build the OCIO test's expected LUT path from its parts join("luts/grade.cube") keeps the forward slash on Windows, while the code resolves the config's LUT as luts\grade.cube, so the test's text lookup in the read log missed there. The code under test is unchanged. --- crates/engine/src/tests/lut_files.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/engine/src/tests/lut_files.rs b/crates/engine/src/tests/lut_files.rs index 98c95652a..6f6818b23 100644 --- a/crates/engine/src/tests/lut_files.rs +++ b/crates/engine/src/tests/lut_files.rs @@ -192,7 +192,7 @@ fn an_overridden_lut_file_renders_again() { #[test] fn ocio_files_render_again_from_warm_caches() { let dir = tempfile::tempdir().unwrap(); - let (lut, config, grade) = (dir.path().join("file.cube"), dir.path().join("config.ocio"), dir.path().join("luts/grade.cube")); + let (lut, config, grade) = (dir.path().join("file.cube"), dir.path().join("config.ocio"), dir.path().join("luts").join("grade.cube")); std::fs::create_dir_all(dir.path().join("luts")).unwrap(); write(&lut, BLACK, 1_000); write(&grade, BLACK, 1_000); From 3972e5181b1a6cad3a47a09524a9760f9a37f109 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 16 Nov 2026 19:38:19 -0500 Subject: [PATCH 17/25] svg: delegate stylesheet parsing and matching to craft-svg --- Cargo.lock | 138 +++--------------------- Cargo.toml | 2 +- crates/svg/src/lib.rs | 231 ++-------------------------------------- crates/svg/src/tests.rs | 33 ------ 4 files changed, 24 insertions(+), 380 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 73d74ecb5..a11599fd7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -147,21 +147,6 @@ dependencies = [ "equator", ] -[[package]] -name = "alloc-no-stdlib" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2fb6cfd47bf496ff64095c20eaba0c201404ee38714d4142fcfa1dc334fcc7a" - -[[package]] -name = "alloc-stdlib" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5c1865780388bfa186411ab5f247819487fc4864c6e9c3106611fa347586e1" -dependencies = [ - "alloc-no-stdlib", -] - [[package]] name = "allocator-api2" version = "0.2.21" @@ -796,16 +781,6 @@ dependencies = [ "syn 3.0.6", ] -[[package]] -name = "brotli-decompressor" -version = "6.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc031cd87c6529082b0b65c604e86af0ed7744841b17ccfe60b1e31fa606179e" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - [[package]] name = "built" version = "0.8.1" @@ -1376,39 +1351,6 @@ dependencies = [ "writeable", ] -[[package]] -name = "craft-image-codecs" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" -dependencies = [ - "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", - "craft-metadata", - "crc32fast", - "exr", - "flate2", - "half", - "hayro-jpeg2000", - "image", - "image-webp", - "jpeg-encoder", - "png", - "rayon", - "serde_json", - "thiserror 2.0.21", - "tiff", - "zune-core", - "zune-jpeg", - "zune-jpegxl", -] - -[[package]] -name = "craft-jpeg" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" -dependencies = [ - "thiserror 2.0.21", -] - [[package]] name = "craft-jpeg" version = "0.1.0" @@ -1461,18 +1403,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "craft-metadata" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" -dependencies = [ - "brotli-decompressor", - "chrono", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", - "quick-xml 0.41.0", - "serde", -] - [[package]] name = "craft-mime" version = "0.1.0" @@ -1543,7 +1473,7 @@ name = "craft-raw" version = "0.1.0" source = "git+https://github.com/storytold/craft-libs?rev=bea91b1861eea3889bec9d26338076f2ff31c4ac#bea91b1861eea3889bec9d26338076f2ff31c4ac" dependencies = [ - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=bea91b1861eea3889bec9d26338076f2ff31c4ac)", + "craft-tiff", "miniz_oxide 0.9.1", "rayon", "serde", @@ -1555,10 +1485,9 @@ dependencies = [ [[package]] name = "craft-svg" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" +source = "git+https://github.com/storytold/craft-libs?rev=c3d9015ec985450386a86b04713d6f1cee597951#c3d9015ec985450386a86b04713d6f1cee597951" dependencies = [ - "craft-image-codecs", - "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87)", + "craft-xml 0.1.0 (git+https://github.com/storytold/craft-libs?rev=c3d9015ec985450386a86b04713d6f1cee597951)", "flate2", "kurbo", "quick-xml 0.41.0", @@ -1576,15 +1505,6 @@ dependencies = [ "thiserror 2.0.21", ] -[[package]] -name = "craft-tiff" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" -dependencies = [ - "serde", - "thiserror 2.0.21", -] - [[package]] name = "craft-tiff" version = "0.1.0" @@ -1747,16 +1667,6 @@ dependencies = [ "thiserror 2.0.21", ] -[[package]] -name = "craft-xml" -version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87#5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" -dependencies = [ - "quick-xml 0.41.0", - "serde", - "thiserror 2.0.21", -] - [[package]] name = "craft-xml" version = "0.1.0" @@ -1777,6 +1687,16 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-xml" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=c3d9015ec985450386a86b04713d6f1cee597951#c3d9015ec985450386a86b04713d6f1cee597951" +dependencies = [ + "quick-xml 0.41.0", + "serde", + "thiserror 2.0.21", +] + [[package]] name = "craft-y4m" version = "0.1.0" @@ -3039,7 +2959,7 @@ version = "0.20.1" source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "craft-audio 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", - "craft-jpeg 0.1.0 (git+https://github.com/storytold/craft-libs?rev=937ac93c5cf3cd4b6a81e195b078fe161eb081b9)", + "craft-jpeg", "craft-media 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", "craft-video 0.1.0 (git+https://github.com/storytold/craft-libs?rev=82062077bba679ba5236e2d1a391f02d1533cbab)", "craft-y4m", @@ -3071,7 +2991,7 @@ version = "0.20.1" source = "git+https://github.com/storytold/filmcraft?rev=3f137a7ed420cac79b32145f5243b7f98b31f71c#3f137a7ed420cac79b32145f5243b7f98b31f71c" dependencies = [ "craft-raw", - "craft-tiff 0.1.0 (git+https://github.com/storytold/craft-libs?rev=bea91b1861eea3889bec9d26338076f2ff31c4ac)", + "craft-tiff", "image", "rayon", "thiserror 2.0.21", @@ -3760,9 +3680,6 @@ name = "hayro-jpeg2000" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c75ab947623ef4ccaa7acf0579edf7cbb5a73838e3839a7be73335e522f433a1" -dependencies = [ - "fearless_simd", -] [[package]] name = "hayro-syntax" @@ -4024,7 +3941,6 @@ dependencies = [ "moxcms", "num-traits", "png", - "qoi", "tiff", "zune-core", "zune-jpeg", @@ -4175,12 +4091,6 @@ dependencies = [ "libc", ] -[[package]] -name = "jpeg-encoder" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b454d911ac55068f53495488d8ccd0646eaa540c033a28ee15b07838afafb01f" - [[package]] name = "js-sys" version = "0.3.106" @@ -5573,15 +5483,6 @@ version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea" -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - [[package]] name = "quick-error" version = "1.2.3" @@ -9001,15 +8902,6 @@ dependencies = [ "zune-core", ] -[[package]] -name = "zune-jpegxl" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cba11ecd07cc23351500e840ae03841b7e4997923ec8e4832ee3ae199ea0b6b4" -dependencies = [ - "zune-core", -] - [[package]] name = "zvariant" version = "5.15.0" diff --git a/Cargo.toml b/Cargo.toml index 2889bdc34..bf9f999be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ craft-ps = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", craft-exr = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-gif = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-psd = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "ce2ec507c2e6a6a078a5f450f641487f8931816d" } -craft-svg = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } +craft-svg = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "c3d9015ec985450386a86b04713d6f1cee597951" } craft-webp = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-lottie = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87" } craft-mesh = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "5a7a63a21dd03dd1a2bc6c308a3a6ce818caae87", default-features = false, features = ["stl", "obj", "gltf", "fbx"] } diff --git a/crates/svg/src/lib.rs b/crates/svg/src/lib.rs index fd4baa543..94977d153 100644 --- a/crates/svg/src/lib.rs +++ b/crates/svg/src/lib.rs @@ -425,186 +425,12 @@ enum PaintRef { Current, } -/// The most selectors (each entry of a comma list counts) the `