Skip to content

Commit 1f8ead7

Browse files
vanceingallsclaude
andauthored
feat(producer,studio): wire capture motion blur into renders and Studio (#5969)
Carry the runtime's blur through the render pipeline and the Studio render panel. - engine: installPageMotionBlur sets the page-side off switch and the render's device scale before any author script runs; CaptureOptions.pageMotionBlur lets a caller stand the page blur down. - producer: a composition that asks for data-motion-blur on the root the runtime would pick forces screenshot capture, because html-in-canvas needs a real paint; the probe session carries the request's pageMotionBlur like every other session. - studio-server and Studio: the render panel sends previewMotionBlur, the render route turns "off" into pageMotionBlur once, and the Studio dev server and the CLI server both receive the final value. - mover scan: a large element that is see-through while it moves (a sweep, a light leak) is no mover, including a large image or canvas with alpha; the scan skips elements moved by a 3D individual transform property. - cli snapshot injects video frames before the seek settles, matching the engine's order. Folded review fixes: R1, R2, R3 (scan half), R7, R16, R18, T3 (render adapters). Co-authored-by: Claude Sonnet 5.5 <[email protected]>
1 parent c4edac3 commit 1f8ead7

29 files changed

Lines changed: 725 additions & 15 deletions

‎packages/cli/src/capture/captureCompositionFrame.test.ts‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import {
1616
resolveCropRegion,
1717
runFfmpegOnce,
1818
seekCompositionTimeline,
19+
seekCompositionTimelineOnly,
20+
settleCompositionSeek,
1921
waitForRuntimeReady,
2022
type CompositionSeekPage,
2123
} from "./captureCompositionFrame.js";
@@ -116,6 +118,18 @@ describe("seekCompositionTimeline", () => {
116118
expect(evaluate).toHaveBeenNthCalledWith(4, expect.any(Function), { ms: 500, frames: 1 });
117119
});
118120

121+
it("can seek without finishing the frame, so overlays land before a blurred frame is drawn", async () => {
122+
const { page, evaluate } = fakeSeekPage();
123+
124+
await seekCompositionTimelineOnly(page, 1.25);
125+
expect(evaluate).toHaveBeenCalledTimes(1);
126+
expect(evaluate).toHaveBeenNthCalledWith(1, expect.any(Function), 1.25, false, false, false);
127+
128+
await settleCompositionSeek(page);
129+
expect(evaluate).toHaveBeenNthCalledWith(2, expect.any(Function), { videoFrames: true });
130+
expect(evaluate).toHaveBeenCalledTimes(4);
131+
});
132+
119133
it("waitForFontsMs: 0 disables the post-seek font wait", async () => {
120134
const { page, evaluate } = fakeSeekPage();
121135

@@ -285,7 +299,7 @@ describe("seekCompositionTimeline", () => {
285299
}).then(() => {
286300
settled = true;
287301
});
288-
await Promise.resolve();
302+
await new Promise((resolve) => setTimeout(resolve, 0));
289303
expect(evaluateCall).toBe(2);
290304
expect(settled).toBe(false);
291305
completeGpu?.();

‎packages/cli/src/capture/captureCompositionFrame.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,16 @@ export async function seekCompositionTimeline(
510510
page: CompositionSeekPage,
511511
timeSeconds: number,
512512
options: SeekCompositionTimelineOptions = {},
513+
): Promise<void> {
514+
await seekCompositionTimelineOnly(page, timeSeconds, options);
515+
await settleCompositionSeek(page, options);
516+
}
517+
518+
/** The seek alone; `settleCompositionSeek` must follow, which is what finishes a blurred frame. */
519+
export async function seekCompositionTimelineOnly(
520+
page: CompositionSeekPage,
521+
timeSeconds: number,
522+
options: SeekCompositionTimelineOptions = {},
513523
): Promise<void> {
514524
if (options.waitForPreferredSeekTargetMs !== undefined) {
515525
await waitForPreferredSeekTarget(page, options.waitForPreferredSeekTargetMs);
@@ -522,7 +532,12 @@ export async function seekCompositionTimeline(
522532
options.exactTime === true,
523533
options.skipWebglDraws === true,
524534
);
535+
}
525536

537+
export async function settleCompositionSeek(
538+
page: CompositionSeekPage,
539+
options: SeekCompositionTimelineOptions = {},
540+
): Promise<void> {
526541
await page.evaluate(
527542
async (barrier: SeekBarrierOptions) => {
528543
const waitForCompletion = Reflect.get(window, "__hfWaitForSeekCompletion");

‎packages/cli/src/commands/snapshot-contactSheet.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ vi.mock("../capture/captureCompositionFrame.js", async (importOriginal) => ({
3131
renderReadyTimedOut: false,
3232
})),
3333
seekCompositionTimeline: capture.seek,
34+
seekCompositionTimelineOnly: capture.seek,
35+
settleCompositionSeek: vi.fn(async () => undefined),
3436
}));
3537

3638
vi.mock("../utils/staticProjectServer.js", () => ({

‎packages/cli/src/commands/snapshot.test.ts‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ const snapshotState = vi.hoisted(() => ({
1414
seek: vi.fn(async (_page: unknown, _time: number, _options?: unknown): Promise<void> => {
1515
throw new Error("seek reached");
1616
}),
17+
settle: vi.fn(async (_page: unknown, _options?: unknown): Promise<void> => undefined),
1718
closeServer: vi.fn(async () => undefined),
1819
}));
1920

2021
vi.mock("../capture/captureCompositionFrame.js", async (importOriginal) => ({
2122
...(await importOriginal<typeof import("../capture/captureCompositionFrame.js")>()),
2223
openSettledCompositionPage: snapshotState.openSettledPage,
23-
seekCompositionTimeline: snapshotState.seek,
24+
seekCompositionTimelineOnly: snapshotState.seek,
25+
settleCompositionSeek: snapshotState.settle,
2426
}));
2527

2628
vi.mock("../utils/staticProjectServer.js", () => ({
@@ -192,6 +194,57 @@ describe("snapshot --at seeks", () => {
192194
});
193195
});
194196

197+
describe("snapshot video overlays and the blurred frame", () => {
198+
// The runtime draws a blurred frame when the seek settles, so the video <img> overlays must
199+
// be in by then (the engine injects before it waits, too).
200+
it("settles the seek only after the video overlays were read and injected", async () => {
201+
const project = mkdtempSync(join(tmpdir(), "hf-snapshot-blur-order-"));
202+
writeFileSync(
203+
join(project, "index.html"),
204+
`<html><body><div data-composition-id="main" data-width="640" data-height="360" data-start="0" data-duration="3" data-motion-blur="on"><div class="clip" data-start="0" data-duration="3">Visible</div></div></body></html>`,
205+
);
206+
const log: string[] = [];
207+
let calls = 0;
208+
const evaluate = vi.fn(async () => {
209+
calls += 1;
210+
if (calls === 1) return { loaded: [], errored: [], unused: [] };
211+
if (calls === 2) return 3;
212+
if (calls === 3) return true;
213+
if (calls === 4) {
214+
log.push("read videos");
215+
return [];
216+
}
217+
return undefined;
218+
});
219+
snapshotState.openSettledPage.mockResolvedValueOnce({
220+
browser: { close: vi.fn(async () => undefined) },
221+
page: { evaluate },
222+
renderReadyTimedOut: false,
223+
});
224+
snapshotState.seek.mockReset();
225+
snapshotState.seek.mockImplementation(async () => {
226+
log.push("seek");
227+
});
228+
snapshotState.settle.mockClear();
229+
snapshotState.settle.mockImplementation(async () => {
230+
log.push("settle");
231+
});
232+
const logSpy = vi.spyOn(console, "log").mockImplementation(() => undefined);
233+
234+
try {
235+
await expect(
236+
snapshotCommand.run?.({
237+
args: { dir: project, at: "1", end: false, output: join(project, "out") },
238+
} as never),
239+
).rejects.toBeDefined();
240+
expect(log).toEqual(["seek", "read videos", "settle"]);
241+
} finally {
242+
logSpy.mockRestore();
243+
rmSync(project, { recursive: true, force: true });
244+
}
245+
});
246+
});
247+
195248
describe("resolveSnapshotVideoFrameTime", () => {
196249
it("holds a clip ending with the composition on its last decodable frame", () => {
197250
expect(

‎packages/cli/src/commands/snapshot.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ import {
3131
parseZoomTarget,
3232
resolveCropRegion,
3333
runFfmpegOnce,
34-
seekCompositionTimeline,
34+
seekCompositionTimelineOnly,
35+
settleCompositionSeek,
3536
type ZoomTarget,
3637
} from "../capture/captureCompositionFrame.js";
3738
import {
@@ -748,7 +749,8 @@ async function captureSnapshots(
748749
for (let i = 0; i < positions.length; i++) {
749750
const time = positions[i]!;
750751

751-
await seekCompositionTimeline(page, time, { exactTime: true });
752+
const seekOptions = { exactTime: true };
753+
await seekCompositionTimelineOnly(page, time, seekOptions);
752754

753755
if (cameraExpr) await page.evaluate(cameraExpr);
754756

@@ -892,6 +894,7 @@ async function captureSnapshots(
892894
}
893895
}
894896

897+
await settleCompositionSeek(page, seekOptions);
895898
await recaptureSnapshotComposite(page);
896899

897900
const timeLabel = formatSnapshotTimestamp(time);

‎packages/cli/src/server/studioServer.renderBrowser.test.ts‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,37 @@ describe("Studio render GPU encoding", () => {
103103
expect(mocks.createRenderJob).toHaveBeenCalledWith(expect.objectContaining({ useGpu: true }));
104104
});
105105
});
106+
107+
describe("Studio render motion blur", () => {
108+
it("hands the route's pageMotionBlur to the job", async () => {
109+
mocks.resolveRenderBrowser.mockResolvedValue({
110+
executablePath: "/opt/chrome",
111+
source: "cache",
112+
});
113+
114+
startStudioRender({ pageMotionBlur: "off" });
115+
await vi.waitFor(() => expect(mocks.createRenderJob).toHaveBeenCalledTimes(1), {
116+
timeout: 10_000,
117+
});
118+
119+
expect(mocks.createRenderJob).toHaveBeenCalledWith(
120+
expect.objectContaining({ pageMotionBlur: "off" }),
121+
);
122+
});
123+
124+
it("sends none when the route sent none", async () => {
125+
mocks.resolveRenderBrowser.mockResolvedValue({
126+
executablePath: "/opt/chrome",
127+
source: "cache",
128+
});
129+
130+
startStudioRender();
131+
await vi.waitFor(() => expect(mocks.createRenderJob).toHaveBeenCalledTimes(1), {
132+
timeout: 10_000,
133+
});
134+
135+
expect(mocks.createRenderJob).not.toHaveBeenCalledWith(
136+
expect.objectContaining({ pageMotionBlur: expect.anything() }),
137+
);
138+
});
139+
});

‎packages/cli/src/server/studioServer.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,7 @@ export function createStudioServer(options: StudioServerOptions): StudioServer {
642642
...(opts.videoFrameFormat ? { videoFrameFormat: opts.videoFrameFormat } : {}),
643643
...(opts.hdrMode ? { hdrMode: opts.hdrMode } : {}),
644644
...(opts.useGpu ? { useGpu: true } : {}),
645+
...(opts.pageMotionBlur ? { pageMotionBlur: opts.pageMotionBlur } : {}),
645646
});
646647
renderJob = job;
647648
const onProgress = (j: { progress: number; currentStage?: string }) => {

0 commit comments

Comments
 (0)