diff --git a/packages/cli/src/commands/measure/extract.ts b/packages/cli/src/commands/measure/extract.ts index 15f30d23b9..de1cc3b329 100644 --- a/packages/cli/src/commands/measure/extract.ts +++ b/packages/cli/src/commands/measure/extract.ts @@ -62,7 +62,7 @@ async function record( return entry.id; } -const crop = (roi: Roi) => `crop=${roi[2]}:${roi[3]}:${roi[0]}:${roi[1]}`; +const crop = (roi: Roi) => `crop=${roi[2]}:${roi[3]}:${roi[0]}:${roi[1]}:exact=1`; /** The frame shown at `at` seconds, cropped, as a picture. */ export async function cutStill(info: VideoInfo, at: number, roi: Roi, out: string) { diff --git a/packages/cli/src/measure/diff.ts b/packages/cli/src/measure/diff.ts index ced369dac2..d18cf4b5cb 100644 --- a/packages/cli/src/measure/diff.ts +++ b/packages/cli/src/measure/diff.ts @@ -368,7 +368,7 @@ function ssimSeries(ref: Clip, yours: Clip, logPath: string): Series { `[1:v]${side([...yours.filters, `scale=${ref.width}:${ref.height}:flags=bicubic`])},split=${n}${tags("o")}`, "[o0][r0]ssim=stats_file=-:shortest=1[s0]", ...Array.from({ length: GRID * GRID }, (_, i) => { - const crop = `crop=${cw}:${ch}:${(i % GRID) * cw}:${Math.floor(i / GRID) * ch}`; + const crop = `crop=${cw}:${ch}:${(i % GRID) * cw}:${Math.floor(i / GRID) * ch}:exact=1`; const k = i + 1; return `[r${k}]${crop}[rc${k}];[o${k}]${crop}[oc${k}];[oc${k}][rc${k}]ssim=stats_file=cell${i}.log:shortest=1[s${k}]`; }), diff --git a/packages/cli/src/measure/drawn.ts b/packages/cli/src/measure/drawn.ts index 8147fcf2b4..628ece5f0d 100644 --- a/packages/cli/src/measure/drawn.ts +++ b/packages/cli/src/measure/drawn.ts @@ -186,7 +186,7 @@ export function readDrawn( `[0:v]${[...clip.filters, "setsar=1", `scale=${width}:${height}:flags=bicubic`].join(",")},split=${jobs.length}${tags}`, ...jobs.map(({ box: [x, y, w, h], frames }, j) => { const pick = sumOf(frames.map((k) => `eq(n\\,${k})`)); - return `[d${j}]select=${pick},crop=${w}:${h}:${x}:${y},format=rgb24[e${j}]`; + return `[d${j}]select=${pick},format=rgb24,crop=${w}:${h}:${x}:${y}[e${j}]`; }), ].join(";"); const outs = jobs.flatMap((_, j) => [ diff --git a/packages/cli/src/measure/media.test.ts b/packages/cli/src/measure/media.test.ts index dfaf2f345a..1a39b115b7 100644 --- a/packages/cli/src/measure/media.test.ts +++ b/packages/cli/src/measure/media.test.ts @@ -4,7 +4,7 @@ import { mkdtempSync, rmSync } from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; import { selectFirstFrameAfterEach } from "../commands/snapshot.js"; -import { probeVideo, readClip, sumOf, videoClip } from "./media.js"; +import { meanAbsDiff, probeVideo, readClip, readFrames, sumOf, videoClip } from "./media.js"; const terms = (n: number) => Array.from({ length: n }, (_, i) => `eq(n\\,${i * 2})`); @@ -52,3 +52,35 @@ describe.skipIf(!ffmpeg)("a select of many frames", () => { expect(decoded(selectFirstFrameAfterEach(times))).toBe(n); }); }); + +// A crop on yuv420p rounds an odd size or place down to even: a 33x33 box came back 32x32, so its bytes split into +// 9.4 frames, and an odd place shifted the colour. +describe.skipIf(!ffmpeg)("an odd box", () => { + const dir = mkdtempSync(join(tmpdir(), "hf-crop-")); + const path = join(dir, "clip.mp4"); + beforeAll(() => { + execFileSync("ffmpeg", [ + ...["-v", "error", "-f", "lavfi", "-i", "testsrc=d=1:r=10:s=64x64"], + ...["-pix_fmt", "yuv420p", "-y", path], + ]); + }); + afterAll(() => rmSync(dir, { recursive: true, force: true })); + + it.each([ + [1, 1, 33, 33], + [3, 5, 31, 17], + ])("reads the box %i,%i,%i,%i as the pixels the whole frame has there", (x, y, w, h) => { + for (const gray of [false, true]) { + const n = gray ? 1 : 3; + const whole = readFrames(path, { gray }).frames[9]!; + const there = Uint8Array.from( + Array.from({ length: h }, (_, r) => [ + ...whole.subarray(((y + r) * 64 + x) * n, ((y + r) * 64 + x + w) * n), + ]).flat(), + ); + const box = readFrames(path, { roi: [x, y, w, h], gray }).frames; + expect(box).toHaveLength(10); + expect(meanAbsDiff(box[9]!, there)).toBe(0); + } + }); +}); diff --git a/packages/cli/src/measure/media.ts b/packages/cli/src/measure/media.ts index 7a70a22e5f..ca9467e639 100644 --- a/packages/cli/src/measure/media.ts +++ b/packages/cli/src/measure/media.ts @@ -225,7 +225,10 @@ export function readClip(clip: Clip, opts: Omit `eq(n\\,${k})`))}`, `scale=${w}:${h}:force_original_aspect_ratio=increase:flags=bicubic`, + "format=rgb24", `crop=${w}:${h}`, `crop=${box[2]}:${box[3]}:${box[0]}:${box[1]}`, - "format=rgb24", ].join(","); runFfmpeg( [ @@ -331,7 +331,7 @@ function stillBox(path: string, box: Roi, w: number, h: number): Uint8Array | un try { const raw = runFfmpeg([ ...["-i", path, "-frames:v", "1", "-vf"], - `scale=${w}:${h}:force_original_aspect_ratio=increase:flags=bicubic,crop=${w}:${h},crop=${box[2]}:${box[3]}:${box[0]}:${box[1]},format=rgb24`, + `scale=${w}:${h}:force_original_aspect_ratio=increase:flags=bicubic,format=rgb24,crop=${w}:${h},crop=${box[2]}:${box[3]}:${box[0]}:${box[1]}`, ...["-f", "rawvideo", "-"], ]); return raw.length >= box[2] * box[3] * 3 ? new Uint8Array(raw) : undefined;