diff --git a/crates/media/Cargo.toml b/crates/media/Cargo.toml index 338bdc6f7..cf93c6861 100644 --- a/crates/media/Cargo.toml +++ b/crates/media/Cargo.toml @@ -33,7 +33,7 @@ craft-frame = { workspace = true } craft-media = { workspace = true, features = ["mpegts", "avi", "mxf"] } craft-media-source = { workspace = true } craft-time = { workspace = true } -craft-video = { workspace = true, features = ["h264-decode", "hevc-decode", "vp9-decode", "vp8-decode", "av1-decode", "prores", "dnx", "mpeg2-decode", "threads"] } +craft-video = { workspace = true, features = ["h264-decode", "hevc-decode", "vp9-decode", "vp8-decode", "av1-decode", "prores", "dnx", "mpeg2-decode", "ffv1", "apv-decode", "threads"] } filmcraft-frame = { workspace = true } filmcraft-color = { workspace = true } filmcraft-time = { workspace = true } diff --git a/crates/media/src/craft_source.rs b/crates/media/src/craft_source.rs index ae8154836..09e9121f6 100644 --- a/crates/media/src/craft_source.rs +++ b/crates/media/src/craft_source.rs @@ -81,7 +81,19 @@ fn prores_has_alpha(packet_size: u32, read: impl FnOnce() -> Option>) -> } fn supports_video_codec(codec: CodecId) -> bool { - matches!(codec, CodecId::H264 | CodecId::Hevc | CodecId::Av1 | CodecId::Vp9 | CodecId::Vp8 | CodecId::ProRes | CodecId::Dnxhd | CodecId::Mpeg2Video) + matches!( + codec, + CodecId::H264 + | CodecId::Hevc + | CodecId::Av1 + | CodecId::Vp9 + | CodecId::Vp8 + | CodecId::ProRes + | CodecId::Dnxhd + | CodecId::Mpeg2Video + | CodecId::Ffv1 + | CodecId::Apv + ) } /// True when `head` begins with a plausible ISO-BMFF top-level box. @@ -3566,6 +3578,32 @@ mod tests { assert_eq!(seek_window, full_window[18..20], "fresh seek must match full read"); } + #[test] + fn ffv1_and_apv_video_codecs_route_through_craft_video() { + assert!(supports_video_codec(CodecId::Ffv1)); + assert!(supports_video_codec(CodecId::Apv)); + + let template = craft_video::ffv1::Frame { + width: 16, + height: 16, + colorspace: craft_video::ffv1::Colorspace::YCbCr, + bit_depth: 8, + chroma_shift: (1, 1), + planes: vec![vec![128; 256], vec![128; 64], vec![128; 64]], + }; + let ffv1_enc = craft_video::ffv1::Encoder::new(&template, craft_video::ffv1::EncoderConfig::default()).expect("ffv1 encoder"); + let mut ffv1_params = CodecParams::new(CodecId::Ffv1); + ffv1_params.width = Some(16); + ffv1_params.height = Some(16); + ffv1_params.extradata = ffv1_enc.config_record(); + assert!(TrackDecoder::with_options(&ffv1_params, TrackDecoderOptions { threads: Some(1), draft: false }).is_ok(), "Ffv1 decoder"); + + let mut apv_params = CodecParams::new(CodecId::Apv); + apv_params.width = Some(16); + apv_params.height = Some(16); + assert!(TrackDecoder::with_options(&apv_params, TrackDecoderOptions { threads: Some(1), draft: false }).is_ok(), "Apv decoder"); + } + #[test] fn avi_prores_coded_alpha_parity() { use craft_video::prores::{ChromaFormat, ColorInfo as ProResColor, Encoder, EncoderConfig, Frame as ProResFrame, Interlace, Profile};