Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion packages/producer/src/services/render/hdrMode.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { describe, expect, it, vi } from "vitest";
import type { ExtractionResult, VideoColorSpace } from "@hyperframes/engine";
import { resolveEffectiveHdrMode } from "./hdrMode.js";
import { resolveEffectiveHdrMode, resolveHdrEncodingMode } from "./hdrMode.js";

function makeLog() {
return { error: vi.fn(), warn: vi.fn(), info: vi.fn(), debug: vi.fn() };
Expand Down Expand Up @@ -145,3 +145,12 @@ describe("resolveEffectiveHdrMode", () => {
);
});
});

describe("resolveHdrEncodingMode", () => {
it("keeps forced HDR encoding enabled for an SDR-only composition", () => {
expect(resolveHdrEncodingMode({ transfer: "hlg" }, 0)).toEqual({
hasNativeHdrContent: false,
encoderHdr: { transfer: "hlg" },
});
});
});
13 changes: 13 additions & 0 deletions packages/producer/src/services/render/hdrMode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,19 @@ import type { ExtractionResult, HdrTransfer, VideoColorSpace } from "@hyperframe
import type { ProducerLogger } from "../../logger.js";
import type { RenderConfig } from "../renderOrchestrator.js";

export function resolveHdrEncodingMode(
effectiveHdr: { transfer: HdrTransfer } | undefined,
nativeHdrResourceCount: number,
): {
hasNativeHdrContent: boolean;
encoderHdr: { transfer: HdrTransfer } | undefined;
} {
return {
hasNativeHdrContent: Boolean(effectiveHdr && nativeHdrResourceCount > 0),
encoderHdr: effectiveHdr,
};
}

export function resolveEffectiveHdrMode(input: {
hdrMode: RenderConfig["hdrMode"];
outputFormat: NonNullable<RenderConfig["format"]>;
Expand Down
8 changes: 5 additions & 3 deletions packages/producer/src/services/renderOrchestrator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ import {
} from "./render/renderEventPublisher.js";
import { normalizeErrorMessage } from "../utils/errorMessage.js";
import { formatCaptureFrameName } from "../utils/paths.js";
import { resolveEffectiveHdrMode } from "./render/hdrMode.js";
import { resolveEffectiveHdrMode, resolveHdrEncodingMode } from "./render/hdrMode.js";
import {
buildRenderPerfSummary,
pushWorkerDedupPerfs,
Expand Down Expand Up @@ -2094,7 +2094,10 @@ export async function executeRenderJob(
// worker resolution, because the DE inversion below must not fire for
// comps that route to the layered/HDR paths.)
const nativeHdrIds = new Set([...nativeHdrVideoIds, ...nativeHdrImageIds]);
const hasHdrContent = Boolean(effectiveHdr && nativeHdrIds.size > 0);
const { hasNativeHdrContent: hasHdrContent, encoderHdr } = resolveHdrEncodingMode(
effectiveHdr,
nativeHdrIds.size,
);
// DE priority inversion eligibility — evaluated BEFORE capture calibration
// because when every multi-worker resolution would be inverted to 1 anyway,
// the calibration stage (a throwaway Chrome launch + timeline-spread sample
Expand Down Expand Up @@ -2532,7 +2535,6 @@ export async function executeRenderJob(
hasShaderTransitions: compiled.hasShaderTransitions,
isPngSequence,
});
const encoderHdr = hasHdrContent ? effectiveHdr : undefined;
// png-sequence has no encoder, but the rest of the orchestrator still
// reads `preset.quality` for `effectiveQuality` and `preset.codec` for
// unrelated bookkeeping. Fall back to the mp4 preset shape — its values
Expand Down
Loading