@remotion/renderer 3.0.0-lambda.99 → 3.0.0-processing.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/add-silent-audio-if-necessary.d.ts +1 -1
- package/dist/add-silent-audio-if-necessary.d.ts.map +1 -1
- package/dist/add-silent-audio-if-necessary.js +6 -2
- package/dist/add-silent-audio-if-necessary.js.map +1 -1
- package/dist/assets/convert-assets-to-file-urls.d.ts +2 -3
- package/dist/assets/convert-assets-to-file-urls.d.ts.map +1 -1
- package/dist/assets/convert-assets-to-file-urls.js +2 -3
- package/dist/assets/convert-assets-to-file-urls.js.map +1 -1
- package/dist/assets/download-and-map-assets-to-file.d.ts +4 -6
- package/dist/assets/download-and-map-assets-to-file.d.ts.map +1 -1
- package/dist/assets/download-and-map-assets-to-file.js +3 -11
- package/dist/assets/download-and-map-assets-to-file.js.map +1 -1
- package/dist/create-ffmpeg-complex-filter.d.ts +4 -1
- package/dist/create-ffmpeg-complex-filter.d.ts.map +1 -1
- package/dist/cycle-browser-tabs.js +1 -1
- package/dist/cycle-browser-tabs.js.map +1 -1
- package/dist/delete-directory.d.ts +2 -0
- package/dist/delete-directory.d.ts.map +1 -0
- package/dist/delete-directory.js +28 -0
- package/dist/delete-directory.js.map +1 -0
- package/dist/ensure-output-directory.d.ts +2 -0
- package/dist/ensure-output-directory.d.ts.map +1 -0
- package/dist/ensure-output-directory.js +18 -0
- package/dist/ensure-output-directory.js.map +1 -0
- package/dist/ffmpeg-flags.d.ts +1 -5
- package/dist/ffmpeg-flags.d.ts.map +1 -1
- package/dist/ffmpeg-flags.js +1 -5
- package/dist/ffmpeg-flags.js.map +1 -1
- package/dist/get-audio-codec-name.d.ts.map +1 -1
- package/dist/get-audio-codec-name.js +0 -3
- package/dist/get-audio-codec-name.js.map +1 -1
- package/dist/get-browser-instance.d.ts +10 -0
- package/dist/get-browser-instance.d.ts.map +1 -0
- package/dist/get-browser-instance.js +35 -0
- package/dist/get-browser-instance.js.map +1 -0
- package/dist/get-compositions.d.ts +1 -3
- package/dist/get-compositions.d.ts.map +1 -1
- package/dist/get-compositions.js +12 -44
- package/dist/get-compositions.js.map +1 -1
- package/dist/get-extension-from-codec.d.ts +3 -0
- package/dist/get-extension-from-codec.d.ts.map +1 -0
- package/dist/get-extension-from-codec.js +33 -0
- package/dist/get-extension-from-codec.js.map +1 -0
- package/dist/index.d.ts +3 -23
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -16
- package/dist/index.js.map +1 -1
- package/dist/is-local-file.d.ts +2 -0
- package/dist/is-local-file.d.ts.map +1 -0
- package/dist/is-local-file.js +13 -0
- package/dist/is-local-file.js.map +1 -0
- package/dist/is-serve-url.d.ts +2 -0
- package/dist/is-serve-url.d.ts.map +1 -0
- package/dist/is-serve-url.js +13 -0
- package/dist/is-serve-url.js.map +1 -0
- package/dist/legacy-webpack-config.d.ts +10 -0
- package/dist/legacy-webpack-config.d.ts.map +1 -0
- package/dist/legacy-webpack-config.js +14 -0
- package/dist/legacy-webpack-config.js.map +1 -0
- package/dist/make-assets-download-dir.d.ts +2 -0
- package/dist/make-assets-download-dir.d.ts.map +1 -0
- package/dist/make-assets-download-dir.js +9 -0
- package/dist/make-assets-download-dir.js.map +1 -0
- package/dist/open-browser.d.ts.map +1 -1
- package/dist/open-browser.js +0 -11
- package/dist/open-browser.js.map +1 -1
- package/dist/prepare-server.d.ts +5 -0
- package/dist/prepare-server.d.ts.map +1 -0
- package/dist/prepare-server.js +20 -0
- package/dist/prepare-server.js.map +1 -0
- package/dist/provide-screenshot.d.ts +2 -2
- package/dist/provide-screenshot.d.ts.map +1 -1
- package/dist/provide-screenshot.js +1 -2
- package/dist/provide-screenshot.js.map +1 -1
- package/dist/puppeteer-screenshot.d.ts +0 -1
- package/dist/puppeteer-screenshot.d.ts.map +1 -1
- package/dist/puppeteer-screenshot.js.map +1 -1
- package/dist/render-media.d.ts +38 -0
- package/dist/render-media.d.ts.map +1 -0
- package/dist/render-media.js +163 -0
- package/dist/render-media.js.map +1 -0
- package/dist/render-still.d.ts +17 -18
- package/dist/render-still.d.ts.map +1 -1
- package/dist/render-still.js +30 -32
- package/dist/render-still.js.map +1 -1
- package/dist/render-video.d.ts +38 -0
- package/dist/render-video.d.ts.map +1 -0
- package/dist/render-video.js +169 -0
- package/dist/render-video.js.map +1 -0
- package/dist/render.d.ts +14 -22
- package/dist/render.d.ts.map +1 -1
- package/dist/render.js +40 -62
- package/dist/render.js.map +1 -1
- package/dist/sample-rate.d.ts +2 -0
- package/dist/sample-rate.d.ts.map +1 -0
- package/dist/sample-rate.js +5 -0
- package/dist/sample-rate.js.map +1 -0
- package/dist/screenshot-dom-element.d.ts.map +1 -1
- package/dist/screenshot-dom-element.js +8 -1
- package/dist/screenshot-dom-element.js.map +1 -1
- package/dist/screenshot-task.d.ts +1 -3
- package/dist/screenshot-task.d.ts.map +1 -1
- package/dist/screenshot-task.js.map +1 -1
- package/dist/set-props-and-env.d.ts +2 -2
- package/dist/set-props-and-env.d.ts.map +1 -1
- package/dist/set-props-and-env.js +2 -3
- package/dist/set-props-and-env.js.map +1 -1
- package/dist/stitcher.d.ts +12 -22
- package/dist/stitcher.d.ts.map +1 -1
- package/dist/stitcher.js +62 -104
- package/dist/stitcher.js.map +1 -1
- package/dist/stringify-ffmpeg-filter.d.ts.map +1 -1
- package/dist/stringify-ffmpeg-filter.js +0 -3
- package/dist/stringify-ffmpeg-filter.js.map +1 -1
- package/dist/tmp-dir.d.ts +2 -0
- package/dist/tmp-dir.d.ts.map +1 -0
- package/dist/tmp-dir.js +31 -0
- package/dist/tmp-dir.js.map +1 -0
- package/dist/types.d.ts +4 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/validate-ffmpeg.d.ts.map +1 -1
- package/dist/validate-ffmpeg.js +2 -7
- package/dist/validate-ffmpeg.js.map +1 -1
- package/package.json +5 -6
package/dist/render-still.js
CHANGED
|
@@ -26,12 +26,15 @@ exports.renderStill = void 0;
|
|
|
26
26
|
const fs_1 = __importStar(require("fs"));
|
|
27
27
|
const path_1 = __importDefault(require("path"));
|
|
28
28
|
const remotion_1 = require("remotion");
|
|
29
|
-
const normalize_serve_url_1 = require("./normalize-serve-url");
|
|
30
29
|
const open_browser_1 = require("./open-browser");
|
|
31
30
|
const provide_screenshot_1 = require("./provide-screenshot");
|
|
32
31
|
const seek_to_frame_1 = require("./seek-to-frame");
|
|
32
|
+
const serve_static_1 = require("./serve-static");
|
|
33
33
|
const set_props_and_env_1 = require("./set-props-and-env");
|
|
34
|
-
|
|
34
|
+
/**
|
|
35
|
+
* @description Render a still frame from a composition and returns an image path
|
|
36
|
+
*/
|
|
37
|
+
const renderStill = async ({ composition, quality, imageFormat = 'png', webpackBundle, browser = remotion_1.Internals.DEFAULT_BROWSER, puppeteerInstance, dumpBrowserLogs = false, onError, inputProps, envVariables, output, frame = 0, overwrite = true, browserExecutable, }) => {
|
|
35
38
|
remotion_1.Internals.validateDimension(composition.height, 'height', 'in the `config` object passed to `renderStill()`');
|
|
36
39
|
remotion_1.Internals.validateDimension(composition.width, 'width', 'in the `config` object passed to `renderStill()`');
|
|
37
40
|
remotion_1.Internals.validateFps(composition.fps, 'in the `config` object of `renderStill()`');
|
|
@@ -58,40 +61,31 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
|
|
|
58
61
|
(0, fs_1.mkdirSync)(path_1.default.resolve(output, '..'), {
|
|
59
62
|
recursive: true,
|
|
60
63
|
});
|
|
61
|
-
const
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
64
|
+
const [{ port, close }, browserInstance] = await Promise.all([
|
|
65
|
+
(0, serve_static_1.serveStatic)(webpackBundle),
|
|
66
|
+
puppeteerInstance !== null && puppeteerInstance !== void 0 ? puppeteerInstance : (0, open_browser_1.openBrowser)(browser, {
|
|
67
|
+
browserExecutable,
|
|
68
|
+
shouldDumpIo: dumpBrowserLogs,
|
|
69
|
+
}),
|
|
70
|
+
]);
|
|
65
71
|
const page = await browserInstance.newPage();
|
|
66
72
|
page.setViewport({
|
|
67
73
|
width: composition.width,
|
|
68
74
|
height: composition.height,
|
|
69
75
|
deviceScaleFactor: 1,
|
|
70
76
|
});
|
|
71
|
-
const cleanup = async () => {
|
|
72
|
-
page.off('pageerror', errorCallback);
|
|
73
|
-
if (puppeteerInstance) {
|
|
74
|
-
await page.close();
|
|
75
|
-
}
|
|
76
|
-
else {
|
|
77
|
-
browserInstance.close().catch((err) => {
|
|
78
|
-
console.log('Unable to close browser', err);
|
|
79
|
-
});
|
|
80
|
-
}
|
|
81
|
-
};
|
|
82
77
|
const errorCallback = (err) => {
|
|
83
|
-
onError(err);
|
|
84
|
-
cleanup();
|
|
78
|
+
onError === null || onError === void 0 ? void 0 : onError(err);
|
|
85
79
|
};
|
|
86
80
|
page.on('pageerror', errorCallback);
|
|
87
|
-
const site = `${(0, normalize_serve_url_1.normalizeServeUrl)(serveUrl)}?composition=${composition.id}`;
|
|
88
81
|
await (0, set_props_and_env_1.setPropsAndEnv)({
|
|
89
82
|
inputProps,
|
|
90
83
|
envVariables,
|
|
91
84
|
page,
|
|
92
|
-
|
|
85
|
+
port,
|
|
93
86
|
initialFrame: frame,
|
|
94
87
|
});
|
|
88
|
+
const site = `http://localhost:${port}/index.html?composition=${composition.id}`;
|
|
95
89
|
await page.goto(site);
|
|
96
90
|
try {
|
|
97
91
|
await (0, seek_to_frame_1.seekToFrame)({ frame, page });
|
|
@@ -100,7 +94,10 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
|
|
|
100
94
|
const error = err;
|
|
101
95
|
if (error.message.includes('timeout') &&
|
|
102
96
|
error.message.includes('exceeded')) {
|
|
103
|
-
|
|
97
|
+
errorCallback(new Error('The rendering timed out. See https://www.remotion.dev/docs/timeout/ for possible reasons.'));
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
errorCallback(error);
|
|
104
101
|
}
|
|
105
102
|
throw error;
|
|
106
103
|
}
|
|
@@ -113,17 +110,18 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
|
|
|
113
110
|
output,
|
|
114
111
|
},
|
|
115
112
|
});
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
* @description Render a still frame from a composition and returns an image path
|
|
120
|
-
*/
|
|
121
|
-
const renderStill = (options) => {
|
|
122
|
-
return new Promise((resolve, reject) => {
|
|
123
|
-
innerRenderStill({ ...options, onError: (err) => reject(err) })
|
|
124
|
-
.then((res) => resolve(res))
|
|
125
|
-
.catch((err) => reject(err));
|
|
113
|
+
page.off('pageerror', errorCallback);
|
|
114
|
+
close().catch((err) => {
|
|
115
|
+
console.log('Unable to close web server', err);
|
|
126
116
|
});
|
|
117
|
+
if (puppeteerInstance) {
|
|
118
|
+
await page.close();
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
browserInstance.close().catch((err) => {
|
|
122
|
+
console.log('Unable to close browser', err);
|
|
123
|
+
});
|
|
124
|
+
}
|
|
127
125
|
};
|
|
128
126
|
exports.renderStill = renderStill;
|
|
129
127
|
//# sourceMappingURL=render-still.js.map
|
package/dist/render-still.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-still.js","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA2C;AAC3C,gDAAwB;AAExB,
|
|
1
|
+
{"version":3,"file":"render-still.js","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { Browser as PuppeteerBrowser } from 'puppeteer-core';
|
|
2
|
+
import { Browser, Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, TCompMetadata } from 'remotion';
|
|
3
|
+
export declare type RenderVideoOnDownload = (src: string) => void;
|
|
4
|
+
export declare type RenderVideoOnProgress = (progress: {
|
|
5
|
+
renderedFrames: number;
|
|
6
|
+
encodedFrames: number;
|
|
7
|
+
encodedDoneIn: number | null;
|
|
8
|
+
renderedDoneIn: number | null;
|
|
9
|
+
stitchStage: 'encoding' | 'muxing';
|
|
10
|
+
}) => void;
|
|
11
|
+
export declare type RenderVideoOptions = {
|
|
12
|
+
proResProfile: ProResProfile | undefined;
|
|
13
|
+
parallelism: number | null;
|
|
14
|
+
parallelEncoding: boolean;
|
|
15
|
+
crf: number | null;
|
|
16
|
+
outputDir: string;
|
|
17
|
+
config: TCompMetadata;
|
|
18
|
+
imageFormat: 'png' | 'jpeg' | 'none';
|
|
19
|
+
ffmpegExecutable: FfmpegExecutable;
|
|
20
|
+
inputProps: object;
|
|
21
|
+
pixelFormat: PixelFormat;
|
|
22
|
+
codec: Codec;
|
|
23
|
+
envVariables: Record<string, string>;
|
|
24
|
+
quality: number | undefined;
|
|
25
|
+
frameRange: FrameRange | null;
|
|
26
|
+
browser: Browser;
|
|
27
|
+
serveUrl: string;
|
|
28
|
+
openedBrowser: PuppeteerBrowser;
|
|
29
|
+
overwrite: boolean;
|
|
30
|
+
absoluteOutputFile: string;
|
|
31
|
+
onProgress: RenderVideoOnProgress;
|
|
32
|
+
shouldOutputImageSequence: boolean;
|
|
33
|
+
fileExtension: string | null;
|
|
34
|
+
bundled: string;
|
|
35
|
+
onDownload: (src: string) => void;
|
|
36
|
+
};
|
|
37
|
+
export declare const renderVideo: ({ parallelism, proResProfile, parallelEncoding, crf, outputDir, config, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, browser, serveUrl, openedBrowser, absoluteOutputFile, onProgress, overwrite, shouldOutputImageSequence, fileExtension, bundled, onDownload, }: RenderVideoOptions) => Promise<void>;
|
|
38
|
+
//# sourceMappingURL=render-video.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"render-video.d.ts","sourceRoot":"","sources":["../src/render-video.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACN,OAAO,EACP,KAAK,EACL,gBAAgB,EAChB,UAAU,EAEV,WAAW,EACX,aAAa,EACb,aAAa,EACb,MAAM,UAAU,CAAC;AAIlB,oBAAY,qBAAqB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;AAE1D,oBAAY,qBAAqB,GAAG,CAAC,QAAQ,EAAE;IAC9C,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,UAAU,GAAG,QAAQ,CAAC;CACnC,KAAK,IAAI,CAAC;AAEX,oBAAY,kBAAkB,GAAG;IAChC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IACzC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,aAAa,CAAC;IACtB,WAAW,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACrC,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,gBAAgB,CAAC;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,qBAAqB,CAAC;IAClC,yBAAyB,EAAE,OAAO,CAAC;IACnC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,WAAW,4TAyBrB,kBAAkB,kBAuKpB,CAAC"}
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.renderVideo = void 0;
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const remotion_1 = require("remotion");
|
|
10
|
+
const stitcher_1 = require("./stitcher");
|
|
11
|
+
const render_1 = require("./render");
|
|
12
|
+
const renderVideo = async ({ parallelism, proResProfile, parallelEncoding, crf, outputDir, config, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, browser, serveUrl, openedBrowser, absoluteOutputFile, onProgress, overwrite, shouldOutputImageSequence, fileExtension, bundled, onDownload, }) => {
|
|
13
|
+
var _a, _b;
|
|
14
|
+
let stitcherFfmpeg;
|
|
15
|
+
let preStitcher;
|
|
16
|
+
let encodedFrames = 0;
|
|
17
|
+
let renderedFrames = 0;
|
|
18
|
+
let preEncodedFileLocation;
|
|
19
|
+
let renderedDoneIn = null;
|
|
20
|
+
let encodedDoneIn = null;
|
|
21
|
+
const renderStart = Date.now();
|
|
22
|
+
if (parallelEncoding) {
|
|
23
|
+
if (typeof crf !== 'number') {
|
|
24
|
+
throw new TypeError('CRF is unexpectedly not a number');
|
|
25
|
+
}
|
|
26
|
+
preEncodedFileLocation = path_1.default.join(outputDir, 'pre-encode.' + fileExtension);
|
|
27
|
+
preStitcher = await (0, stitcher_1.spawnFfmpeg)({
|
|
28
|
+
dir: outputDir,
|
|
29
|
+
width: config.width,
|
|
30
|
+
height: config.height,
|
|
31
|
+
fps: config.fps,
|
|
32
|
+
outputLocation: preEncodedFileLocation,
|
|
33
|
+
force: true,
|
|
34
|
+
imageFormat,
|
|
35
|
+
pixelFormat,
|
|
36
|
+
codec,
|
|
37
|
+
proResProfile,
|
|
38
|
+
crf,
|
|
39
|
+
parallelism,
|
|
40
|
+
onProgress: (frame) => {
|
|
41
|
+
encodedFrames = frame;
|
|
42
|
+
onProgress({
|
|
43
|
+
encodedFrames,
|
|
44
|
+
renderedFrames,
|
|
45
|
+
encodedDoneIn: null,
|
|
46
|
+
renderedDoneIn: null,
|
|
47
|
+
stitchStage: 'encoding',
|
|
48
|
+
});
|
|
49
|
+
},
|
|
50
|
+
verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
|
|
51
|
+
parallelEncoding,
|
|
52
|
+
webpackBundle: bundled,
|
|
53
|
+
ffmpegExecutable,
|
|
54
|
+
assetsInfo: { assets: [] },
|
|
55
|
+
});
|
|
56
|
+
stitcherFfmpeg = preStitcher.task;
|
|
57
|
+
}
|
|
58
|
+
const renderer = (0, render_1.renderFrames)({
|
|
59
|
+
config,
|
|
60
|
+
onFrameUpdate: (frame) => {
|
|
61
|
+
renderedFrames = frame;
|
|
62
|
+
onProgress({
|
|
63
|
+
encodedFrames,
|
|
64
|
+
renderedFrames,
|
|
65
|
+
encodedDoneIn,
|
|
66
|
+
renderedDoneIn,
|
|
67
|
+
stitchStage: 'encoding',
|
|
68
|
+
});
|
|
69
|
+
},
|
|
70
|
+
parallelism,
|
|
71
|
+
parallelEncoding,
|
|
72
|
+
outputDir,
|
|
73
|
+
onStart: () => {
|
|
74
|
+
renderedFrames = 0;
|
|
75
|
+
onProgress({
|
|
76
|
+
encodedDoneIn,
|
|
77
|
+
encodedFrames,
|
|
78
|
+
renderedDoneIn,
|
|
79
|
+
renderedFrames,
|
|
80
|
+
// TODO: Keep a state
|
|
81
|
+
stitchStage: 'encoding',
|
|
82
|
+
});
|
|
83
|
+
},
|
|
84
|
+
inputProps,
|
|
85
|
+
envVariables,
|
|
86
|
+
imageFormat,
|
|
87
|
+
quality,
|
|
88
|
+
browser,
|
|
89
|
+
frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
|
|
90
|
+
puppeteerInstance: openedBrowser,
|
|
91
|
+
writeFrame: async (buffer) => {
|
|
92
|
+
var _a;
|
|
93
|
+
(_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
|
|
94
|
+
},
|
|
95
|
+
serveUrl,
|
|
96
|
+
});
|
|
97
|
+
const { assetsInfo } = await renderer;
|
|
98
|
+
if (stitcherFfmpeg) {
|
|
99
|
+
(_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
|
|
100
|
+
await stitcherFfmpeg;
|
|
101
|
+
(_b = preStitcher === null || preStitcher === void 0 ? void 0 : preStitcher.cleanup) === null || _b === void 0 ? void 0 : _b.call(preStitcher);
|
|
102
|
+
}
|
|
103
|
+
const closeBrowserPromise = openedBrowser.close();
|
|
104
|
+
renderedDoneIn = Date.now() - renderStart;
|
|
105
|
+
onProgress({
|
|
106
|
+
encodedFrames,
|
|
107
|
+
renderedFrames,
|
|
108
|
+
renderedDoneIn,
|
|
109
|
+
encodedDoneIn,
|
|
110
|
+
stitchStage: 'encoding',
|
|
111
|
+
});
|
|
112
|
+
if (process.env.DEBUG) {
|
|
113
|
+
remotion_1.Internals.perf.logPerf();
|
|
114
|
+
}
|
|
115
|
+
if (shouldOutputImageSequence) {
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
if (typeof crf !== 'number') {
|
|
119
|
+
throw new TypeError('CRF is unexpectedly not a number');
|
|
120
|
+
}
|
|
121
|
+
const dirName = path_1.default.dirname(absoluteOutputFile);
|
|
122
|
+
if (!fs_1.default.existsSync(dirName)) {
|
|
123
|
+
fs_1.default.mkdirSync(dirName, {
|
|
124
|
+
recursive: true,
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
const stitchStart = Date.now();
|
|
128
|
+
await (0, stitcher_1.stitchFramesToVideo)({
|
|
129
|
+
dir: outputDir,
|
|
130
|
+
width: config.width,
|
|
131
|
+
height: config.height,
|
|
132
|
+
fps: config.fps,
|
|
133
|
+
outputLocation: absoluteOutputFile,
|
|
134
|
+
preEncodedFileLocation,
|
|
135
|
+
force: overwrite,
|
|
136
|
+
imageFormat,
|
|
137
|
+
pixelFormat,
|
|
138
|
+
codec,
|
|
139
|
+
proResProfile,
|
|
140
|
+
crf,
|
|
141
|
+
assetsInfo,
|
|
142
|
+
parallelism,
|
|
143
|
+
ffmpegExecutable,
|
|
144
|
+
onProgress: (frame) => {
|
|
145
|
+
onProgress({
|
|
146
|
+
encodedFrames: frame,
|
|
147
|
+
renderedFrames,
|
|
148
|
+
renderedDoneIn,
|
|
149
|
+
encodedDoneIn,
|
|
150
|
+
stitchStage: 'muxing',
|
|
151
|
+
});
|
|
152
|
+
},
|
|
153
|
+
// TODO: Optimization, Now can download before!
|
|
154
|
+
onDownload,
|
|
155
|
+
webpackBundle: bundled,
|
|
156
|
+
verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
|
|
157
|
+
});
|
|
158
|
+
encodedDoneIn = Date.now() - stitchStart;
|
|
159
|
+
onProgress({
|
|
160
|
+
encodedDoneIn,
|
|
161
|
+
encodedFrames,
|
|
162
|
+
renderedDoneIn,
|
|
163
|
+
renderedFrames,
|
|
164
|
+
stitchStage: 'muxing',
|
|
165
|
+
});
|
|
166
|
+
await closeBrowserPromise;
|
|
167
|
+
};
|
|
168
|
+
exports.renderVideo = renderVideo;
|
|
169
|
+
//# sourceMappingURL=render-video.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"render-video.js","sourceRoot":"","sources":["../src/render-video.ts"],"names":[],"mappings":"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"}
|
package/dist/render.d.ts
CHANGED
|
@@ -1,31 +1,23 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
1
|
import { Browser as PuppeteerBrowser } from 'puppeteer-core';
|
|
3
2
|
import { Browser, BrowserExecutable, FrameRange, ImageFormat, VideoConfig } from 'remotion';
|
|
4
|
-
import {
|
|
5
|
-
|
|
6
|
-
declare type RenderFramesOptions = {
|
|
3
|
+
import { OnErrorInfo, OnStartData, RenderFramesOutput } from './types';
|
|
4
|
+
export declare const renderFrames: ({ config, parallelism, onFrameUpdate, compositionId, outputDir, onStart, inputProps, envVariables, webpackBundle, quality, imageFormat, browser, frameRange, dumpBrowserLogs, puppeteerInstance, onError, browserExecutable, }: {
|
|
7
5
|
config: VideoConfig;
|
|
6
|
+
compositionId: string;
|
|
8
7
|
onStart: (data: OnStartData) => void;
|
|
9
|
-
onFrameUpdate: (
|
|
8
|
+
onFrameUpdate: (f: number) => void;
|
|
10
9
|
outputDir: string;
|
|
11
10
|
inputProps: unknown;
|
|
12
|
-
envVariables?: Record<string, string
|
|
11
|
+
envVariables?: Record<string, string> | undefined;
|
|
12
|
+
webpackBundle: string;
|
|
13
13
|
imageFormat: ImageFormat;
|
|
14
|
-
parallelism?: number | null;
|
|
15
|
-
quality?: number;
|
|
16
|
-
browser?: Browser;
|
|
17
|
-
frameRange?: FrameRange | null;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
onBrowserLog?: (log: BrowserLog) => void;
|
|
23
|
-
parallelEncoding?: boolean;
|
|
24
|
-
writeFrame?: (buffer?: Buffer) => void;
|
|
25
|
-
};
|
|
26
|
-
export declare const innerRenderFrames: ({ config, parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, serveUrl, onError, envVariables, browserExecutable, dumpBrowserLogs, browser, onBrowserLog, parallelEncoding, writeFrame, }: RenderFramesOptions & {
|
|
27
|
-
onError: (err: Error) => void;
|
|
14
|
+
parallelism?: number | null | undefined;
|
|
15
|
+
quality?: number | undefined;
|
|
16
|
+
browser?: Browser | undefined;
|
|
17
|
+
frameRange?: FrameRange | null | undefined;
|
|
18
|
+
dumpBrowserLogs?: boolean | undefined;
|
|
19
|
+
puppeteerInstance?: PuppeteerBrowser | undefined;
|
|
20
|
+
browserExecutable?: BrowserExecutable | undefined;
|
|
21
|
+
onError?: ((info: OnErrorInfo) => void) | undefined;
|
|
28
22
|
}) => Promise<RenderFramesOutput>;
|
|
29
|
-
export declare const renderFrames: (options: RenderFramesOptions) => Promise<RenderFramesOutput>;
|
|
30
|
-
export {};
|
|
31
23
|
//# sourceMappingURL=render.d.ts.map
|
package/dist/render.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACN,OAAO,EACP,iBAAiB,EACjB,UAAU,EACV,WAAW,EAEX,WAAW,EACX,MAAM,UAAU,CAAC;AAYlB,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAErE,eAAO,MAAM,YAAY;YAmBhB,WAAW;mBACJ,MAAM;oBACL,WAAW,KAAK,IAAI;uBACjB,MAAM,KAAK,IAAI;eACvB,MAAM;gBACL,OAAO;;mBAEJ,MAAM;iBACR,WAAW;;;;;;;;sBAQP,WAAW,KAAK,IAAI;MAClC,QAAQ,kBAAkB,CA4K7B,CAAC"}
|
package/dist/render.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.renderFrames =
|
|
6
|
+
exports.renderFrames = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const remotion_1 = require("remotion");
|
|
9
9
|
const cycle_browser_tabs_1 = require("./cycle-browser-tabs");
|
|
@@ -11,13 +11,13 @@ const get_concurrency_1 = require("./get-concurrency");
|
|
|
11
11
|
const get_frame_range_1 = require("./get-frame-range");
|
|
12
12
|
const get_frame_to_render_1 = require("./get-frame-to-render");
|
|
13
13
|
const image_format_1 = require("./image-format");
|
|
14
|
-
const normalize_serve_url_1 = require("./normalize-serve-url");
|
|
15
14
|
const open_browser_1 = require("./open-browser");
|
|
16
15
|
const pool_1 = require("./pool");
|
|
17
16
|
const provide_screenshot_1 = require("./provide-screenshot");
|
|
18
17
|
const seek_to_frame_1 = require("./seek-to-frame");
|
|
18
|
+
const serve_static_1 = require("./serve-static");
|
|
19
19
|
const set_props_and_env_1 = require("./set-props-and-env");
|
|
20
|
-
const
|
|
20
|
+
const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId, outputDir, onStart, inputProps, envVariables = {}, webpackBundle, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, browser = remotion_1.Internals.DEFAULT_BROWSER, frameRange, dumpBrowserLogs = false, puppeteerInstance, onError, browserExecutable, }) => {
|
|
21
21
|
remotion_1.Internals.validateDimension(config.height, 'height', 'in the `config` object passed to `renderFrames()`');
|
|
22
22
|
remotion_1.Internals.validateDimension(config.width, 'width', 'in the `config` object passed to `renderFrames()`');
|
|
23
23
|
remotion_1.Internals.validateFps(config.fps, 'in the `config` object of `renderFrames()`');
|
|
@@ -27,10 +27,13 @@ const innerRenderFrames = async ({ config, parallelism, onFrameUpdate, outputDir
|
|
|
27
27
|
}
|
|
28
28
|
remotion_1.Internals.validateQuality(quality);
|
|
29
29
|
const actualParallelism = (0, get_concurrency_1.getActualConcurrency)(parallelism !== null && parallelism !== void 0 ? parallelism : null);
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
30
|
+
const [{ port, close }, browserInstance] = await Promise.all([
|
|
31
|
+
(0, serve_static_1.serveStatic)(webpackBundle),
|
|
32
|
+
puppeteerInstance !== null && puppeteerInstance !== void 0 ? puppeteerInstance : (0, open_browser_1.openBrowser)(browser, {
|
|
33
|
+
shouldDumpIo: dumpBrowserLogs,
|
|
34
|
+
browserExecutable,
|
|
35
|
+
}),
|
|
36
|
+
]);
|
|
34
37
|
const pages = new Array(actualParallelism).fill(true).map(async () => {
|
|
35
38
|
const page = await browserInstance.newPage();
|
|
36
39
|
page.setViewport({
|
|
@@ -38,16 +41,10 @@ const innerRenderFrames = async ({ config, parallelism, onFrameUpdate, outputDir
|
|
|
38
41
|
height: config.height,
|
|
39
42
|
deviceScaleFactor: 1,
|
|
40
43
|
});
|
|
41
|
-
const
|
|
42
|
-
|
|
43
|
-
stackTrace: log.stackTrace(),
|
|
44
|
-
text: log.text(),
|
|
45
|
-
type: log.type(),
|
|
46
|
-
});
|
|
44
|
+
const errorCallback = (err) => {
|
|
45
|
+
onError === null || onError === void 0 ? void 0 : onError({ error: err, frame: null });
|
|
47
46
|
};
|
|
48
|
-
|
|
49
|
-
page.on('console', logCallback);
|
|
50
|
-
}
|
|
47
|
+
page.on('pageerror', errorCallback);
|
|
51
48
|
const initialFrame = typeof frameRange === 'number'
|
|
52
49
|
? frameRange
|
|
53
50
|
: frameRange === null || frameRange === undefined
|
|
@@ -57,22 +54,24 @@ const innerRenderFrames = async ({ config, parallelism, onFrameUpdate, outputDir
|
|
|
57
54
|
inputProps,
|
|
58
55
|
envVariables,
|
|
59
56
|
page,
|
|
60
|
-
|
|
57
|
+
port,
|
|
61
58
|
initialFrame,
|
|
62
59
|
});
|
|
63
|
-
const site =
|
|
60
|
+
const site = `http://localhost:${port}/index.html?composition=${compositionId}`;
|
|
64
61
|
await page.goto(site);
|
|
65
|
-
page.off('
|
|
62
|
+
page.off('pageerror', errorCallback);
|
|
66
63
|
return page;
|
|
67
64
|
});
|
|
68
65
|
const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserInstance);
|
|
69
66
|
const puppeteerPages = await Promise.all(pages);
|
|
70
67
|
const pool = new pool_1.Pool(puppeteerPages);
|
|
71
68
|
const frameCount = (0, get_frame_range_1.getFrameCount)(config.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null);
|
|
72
|
-
const lastFrameIndex = (0, get_frame_to_render_1.getFrameToRender)(frameRange !== null && frameRange !== void 0 ? frameRange : null, frameCount - 1);
|
|
73
69
|
// Substract one because 100 frames will be 00-99
|
|
74
70
|
// --> 2 digits
|
|
75
|
-
|
|
71
|
+
let filePadLength = 0;
|
|
72
|
+
if (frameCount) {
|
|
73
|
+
filePadLength = String(frameCount - 1).length;
|
|
74
|
+
}
|
|
76
75
|
let framesRendered = 0;
|
|
77
76
|
onStart({
|
|
78
77
|
frameCount,
|
|
@@ -84,11 +83,10 @@ const innerRenderFrames = async ({ config, parallelism, onFrameUpdate, outputDir
|
|
|
84
83
|
const frame = (0, get_frame_to_render_1.getFrameToRender)(frameRange !== null && frameRange !== void 0 ? frameRange : null, index);
|
|
85
84
|
const freePage = await pool.acquire();
|
|
86
85
|
const paddedIndex = String(frame).padStart(filePadLength, '0');
|
|
87
|
-
const
|
|
88
|
-
onError
|
|
86
|
+
const errorCallback = (err) => {
|
|
87
|
+
onError === null || onError === void 0 ? void 0 : onError({ error: err, frame });
|
|
89
88
|
};
|
|
90
|
-
freePage.on('pageerror',
|
|
91
|
-
freePage.on('error', errorCallbackOnFrame);
|
|
89
|
+
freePage.on('pageerror', errorCallback);
|
|
92
90
|
try {
|
|
93
91
|
await (0, seek_to_frame_1.seekToFrame)({ frame, page: freePage });
|
|
94
92
|
}
|
|
@@ -96,49 +94,36 @@ const innerRenderFrames = async ({ config, parallelism, onFrameUpdate, outputDir
|
|
|
96
94
|
const error = err;
|
|
97
95
|
if (error.message.includes('timeout') &&
|
|
98
96
|
error.message.includes('exceeded')) {
|
|
99
|
-
|
|
97
|
+
errorCallback(new Error('The rendering timed out. See https://www.remotion.dev/docs/timeout/ for possible reasons.'));
|
|
100
98
|
}
|
|
101
99
|
else {
|
|
102
|
-
|
|
100
|
+
errorCallback(error);
|
|
103
101
|
}
|
|
104
102
|
throw error;
|
|
105
103
|
}
|
|
106
104
|
if (imageFormat !== 'none') {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
});
|
|
117
|
-
writeFrame === null || writeFrame === void 0 ? void 0 : writeFrame(buffer);
|
|
118
|
-
}
|
|
119
|
-
else {
|
|
120
|
-
const output = path_1.default.join(outputDir, `element-${paddedIndex}.${imageFormat}`);
|
|
121
|
-
await (0, provide_screenshot_1.provideScreenshot)({
|
|
122
|
-
page: freePage,
|
|
123
|
-
imageFormat,
|
|
124
|
-
quality,
|
|
125
|
-
options: {
|
|
126
|
-
frame,
|
|
127
|
-
output,
|
|
128
|
-
},
|
|
129
|
-
});
|
|
130
|
-
}
|
|
105
|
+
await (0, provide_screenshot_1.provideScreenshot)({
|
|
106
|
+
page: freePage,
|
|
107
|
+
imageFormat,
|
|
108
|
+
quality,
|
|
109
|
+
options: {
|
|
110
|
+
frame,
|
|
111
|
+
output: path_1.default.join(outputDir, `element-${paddedIndex}.${imageFormat}`),
|
|
112
|
+
},
|
|
113
|
+
});
|
|
131
114
|
}
|
|
132
115
|
const collectedAssets = await freePage.evaluate(() => {
|
|
133
116
|
return window.remotion_collectAssets();
|
|
134
117
|
});
|
|
135
118
|
pool.release(freePage);
|
|
136
119
|
framesRendered++;
|
|
137
|
-
onFrameUpdate(framesRendered
|
|
138
|
-
freePage.off('pageerror',
|
|
139
|
-
freePage.off('error', errorCallbackOnFrame);
|
|
120
|
+
onFrameUpdate(framesRendered);
|
|
121
|
+
freePage.off('pageerror', errorCallback);
|
|
140
122
|
return collectedAssets;
|
|
141
123
|
}));
|
|
124
|
+
close().catch((err) => {
|
|
125
|
+
console.log('Unable to close web server', err);
|
|
126
|
+
});
|
|
142
127
|
stopCycling();
|
|
143
128
|
// If browser instance was passed in, we close all the pages
|
|
144
129
|
// we opened.
|
|
@@ -156,17 +141,10 @@ const innerRenderFrames = async ({ config, parallelism, onFrameUpdate, outputDir
|
|
|
156
141
|
return {
|
|
157
142
|
assetsInfo: {
|
|
158
143
|
assets,
|
|
144
|
+
bundleDir: webpackBundle,
|
|
159
145
|
},
|
|
160
146
|
frameCount,
|
|
161
147
|
};
|
|
162
148
|
};
|
|
163
|
-
exports.innerRenderFrames = innerRenderFrames;
|
|
164
|
-
const renderFrames = (options) => {
|
|
165
|
-
return new Promise((resolve, reject) => {
|
|
166
|
-
(0, exports.innerRenderFrames)({ ...options, onError: (err) => reject(err) })
|
|
167
|
-
.then((res) => resolve(res))
|
|
168
|
-
.catch((err) => reject(err));
|
|
169
|
-
});
|
|
170
|
-
};
|
|
171
149
|
exports.renderFrames = renderFrames;
|
|
172
150
|
//# sourceMappingURL=render.js.map
|
package/dist/render.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,uCAOkB;
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sample-rate.d.ts","sourceRoot":"","sources":["../src/sample-rate.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,QAAQ,CAAC"}
|