Skip to content

refactor(producer): extract HDR compositor from renderOrchestrator #1419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
miguel-heygen wants to merge 1 commit into from
Closed

refactor(producer): extract HDR compositor from renderOrchestrator #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
703 changes: 703 additions & 0 deletions packages/producer/src/services/hdrCompositor.ts
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions packages/producer/src/services/render/perfSummary.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
*/

import { fpsToNumber } from "@hyperframes/core";
import type { CaptureCalibrationSample, CaptureCostEstimate } from "./captureCost.js";
import type {
CaptureAttemptSummary,
CaptureCalibrationSample,
CaptureCostEstimate,
HdrDiagnostics,
RenderJob,
RenderPerfSummary,
Expand Down
5 changes: 2 additions & 3 deletions packages/producer/src/services/render/stages/captureHdrFrameShared.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,13 @@ import {
import type { ProducerLogger } from "../../../logger.js";
import {
type HdrCompositeContext,
type HdrPerfCollector,
type HdrVideoFrameSource,
type TransitionRange,
addHdrTiming,
blitHdrImageLayer,
blitHdrVideoLayer,
closeHdrVideoFrameSource,
} from "../../renderOrchestrator.js";
} from "../../hdrCompositor.js";
import { type HdrPerfCollector, addHdrTiming } from "../hdrPerf.js";

// ─── Hybrid path gating + partitioning ─────────────────────────────────────

Expand Down
8 changes: 3 additions & 5 deletions packages/producer/src/services/render/stages/captureHdrHybridLoop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,11 @@ import type { FileServerHandle } from "../../fileServer.js";
import type { ProducerLogger } from "../../../logger.js";
import {
type HdrCompositeContext,
type HdrPerfCollector,
type ProgressCallback,
type RenderJob,
type TransitionRange,
addHdrTiming,
compositeHdrFrame,
} from "../../renderOrchestrator.js";
} from "../../hdrCompositor.js";
import { type HdrPerfCollector, addHdrTiming } from "../hdrPerf.js";
import type { ProgressCallback, RenderJob } from "../../renderOrchestrator.js";
import { writeFileExclusiveSync } from "../shared.js";
import {
type ShaderTransitionWorkerPool,
Expand Down
8 changes: 2 additions & 6 deletions packages/producer/src/services/render/stages/captureHdrResources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,8 @@ import {
} from "@hyperframes/engine";
import { fpsToFfmpegArg } from "@hyperframes/core";
import type { ProducerLogger } from "../../../logger.js";
import type {
HdrDiagnostics,
HdrImageBuffer,
HdrVideoFrameSource,
RenderJob,
} from "../../renderOrchestrator.js";
import type { HdrImageBuffer, HdrVideoFrameSource } from "../../hdrCompositor.js";
import type { HdrDiagnostics, RenderJob } from "../../renderOrchestrator.js";
import type { CompositionMetadata } from "../shared.js";

const NO_FOLLOW_FLAG = constants.O_NOFOLLOW ?? 0;
Expand Down
10 changes: 4 additions & 6 deletions packages/producer/src/services/render/stages/captureHdrSequentialLoop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@ import {
import type { ProducerLogger } from "../../../logger.js";
import {
type HdrCompositeContext,
type HdrPerfCollector,
type ProgressCallback,
type RenderJob,
type TransitionRange,
addHdrTiming,
compositeHdrFrame,
} from "../../renderOrchestrator.js";
} from "../../hdrCompositor.js";
import { type HdrPerfCollector, addHdrTiming } from "../hdrPerf.js";
import type { ProgressCallback, RenderJob } from "../../renderOrchestrator.js";
import { writeFileExclusiveSync } from "../shared.js";
import {
captureSceneIntoBuffer,
Expand Down Expand Up @@ -57,7 +55,7 @@ export interface SequentialLoopInput {
hdrTargetTransfer: "pq" | "hlg" | undefined;
hdrVideoEndTimes: Map<string, number>;
cleanedUpVideos: Set<string>;
hdrVideoFrameSources: Map<string, import("../../renderOrchestrator.js").HdrVideoFrameSource>;
hdrVideoFrameSources: Map<string, import("../../hdrCompositor.js").HdrVideoFrameSource>;
debugDumpEnabled: boolean;
debugDumpDir: string | null;
assertNotAborted: () => void;
Expand Down
9 changes: 3 additions & 6 deletions packages/producer/src/services/render/stages/captureHdrStage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,14 @@ import type { ProducerLogger } from "../../../logger.js";
import { createHdrImageTransferCache } from "../../hdrImageTransferCache.js";
import {
type HdrCompositeContext,
type HdrDiagnostics,
type HdrPerfCollector,
type HdrTransitionMeta,
type HdrVideoFrameSource,
type ProgressCallback,
type RenderJob,
type TransitionRange,
closeHdrVideoFrameSource,
createHdrPerfCollector,
resolveCompositeTransfer,
} from "../../renderOrchestrator.js";
} from "../../hdrCompositor.js";
import { type HdrPerfCollector, createHdrPerfCollector } from "../hdrPerf.js";
import type { HdrDiagnostics, ProgressCallback, RenderJob } from "../../renderOrchestrator.js";
import type { CompositionMetadata } from "../shared.js";
import {
decodeHdrImageBuffers,
Expand Down
3 changes: 1 addition & 2 deletions packages/producer/src/services/render/stages/extractVideosStage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@ import { fpsToNumber } from "@hyperframes/core";
import {
collectVideoMetadataHints,
collectVideoReadinessSkipIds,
materializeExtractedFramesForCompiledDir,
type RenderJob,
} from "../../renderOrchestrator.js";
import { type CompositionMetadata } from "../shared.js";
import { materializeExtractedFramesForCompiledDir, type CompositionMetadata } from "../shared.js";
import type { ProducerLogger } from "../../../logger.js";

export interface ExtractVideosStageInput {
Expand Down
3 changes: 1 addition & 2 deletions packages/producer/src/services/renderOrchestrator.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ import {
findMissingFrameRanges,
getNextRetryWorkerCount,
isRecoverableParallelCaptureError,
resolveCompositeTransfer,
shouldUseLayeredComposite,
shouldUseStreamingEncode,
} from "./renderOrchestrator.js";
import { resolveCompositeTransfer, shouldUseLayeredComposite } from "./hdrCompositor.js";
import {
createCaptureCalibrationConfig,
estimateCaptureCostMultiplier,
Expand Down
Loading
Loading