diff --git a/packages/cli/src/commands/render/plan.ts b/packages/cli/src/commands/render/plan.ts index b150a15048..4054375e42 100644 --- a/packages/cli/src/commands/render/plan.ts +++ b/packages/cli/src/commands/render/plan.ts @@ -131,6 +131,7 @@ export interface RenderPlan { renderTarget: string; fps: Fps; quality: RenderQuality; + qualityPreset: keyof typeof QUALITY_ALIASES; authoringSkill?: string; invalidAuthoringSkill?: string; /** Which resolution step provided authoringSkill: an explicit --skill flag, or the project's own config. */ @@ -638,6 +639,7 @@ export function createRenderPlan(args: RenderCommandArgs, now = new Date()): Ren renderTarget, fps, quality, + qualityPreset: qualityRaw as keyof typeof QUALITY_ALIASES, authoringSkill, invalidAuthoringSkill, authoringSkillSource, diff --git a/packages/cli/src/commands/render/present.test.ts b/packages/cli/src/commands/render/present.test.ts new file mode 100644 index 0000000000..e4d9cb2530 --- /dev/null +++ b/packages/cli/src/commands/render/present.test.ts @@ -0,0 +1,45 @@ +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { mkdtempSync, rmSync, writeFileSync } from "node:fs"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; +import { createRenderPlan, type RenderCommandArgs } from "./plan.js"; +import { presentRenderPlan } from "./present.js"; + +describe("presentRenderPlan", () => { + let projectDir: string; + let printed: string[]; + + beforeEach(() => { + projectDir = mkdtempSync(join(tmpdir(), "hf-render-present-")); + writeFileSync( + join(projectDir, "index.html"), + '
', + ); + printed = []; + vi.spyOn(console, "log").mockImplementation((line?: unknown) => { + printed.push(String(line ?? "")); + }); + vi.spyOn(console, "error").mockImplementation(() => {}); + }); + + afterEach(() => { + vi.restoreAllMocks(); + rmSync(projectDir, { recursive: true, force: true }); + }); + + async function settingsLine(args: Omit): Promise { + await presentRenderPlan(createRenderPlan({ dir: projectDir, workers: "2", ...args })); + return printed.find((line) => line.includes("2 workers")); + } + + it.each([ + [{}, "looks (CRF 16)"], + [{ quality: "draft" }, "draft"], + [{ quality: "standard" }, "standard"], + [{ quality: "delivery" }, "delivery"], + [{ crf: "20" }, "looks (CRF 20)"], + [{ "video-bitrate": "10M" }, "looks (10M)"], + ])("names the quality it encodes with for %o", async (args, label) => { + expect(await settingsLine(args)).toContain(`30fps · ${label} · 2 workers`); + }); +}); diff --git a/packages/cli/src/commands/render/present.ts b/packages/cli/src/commands/render/present.ts index 62a3708d96..051f3acfaa 100644 --- a/packages/cli/src/commands/render/present.ts +++ b/packages/cli/src/commands/render/present.ts @@ -37,7 +37,7 @@ function presentRenderSummary(plan: RenderPlan): void { c.accent("\u25C6") + " Rendering " + c.accent(nameLabel) + c.dim(" \u2192 " + plan.outputPath), ); console.log( - c.dim(` ${fpsToFfmpegArg(plan.fps)}fps \u00B7 ${plan.quality} \u00B7 ${workerLabel}`), + c.dim(` ${fpsToFfmpegArg(plan.fps)}fps \u00B7 ${qualityLabel(plan)} \u00B7 ${workerLabel}`), ); if (plan.outputResolution) { console.log(c.dim(" Output resolution: " + plan.outputResolution)); @@ -50,6 +50,12 @@ function presentRenderSummary(plan: RenderPlan): void { console.log(""); } +function qualityLabel(plan: Pick): string { + if (plan.crf !== undefined) return `${plan.qualityPreset} (CRF ${plan.crf})`; + if (plan.videoBitrate) return `${plan.qualityPreset} (${plan.videoBitrate})`; + return plan.qualityPreset; +} + /** The GPU line's accelerated modes, or undefined when neither is. */ function formatGpuModes(plan: RenderPlan): string | undefined { const modes: string[] = [];