interchange: update test fixtures and adopt merged shared AAF route

This commit is contained in:
Dylan M. Taylor committed 2026-11-16 09:41:59 -05:00
1 parent cb29f77eaf
commit adb120c327
5 files changed
+33 -37

No files matched your search

Generated
+20 -26
View File
@@ -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)",
]
+8 -8
View File
@@ -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"] }
+2 -1
View File
@@ -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
+1 -1
View File
@@ -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());
+2 -1
View File
@@ -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 {