🎥 Make videos programmatically with React
`@remotion/renderer`: Fix progressive slowdown in long renders
Jonny Burgerfcdfe02da02d
diff --git a/packages/renderer/src/compress-assets.ts b/packages/renderer/src/compress-assets.tsindex d5c2167754..3c7ea56b41 100644--- a/packages/renderer/src/compress-assets.ts+++ b/packages/renderer/src/compress-assets.ts@@ -6,18 +6,14 @@import type {AudioOrVideoAsset} from 'remotion/no-react';export const compressAsset = (- previousRenderAssets:- | AudioOrVideoAsset[]- | ReadonlyMap<string, AudioOrVideoAsset>,+ previousRenderAssets: ReadonlyMap<string, AudioOrVideoAsset>,newRenderAsset: AudioOrVideoAsset,): AudioOrVideoAsset => {if (newRenderAsset.src.length < 400) {return newRenderAsset;}- const assetWithSameSrc = Array.isArray(previousRenderAssets)- ? previousRenderAssets.find((a) => a.src === newRenderAsset.src)- : previousRenderAssets.get(newRenderAsset.src);+ const assetWithSameSrc = previousRenderAssets.get(newRenderAsset.src);if (!assetWithSameSrc) {return newRenderAsset;}diff --git a/packages/renderer/src/test/asset-compression.test.ts b/packages/renderer/src/test/asset-compression.test.tsindex 7623ad9907..b58809e46b 100644--- a/packages/renderer/src/test/asset-compression.test.ts+++ b/packages/renderer/src/test/asset-compression.test.ts@@ -39,9 +39,15 @@ test('Should compress and uncompress assets', () => {].flat(1);const onlyAudioAndVideo = onlyAudioAndVideoAssets(uncompressed);+ const firstAssetBySrc = new Map<string, AudioOrVideoAsset>();- const compressedAssets = onlyAudioAndVideo.map((asset, i) => {- return compressAsset(onlyAudioAndVideo.slice(0, i), asset);+ const compressedAssets = onlyAudioAndVideo.map((asset) => {+ const compressed = compressAsset(firstAssetBySrc, asset);+ if (!firstAssetBySrc.has(compressed.src)) {+ firstAssetBySrc.set(compressed.src, compressed);+ }++ return compressed;});expect(compressedAssets[0].src).toBe(String('x').repeat(1000));@@ -107,8 +113,14 @@ test('Should uncompress correctly when multiple assets share the same id and fra},];- const compressed = assets.map((asset, i) => {- return compressAsset(assets.slice(0, i), asset);+ const firstAssetBySrc = new Map<string, AudioOrVideoAsset>();+ const compressed = assets.map((asset) => {+ const compressedAsset = compressAsset(firstAssetBySrc, asset);+ if (!firstAssetBySrc.has(compressedAsset.src)) {+ firstAssetBySrc.set(compressedAsset.src, compressedAsset);+ }++ return compressedAsset;});expect(compressed[0].src).toBe(longSrc);diff --git a/packages/renderer/src/test/calculate-asset-positions.test.ts b/packages/renderer/src/test/calculate-asset-positions.test.tsindex 83af2e32b5..35877bbd0a 100644--- a/packages/renderer/src/test/calculate-asset-positions.test.ts+++ b/packages/renderer/src/test/calculate-asset-positions.test.ts@@ -186,7 +186,7 @@ test('A late compressed asset can repeatedly close and reopen', () => {const numFrames = 4000;const sourceStart = 3000;const longSrc = `data:audio/mp3;base64,${'A'.repeat(500)}`;- const previousAssets: AudioOrVideoAsset[] = [];+ const firstAssetBySrc = new Map<string, AudioOrVideoAsset>();const frames = new Array(numFrames).fill(true).map((_, frame) => {const uncompressed = [@@ -209,9 +209,14 @@ test('A late compressed asset can repeatedly close and reopen', () => {}const compressed = uncompressed.map((asset) => {- return compressAsset(previousAssets, asset);+ return compressAsset(firstAssetBySrc, asset);});- previousAssets.push(...compressed);+ for (const asset of compressed) {+ if (asset.src.length >= 400 && !firstAssetBySrc.has(asset.src)) {+ firstAssetBySrc.set(asset.src, asset);+ }+ }+return compressed;});