Skip to content

Write HTML. Render video. Built for agents.

fix(engine): keep the rightmost 8 columns of SDR MP4 at widths like 1080 (#5559)

James Russo401354cd8f68
diff --git a/packages/engine/src/services/chunkEncoder.test.ts b/packages/engine/src/services/chunkEncoder.test.ts
index 7e263cfb7b..74e5e278a2 100644
--- a/packages/engine/src/services/chunkEncoder.test.ts
+++ b/packages/engine/src/services/chunkEncoder.test.ts
@@ -1897,6 +1897,50 @@ describe.skipIf(!HAS_FFMPEG)("buildEncoderArgs SDR colour", () => {
}
}, 30_000);
+ it("keeps the rightmost 8 columns of a 1080-wide (16n + 8) mp4", () => {
+ const dir = mkdtempSync(join(tmpdir(), "hf-sdr-right-edge-"));
+ try {
+ const jpg = join(dir, "frame.jpg");
+ const out = join(dir, "out.mp4");
+ const synth = spawnSync(ffmpeg, [
+ "-v",
+ "error",
+ "-y",
+ "-f",
+ "lavfi",
+ "-i",
+ "color=c=0xC83C28:s=1080x16,format=rgb24",
+ "-frames:v",
+ "1",
+ "-pix_fmt",
+ "yuvj420p",
+ jpg,
+ ]);
+ expect(synth.status).toBe(0);
+ const args = buildEncoderArgs(
+ {
+ fps: { num: 30, den: 1 },
+ width: 1080,
+ height: 16,
+ codec: "h264",
+ preset: "ultrafast",
+ quality: 0,
+ },
+ ["-i", jpg],
+ out,
+ );
+ expect(spawnSync(ffmpeg, args).status).toBe(0);
+ for (const x of [1071, 1075, 1079]) {
+ const captured = pixelAt(jpg, "", x);
+ const delivered = pixelAt(out, "scale=in_color_matrix=bt709:in_range=tv,", x);
+ const worst = Math.max(...delivered.map((v, i) => Math.abs(v - captured[i]!)));
+ expect(worst, `x=${x}: capture ${captured} delivered ${delivered}`).toBeLessThanOrEqual(2);
+ }
+ } finally {
+ rmSync(dir, { recursive: true, force: true });
+ }
+ }, 30_000);
+
// Untagged HD reads as BT.709 in QuickTime, so ProRes has to be BT.709 too. MOV captures are
// RGBA PNGs, and the conversion must leave their alpha plane alone. The tags come from
// setparams because prores_ks ignores -color_* (ffmpeg 5.1 writes none, 8.1 only the matrix).
diff --git a/packages/engine/src/services/videoFrameExtractor.test.ts b/packages/engine/src/services/videoFrameExtractor.test.ts
index 0b3f57ddb3..672f1cb351 100644
--- a/packages/engine/src/services/videoFrameExtractor.test.ts
+++ b/packages/engine/src/services/videoFrameExtractor.test.ts
@@ -1382,6 +1382,60 @@ describe.skipIf(!HAS_FFMPEG)("video frame extraction format", () => {
};
}
+ it("keeps the rightmost 8 columns of a 1080-wide (16n + 8) jpg extraction", async () => {
+ const source = join(FIXTURE_DIR, "white-1080.mp4");
+ const synth = await runFfmpeg([
+ "-y",
+ "-hide_banner",
+ "-loglevel",
+ "error",
+ "-f",
+ "lavfi",
+ "-i",
+ "color=c=white:s=1080x16:d=1:r=1",
+ "-c:v",
+ "libx264",
+ "-preset",
+ "ultrafast",
+ "-crf",
+ "0",
+ "-pix_fmt",
+ "yuv420p",
+ source,
+ ]);
+ expect(synth.success).toBe(true);
+ const outDir = join(FIXTURE_DIR, "out-white-1080");
+ mkdirSync(outDir, { recursive: true });
+ const result = await extractAllVideoFrames(
+ [{ ...fixtureVideo(), id: "white", src: source }],
+ FIXTURE_DIR,
+ { fps: 1, outputDir: outDir },
+ );
+ expect(result.errors).toEqual([]);
+ const frame = result.extracted[0]!.framePaths.get(0)!;
+ expect(frame.endsWith(".jpg")).toBe(true);
+ const lastColumns = (file: string) => [
+ ...spawnSync("ffmpeg", [
+ "-v",
+ "error",
+ "-i",
+ file,
+ "-frames:v",
+ "1",
+ "-vf",
+ "format=gray,crop=8:1:iw-8:8",
+ "-f",
+ "rawvideo",
+ "-",
+ ]).stdout,
+ ];
+ const delivered = lastColumns(frame);
+ const expected = lastColumns(source);
+ expect(delivered).toHaveLength(8);
+ for (const [i, v] of delivered.entries())
+ expect(Math.abs(v - expected[i]!)).toBeLessThanOrEqual(5);
+ }, 60_000);
+
it("keeps color-sensitive UI reds closer to source when extraction is forced to png", async () => {
const defaultOut = join(FIXTURE_DIR, "out-default");
const pngOut = join(FIXTURE_DIR, "out-png");
diff --git a/packages/engine/src/services/videoFrameExtractor.ts b/packages/engine/src/services/videoFrameExtractor.ts
index 0a38fa3852..3a271e2efe 100644
--- a/packages/engine/src/services/videoFrameExtractor.ts
+++ b/packages/engine/src/services/videoFrameExtractor.ts
@@ -258,7 +258,7 @@ const HDR_TO_SDR_ZSCALE_TRANSFORM_KEY = "hdr2sdr-hable-srgb";
const HDR_TO_SDR_VIDEOTOOLBOX_TRANSFORM_KEY = "hdr2sdr-videotoolbox-hdr";
const SDR_CANVAS_PASSTHROUGH_FILTER = "setparams=color_primaries=bt709:color_trc=iec61966-2-1";
const SDR_JPEG_AS_BT601_FULL_RANGE_FILTER =
- "scale=flags=neighbor,format=gbrp,scale=out_color_matrix=bt601:out_range=pc:flags=neighbor,format=yuv420p";
+ "scale=flags=neighbor+accurate_rnd,format=gbrp,scale=out_color_matrix=bt601:out_range=pc:flags=neighbor,format=yuv420p";
let warnedMissingZscale = false;
diff --git a/packages/engine/src/utils/sdrCaptureColor.ts b/packages/engine/src/utils/sdrCaptureColor.ts
index 7cc94e0fb6..fcb9977362 100644
--- a/packages/engine/src/utils/sdrCaptureColor.ts
+++ b/packages/engine/src/utils/sdrCaptureColor.ts
@@ -1,5 +1,5 @@
export const SDR_RGB_TO_BT709_FILTER = "scale=out_color_matrix=bt709:out_range=tv:flags=neighbor";
-export const SDR_CAPTURE_TO_BT709_FILTER = `scale=in_color_matrix=bt601:in_range=pc:flags=neighbor,format=gbrp,${SDR_RGB_TO_BT709_FILTER}`;
+export const SDR_CAPTURE_TO_BT709_FILTER = `scale=in_color_matrix=bt601:in_range=pc:flags=neighbor+accurate_rnd,format=gbrp,${SDR_RGB_TO_BT709_FILTER}`;
export const SDR_RGB_TO_TAGGED_BT709_FILTER = `${SDR_RGB_TO_BT709_FILTER},setparams=color_primaries=bt709:color_trc=bt709:colorspace=bt709:range=tv`;