From f7ab031c3cc4ff84783a52cce8d502300d3408b7 Mon Sep 17 00:00:00 2001 From: Terra854 Date: Sun, 22 Nov 2026 01:53:50 +0800 Subject: [PATCH] media: present monochrome frames from the shared decoder (#4051) --- ATTRIBUTION.md | 1 + crates/media/src/craft_source.rs | 33 +++++++++++- .../src/craft_source/monochrome_tests.rs | 49 ++++++++++++++++++ .../tests/fixtures/generate-monochrome-av1.sh | 9 ++++ .../media/tests/fixtures/monochrome-av1.mkv | Bin 0 -> 1243 bytes .../fixtures/monochrome-av1.mkv.attribution | 7 +++ 6 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 crates/media/src/craft_source/monochrome_tests.rs create mode 100755 crates/media/tests/fixtures/generate-monochrome-av1.sh create mode 100644 crates/media/tests/fixtures/monochrome-av1.mkv create mode 100644 crates/media/tests/fixtures/monochrome-av1.mkv.attribution diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index 7043e6128..74dbce1fa 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -162,3 +162,4 @@ under [`docs/brand/LICENSE-brand.txt`](docs/brand/LICENSE-brand.txt). Forks and | 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 | +| `crates/media/tests/fixtures/monochrome-av1.mkv` | Terra854 | Original grayscale ramps from `crates/media/tests/fixtures/generate-monochrome-av1.sh` | MIT OR Apache-2.0 | diff --git a/crates/media/src/craft_source.rs b/crates/media/src/craft_source.rs index 48a6b679e..a0212d14d 100644 --- a/crates/media/src/craft_source.rs +++ b/crates/media/src/craft_source.rs @@ -2293,7 +2293,35 @@ fn to_craft_frame(vf: DecodedVideoFrame, presentation: FramePresentation, pts: T PixelData::Yuv16 { planes: [y, cb, cr], chroma, bits: u32::from(bit_depth), alpha: a } } } - ColorFamily::Rgb | ColorFamily::Gray => return Err(MediaError::Unsupported("non-YCbCr pixel format".into())), + ColorFamily::Gray => { + let y = planes.into_iter().next().ok_or_else(|| MediaError::Decode("missing grayscale plane".into()))?; + let luma = aperture.and_then(|clap| clean_aperture_region(clap, (width, height))); + if let Some(r) = luma { + (width, height) = (r.w as u32, r.h as u32); + } + // Chroma is constant, so subsampling does not change the visible grayscale picture. + let chroma = Chroma::C420; + let chroma_len = (width as usize) + .div_ceil(2) + .checked_mul((height as usize).div_ceil(2)) + .ok_or_else(|| MediaError::Decode("monochrome chroma size overflows".into()))?; + match bit_depth { + 8 => { + let y = Arc::new(plane_u8(y, luma)?); + let alpha = alpha.map(|p| plane_u8(p, luma)).transpose()?.map(Arc::new); + let neutral = Arc::new(vec![128; chroma_len]); + PixelData::Yuv8 { planes: [y, neutral.clone(), neutral], chroma, alpha } + } + 9..=16 => { + let y = Arc::new(plane_u16(y, luma)?); + let alpha = alpha.map(|p| plane_u16(p, luma)).transpose()?.map(Arc::new); + let neutral = Arc::new(vec![1u16 << (bit_depth - 1); chroma_len]); + PixelData::Yuv16 { planes: [y, neutral.clone(), neutral], chroma, bits: u32::from(bit_depth), alpha } + } + _ => return Err(MediaError::Unsupported("monochrome bit depth below 8".into())), + } + } + ColorFamily::Rgb => return Err(MediaError::Unsupported("non-YCbCr pixel format".into())), }; let frame = VideoFrame { width, height, data, color, par, pts }; @@ -4793,3 +4821,6 @@ mod tests { assert_eq!(read_count, 0); } } + +#[cfg(test)] +mod monochrome_tests; diff --git a/crates/media/src/craft_source/monochrome_tests.rs b/crates/media/src/craft_source/monochrome_tests.rs new file mode 100644 index 000000000..e3251550d --- /dev/null +++ b/crates/media/src/craft_source/monochrome_tests.rs @@ -0,0 +1,49 @@ +use super::*; +use crate::stream::{self, MediaSource as OpenedSource}; + +#[test] +fn shared_monochrome_av1_retains_luma_on_backward_seek() -> std::result::Result<(), Box> { + let bytes: Arc<[u8]> = Arc::from(include_bytes!("../../tests/fixtures/monochrome-av1.mkv").as_slice()); + let OpenedSource::Craft(source) = stream::open_bytes("monochrome-av1.mkv", bytes)? else { + panic!("expected the shared AV1 reader"); + }; + for i in [2u8, 0, 1] { + let pts = Tick::from_units(i64::from(i), 25); + let frame = source.video_frame(FrameRequest { time: pts, scale: 1.0 })?; + assert_eq!((frame.width, frame.height, frame.pts, frame.color.range), (16, 12, pts, Range::Full)); + let PixelData::Yuv8 { planes: [y, cb, cr], chroma: Chroma::C420, alpha: None } = &frame.data else { + panic!("expected 8-bit luma with neutral chroma"); + }; + let expected: Vec = (0..12).flat_map(|row| (0..16).map(move |col| 16 + 64 * i + col + 2 * row)).collect(); + assert_eq!(y.as_slice(), expected); + assert_eq!(cb.as_slice(), [128; 48]); + assert_eq!(cr.as_slice(), cb.as_slice()); + let rgba = frame.to_rgba8()?; + for (pixel, &sample) in rgba.as_chunks::<4>().0.iter().zip(&expected) { + assert_eq!(*pixel, [sample, sample, sample, 255]); + } + } + Ok(()) +} + +#[test] +fn monochrome_10_bit_preserves_aperture_rotation_alpha_and_layout() -> std::result::Result<(), Box> { + let y = Plane::packed(5, 5, 10, Samples::U16((64..89).collect()))?; + let alpha = Plane::packed(5, 5, 10, Samples::U16((900..925).collect()))?; + let mut decoded = DecodedVideoFrame::new(5, 5, ColorFamily::Gray, Subsampling::S444, vec![y], Some(alpha))?; + decoded.sar = Some((3, 2)); + let aperture = isobmff::CleanAperture { width: (3, 1), height: (3, 1), horiz_offset: (0, 1), vert_offset: (0, 1) }; + let presentation = FramePresentation { container_color: Some(ColorInfo::REC709), par: (1, 1), rotation: 1, aperture: Some(aperture) }; + let pts = Tick::from_units(4, 25); + let frame = to_craft_frame(decoded, presentation, pts)?; + assert_eq!((frame.width, frame.height, frame.par, frame.pts), (3, 3, (2, 3), pts)); + assert_eq!(frame.color, ColorInfo::REC709); + let PixelData::Yuv16 { planes: [y, cb, cr], chroma: Chroma::C420, bits: 10, alpha: Some(alpha) } = &frame.data else { + panic!("expected 10-bit luma and alpha"); + }; + assert_eq!(y.as_slice(), [80, 75, 70, 81, 76, 71, 82, 77, 72]); + assert_eq!(alpha.as_slice(), [916, 911, 906, 917, 912, 907, 918, 913, 908]); + assert_eq!(cb.as_slice(), [512; 4]); + assert_eq!(cr.as_slice(), cb.as_slice()); + Ok(()) +} diff --git a/crates/media/tests/fixtures/generate-monochrome-av1.sh b/crates/media/tests/fixtures/generate-monochrome-av1.sh new file mode 100755 index 000000000..ecfdfc830 --- /dev/null +++ b/crates/media/tests/fixtures/generate-monochrome-av1.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env sh +set -eu +cd "$(dirname "$0")" +ffmpeg -hide_banner -loglevel error \ + -f lavfi -i "nullsrc=s=16x12:r=25,format=gray,geq=lum='16+64*N+X+2*Y'" \ + -frames:v 3 -c:v libaom-av1 -pix_fmt gray -color_range pc \ + -color_primaries bt709 -color_trc bt709 -colorspace bt709 \ + -g 1 -crf 0 -b:v 0 -aom-params lossless=1 -cpu-used 6 -threads 16 \ + -fflags +bitexact -flags:v +bitexact -f matroska -y monochrome-av1.mkv diff --git a/crates/media/tests/fixtures/monochrome-av1.mkv b/crates/media/tests/fixtures/monochrome-av1.mkv new file mode 100644 index 0000000000000000000000000000000000000000..37749f35e37fcccf6b0043c56a681dcbdce8e12d GIT binary patch literal 1243 zcmb1gy}x*|Q(GgW({~{L)X3uWxsk)EsUtVBq$s~QJJG2fDAd}>BoW+@&d2})EXxIb zXO|q<-{RsP{oQwWckt>KQO}iW!D|{9LU>{!>#~8oGrqfffO0}1htq@CG%+hcxH7@J zfs#!unQtJbF$9ARr7i(-&$9h3$2&UAwXSb$=67=NZD{dHEK3V_1XC`Z9S(62D?yHR z^4s5{wS8sSI*5~)?5{U679Z_^x`}a4BZJb`InAYcDIJXrZLMMPj$ww)jf~2Vn_HNY zq8J`b*w84jtC43`BU9*xme8F*>RlrP%zI1>49Sc78yRF6xHy3ZGS0ub^-~B`lJOdK zy*+B$;0OUwlE1aTrT=qkesS@|Os!UeM$xKSj z&(%#VGfY3R&~ILoDkN#xY7k~^3z+q6g8^-~L