Skip to content

Commit 60f7116

Browse files
fix(producer): auto renders with color-graded media stay SDR instead of promoting to HDR (#6671)
* fix(producer): auto renders with color-graded media stay SDR instead of promoting to HDR * fix(producer): keep auto renders SDR when a graded canvas is present
1 parent 168429d commit 60f7116

16 files changed

Lines changed: 199 additions & 19 deletions

‎packages/cli/src/utils/hdrPromotion.test.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,20 @@ function bundledMedia(videos: string[], images: string[]) {
3838
}
3939

4040
describe("inspectHdrAutoPromotion", () => {
41+
it("reports no promotion when graded media keeps the render SDR, without probing", async () => {
42+
const extractMetadata = vi.fn(async () => metadata(HDR));
43+
const media = bundledMedia(["assets/source-hdr.mp4"], []);
44+
45+
await expect(
46+
inspectHdrAutoPromotion(
47+
PROJECT,
48+
{ ...media, images: [{ src: "assets/look.png", graded: true }] },
49+
extractMetadata,
50+
),
51+
).resolves.toBeNull();
52+
expect(extractMetadata).not.toHaveBeenCalled();
53+
});
54+
4155
it("reports the local HDR asset that promotes automatic output", async () => {
4256
const assetPath = resolveProjectRelativeSrc("assets/source-hdr.mp4", PROJECT.dir, PROJECT.dir);
4357
const extractMetadata = vi.fn(async () => metadata(HDR));

‎packages/cli/src/utils/hdrPromotion.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {
22
extractMediaMetadata,
33
findHdrAutoPromotion,
4+
gradingKeepsSdr,
45
type HdrAutoPromotion,
56
} from "@hyperframes/engine";
67
import type { ProjectDir } from "./project.js";
@@ -13,6 +14,7 @@ export async function inspectHdrAutoPromotion(
1314
media: Pick<ProjectMedia, "videos" | "images">,
1415
extractMetadata: ExtractMetadata = extractMediaMetadata,
1516
): Promise<HdrAutoPromotion | null> {
17+
if (gradingKeepsSdr("auto", media)) return null;
1618
const assets: Array<{
1719
asset: string;
1820
colorSpace: Awaited<ReturnType<typeof extractMediaMetadata>>["colorSpace"];

‎packages/cli/src/utils/projectMedia.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import { loadProducer } from "./producer.js";
77

88
/** The render's own media list for a project: what it extracts, probes and mixes. */
99
export interface ProjectMedia {
10-
videos: readonly Pick<VideoElement, "src" | "hasAudio">[];
11-
images: readonly { src: string }[];
10+
videos: readonly Pick<VideoElement, "src" | "hasAudio" | "graded">[];
11+
images: readonly { src: string; graded?: boolean }[];
12+
gradedCanvas?: boolean;
1213
audios: readonly AudioElement[];
1314
/** The bundled document the lists were read from. */
1415
html: string;

‎packages/engine/src/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ export {
221221
// ── Media processing ───────────────────────────────────────────────────────────
222222
export {
223223
parseVideoElements,
224+
hasGradedCanvas,
224225
parseImageElements,
225226
extractVideoFramesRange,
226227
extractAllVideoFrames,
@@ -487,6 +488,7 @@ export {
487488
getHdrEncoderColorParams,
488489
analyzeCompositionHdr,
489490
findHdrAutoPromotion,
491+
gradingKeepsSdr,
490492
formatHdrAutoPromotionWarning,
491493
sanitizeHdrAutoPromotionAsset,
492494
DEFAULT_HDR10_MASTERING,

‎packages/engine/src/services/videoFrameExtractor.test.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { tmpdir } from "node:os";
1616
import { spawnSync } from "node:child_process";
1717
import {
1818
parseVideoElements,
19+
hasGradedCanvas,
1920
parseImageElements,
2021
extractAllVideoFrames,
2122
extractVideoFramesRange,
@@ -738,6 +739,25 @@ describe("resolveFrameFormat", () => {
738739
});
739740

740741
describe("parseVideoElements", () => {
742+
it("marks a graded video and image, and only those", () => {
743+
const html = `<video id="g" src="g.mp4" data-color-grading='{"preset":"clean-studio"}'></video>
744+
<video id="p" src="p.mp4"></video>
745+
<img id="gi" src="gi.png" data-color-grading='{"adjust":{"exposure":0.2}}'>
746+
<img id="pi" src="pi.png">`;
747+
expect(parseVideoElements(html).map(({ id, graded }) => [id, graded])).toEqual([
748+
["g", true],
749+
["p", undefined],
750+
]);
751+
expect(parseImageElements(html).map(({ id, graded }) => [id, graded])).toEqual([
752+
["gi", true],
753+
["pi", undefined],
754+
]);
755+
expect(hasGradedCanvas(html)).toBe(false);
756+
expect(
757+
hasGradedCanvas(`<canvas data-color-grading='{"preset":"clean-studio"}'></canvas>`),
758+
).toBe(true);
759+
});
760+
741761
it.each([
742762
{
743763
label: "valueless playback-start",

‎packages/engine/src/services/videoFrameExtractor.ts‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { basename, join } from "path";
1212
import { cpus } from "os";
1313
import { createConcurrencyLimit } from "../utils/concurrencyLimit.js";
1414
import { parseHTML } from "linkedom";
15+
import { HF_COLOR_GRADING_ATTR } from "@hyperframes/core";
1516
import { isPathInside } from "@hyperframes/parsers/asset-paths";
1617
import { resolveProjectRelativeSrc } from "@hyperframes/parsers/asset-resolution";
1718
import { alphaDecoderFor } from "@hyperframes/parsers/media-alpha";
@@ -104,6 +105,7 @@ export interface VideoElement {
104105
loop: boolean;
105106
hasAudio: boolean;
106107
hidden?: boolean;
108+
graded?: boolean;
107109
}
108110

109111
export interface ExtractedFrames {
@@ -844,6 +846,7 @@ export function parseVideoElements(html: string): VideoElement[] {
844846
(isAudibleVideoElement(el) && isMemberGroupHidden(groupsById, el))
845847
? { hidden: true }
846848
: {}),
849+
...(el.hasAttribute(HF_COLOR_GRADING_ATTR) ? { graded: true } : {}),
847850
});
848851
}
849852

@@ -855,6 +858,14 @@ export interface ImageElement {
855858
src: string;
856859
start: number;
857860
end: number;
861+
graded?: boolean;
862+
}
863+
864+
export function hasGradedCanvas(html: string): boolean {
865+
return (
866+
parseHTML(unwrapTemplate(html)).document.querySelector(`canvas[${HF_COLOR_GRADING_ATTR}]`) !==
867+
null
868+
);
858869
}
859870

860871
export function parseImageElements(html: string): ImageElement[] {
@@ -894,7 +905,13 @@ export function parseImageElements(html: string): ImageElement[] {
894905
end = Infinity;
895906
}
896907

897-
images.push({ id, src, start, end });
908+
images.push({
909+
id,
910+
src,
911+
start,
912+
end,
913+
...(el.hasAttribute(HF_COLOR_GRADING_ATTR) ? { graded: true } : {}),
914+
});
898915
}
899916

900917
return images;

‎packages/engine/src/utils/hdr.test.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
getHdrEncoderColorParams,
66
analyzeCompositionHdr,
77
findHdrAutoPromotion,
8+
gradingKeepsSdr,
89
formatHdrAutoPromotionWarning,
910
sanitizeHdrAutoPromotionAsset,
1011
DEFAULT_HDR10_MASTERING,
@@ -224,3 +225,14 @@ describe("HDR auto-promotion reporting", () => {
224225
);
225226
});
226227
});
228+
229+
describe("gradingKeepsSdr", () => {
230+
const graded = { videos: [{}], images: [{ graded: true }] };
231+
it("keeps auto renders with graded media SDR, never a forced mode or ungraded media", () => {
232+
expect(gradingKeepsSdr(undefined, graded)).toBe(true);
233+
expect(gradingKeepsSdr("auto", graded)).toBe(true);
234+
expect(gradingKeepsSdr("force-hdr", graded)).toBe(false);
235+
expect(gradingKeepsSdr("auto", { videos: [{}], images: [] })).toBe(false);
236+
expect(gradingKeepsSdr("auto", { videos: [], images: [], gradedCanvas: true })).toBe(true);
237+
});
238+
});

‎packages/engine/src/utils/hdr.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,22 @@ export function findHdrAutoPromotion(
142142
: null;
143143
}
144144

145+
/** Grading is SDR-only, so in auto mode a composition with graded media renders SDR, as `--sdr` does. */
146+
export function gradingKeepsSdr(
147+
hdrMode: "auto" | "force-hdr" | "force-sdr" | undefined,
148+
media: {
149+
videos: readonly { graded?: boolean }[];
150+
images: readonly { graded?: boolean }[];
151+
gradedCanvas?: boolean;
152+
},
153+
): boolean {
154+
return (
155+
(hdrMode ?? "auto") === "auto" &&
156+
(media.gradedCanvas === true ||
157+
[...media.videos, ...media.images].some(({ graded }) => graded === true))
158+
);
159+
}
160+
145161
export function formatHdrAutoPromotionWarning(promotion: HdrAutoPromotion): string {
146162
return `[Render] HDR auto-promotion triggered by "${promotion.triggeringAsset}", output: ${promotion.output.colorSpace} / ${promotion.output.codec}`;
147163
}

‎packages/producer/src/services/htmlCompiler.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ export interface CompiledComposition {
118118
audios: AudioElement[];
119119
images: ImageElement[];
120120
droppedMediaIds: Set<string>;
121+
gradedCanvas: boolean;
121122
masterFxChain?: string;
122123
unresolvedCompositions: UnresolvedElement[];
123124
/** Assets that resolve outside projectDir. Keys are the path used in HTML, values are absolute filesystem paths. */
@@ -2236,7 +2237,7 @@ export async function compileForRender(
22362237
// within one composition file: two scenes declaring `<video id="clip">` — or
22372238
// two bare `<video>`s, both auto-numbered `hf-video-0` — collapsed into one
22382239
// entry and injected frames onto whichever element came first. See #3340.
2239-
const { videos, audios, images, droppedMediaIds } = collectRenderMedia(html);
2240+
const { videos, audios, images, droppedMediaIds, gradedCanvas } = collectRenderMedia(html);
22402241
const masterFxChain = parseMasterFxChain(html);
22412242

22422243
// Advisory video checks (sparse keyframes, VFR). Fire-and-forget — these spawn
@@ -2294,6 +2295,7 @@ export async function compileForRender(
22942295
audios,
22952296
images,
22962297
droppedMediaIds,
2298+
gradedCanvas,
22972299
...(masterFxChain ? { masterFxChain } : {}),
22982300
unresolvedCompositions,
22992301
externalAssets,

‎packages/producer/src/services/render/hdrMode.test.ts‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@
77

88
import { describe, expect, it, vi } from "vitest";
99
import type { ExtractionResult, VideoColorSpace } from "@hyperframes/engine";
10-
import { findRenderHdrAutoPromotionTrigger, resolveEffectiveHdrMode } from "./hdrMode.js";
10+
import {
11+
findRenderHdrAutoPromotionTrigger,
12+
rendersSdrOnly,
13+
resolveEffectiveHdrMode,
14+
} from "./hdrMode.js";
15+
16+
const NO_MEDIA = { videos: [], images: [] };
17+
const GRADED_VIDEO = { videos: [{ graded: true }, {}], images: [] };
1118

1219
function makeLog() {
1320
return { error: vi.fn(), warn: vi.fn(), info: vi.fn(), debug: vi.fn() };
@@ -37,9 +44,41 @@ const HDR_PQ: VideoColorSpace = {
3744
};
3845

3946
describe("resolveEffectiveHdrMode", () => {
47+
it("keeps an auto render with graded media SDR when an HDR source would promote it, and says why", () => {
48+
const log = makeLog();
49+
const result = resolveEffectiveHdrMode({
50+
media: GRADED_VIDEO,
51+
hdrMode: "auto",
52+
outputFormat: "mp4",
53+
extractionResult: extractionWith([HDR_PQ]),
54+
imageColorSpaces: [],
55+
log,
56+
});
57+
expect(result).toBeUndefined();
58+
expect(log.warn).toHaveBeenCalledWith(expect.stringContaining("color grading is SDR-only"));
59+
expect(log.warn).not.toHaveBeenCalledWith(expect.stringContaining("auto-promotion"));
60+
});
61+
62+
it("keeps --hdr with graded media HDR and warns that the grades are SDR", () => {
63+
const log = makeLog();
64+
const result = resolveEffectiveHdrMode({
65+
media: { videos: [], images: [{ graded: true }] },
66+
hdrMode: "force-hdr",
67+
outputFormat: "mp4",
68+
extractionResult: extractionWith([HDR_PQ]),
69+
imageColorSpaces: [],
70+
log,
71+
});
72+
expect(result).toEqual({ transfer: "pq" });
73+
expect(log.warn).toHaveBeenCalledWith(
74+
expect.stringContaining("graded elements are graded in SDR"),
75+
);
76+
});
77+
4078
it("returns undefined when force-sdr is set, regardless of HDR sources", () => {
4179
const log = makeLog();
4280
const result = resolveEffectiveHdrMode({
81+
media: NO_MEDIA,
4382
hdrMode: "force-sdr",
4483
outputFormat: "mp4",
4584
extractionResult: extractionWith([HDR_PQ]),
@@ -53,6 +92,7 @@ describe("resolveEffectiveHdrMode", () => {
5392
it("auto-detects HDR from video sources when format=mp4", () => {
5493
const log = makeLog();
5594
const result = resolveEffectiveHdrMode({
95+
media: NO_MEDIA,
5696
hdrMode: undefined,
5797
outputFormat: "mp4",
5898
extractionResult: extractionWith([HDR_PQ]),
@@ -71,6 +111,7 @@ describe("resolveEffectiveHdrMode", () => {
71111
it("auto-detects SDR with no HDR sources", () => {
72112
const log = makeLog();
73113
const result = resolveEffectiveHdrMode({
114+
media: NO_MEDIA,
74115
hdrMode: "auto",
75116
outputFormat: "mp4",
76117
extractionResult: extractionWith([]),
@@ -84,6 +125,7 @@ describe("resolveEffectiveHdrMode", () => {
84125
it("force-hdr without sources falls back to HLG and warns", () => {
85126
const log = makeLog();
86127
const result = resolveEffectiveHdrMode({
128+
media: NO_MEDIA,
87129
hdrMode: "force-hdr",
88130
outputFormat: "mp4",
89131
extractionResult: extractionWith([]),
@@ -99,6 +141,7 @@ describe("resolveEffectiveHdrMode", () => {
99141
it("force-hdr uses the dominant probed transfer when sources are HDR", () => {
100142
const log = makeLog();
101143
const result = resolveEffectiveHdrMode({
144+
media: NO_MEDIA,
102145
hdrMode: "force-hdr",
103146
outputFormat: "mp4",
104147
extractionResult: extractionWith([HDR_PQ]),
@@ -113,6 +156,7 @@ describe("resolveEffectiveHdrMode", () => {
113156
for (const fmt of ["webm", "mov", "png-sequence"] as const) {
114157
const log = makeLog();
115158
const result = resolveEffectiveHdrMode({
159+
media: NO_MEDIA,
116160
hdrMode: "auto",
117161
outputFormat: fmt,
118162
extractionResult: extractionWith([HDR_PQ]),
@@ -135,6 +179,7 @@ describe("resolveEffectiveHdrMode", () => {
135179
it("downgrades auto-detected HDR on hls with an SDR-only reason, not the alpha one", () => {
136180
const log = makeLog();
137181
const result = resolveEffectiveHdrMode({
182+
media: NO_MEDIA,
138183
hdrMode: "auto",
139184
outputFormat: "hls",
140185
extractionResult: extractionWith([HDR_PQ]),
@@ -154,6 +199,7 @@ describe("resolveEffectiveHdrMode", () => {
154199
it("force-hdr without sources + non-mp4 format: still downgrades, two warns fire", () => {
155200
const log = makeLog();
156201
const result = resolveEffectiveHdrMode({
202+
media: NO_MEDIA,
157203
hdrMode: "force-hdr",
158204
outputFormat: "webm",
159205
extractionResult: extractionWith([]),
@@ -202,3 +248,11 @@ describe("findRenderHdrAutoPromotionTrigger", () => {
202248
).toBe("assets/hero.png");
203249
});
204250
});
251+
252+
describe("rendersSdrOnly", () => {
253+
it("is true for an auto render with graded media, so HDR sources are tone-mapped before the grade", () => {
254+
expect(rendersSdrOnly({ hdrMode: undefined, format: "mp4" }, GRADED_VIDEO)).toBe(true);
255+
expect(rendersSdrOnly({ hdrMode: "auto", format: "mp4" }, NO_MEDIA)).toBe(false);
256+
expect(rendersSdrOnly({ hdrMode: "force-hdr", format: "mp4" }, GRADED_VIDEO)).toBe(false);
257+
});
258+
});

0 commit comments

Comments
 (0)