diff --git a/Cargo.lock b/Cargo.lock index 7af09affa..6366af909 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1103,6 +1103,15 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "craft-cms" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=9fd926dc93be7d4723e6eb4f484c7233d91d3e94#9fd926dc93be7d4723e6eb4f484c7233d91d3e94" +dependencies = [ + "md-5", + "rayon", +] + [[package]] name = "craft-doc" version = "0.1.0" @@ -1661,6 +1670,7 @@ name = "effectcraft-effects" version = "0.24.1" dependencies = [ "chrono", + "craft-cms", "effectcraft-color", "effectcraft-geom", "effectcraft-keyframe", @@ -4063,6 +4073,16 @@ dependencies = [ "rawpointer", ] +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + [[package]] name = "memchr" version = "2.8.3" diff --git a/crates/effects/Cargo.toml b/crates/effects/Cargo.toml index bb26d3127..c486ceece 100644 --- a/crates/effects/Cargo.toml +++ b/crates/effects/Cargo.toml @@ -10,6 +10,7 @@ rust-version.workspace = true workspace = true [dependencies] +craft-cms = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "9fd926dc93be7d4723e6eb4f484c7233d91d3e94" } effectcraft-geom = { workspace = true } effectcraft-color = { workspace = true } effectcraft-keyframe = { workspace = true } diff --git a/crates/effects/src/ocio/lut.rs b/crates/effects/src/ocio/lut.rs index daa584278..186209fbc 100644 --- a/crates/effects/src/ocio/lut.rs +++ b/crates/effects/src/ocio/lut.rs @@ -35,39 +35,8 @@ pub fn parse_spimtx(text: &str) -> Option { /// Parse a Sony Imageworks `.spi1d` 1D LUT: `From `, `Length `, `Components /// <1 | 3>`, then `{` the values `}`. pub fn parse_spi1d(text: &str) -> Option { - let (mut from, mut len, mut comps) = ([0.0f32, 1.0], 0usize, 1usize); - let mut values: Vec = vec![]; - let mut body = false; - for line in text.lines().map(str::trim).filter(|l| !l.is_empty()) { - if body { - if line.starts_with('}') { - break; - } - for t in line.split_whitespace() { - values.push(t.parse().ok()?); - } - continue; - } - let mut t = line.split_whitespace(); - match t.next()? { - "{" => body = true, - "From" => from = [t.next()?.parse().ok()?, t.next()?.parse().ok()?], - "Length" => len = t.next()?.parse().ok()?, - "Components" => comps = t.next()?.parse().ok()?, - _ => {} - } - } - // A 1D table is interpolated by index, so cap it like the lattices (2²⁴ entries). - if !(2..=MAX_1D).contains(&len) - || !matches!(comps, 1 | 3) - || values.len() != len.checked_mul(comps)? - || from[1] <= from[0] - || from.iter().any(|v| !v.is_finite()) - { - return None; - } - let d1 = values.chunks_exact(comps).map(|c| if comps == 3 { [c[0], c[1], c[2]] } else { [c[0]; 3] }).collect(); - Some(Lut { n1: len, d1, n3: 0, d3: vec![], dmin: [from[0]; 3], dmax: [from[1]; 3] }) + let table = craft_cms::spi1d::parse(text)?; + Some(Lut { n1: table.values.len(), d1: table.values, n3: 0, d3: vec![], dmin: [table.domain[0]; 3], dmax: [table.domain[1]; 3] }) } /// Parse a Sony Imageworks `.spi3d` lattice: `SPILUT 1.0`, `3 3`, the sizes, then one diff --git a/crates/effects/src/ocio/tests.rs b/crates/effects/src/ocio/tests.rs index ea2423043..d9b50505f 100644 --- a/crates/effects/src/ocio/tests.rs +++ b/crates/effects/src/ocio/tests.rs @@ -116,6 +116,13 @@ fn spi_files_parse() { assert!((back[0] - 1.0).abs() < 1e-5 && (back[2] - 2.0).abs() < 1e-5, "{back:?}"); let three = parse_spi1d("Version 1\nFrom 0 1\nLength 2\nComponents 3\n{\n0 0 0\n1 0.5 2\n}\n").unwrap(); assert_eq!(three.d1, vec![[0.0; 3], [1.0, 0.5, 2.0]]); + let eof = parse_spi1d("Length 2\nFrom -1 2\n{\n0 1").unwrap(); + assert_eq!(eof.n1, 2); + assert_eq!(eof.dmin, [-1.0; 3]); + assert_eq!(eof.dmax, [2.0; 3]); + assert_eq!(eof.n3, 0); + assert!(eof.d3.is_empty()); + assert!(parse_spi1d("Length 2\n{\n0 1 2").is_none()); let mut spi3d = String::from("SPILUT 1.0\n3 3\n2 2 2\n"); for (r, g, b) in (0..8).map(|i| (i & 1, (i >> 1) & 1, i >> 2)) { spi3d += &format!("{r} {g} {b} {} {} {}\n", r as f32 * 0.5, g, b);