diff --git a/packages/producer/src/renderRequest.test.ts b/packages/producer/src/renderRequest.test.ts index a59830ceeb..06f5cdb6a2 100644 --- a/packages/producer/src/renderRequest.test.ts +++ b/packages/producer/src/renderRequest.test.ts @@ -43,6 +43,8 @@ function request() { codec: "h264", chunkSize: 120, maxParallelChunks: 8, + targetChunkFrames: 1600, + minParallelChunks: 4, cfr: true, }, }, diff --git a/packages/producer/src/renderRequest.ts b/packages/producer/src/renderRequest.ts index c0ad93e263..75553cefa5 100644 --- a/packages/producer/src/renderRequest.ts +++ b/packages/producer/src/renderRequest.ts @@ -32,6 +32,7 @@ export interface DistributedRenderOptions { chunkSize?: number; maxParallelChunks?: number; targetChunkFrames?: number; + minParallelChunks?: number; runtimeCap?: DistributedRenderConfig["runtimeCap"]; rejectOnSystemFonts?: boolean; failClosedFontFetch?: boolean; @@ -166,6 +167,7 @@ function assertDistributedOptions(value: unknown): void { "chunkSize", "maxParallelChunks", "targetChunkFrames", + "minParallelChunks", "planDirSizeLimitBytes", ] as const) { assertOptionalInteger(value, field, 1); @@ -328,6 +330,7 @@ export function distributedConfigFromRequest( chunkSize: distributed.chunkSize, maxParallelChunks: distributed.maxParallelChunks, targetChunkFrames: distributed.targetChunkFrames, + minParallelChunks: distributed.minParallelChunks, runtimeCap: distributed.runtimeCap, rejectOnSystemFonts: distributed.rejectOnSystemFonts, failClosedFontFetch: distributed.failClosedFontFetch, @@ -364,6 +367,7 @@ export function renderRequestFromDistributedConfig(input: { ...optionalProperty("chunkSize", config.chunkSize), ...optionalProperty("maxParallelChunks", config.maxParallelChunks), ...optionalProperty("targetChunkFrames", config.targetChunkFrames), + ...optionalProperty("minParallelChunks", config.minParallelChunks), ...optionalProperty("runtimeCap", config.runtimeCap), ...optionalProperty("rejectOnSystemFonts", config.rejectOnSystemFonts), ...optionalProperty("failClosedFontFetch", config.failClosedFontFetch), diff --git a/packages/producer/src/services/distributed/plan.test.ts b/packages/producer/src/services/distributed/plan.test.ts index ace146fa51..e1ef2aeae3 100644 --- a/packages/producer/src/services/distributed/plan.test.ts +++ b/packages/producer/src/services/distributed/plan.test.ts @@ -391,6 +391,34 @@ describe("resolveChunkPlan", () => { expect(result.effectiveChunkSize).toBe(240); }); + describe("sized in one plan from a frame budget and a fan-out floor", () => { + // The workflow's budget is 1600 frames a chunk and its fan-out 4 chunks, up to a tier cap of 16. + const size = (totalFrames: number, cap = 16) => + resolveChunkPlan(totalFrames, undefined, cap, 1600, 4).chunkCount; + + it("adds chunks to a long film so each stays inside the budget", () => { + expect(size(10929)).toBe(7); + expect( + resolveChunkPlan(10929, undefined, 16, 1600, 4).effectiveChunkSize, + ).toBeLessThanOrEqual(1600); + }); + + it("keeps a short film at the fan-out instead of collapsing it to the budget", () => { + expect(size(1800)).toBe(4); + expect(size(6400)).toBe(4); + }); + + it("rejects a non-positive or non-integer floor", () => { + expect(() => resolveChunkPlan(1800, undefined, 16, 1600, 0)).toThrow(/minParallelChunks/); + expect(() => resolveChunkPlan(1800, undefined, 16, 1600, 2.5)).toThrow(/minParallelChunks/); + }); + + it("never goes past the cap, however long the film", () => { + expect(size(54000, 9)).toBe(9); + expect(size(1800, 2)).toBe(2); + }); + }); + it("rejects non-positive totalFrames", () => { expect(() => resolveChunkPlan(0, 240, 16)).toThrow(); expect(() => resolveChunkPlan(-1, 240, 16)).toThrow(); diff --git a/packages/producer/src/services/distributed/plan.ts b/packages/producer/src/services/distributed/plan.ts index 6fd08c2556..520af2021e 100644 --- a/packages/producer/src/services/distributed/plan.ts +++ b/packages/producer/src/services/distributed/plan.ts @@ -221,17 +221,19 @@ export interface DistributedRenderConfig extends Pick { ).toThrow("applies to mov renders, not mp4"); }); }); + +describe("validateDistributedRenderConfig minParallelChunks", () => { + const mp4 = { ...base, format: "mp4" } as const; + it("accepts a floor up to the chunk ceiling and refuses one outside it", () => { + expect(() => validateDistributedRenderConfig({ ...mp4, minParallelChunks: 4 })).not.toThrow(); + expect(() => validateDistributedRenderConfig({ ...mp4, minParallelChunks: 0 })).toThrow( + "config.minParallelChunks", + ); + expect(() => validateDistributedRenderConfig({ ...mp4, minParallelChunks: 257 })).toThrow( + "must be <= 256", + ); + }); +}); diff --git a/packages/producer/src/services/distributed/renderConfigValidation.ts b/packages/producer/src/services/distributed/renderConfigValidation.ts index 50998ae6a6..d094dbb542 100644 --- a/packages/producer/src/services/distributed/renderConfigValidation.ts +++ b/packages/producer/src/services/distributed/renderConfigValidation.ts @@ -222,6 +222,21 @@ export function validateDistributedRenderConfig( } } + if (config.minParallelChunks !== undefined) { + if (!Number.isInteger(config.minParallelChunks) || config.minParallelChunks < 1) { + throw new InvalidConfigError( + "config.minParallelChunks", + `must be a positive integer; got ${config.minParallelChunks}`, + ); + } + if (config.minParallelChunks > MAX_PARALLEL_CHUNKS_CEILING) { + throw new InvalidConfigError( + "config.minParallelChunks", + `must be <= ${MAX_PARALLEL_CHUNKS_CEILING}; got ${config.minParallelChunks}`, + ); + } + } + for (const field of ["workerTimeoutSeconds", "workerConcurrency"] as const) { const value = config[field]; if (value !== undefined && (!Number.isInteger(value) || value < 1)) {