Skip to content

🎥 Make videos programmatically with React

Remove the partitioned rendering experiment

Jonny Burger20a734efd8bc
diff --git a/packages/renderer/src/can-use-parallel-encoding.ts b/packages/renderer/src/can-use-parallel-encoding.ts
index f70d11d82a..06634992ae 100644
--- a/packages/renderer/src/can-use-parallel-encoding.ts
+++ b/packages/renderer/src/can-use-parallel-encoding.ts
@@ -2,10 +2,6 @@ import type {Codec} from './codec';
import {isAudioCodec} from './is-audio-codec';
export const canUseParallelEncoding = (codec: Codec) => {
- if (getShouldUsePartitionedRendering()) {
- return false;
- }
-
if (isAudioCodec(codec)) {
return false;
}
@@ -19,9 +15,3 @@ export const canUseParallelEncoding = (codec: Codec) => {
codec === 'h265'
);
};
-
-export const getShouldUsePartitionedRendering = () => {
- const shouldUsePartitionedRendering =
- process.env.REMOTION_PARTITIONED_RENDERING === 'true';
- return shouldUsePartitionedRendering;
-};
diff --git a/packages/renderer/src/next-frame-to-render.ts b/packages/renderer/src/next-frame-to-render.ts
index 5c49d6e59b..d6f75e9af9 100644
--- a/packages/renderer/src/next-frame-to-render.ts
+++ b/packages/renderer/src/next-frame-to-render.ts
@@ -1,18 +1,12 @@
-import {renderPartitions} from './render-partitions';
-
export const nextFrameToRenderState = ({
allFramesAndExtraFrames,
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
- concurrencyOrFramesToRender: _concurrency,
}: {
allFramesAndExtraFrames: number[];
- concurrencyOrFramesToRender: number;
}) => {
const rendered = new Map<number, boolean>();
return {
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
- getNextFrame: (_pageIndex: number) => {
+ getNextFrame: () => {
const nextFrame = allFramesAndExtraFrames.find((frame) => {
return !rendered.has(frame);
});
@@ -29,26 +23,4 @@ export const nextFrameToRenderState = ({
};
};
-type Fn = typeof nextFrameToRenderState;
-export type NextFrameToRender = ReturnType<Fn>;
-
-export const partitionedNextFrameToRenderState: Fn = ({
- allFramesAndExtraFrames,
- concurrencyOrFramesToRender: concurrency,
-}) => {
- const partitions = renderPartitions({
- frames: allFramesAndExtraFrames,
- concurrency,
- });
-
- return {
- getNextFrame: (pageIndex) => {
- return partitions.getNextFrame(pageIndex);
- },
- returnFrame: () => {
- throw new Error(
- 'retrying failed frames for partitioned rendering is not supported. Disable partitioned rendering.',
- );
- },
- };
-};
+export type NextFrameToRender = ReturnType<typeof nextFrameToRenderState>;
diff --git a/packages/renderer/src/render-frame-and-retry-target-close.ts b/packages/renderer/src/render-frame-and-retry-target-close.ts
index 50498a4203..9e5b83ed0f 100644
--- a/packages/renderer/src/render-frame-and-retry-target-close.ts
+++ b/packages/renderer/src/render-frame-and-retry-target-close.ts
@@ -120,7 +120,7 @@ export const renderFrameAndRetryTargetClose = async ({
const freePage = await currentPool.acquire();
- const frame = nextFrameToRender.getNextFrame(freePage.pageIndex);
+ const frame = nextFrameToRender.getNextFrame();
try {
await Promise.race([
@@ -155,7 +155,6 @@ export const renderFrameAndRetryTargetClose = async ({
outputDir,
stoppedSignal,
timeoutInMilliseconds,
- nextFrameToRender,
frame,
page: freePage,
imageSequencePattern,
diff --git a/packages/renderer/src/render-frame.ts b/packages/renderer/src/render-frame.ts
index 87908d2c06..19a0badba3 100644
--- a/packages/renderer/src/render-frame.ts
+++ b/packages/renderer/src/render-frame.ts
@@ -6,7 +6,6 @@ import type {CountType} from './get-frame-padded-index';
import type {VideoImageFormat} from './image-format';
import type {LogLevel} from './log-level';
import type {CancelSignal} from './make-cancel-signal';
-import type {NextFrameToRender} from './next-frame-to-render';
import type {
CapturedFrame,
RemotionSharedMemoryCapture,
@@ -87,7 +86,6 @@ export const renderFrame = ({
timeToRenderInMilliseconds: number,
) => void);
framesRenderedObj: {count: number};
- nextFrameToRender: NextFrameToRender;
frame: number;
page: Page;
imageSequencePattern: string | null;
diff --git a/packages/renderer/src/render-frames.ts b/packages/renderer/src/render-frames.ts
index 16d45ac1e6..504b441e52 100644
--- a/packages/renderer/src/render-frames.ts
+++ b/packages/renderer/src/render-frames.ts
@@ -17,7 +17,6 @@ import type {OnLog, Page} from './browser/BrowserPage';
import {isTargetClosedErr} from './browser/flaky-errors';
import type {SourceMapGetter} from './browser/source-map-getter';
import {DEFAULT_TIMEOUT} from './browser/TimeoutSettings';
-import {getShouldUsePartitionedRendering} from './can-use-parallel-encoding';
import {cycleBrowserTabs} from './cycle-browser-tabs';
import {defaultOnLog} from './default-on-log';
import {findRemotionRoot} from './find-closest-package-json';
@@ -35,10 +34,7 @@ import {Log} from './logger';
import type {CancelSignal} from './make-cancel-signal';
import {cancelErrorMessages} from './make-cancel-signal';
import {makePage} from './make-page';
-import {
- nextFrameToRenderState,
- partitionedNextFrameToRenderState,
-} from './next-frame-to-render';
+import {nextFrameToRenderState} from './next-frame-to-render';
import type {ChromiumOptions} from './open-browser';
import {internalOpenBrowser} from './open-browser';
import {DEFAULT_RENDER_FRAMES_OFFTHREAD_VIDEO_THREADS} from './options/offthreadvideo-threads';
@@ -416,24 +412,9 @@ const innerRenderFrames = async ({
...extraFramesToCaptureAssetsBackend,
];
- const shouldUsePartitionedRendering = getShouldUsePartitionedRendering();
-
- if (shouldUsePartitionedRendering) {
- Log.info(
- {indent, logLevel},
- 'Experimental: Using partitioned rendering (https://github.com/remotion-dev/remotion/pull/4830)',
- );
- }
-
- const nextFrameToRender = shouldUsePartitionedRendering
- ? partitionedNextFrameToRenderState({
- allFramesAndExtraFrames,
- concurrencyOrFramesToRender,
- })
- : nextFrameToRenderState({
- allFramesAndExtraFrames,
- concurrencyOrFramesToRender,
- });
+ const nextFrameToRender = nextFrameToRenderState({
+ allFramesAndExtraFrames,
+ });
const pattern = imageSequencePattern || `element-[frame].[ext]`;
const imageSequenceName = pattern
diff --git a/packages/renderer/src/render-partitions.ts b/packages/renderer/src/render-partitions.ts
deleted file mode 100644
index 08ad33ca00..0000000000
--- a/packages/renderer/src/render-partitions.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-export const renderPartitions = ({
- frames,
- concurrency,
-}: {
- frames: number[];
- concurrency: number;
-}) => {
- const partitions: number[][] = [];
- let start = 0;
-
- for (let i = 0; i < concurrency; i++) {
- const end = start + Math.ceil((frames.length - start) / (concurrency - i));
- partitions.push(frames.slice(start, end));
- start = end;
- }
-
- return {
- partitions,
- getNextFrame: (pageIndex: number) => {
- if (partitions[pageIndex].length === 0) {
- const partitionLengths = partitions.map((p) => p.length);
- if (partitionLengths.every((p) => p === 0)) {
- throw new Error('No more frames to render');
- }
-
- let longestRemainingPartitionIndex = -1;
- for (let i = 0; i < partitions.length; i++) {
- if (longestRemainingPartitionIndex === -1) {
- longestRemainingPartitionIndex = i;
- continue;
- }
-
- if (
- partitions[i].length >
- partitions[longestRemainingPartitionIndex].length
- ) {
- longestRemainingPartitionIndex = i;
- }
- }
-
- if (longestRemainingPartitionIndex === -1) {
- throw new Error('No more frames to render');
- }
-
- // Round up - let's say only one frame is left to render, we should take this one
- const slicePoint =
- Math.ceil(partitions[longestRemainingPartitionIndex].length / 2) -
- // but don't forget it's zero indexed :)
- 1;
-
- partitions[pageIndex] =
- partitions[longestRemainingPartitionIndex].slice(slicePoint);
- partitions[longestRemainingPartitionIndex] = partitions[
- longestRemainingPartitionIndex
- ].slice(0, slicePoint);
- }
-
- const value = partitions[pageIndex].shift();
- if (value === undefined) {
- throw new Error('No more frames to render');
- }
-
- return value;
- },
- };
-};
diff --git a/packages/renderer/src/test/partitions.test.ts b/packages/renderer/src/test/partitions.test.ts
deleted file mode 100644
index aa2eb3d4c8..0000000000
--- a/packages/renderer/src/test/partitions.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import {expect, test} from 'bun:test';
-import {renderPartitions} from '../render-partitions';
-
-test('balanced partitions', () => {
- expect(
- renderPartitions({frames: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], concurrency: 3})
- .partitions,
- ).toEqual([
- [1, 2, 3, 4],
- [5, 6, 7],
- [8, 9, 10],
- ]);
-});
-
-test('should handle concurrency > partitions', () => {
- expect(
- renderPartitions({frames: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], concurrency: 12})
- .partitions,
- ).toEqual([[1], [2], [3], [4], [5], [6], [7], [8], [9], [10], [], []]);
-});
-
-test('if done with your partition, split the biggest partition again', () => {
- const partitions = renderPartitions({
- frames: new Array(64).fill(true).map((_, i) => i),
- concurrency: 4,
- });
-
- expect(partitions.partitions).toEqual([
- [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
- [16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31],
- [32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47],
- [48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63],
- ]);
-
- expect(partitions.getNextFrame(0)).toBe(0);
- expect(partitions.getNextFrame(0)).toBe(1);
- expect(partitions.getNextFrame(1)).toBe(16);
- expect(partitions.getNextFrame(2)).toBe(32);
- expect(partitions.getNextFrame(2)).toBe(33);
- expect(partitions.getNextFrame(0)).toBe(2);
- expect(partitions.getNextFrame(0)).toBe(3);
- expect(partitions.getNextFrame(0)).toBe(4);
- expect(partitions.getNextFrame(0)).toBe(5);
- expect(partitions.getNextFrame(0)).toBe(6);
- expect(partitions.getNextFrame(0)).toBe(7);
- expect(partitions.getNextFrame(0)).toBe(8);
- expect(partitions.getNextFrame(0)).toBe(9);
- expect(partitions.getNextFrame(0)).toBe(10);
- expect(partitions.getNextFrame(0)).toBe(11);
- expect(partitions.getNextFrame(0)).toBe(12);
- expect(partitions.getNextFrame(0)).toBe(13);
- expect(partitions.getNextFrame(0)).toBe(14);
- expect(partitions.getNextFrame(0)).toBe(15);
- expect(partitions.getNextFrame(0)).toBe(55);
- expect(partitions.getNextFrame(0)).toBe(56);
- expect(partitions.getNextFrame(1)).toBe(17);
- expect(() => partitions.getNextFrame(10)).toThrow();
-});