Skip to content

Commit bb8edac

Browse files
committed
ci: check wrapped frames against the copy in-process
1 parent 5ac26be commit bb8edac

2 files changed

Lines changed: 36 additions & 5 deletions

File tree

‎.github/workflows/export-readback-avframe-ab.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
settings:
1313
- target: x86_64-pc-windows-msvc
1414
runner: blacksmith-8vcpu-windows-2025
15-
- target: x86_64-pc-windows-msvc
16-
runner: windows-2022
15+
- target: x86_64-unknown-linux-gnu
16+
runner: blacksmith-8vcpu-ubuntu-2404
1717
runs-on: ${{ matrix.settings.runner }}
1818
timeout-minutes: 180
1919
env:
@@ -105,7 +105,7 @@ jobs:
105105
for variant in base head base2; do
106106
exe="$bin/${variant%2}/export-cli"
107107
rm -rf "$proj/output"
108-
CAP_AB_HASH_FILE="$ab/$variant-$res.input" CAP_AB_REPORT="$ab/identity.txt" RUST_LOG=warn \
108+
CAP_AB_VERIFY=1 CAP_AB_HASH_FILE="$ab/$variant-$res.input" CAP_AB_REPORT="$ab/identity.txt" RUST_LOG=warn \
109109
"$exe" "$proj" mp4 "{\"fps\":30,\"resolution_base\":{\"x\":$w,\"y\":$h},\"compression\":\"Maximum\",\"custom_bpp\":null}" > "$ab/$variant-$res.log" 2>&1
110110
echo "$variant $res exit $?"
111111
tr '\r' '\n' < "$ab/$variant-$res.log" | grep -v "^Exporting frame" | tail -40
@@ -137,8 +137,9 @@ jobs:
137137
if: always()
138138
with:
139139
name: identity-${{ matrix.settings.runner }}
140-
path: ${{ runner.temp }}/ab/*.log
140+
path: ${{ runner.temp }}/ab/
141141
- name: Export benchmark, base vs head
142+
if: ${{ github.event_name == 'workflow_dispatch' }}
142143
shell: bash
143144
run: |
144145
set +e

‎crates/export/src/mp4.rs‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,11 @@ impl Mp4ExportSettings {
547547
}
548548
};
549549
ab_stats::record(ab_started.elapsed(), ab_copied, frame);
550+
if ab_copied == 0 && std::env::var_os("CAP_AB_VERIFY").is_some() {
551+
let mut check = ffmpeg::frame::Video::new(ffmpeg::format::Pixel::NV12, input.width, input.height);
552+
fill_nv12_frame_direct(&mut check, nv12_data, input.width, input.height, input.y_stride, input.frame_number as i64);
553+
ab_stats::verify(frame, &check);
554+
}
550555
encoder
551556
.queue_video_frame_reusable(frame, &mut converted_frame, Duration::MAX)
552557
.map_err(|err| err.to_string())?;
@@ -2149,12 +2154,35 @@ pub(crate) mod ab_stats {
21492154
}
21502155
}
21512156

2157+
static VERIFIED: AtomicU64 = AtomicU64::new(0);
2158+
static MISMATCHED: AtomicU64 = AtomicU64::new(0);
2159+
2160+
pub fn verify(wrapped: &ffmpeg::frame::Video, copied: &ffmpeg::frame::Video) {
2161+
let width = wrapped.width() as usize;
2162+
let mut same = wrapped.pts() == copied.pts()
2163+
&& wrapped.format() == copied.format()
2164+
&& wrapped.width() == copied.width()
2165+
&& wrapped.height() == copied.height();
2166+
for (plane, rows) in [(0usize, wrapped.height() as usize), (1usize, wrapped.height() as usize / 2)] {
2167+
let (a, b) = (wrapped.stride(plane), copied.stride(plane));
2168+
for row in 0..rows {
2169+
same &= wrapped.data(plane)[row * a..row * a + width] == copied.data(plane)[row * b..row * b + width];
2170+
}
2171+
}
2172+
VERIFIED.fetch_add(1, Ordering::Relaxed);
2173+
if !same {
2174+
MISMATCHED.fetch_add(1, Ordering::Relaxed);
2175+
}
2176+
}
2177+
21522178
pub fn reset() -> (std::time::Instant, u64) {
21532179
PREP_NS.store(0, Ordering::Relaxed);
21542180
COPY_BYTES.store(0, Ordering::Relaxed);
21552181
FRAMES.store(0, Ordering::Relaxed);
21562182
WRAPPED.store(0, Ordering::Relaxed);
21572183
HASHES.lock().unwrap().clear();
2184+
VERIFIED.store(0, Ordering::Relaxed);
2185+
MISMATCHED.store(0, Ordering::Relaxed);
21582186
cap_rendering::loop_stats::READBACK_COPY_NS.store(0, Ordering::Relaxed);
21592187
cap_rendering::loop_stats::READBACK_COPY_BYTES.store(0, Ordering::Relaxed);
21602188
(std::time::Instant::now(), cpu_time_us())
@@ -2168,12 +2196,14 @@ pub(crate) mod ab_stats {
21682196
let readback_ns = cap_rendering::loop_stats::READBACK_COPY_NS.load(Ordering::Relaxed);
21692197
let readback_bytes = cap_rendering::loop_stats::READBACK_COPY_BYTES.load(Ordering::Relaxed);
21702198
let line = format!(
2171-
"AB_EXPORT size={width}x{height} frames={frames} wrapped={} wall_ms={wall_ms:.0} cpu_ms={cpu_ms:.0} prep_us_per_frame={:.1} avframe_copy_bytes_per_frame={:.0} readback_copy_us_per_frame={:.1} readback_copy_bytes_per_frame={:.0}",
2199+
"AB_EXPORT size={width}x{height} frames={frames} wrapped={} wall_ms={wall_ms:.0} cpu_ms={cpu_ms:.0} prep_us_per_frame={:.1} avframe_copy_bytes_per_frame={:.0} readback_copy_us_per_frame={:.1} readback_copy_bytes_per_frame={:.0} verified={} verify_mismatches={}",
21722200
WRAPPED.load(Ordering::Relaxed),
21732201
per(PREP_NS.load(Ordering::Relaxed)) / 1000.0,
21742202
per(COPY_BYTES.load(Ordering::Relaxed)),
21752203
per(readback_ns) / 1000.0,
21762204
per(readback_bytes),
2205+
VERIFIED.load(Ordering::Relaxed),
2206+
MISMATCHED.load(Ordering::Relaxed),
21772207
);
21782208
eprintln!("{line}");
21792209
if let Some(path) = std::env::var_os("CAP_AB_REPORT")

0 commit comments

Comments
 (0)