merge into captions

arthurdenner · Aug 15, 2022 · b34bbfa · b34bbfa
1 parent 3f1b37f
commit b34bbfa
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/packages/renderer/src/assets/download-map.ts b/packages/renderer/src/assets/download-map.ts
@@ -1,6 +1,6 @@
 import fs, {mkdirSync} from 'fs';
 import path from 'path';
-import type {TAsset} from 'remotion';
+import type {TAsset, TCaption} from 'remotion';
 import {deleteDirectory} from '../delete-directory';
 import {tmpDir} from '../tmp-dir';
 
@@ -64,6 +64,7 @@ export type DownloadMap = {
 
 export type RenderAssetInfo = {
 	assets: TAsset[][];
+	captions: TCaption[][];
 	imageSequenceName: string;
 	firstFrameIndex: number;
 	downloadMap: DownloadMap;

diff --git a/packages/renderer/src/assets/types.ts b/packages/renderer/src/assets/types.ts
@@ -55,6 +55,5 @@ export const uncompressMediaAsset = (
 export type Assets = MediaAsset[];
 
 export interface DownloadableAsset {
-	isRemote: boolean;
 	src: string;
 }
diff --git a/packages/renderer/src/captions-to-ffmpeg-inputs.ts b/packages/renderer/src/captions-to-ffmpeg-inputs.ts
@@ -1,4 +1,4 @@
-import {TCaption} from 'remotion';
+import type {TCaption} from 'remotion';
 
 interface CaptionFfmpegInputs {
 	captionFilters: string[];

diff --git a/packages/renderer/src/render-frames.ts b/packages/renderer/src/render-frames.ts
@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import type {SmallTCompMetadata, TAsset} from 'remotion';
+import type {SmallTCompMetadata, TAsset, TCaption} from 'remotion';
 import {Internals} from 'remotion';
 import type {RenderMediaOnDownload} from './assets/download-and-map-assets-to-file';
 import {downloadAndMapAssetsToFileUrl} from './assets/download-and-map-assets-to-file';
@@ -235,6 +235,9 @@ const innerRenderFrames = ({
 	});
 
 	const assets: TAsset[][] = new Array(framesToRender.length).fill(undefined);
+	const captions: TCaption[][] = new Array(framesToRender.length).fill(
+		undefined
+	);
 	let stopped = false;
 	cancelSignal?.(() => {
 		stopped = true;
@@ -312,10 +315,19 @@ const innerRenderFrames = ({
 				frame,
 				page: freePage,
 			});
+			const collectedCaptions = await puppeteerEvaluateWithCatch<TAsset[]>({
+				pageFunction: () => {
+					return window.remotion_collectCaptions();
+				},
+				args: [],
+				frame,
+				page: freePage,
+			});
 			const compressedAssets = collectedAssets.map((asset) =>
 				compressAsset(assets.filter(truthy).flat(1), asset)
 			);
 			assets[index] = compressedAssets;
+			captions[index] = collectedCaptions;
 			compressedAssets.forEach((asset) => {
 				downloadAndMapAssetsToFileUrl({
 					asset,
@@ -332,14 +344,14 @@ const innerRenderFrames = ({
 			onFrameUpdate(framesRendered, frame);
 			cleanupPageError();
 			freePage.off('error', errorCallbackOnFrame);
-			return compressedAssets;
 		})
 	);
 
 	const happyPath = progress.then(() => {
 		const returnValue: RenderFramesOutput = {
 			assetsInfo: {
 				assets,
+				captions,
 				imageSequenceName: `element-%0${filePadLength}d.${imageFormat}`,
 				firstFrameIndex: framesToRender[0],
 				downloadMap,

diff --git a/packages/renderer/src/stitch-frames-to-video.ts b/packages/renderer/src/stitch-frames-to-video.ts
@@ -10,6 +10,7 @@ import type {RenderMediaOnDownload} from './assets/download-and-map-assets-to-fi
 import {markAllAssetsAsDownloaded} from './assets/download-and-map-assets-to-file';
 import type {DownloadMap, RenderAssetInfo} from './assets/download-map';
 import type {Assets} from './assets/types';
+import {captionsToFfmpegInputs} from './captions-to-ffmpeg-inputs';
 import type {Codec} from './codec';
 import {DEFAULT_CODEC} from './codec';
 import {codecSupportsMedia} from './codec-supports-media';
@@ -256,6 +257,11 @@ export const spawnFfmpeg = async (
 		  })
 		: null;
 
+	const captions = captionsToFfmpegInputs({
+		captions: options.assetsInfo.captions,
+		assetsCount: 1,
+	});
+
 	if (mediaSupport.audio && !mediaSupport.video) {
 		if (!audioCodecName) {
 			throw new TypeError(
@@ -317,6 +323,7 @@ export const spawnFfmpeg = async (
 					['-i', options.assetsInfo.imageSequenceName],
 			  ]),
 		audio ? ['-i', audio] : null,
+		...(captions ? captions.captionInputs : []),
 		(options.numberOfGifLoops ?? null) === null
 			? null
 			: [
@@ -344,6 +351,7 @@ export const spawnFfmpeg = async (
 		audioCodecName ? ['-c:a', audioCodecName] : null,
 		// Set max bitrate up to 1024kbps, will choose lower if that's too much
 		audioCodecName ? ['-b:a', '512K'] : null,
+		captions.captionFilters,
 		// Ignore metadata that may come from remote media
 		['-map_metadata', '-1'],
 		[