EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Bump FilmCraft to 4e2d0bc2 (part of #804)
vangel7693b06a6eab9c
diff --git a/Cargo.lock b/Cargo.lockindex ce8fe1231..98e00791d 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -2025,8 +2025,8 @@ checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693"[[package]]name = "filmcraft-aac"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-bitstream","thiserror 2.0.21",@@ -2034,16 +2034,26 @@ dependencies = [[[package]]name = "filmcraft-ac3"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["thiserror 2.0.21",]+[[package]]+name = "filmcraft-apv"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"+dependencies = [+ "filmcraft-bitstream",+ "rayon",+ "thiserror 2.0.21",+]+[[package]]name = "filmcraft-av1"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-bitstream","rayon",@@ -2052,21 +2062,22 @@ dependencies = [[[package]]name = "filmcraft-bitstream"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"[[package]]name = "filmcraft-cfb"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"[[package]]name = "filmcraft-codecs"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-aac","filmcraft-ac3",+ "filmcraft-apv","filmcraft-av1","filmcraft-bitstream","filmcraft-color",@@ -2094,16 +2105,16 @@ dependencies = [[[package]]name = "filmcraft-color"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["serde",][[package]]name = "filmcraft-dnx"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-bitstream","rayon",@@ -2112,8 +2123,8 @@ dependencies = [[[package]]name = "filmcraft-frame"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-color","filmcraft-time",@@ -2123,16 +2134,16 @@ dependencies = [[[package]]name = "filmcraft-geom"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["serde",][[package]]name = "filmcraft-h264"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-bitstream","rayon",@@ -2141,8 +2152,8 @@ dependencies = [[[package]]name = "filmcraft-h264enc"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-bitstream","rayon",@@ -2151,8 +2162,8 @@ dependencies = [[[package]]name = "filmcraft-hevc"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-bitstream","rayon",@@ -2161,8 +2172,8 @@ dependencies = [[[package]]name = "filmcraft-interchange"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-cfb","filmcraft-color",@@ -2178,8 +2189,8 @@ dependencies = [[[package]]name = "filmcraft-isobmff"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-bitstream","thiserror 2.0.21",@@ -2187,13 +2198,13 @@ dependencies = [[[package]]name = "filmcraft-matroska"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"[[package]]name = "filmcraft-media"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-color","filmcraft-frame",@@ -2206,8 +2217,8 @@ dependencies = [[[package]]name = "filmcraft-mpeg2v"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["rayon","thiserror 2.0.21",@@ -2215,31 +2226,31 @@ dependencies = [[[package]]name = "filmcraft-mpegts"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["thiserror 2.0.21",][[package]]name = "filmcraft-mxf"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"[[package]]name = "filmcraft-ogg"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"[[package]]name = "filmcraft-opus"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"[[package]]name = "filmcraft-project"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-color","filmcraft-geom",@@ -2252,8 +2263,8 @@ dependencies = [[[package]]name = "filmcraft-prores"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-bitstream","rayon",@@ -2262,16 +2273,16 @@ dependencies = [[[package]]name = "filmcraft-time"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["serde",][[package]]name = "filmcraft-vp9"-version = "0.1.1"-source = "git+https://github.com/storytold/filmcraft?rev=2c5ba7a72619935f0481f99d59409e0d1844b234#2c5ba7a72619935f0481f99d59409e0d1844b234"+version = "0.6.0"+source = "git+https://github.com/storytold/filmcraft?rev=4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe#4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe"dependencies = ["filmcraft-bitstream","rayon",diff --git a/Cargo.toml b/Cargo.tomlindex 9f4e9d17f..cb8b7ea38 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -71,26 +71,26 @@ image = { version = "0.25", default-features = false, features = ["png", "jpeg"]# media codecs + containers: 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 = "2c5ba7a72619935f0481f99d59409e0d1844b234" }-filmcraft-media = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }-filmcraft-frame = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }-filmcraft-color = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }-filmcraft-time = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }+filmcraft-codecs = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }+filmcraft-media = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }+filmcraft-frame = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }+filmcraft-color = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }+filmcraft-time = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }# encoders + muxer (crates/export)-filmcraft-h264enc = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }-filmcraft-prores = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }-filmcraft-aac = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }-filmcraft-isobmff = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }+filmcraft-h264enc = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }+filmcraft-prores = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }+filmcraft-aac = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }+filmcraft-isobmff = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }# decoder used as the round-trip oracle of effectcraft-opusenc (crates/export dev-dependency)-filmcraft-opus = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }-filmcraft-vp9 = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }+filmcraft-opus = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }+filmcraft-vp9 = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }# decoders used as the round-trip oracles of effectcraft-hevcenc / effectcraft-av1enc (dev-dependencies only)-filmcraft-hevc = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }-filmcraft-av1 = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }+filmcraft-hevc = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }+filmcraft-av1 = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }# timeline interchange (EDL, FCP7 XML, FCPXML, OTIO) for Premiere Pro interop (crates/interchange only)-filmcraft-interchange = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }-filmcraft-project = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }-filmcraft-geom = { git = "https://github.com/storytold/filmcraft", rev = "2c5ba7a72619935f0481f99d59409e0d1844b234" }+filmcraft-interchange = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }+filmcraft-project = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }+filmcraft-geom = { git = "https://github.com/storytold/filmcraft", rev = "4e2d0bc2d3646f9cf27ef7aa8b2095c6858c7efe" }# gpu (the same wgpu eframe / egui-wgpu use)wgpu = { version = "30.0.1", features = ["fragile-send-sync-non-atomic-wasm"] }diff --git a/crates/export/tests/vp9_roundtrip.rs b/crates/export/tests/vp9_roundtrip.rsindex e7c2b0346..1432e3892 100644--- a/crates/export/tests/vp9_roundtrip.rs+++ b/crates/export/tests/vp9_roundtrip.rs@@ -41,7 +41,7 @@ fn source(w: usize, h: usize, kind: u32) -> (Vec<u8>, Vec<u8>, Vec<u8>) {}fn decode(frame: &[u8]) -> filmcraft_vp9::Picture {- let mut d = Decoder::new();+ let mut d = Decoder::with_threads(1);let mut pics = d.decode(frame, 0).expect("decode");assert_eq!(pics.len(), 1);pics.remove(0)@@ -189,7 +189,7 @@ fn planes_of(p: &filmcraft_vp9::Picture, w: usize, h: usize) -> [Vec<u8>; 3] {fn run_sequence(cfg: EncoderConfig, n: usize, kind: u32) -> (usize, f64) {let (w, h) = (cfg.width as usize, cfg.height as usize);let mut e = Vp9Encoder::new(cfg);- let mut d = Decoder::new();+ let mut d = Decoder::with_threads(1);let (mut bytes, mut db) = (0usize, 0.0);for t in 0..n {let (y, u, v) = moving(w, h, t, kind);@@ -344,7 +344,7 @@ fn frames_never_end_in_a_superframe_marker() {}let Some((w, h, q, frames, recon)) = padded else { panic!("no frame needed the padding: widen the search") };// The padded frames decode exactly, with FilmCraft's decoder and with ffmpeg.- let mut d = Decoder::new();+ let mut d = Decoder::with_threads(1);for (t, (f, r)) in frames.iter().zip(&recon).enumerate() {let mut pics = d.decode(f, t as i64).unwrap_or_else(|e| panic!("{w}x{h} q{q} frame {t}: {e:?}"));assert_eq!(planes_of(&pics.remove(0), w, h), *r, "{w}x{h} q{q} frame {t}");diff --git a/crates/host/tests/timeline_interop.rs b/crates/host/tests/timeline_interop.rsindex 5123dc721..9688a409f 100644--- a/crates/host/tests/timeline_interop.rs+++ b/crates/host/tests/timeline_interop.rs@@ -56,8 +56,9 @@ fn still(p: &mut fp::Project, path: &str) -> fp::ItemId {color: Default::default(),has_alpha: false,bitrate: None,+ hdr: None,}),- audio: None,+ audio_streams: Vec::new(),container: String::new(),start_timecode: None,file_size: None,diff --git a/crates/interchange/src/export.rs b/crates/interchange/src/export.rsindex 7da18913a..da6ef1382 100644--- a/crates/interchange/src/export.rs+++ b/crates/interchange/src/export.rs@@ -684,8 +684,12 @@ fn media_info(name: &str, kind: MediaKind, duration: Tick, video: Option<VideoSpcolor: Default::default(),has_alpha,bitrate: None,+ hdr: None,}),- audio: audio.then(|| AudioStreamInfo { sample_rate: 48_000, channels: 2, codec: "pcm".into(), bits_per_sample: Some(16) }),+ audio_streams: audio+ .then(|| AudioStreamInfo { sample_rate: 48_000, channels: 2, codec: "pcm".into(), bits_per_sample: Some(16) })+ .into_iter()+ .collect(),container: String::new(),start_timecode: None,file_size: None,diff --git a/crates/interchange/src/import.rs b/crates/interchange/src/import.rsindex 55161b718..82567eb53 100644--- a/crates/interchange/src/import.rs+++ b/crates/interchange/src/import.rs@@ -271,7 +271,7 @@ impl Importer<'_> {MediaKind::AudioOnly => FootageKind::Audio,MediaKind::Still => FootageKind::Still,MediaKind::ImageSequence => FootageKind::Sequence,- _ if v.is_none() && info.audio.is_some() => FootageKind::Audio,+ _ if v.is_none() && info.has_audio() => FootageKind::Audio,_ => FootageKind::Video,};let _ = name;@@ -284,7 +284,7 @@ impl Importer<'_> {frame_rate: rate_in(info.frame_rate()),duration: tick_in(info.duration),has_video: kind != FootageKind::Audio,- has_audio: info.audio.is_some() || kind == FootageKind::Audio,+ has_audio: info.has_audio() || kind == FootageKind::Audio,alpha: if v.is_some_and(|v| v.has_alpha) { AlphaMode::Straight } else { AlphaMode::Ignore },codec: v.map(|v| v.codec.clone()).unwrap_or_default(),missing: true,diff --git a/crates/interchange/src/tests.rs b/crates/interchange/src/tests.rsindex 3ad7fcaae..6e29c79d2 100644--- a/crates/interchange/src/tests.rs+++ b/crates/interchange/src/tests.rs@@ -36,8 +36,12 @@ fn info(kind: filmcraft_media::MediaKind, video: bool, audio: bool) -> filmcraftcolor: Default::default(),has_alpha: false,bitrate: None,+ hdr: None,}),- audio: audio.then(|| filmcraft_media::AudioStreamInfo { sample_rate: 48_000, channels: 2, codec: "pcm".into(), bits_per_sample: Some(16) }),+ audio_streams: audio+ .then(|| filmcraft_media::AudioStreamInfo { sample_rate: 48_000, channels: 2, codec: "pcm".into(), bits_per_sample: Some(16) })+ .into_iter()+ .collect(),container: String::new(),start_timecode: None,file_size: None,diff --git a/crates/media/src/downmix.rs b/crates/media/src/downmix.rsindex 2ef417dd7..e8a9237e0 100644--- a/crates/media/src/downmix.rs+++ b/crates/media/src/downmix.rs@@ -64,11 +64,30 @@ pub fn stereo_gains(count: usize, aac: bool) -> Vec<Pair> {out}+/// The gains for AAC as FilmCraft's decoder hands it over: channel configurations 3 to 6 (3 to 6+/// channels) are already in WAV/SMPTE order (L R C [Cs] / [LFE] Ls Rs), everything else (mono,+/// stereo, 7 and 8 channels, program-config layouts) in AAC's element order.+pub fn decoded_aac_gains(count: usize) -> Vec<Pair> {+ match count {+ // C L R Cs, reordered to L R C Cs: the same gains, permuted.+ 4 => {+ let g = stereo_gains(4, true);+ [1, 2, 0, 3].iter().filter_map(|&i| g.get(i).copied()).collect()+ }+ 3 | 5 | 6 => stereo_gains(count, false),+ _ => stereo_gains(count, true),+ }+}+/// Downmix planar `channels` to interleaved stereo in `out` (`out.len() / 2` frames); frames a/// channel is too short for count as silence, extra frames in `out` stay as they are.pub fn downmix_into(channels: &[Vec<f32>], aac: bool, out: &mut [f32]) {- let gains = stereo_gains(channels.len(), aac);- for (ch, g) in channels.iter().zip(&gains) {+ let gains = if aac { decoded_aac_gains(channels.len()) } else { stereo_gains(channels.len(), false) };+ mix(channels, &gains, out);+}++fn mix(channels: &[Vec<f32>], gains: &[Pair], out: &mut [f32]) {+ for (ch, g) in channels.iter().zip(gains) {if g[0] == 0.0 && g[1] == 0.0 {continue;}@@ -98,6 +117,22 @@ mod tests {}}+ #[test]+ fn decoded_aac_is_in_wav_order_for_three_to_six_channels() {+ // FilmCraft hands AAC 3.0 to 5.1 over as L R C [LFE] Ls Rs, the order of the plain layouts.+ for n in [3, 5, 6] {+ assert_eq!(decoded_aac_gains(n), stereo_gains(n, false), "{n} channels");+ }+ let g = decoded_aac_gains(4);+ assert_eq!(g.len(), 4);+ assert!(g[0][0] > 0.0 && g[0][1] == 0.0 && g[1][1] > 0.0 && g[1][0] == 0.0, "L R first");+ assert!(g[2][0] > 0.0 && g[2][0] == g[2][1], "the centre is third and feeds both sides");+ assert!(g[3][0] > 0.0 && g[3][0] < g[2][0], "the rear centre is last, below the centre");+ for n in [1, 2, 7, 8, 9] {+ assert_eq!(decoded_aac_gains(n), stereo_gains(n, true), "{n} channels");+ }+ }+#[test]fn five_one_matches_the_bs775_matrix() {let k = 1.0 / (1.0 + 2.0 * FRAC_1_SQRT_2);diff --git a/crates/media/src/pool.rs b/crates/media/src/pool.rsindex 98c707108..33fb0b26f 100644--- a/crates/media/src/pool.rs+++ b/crates/media/src/pool.rs@@ -509,7 +509,7 @@ impl MediaPool {let path: Arc<str> = footage.path.as_str().into();let src = self.inner.source(&path).ok_or("the file can't be opened")?;let s0 = start.to_units_floor(rate as i64);- let native = src.info().audio.as_ref().map_or(rate, |a| a.sample_rate);+ let native = src.info().audio().map_or(rate, |a| a.sample_rate);if native == 0 || rate == 0 || native == rate {return read_stereo(&src, s0, frames, rate);}@@ -700,9 +700,12 @@ impl Inner {let rate = footage.frame_rate;let n = Self::frame_count(rate, footage.duration);let i = Self::frame_index(rate, t, n, footage.loop_count);- // Middle of the frame in the file's own timing (robust to timestamp rounding).+ // A quarter into the frame in the file's own timing: FilmCraft rounds a request to+ // the track's nearest timestamp unit (halves up), so the middle of a frame would+ // land on the next one when the timescale is the frame rate; a quarter still+ // tolerates timestamps rounded either way.let native = footage.native_rate.unwrap_or(rate);- let mt = native.tick_of(i) + Tick(native.frame_duration().0 / 2);+ let mt = native.tick_of(i) + Tick(native.frame_duration().0 / 4);Loc { key: key(&footage.path, i), media_t: Some(mt), float }}}@@ -915,7 +918,7 @@ fn read_stereo(src: &SharedSource, s0: i64, frames: usize, rate: u32) -> std::re}let buf = src.audio(s0.max(0), frames - skip, rate).map_err(|e| e.to_string())?;let Some(dst) = skip.checked_mul(2).and_then(|i| out.get_mut(i..)) else { return Ok(out) };- let aac = src.info().audio.as_ref().is_some_and(|a| a.codec.starts_with("AAC"));+ let aac = src.info().audio().is_some_and(|a| a.codec.starts_with("AAC"));crate::downmix::downmix_into(&buf.channels, aac, dst);Ok(out)}diff --git a/crates/media/src/probe.rs b/crates/media/src/probe.rsindex bae714c81..7c5d1c491 100644--- a/crates/media/src/probe.rs+++ b/crates/media/src/probe.rs@@ -119,7 +119,7 @@ pub(crate) fn footage_from_info(path: &str, info: &filmcraft_media::MediaInfo) -(_, None) => FootageKind::Audio,};let rate = v.map_or(FrameRate::FPS_30, |v| rate_from_fc(v.frame_rate));- let codec = match (v, info.audio.as_ref()) {+ let codec = match (v, info.audio()) {(Some(v), _) => v.codec.clone(),(None, Some(a)) => a.codec.clone(),_ => String::new(),@@ -134,7 +134,7 @@ pub(crate) fn footage_from_info(path: &str, info: &filmcraft_media::MediaInfo) -native_rate: None,duration: if kind == FootageKind::Still { Tick::ZERO } else { Tick(info.duration.0) },has_video: v.is_some(),- has_audio: info.audio.is_some(),+ has_audio: info.has_audio(),alpha: if v.is_some_and(|v| v.has_alpha) { AlphaMode::Straight } else { AlphaMode::Ignore },premul_color: [0.0; 3],loop_count: 1,@@ -239,12 +239,19 @@ pub(crate) fn load_oriented(bytes: &[u8], fmt: Option<image::ImageFormat>) -> im/// The rotation an MP4/MOV movie is shown with (a phone held upright records sideways frames and/// says so in its video track's header): the quarter turn nearest the track's rotation. Only the/// rotation counts; any mirroring, scaling or offset in the header is ignored, and other-/// containers have none.+/// containers have none. FilmCraft turns the frames of a pure 0/90/180/270° header itself, so this+/// is only the quarter turn nearest to a header it does not turn.pub(crate) fn video_turn(bytes: &[u8]) -> Orientation {let Ok(file) = filmcraft_isobmff::open(bytes) else { return Orientation::NoTransforms };- let Some(m) = file.tracks.iter().find(|t| t.kind == filmcraft_isobmff::TrackKind::Video).map(|t| t.matrix) else {+ let Some(track) = file.tracks.iter().find(|t| t.kind == filmcraft_isobmff::TrackKind::Video) else {return Orientation::NoTransforms;};+ // A pure rotation is already applied by FilmCraft's decoder (frames and size come out+ // upright); only the headers it leaves as stored (mirrored, scaled, sheared) are turned here.+ if track.display_rotation().is_some() {+ return Orientation::NoTransforms;+ }+ let m = track.matrix;// [a b u; c d v; x y w]: (a, b) is where the picture's x axis points.let (a, b) = (m[0] as i64, m[1] as i64);match (a.abs() >= b.abs(), a >= 0, b >= 0) {