@remotion/renderer 3.0.0-lambda.288 → 3.0.0-lambda.327
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 +7 -1
- package/dist/add-silent-audio-if-necessary.d.ts.map +1 -1
- package/dist/add-silent-audio-if-necessary.js +14 -8
- package/dist/add-silent-audio-if-necessary.js.map +1 -1
- package/dist/assets/calculate-asset-positions.d.ts.map +1 -1
- package/dist/assets/calculate-asset-positions.js +3 -1
- package/dist/assets/calculate-asset-positions.js.map +1 -1
- package/dist/assets/download-and-map-assets-to-file.d.ts +1 -0
- package/dist/assets/download-and-map-assets-to-file.d.ts.map +1 -1
- package/dist/assets/download-and-map-assets-to-file.js +73 -19
- package/dist/assets/download-and-map-assets-to-file.js.map +1 -1
- package/dist/assets/download-file.d.ts +8 -0
- package/dist/assets/download-file.d.ts.map +1 -0
- package/dist/assets/download-file.js +34 -0
- package/dist/assets/download-file.js.map +1 -0
- package/dist/assets/read-file.d.ts +3 -0
- package/dist/assets/read-file.d.ts.map +1 -0
- package/dist/assets/read-file.js +28 -0
- package/dist/assets/read-file.js.map +1 -0
- package/dist/assets/sanitize-filename.d.ts +2 -0
- package/dist/assets/sanitize-filename.d.ts.map +1 -0
- package/dist/assets/sanitize-filename.js +59 -0
- package/dist/assets/sanitize-filename.js.map +1 -0
- package/dist/assets/sanitize-filepath.d.ts +2 -0
- package/dist/assets/sanitize-filepath.d.ts.map +1 -0
- package/dist/assets/sanitize-filepath.js +16 -0
- package/dist/assets/sanitize-filepath.js.map +1 -0
- package/dist/assets/truncate-utf8-bytes.d.ts +2 -0
- package/dist/assets/truncate-utf8-bytes.d.ts.map +1 -0
- package/dist/assets/truncate-utf8-bytes.js +38 -0
- package/dist/assets/truncate-utf8-bytes.js.map +1 -0
- package/dist/assets/types.d.ts +1 -0
- package/dist/assets/types.d.ts.map +1 -1
- package/dist/assets/types.js +19 -0
- package/dist/assets/types.js.map +1 -1
- package/dist/can-use-parallel-encoding.d.ts +3 -0
- package/dist/can-use-parallel-encoding.d.ts.map +1 -0
- package/dist/can-use-parallel-encoding.js +12 -0
- package/dist/can-use-parallel-encoding.js.map +1 -0
- package/dist/combine-videos.js +1 -1
- package/dist/combine-videos.js.map +1 -1
- package/dist/convert-mp3-to-pcm.d.ts +7 -0
- package/dist/convert-mp3-to-pcm.d.ts.map +1 -0
- package/dist/convert-mp3-to-pcm.js +41 -0
- package/dist/convert-mp3-to-pcm.js.map +1 -0
- package/dist/create-ffmpeg-complex-filter.d.ts +4 -1
- package/dist/create-ffmpeg-complex-filter.d.ts.map +1 -1
- package/dist/ensure-frames-in-order.d.ts +1 -2
- package/dist/ensure-frames-in-order.d.ts.map +1 -1
- package/dist/ensure-frames-in-order.js +3 -9
- package/dist/ensure-frames-in-order.js.map +1 -1
- package/dist/get-audio-codec-name.d.ts.map +1 -1
- package/dist/get-audio-codec-name.js +3 -0
- package/dist/get-audio-codec-name.js.map +1 -1
- package/dist/get-browser-instance.d.ts +3 -1
- package/dist/get-browser-instance.d.ts.map +1 -1
- package/dist/get-browser-instance.js +2 -1
- package/dist/get-browser-instance.js.map +1 -1
- package/dist/get-compositions.d.ts +3 -0
- package/dist/get-compositions.d.ts.map +1 -1
- package/dist/get-compositions.js +5 -1
- package/dist/get-compositions.js.map +1 -1
- package/dist/handle-null-audio.d.ts +1 -0
- package/dist/handle-null-audio.d.ts.map +1 -0
- package/dist/handle-null-audio.js +2 -0
- package/dist/handle-null-audio.js.map +1 -0
- package/dist/index.d.ts +19 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +10 -7
- 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/open-browser.d.ts +11 -0
- package/dist/open-browser.d.ts.map +1 -1
- package/dist/open-browser.js +36 -4
- package/dist/open-browser.js.map +1 -1
- package/dist/provide-screenshot.d.ts +0 -1
- package/dist/provide-screenshot.d.ts.map +1 -1
- package/dist/puppeteer-screenshot.d.ts +0 -1
- package/dist/puppeteer-screenshot.d.ts.map +1 -1
- package/dist/render-media.d.ts +7 -3
- package/dist/render-media.d.ts.map +1 -1
- package/dist/render-media.js +32 -13
- package/dist/render-media.js.map +1 -1
- package/dist/render-still.d.ts +4 -0
- package/dist/render-still.d.ts.map +1 -1
- package/dist/render-still.js +8 -2
- package/dist/render-still.js.map +1 -1
- package/dist/render-video.d.ts +7 -8
- package/dist/render-video.d.ts.map +1 -1
- package/dist/render-video.js +55 -24
- package/dist/render-video.js.map +1 -1
- package/dist/render.d.ts +9 -5
- package/dist/render.d.ts.map +1 -1
- package/dist/render.js +12 -5
- package/dist/render.js.map +1 -1
- package/dist/screenshot-dom-element.d.ts +0 -1
- package/dist/screenshot-dom-element.d.ts.map +1 -1
- package/dist/screenshot-task.d.ts +0 -1
- package/dist/screenshot-task.d.ts.map +1 -1
- package/dist/set-props-and-env.d.ts +2 -1
- package/dist/set-props-and-env.d.ts.map +1 -1
- package/dist/set-props-and-env.js +22 -16
- package/dist/set-props-and-env.js.map +1 -1
- package/dist/stitcher.d.ts +5 -2
- package/dist/stitcher.d.ts.map +1 -1
- package/dist/stitcher.js +28 -23
- package/dist/stitcher.js.map +1 -1
- package/dist/validate-even-dimensions-with-codec.d.ts +2 -1
- package/dist/validate-even-dimensions-with-codec.d.ts.map +1 -1
- package/dist/validate-even-dimensions-with-codec.js +23 -4
- package/dist/validate-even-dimensions-with-codec.js.map +1 -1
- package/dist/validate-frame.d.ts +2 -0
- package/dist/validate-frame.d.ts.map +1 -0
- package/dist/validate-frame.js +25 -0
- package/dist/validate-frame.js.map +1 -0
- package/dist/validate-puppeteer-timeout.d.ts +2 -0
- package/dist/validate-puppeteer-timeout.d.ts.map +1 -0
- package/dist/validate-puppeteer-timeout.js +25 -0
- package/dist/validate-puppeteer-timeout.js.map +1 -0
- package/dist/validate-quality.d.ts +1 -0
- package/dist/validate-quality.d.ts.map +1 -0
- package/dist/validate-quality.js +2 -0
- package/dist/validate-quality.js.map +1 -0
- package/dist/validate-scale.d.ts +2 -0
- package/dist/validate-scale.d.ts.map +1 -0
- package/dist/validate-scale.js +27 -0
- package/dist/validate-scale.js.map +1 -0
- package/package.json +6 -8
- package/dist/get-pro-res-profile-name.d.ts +0 -3
- package/dist/get-pro-res-profile-name.d.ts.map +0 -1
- package/dist/get-pro-res-profile-name.js +0 -26
- package/dist/get-pro-res-profile-name.js.map +0 -1
- package/dist/run-ffmpeg-command.d.ts +0 -6
- package/dist/run-ffmpeg-command.d.ts.map +0 -1
- package/dist/run-ffmpeg-command.js +0 -25
- package/dist/run-ffmpeg-command.js.map +0 -1
package/dist/render-media.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { Browser as PuppeteerBrowser } from 'puppeteer-core';
|
|
2
|
-
import { Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile,
|
|
2
|
+
import { Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, SmallTCompMetadata } from 'remotion';
|
|
3
3
|
import { BrowserLog } from './browser-log';
|
|
4
4
|
import { OnStartData } from './types';
|
|
5
5
|
import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
|
|
6
6
|
import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
|
|
7
|
+
import { ChromiumOptions } from './open-browser';
|
|
7
8
|
export declare type StitchingState = 'encoding' | 'muxing';
|
|
8
9
|
export declare type RenderMediaOnProgress = (progress: {
|
|
9
10
|
renderedFrames: number;
|
|
@@ -15,7 +16,7 @@ export declare type RenderMediaOnProgress = (progress: {
|
|
|
15
16
|
export declare type RenderMediaOptions = {
|
|
16
17
|
outputLocation: string;
|
|
17
18
|
codec: Codec;
|
|
18
|
-
composition:
|
|
19
|
+
composition: SmallTCompMetadata;
|
|
19
20
|
inputProps?: unknown;
|
|
20
21
|
parallelism?: number | null;
|
|
21
22
|
crf?: number | null;
|
|
@@ -33,6 +34,9 @@ export declare type RenderMediaOptions = {
|
|
|
33
34
|
dumpBrowserLogs?: boolean;
|
|
34
35
|
onBrowserLog?: ((log: BrowserLog) => void) | undefined;
|
|
35
36
|
onStart?: (data: OnStartData) => void;
|
|
37
|
+
timeoutInMilliseconds?: number;
|
|
38
|
+
chromiumOptions?: ChromiumOptions;
|
|
39
|
+
scale?: number;
|
|
36
40
|
} & ServeUrlOrWebpackBundle;
|
|
37
|
-
export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, ...options }: RenderMediaOptions) => Promise<void>;
|
|
41
|
+
export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, ...options }: RenderMediaOptions) => Promise<void>;
|
|
38
42
|
//# sourceMappingURL=render-media.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-media.d.ts","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"render-media.d.ts","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACN,KAAK,EACL,gBAAgB,EAChB,UAAU,EAEV,WAAW,EACX,aAAa,EACb,kBAAkB,EAClB,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAG/E,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAI/C,oBAAY,cAAc,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEnD,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,cAAc,CAAC;CAC5B,KAAK,IAAI,CAAC;AAEX,oBAAY,kBAAkB,GAAG;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,kBAAkB,CAAC;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/B,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACvD,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACtC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,uBAAuB,CAAC;AAI5B,eAAO,MAAM,WAAW,gUAyBrB,kBAAkB,kBAwKpB,CAAC"}
|
package/dist/render-media.js
CHANGED
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.renderMedia = void 0;
|
|
7
|
+
const os_1 = __importDefault(require("os"));
|
|
7
8
|
const fs_1 = __importDefault(require("fs"));
|
|
8
9
|
const path_1 = __importDefault(require("path"));
|
|
9
10
|
const remotion_1 = require("remotion");
|
|
@@ -14,12 +15,16 @@ const get_extension_from_codec_1 = require("./get-extension-from-codec");
|
|
|
14
15
|
const legacy_webpack_config_1 = require("./legacy-webpack-config");
|
|
15
16
|
const ensure_output_directory_1 = require("./ensure-output-directory");
|
|
16
17
|
const ensure_frames_in_order_1 = require("./ensure-frames-in-order");
|
|
17
|
-
const
|
|
18
|
+
const get_frame_to_render_1 = require("./get-frame-to-render");
|
|
19
|
+
const validate_scale_1 = require("./validate-scale");
|
|
20
|
+
const can_use_parallel_encoding_1 = require("./can-use-parallel-encoding");
|
|
21
|
+
const renderMedia = async ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, ...options }) => {
|
|
18
22
|
var _a, _b;
|
|
19
23
|
remotion_1.Internals.validateQuality(quality);
|
|
20
24
|
if (typeof crf !== 'undefined' && crf !== null) {
|
|
21
25
|
remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
|
|
22
26
|
}
|
|
27
|
+
(0, validate_scale_1.validateScale)(scale);
|
|
23
28
|
const serveUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
|
|
24
29
|
let stitchStage = 'encoding';
|
|
25
30
|
let stitcherFfmpeg;
|
|
@@ -30,10 +35,13 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
30
35
|
let encodedDoneIn = null;
|
|
31
36
|
const renderStart = Date.now();
|
|
32
37
|
const tmpdir = (0, tmp_dir_1.tmpDir)('pre-encode');
|
|
33
|
-
const parallelEncoding =
|
|
38
|
+
const parallelEncoding = (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec);
|
|
34
39
|
const preEncodedFileLocation = parallelEncoding
|
|
35
40
|
? path_1.default.join(tmpdir, 'pre-encode.' + (0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'chunk'))
|
|
36
41
|
: null;
|
|
42
|
+
const outputDir = parallelEncoding
|
|
43
|
+
? null
|
|
44
|
+
: await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-render'));
|
|
37
45
|
try {
|
|
38
46
|
const callUpdate = () => {
|
|
39
47
|
onProgress === null || onProgress === void 0 ? void 0 : onProgress({
|
|
@@ -60,13 +68,16 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
60
68
|
callUpdate();
|
|
61
69
|
},
|
|
62
70
|
verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
|
|
63
|
-
parallelEncoding,
|
|
64
71
|
ffmpegExecutable,
|
|
72
|
+
internalOptions: {
|
|
73
|
+
parallelEncoding,
|
|
74
|
+
preEncodedFileLocation: null,
|
|
75
|
+
},
|
|
65
76
|
assetsInfo: null,
|
|
66
77
|
});
|
|
67
78
|
stitcherFfmpeg = preStitcher.task;
|
|
68
79
|
}
|
|
69
|
-
const { waitForRightTimeOfFrameToBeInserted, setFrameToStitch, waitForFinish, } = (0, ensure_frames_in_order_1.ensureFramesInOrder)(frameRange !== null && frameRange !== void 0 ? frameRange : null);
|
|
80
|
+
const { waitForRightTimeOfFrameToBeInserted, setFrameToStitch, waitForFinish, } = (0, ensure_frames_in_order_1.ensureFramesInOrder)((0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null));
|
|
70
81
|
const { assetsInfo } = await (0, render_1.renderFrames)({
|
|
71
82
|
config: composition,
|
|
72
83
|
onFrameUpdate: (frame) => {
|
|
@@ -74,7 +85,7 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
74
85
|
callUpdate();
|
|
75
86
|
},
|
|
76
87
|
parallelism,
|
|
77
|
-
outputDir
|
|
88
|
+
outputDir,
|
|
78
89
|
onStart: (data) => {
|
|
79
90
|
renderedFrames = 0;
|
|
80
91
|
callUpdate();
|
|
@@ -86,16 +97,21 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
86
97
|
quality,
|
|
87
98
|
frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
|
|
88
99
|
puppeteerInstance,
|
|
89
|
-
onFrameBuffer:
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
100
|
+
onFrameBuffer: parallelEncoding
|
|
101
|
+
? async (buffer, frame) => {
|
|
102
|
+
var _a;
|
|
103
|
+
await waitForRightTimeOfFrameToBeInserted(frame);
|
|
104
|
+
(_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
|
|
105
|
+
setFrameToStitch(frame + 1);
|
|
106
|
+
}
|
|
107
|
+
: undefined,
|
|
95
108
|
serveUrl,
|
|
96
109
|
dumpBrowserLogs,
|
|
97
110
|
onBrowserLog,
|
|
98
111
|
onDownload,
|
|
112
|
+
timeoutInMilliseconds,
|
|
113
|
+
chromiumOptions,
|
|
114
|
+
scale,
|
|
99
115
|
});
|
|
100
116
|
if (stitcherFfmpeg) {
|
|
101
117
|
await waitForFinish();
|
|
@@ -112,7 +128,10 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
112
128
|
height: composition.height,
|
|
113
129
|
fps: composition.fps,
|
|
114
130
|
outputLocation,
|
|
115
|
-
|
|
131
|
+
internalOptions: {
|
|
132
|
+
parallelEncoding,
|
|
133
|
+
preEncodedFileLocation,
|
|
134
|
+
},
|
|
116
135
|
force: overwrite !== null && overwrite !== void 0 ? overwrite : remotion_1.Internals.DEFAULT_OVERWRITE,
|
|
117
136
|
pixelFormat,
|
|
118
137
|
codec,
|
|
@@ -127,7 +146,7 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
127
146
|
},
|
|
128
147
|
onDownload,
|
|
129
148
|
verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
|
|
130
|
-
|
|
149
|
+
dir: outputDir !== null && outputDir !== void 0 ? outputDir : undefined,
|
|
131
150
|
});
|
|
132
151
|
encodedFrames = composition.durationInFrames;
|
|
133
152
|
encodedDoneIn = Date.now() - stitchStart;
|
package/dist/render-media.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-media.js","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":";;;;;;AACA,4CAAoB;AACpB,gDAAwB;AAExB,uCAQkB;AAClB,yCAA4D;AAC5D,qCAAsC;AAItC,uCAAiC;AACjC,yEAAqE;AACrE,mEAGiC;AACjC,uEAAgE;AAChE,qEAA6D;
|
|
1
|
+
{"version":3,"file":"render-media.js","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"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"}
|
package/dist/render-still.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Browser as PuppeteerBrowser } from 'puppeteer-core';
|
|
2
2
|
import { BrowserExecutable, StillImageFormat, TCompMetadata } from 'remotion';
|
|
3
3
|
import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
|
|
4
|
+
import { ChromiumOptions } from './open-browser';
|
|
4
5
|
declare type InnerStillOptions = {
|
|
5
6
|
composition: TCompMetadata;
|
|
6
7
|
output: string;
|
|
@@ -13,6 +14,9 @@ declare type InnerStillOptions = {
|
|
|
13
14
|
envVariables?: Record<string, string>;
|
|
14
15
|
overwrite?: boolean;
|
|
15
16
|
browserExecutable?: BrowserExecutable;
|
|
17
|
+
timeoutInMilliseconds?: number;
|
|
18
|
+
chromiumOptions?: ChromiumOptions;
|
|
19
|
+
scale?: number;
|
|
16
20
|
};
|
|
17
21
|
export declare type RenderStillOptions = InnerStillOptions & ServeUrlOrWebpackBundle;
|
|
18
22
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-still.d.ts","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACN,iBAAiB,EAEjB,gBAAgB,EAChB,aAAa,EACb,MAAM,UAAU,CAAC;AAElB,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"render-still.d.ts","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACN,iBAAiB,EAEjB,gBAAgB,EAChB,aAAa,EACb,MAAM,UAAU,CAAC;AAElB,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAC,eAAe,EAAc,MAAM,gBAAgB,CAAC;AAQ5D,aAAK,iBAAiB,GAAG;IACxB,WAAW,EAAE,aAAa,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,oBAAY,kBAAkB,GAAG,iBAAiB,GAAG,uBAAuB,CAAC;AAsJ7E;;GAEG;AAEH,eAAO,MAAM,WAAW,YACd,kBAAkB,KACzB,QAAQ,IAAI,CAgBd,CAAC"}
|
package/dist/render-still.js
CHANGED
|
@@ -34,13 +34,17 @@ const prepare_server_1 = require("./prepare-server");
|
|
|
34
34
|
const provide_screenshot_1 = require("./provide-screenshot");
|
|
35
35
|
const seek_to_frame_1 = require("./seek-to-frame");
|
|
36
36
|
const set_props_and_env_1 = require("./set-props-and-env");
|
|
37
|
-
const
|
|
37
|
+
const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
|
|
38
|
+
const validate_scale_1 = require("./validate-scale");
|
|
39
|
+
const innerRenderStill = async ({ composition, quality, imageFormat = 'png', serveUrl, puppeteerInstance, dumpBrowserLogs = false, onError, inputProps, envVariables, output, frame = 0, overwrite = true, browserExecutable, timeoutInMilliseconds, chromiumOptions, scale, }) => {
|
|
38
40
|
remotion_1.Internals.validateDimension(composition.height, 'height', 'in the `config` object passed to `renderStill()`');
|
|
39
41
|
remotion_1.Internals.validateDimension(composition.width, 'width', 'in the `config` object passed to `renderStill()`');
|
|
40
42
|
remotion_1.Internals.validateFps(composition.fps, 'in the `config` object of `renderStill()`');
|
|
41
43
|
remotion_1.Internals.validateDurationInFrames(composition.durationInFrames, 'in the `config` object passed to `renderStill()`');
|
|
42
44
|
remotion_1.Internals.validateNonNullImageFormat(imageFormat);
|
|
43
45
|
remotion_1.Internals.validateFrame(frame, composition.durationInFrames);
|
|
46
|
+
(0, validate_puppeteer_timeout_1.validatePuppeteerTimeout)(timeoutInMilliseconds);
|
|
47
|
+
(0, validate_scale_1.validateScale)(scale);
|
|
44
48
|
if (typeof output !== 'string') {
|
|
45
49
|
throw new TypeError('`output` parameter was not passed or is not a string');
|
|
46
50
|
}
|
|
@@ -62,12 +66,13 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
|
|
|
62
66
|
const browserInstance = puppeteerInstance !== null && puppeteerInstance !== void 0 ? puppeteerInstance : (await (0, open_browser_1.openBrowser)(remotion_1.Internals.DEFAULT_BROWSER, {
|
|
63
67
|
browserExecutable,
|
|
64
68
|
shouldDumpIo: dumpBrowserLogs,
|
|
69
|
+
chromiumOptions,
|
|
65
70
|
}));
|
|
66
71
|
const page = await browserInstance.newPage();
|
|
67
72
|
page.setViewport({
|
|
68
73
|
width: composition.width,
|
|
69
74
|
height: composition.height,
|
|
70
|
-
deviceScaleFactor: 1,
|
|
75
|
+
deviceScaleFactor: scale !== null && scale !== void 0 ? scale : 1,
|
|
71
76
|
});
|
|
72
77
|
const cleanup = async () => {
|
|
73
78
|
page.off('pageerror', errorCallback);
|
|
@@ -92,6 +97,7 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
|
|
|
92
97
|
page,
|
|
93
98
|
serveUrl,
|
|
94
99
|
initialFrame: frame,
|
|
100
|
+
timeoutInMilliseconds,
|
|
95
101
|
});
|
|
96
102
|
await page.goto(site);
|
|
97
103
|
try {
|
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,yCAAgC;AAChC,gDAAwB;AAExB,uCAKkB;AAClB,uEAAgE;AAChE,mEAGiC;AACjC,+DAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"render-still.js","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":"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"}
|
package/dist/render-video.d.ts
CHANGED
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
import type { Browser as PuppeteerBrowser } from 'puppeteer-core';
|
|
2
2
|
import { Browser, Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, TCompMetadata } from 'remotion';
|
|
3
|
-
export declare type
|
|
4
|
-
export declare type
|
|
5
|
-
export declare type RenderMediaOnProgress = (progress: {
|
|
3
|
+
export declare type RenderVideoOnDownload = (src: string) => void;
|
|
4
|
+
export declare type RenderVideoOnProgress = (progress: {
|
|
6
5
|
renderedFrames: number;
|
|
7
6
|
encodedFrames: number;
|
|
8
7
|
encodedDoneIn: number | null;
|
|
9
8
|
renderedDoneIn: number | null;
|
|
10
|
-
stitchStage:
|
|
9
|
+
stitchStage: 'encoding' | 'muxing';
|
|
11
10
|
}) => void;
|
|
12
|
-
export declare type
|
|
11
|
+
export declare type RenderVideoOptions = {
|
|
13
12
|
proResProfile: ProResProfile | undefined;
|
|
14
13
|
parallelism: number | null;
|
|
15
14
|
parallelEncoding: boolean;
|
|
@@ -29,11 +28,11 @@ export declare type RenderMediaOptions = {
|
|
|
29
28
|
openedBrowser: PuppeteerBrowser;
|
|
30
29
|
overwrite: boolean;
|
|
31
30
|
absoluteOutputFile: string;
|
|
32
|
-
onProgress
|
|
31
|
+
onProgress: RenderVideoOnProgress;
|
|
32
|
+
shouldOutputImageSequence: boolean;
|
|
33
33
|
fileExtension: string | null;
|
|
34
34
|
bundled: string;
|
|
35
35
|
onDownload: (src: string) => void;
|
|
36
|
-
dumpBrowserLogs: boolean;
|
|
37
36
|
};
|
|
38
|
-
export declare const
|
|
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>;
|
|
39
38
|
//# sourceMappingURL=render-video.d.ts.map
|
|
@@ -1 +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,
|
|
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"}
|
package/dist/render-video.js
CHANGED
|
@@ -3,15 +3,14 @@ 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.
|
|
6
|
+
exports.renderVideo = void 0;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const remotion_1 = require("remotion");
|
|
10
10
|
const stitcher_1 = require("./stitcher");
|
|
11
11
|
const render_1 = require("./render");
|
|
12
|
-
const
|
|
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
13
|
var _a, _b;
|
|
14
|
-
let stitchStage = 'encoding';
|
|
15
14
|
let stitcherFfmpeg;
|
|
16
15
|
let preStitcher;
|
|
17
16
|
let encodedFrames = 0;
|
|
@@ -20,15 +19,6 @@ const renderMedia = async ({ parallelism, proResProfile, parallelEncoding, crf,
|
|
|
20
19
|
let renderedDoneIn = null;
|
|
21
20
|
let encodedDoneIn = null;
|
|
22
21
|
const renderStart = Date.now();
|
|
23
|
-
const callUpdate = () => {
|
|
24
|
-
onProgress === null || onProgress === void 0 ? void 0 : onProgress({
|
|
25
|
-
encodedDoneIn,
|
|
26
|
-
encodedFrames,
|
|
27
|
-
renderedDoneIn,
|
|
28
|
-
renderedFrames,
|
|
29
|
-
stitchStage,
|
|
30
|
-
});
|
|
31
|
-
};
|
|
32
22
|
if (parallelEncoding) {
|
|
33
23
|
if (typeof crf !== 'number') {
|
|
34
24
|
throw new TypeError('CRF is unexpectedly not a number');
|
|
@@ -49,7 +39,13 @@ const renderMedia = async ({ parallelism, proResProfile, parallelEncoding, crf,
|
|
|
49
39
|
parallelism,
|
|
50
40
|
onProgress: (frame) => {
|
|
51
41
|
encodedFrames = frame;
|
|
52
|
-
|
|
42
|
+
onProgress({
|
|
43
|
+
encodedFrames,
|
|
44
|
+
renderedFrames,
|
|
45
|
+
encodedDoneIn: null,
|
|
46
|
+
renderedDoneIn: null,
|
|
47
|
+
stitchStage: 'encoding',
|
|
48
|
+
});
|
|
53
49
|
},
|
|
54
50
|
verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
|
|
55
51
|
parallelEncoding,
|
|
@@ -59,17 +55,31 @@ const renderMedia = async ({ parallelism, proResProfile, parallelEncoding, crf,
|
|
|
59
55
|
});
|
|
60
56
|
stitcherFfmpeg = preStitcher.task;
|
|
61
57
|
}
|
|
62
|
-
const
|
|
58
|
+
const renderer = (0, render_1.renderFrames)({
|
|
63
59
|
config,
|
|
64
60
|
onFrameUpdate: (frame) => {
|
|
65
61
|
renderedFrames = frame;
|
|
66
|
-
|
|
62
|
+
onProgress({
|
|
63
|
+
encodedFrames,
|
|
64
|
+
renderedFrames,
|
|
65
|
+
encodedDoneIn,
|
|
66
|
+
renderedDoneIn,
|
|
67
|
+
stitchStage: 'encoding',
|
|
68
|
+
});
|
|
67
69
|
},
|
|
68
70
|
parallelism,
|
|
71
|
+
parallelEncoding,
|
|
69
72
|
outputDir,
|
|
70
73
|
onStart: () => {
|
|
71
74
|
renderedFrames = 0;
|
|
72
|
-
|
|
75
|
+
onProgress({
|
|
76
|
+
encodedDoneIn,
|
|
77
|
+
encodedFrames,
|
|
78
|
+
renderedDoneIn,
|
|
79
|
+
renderedFrames,
|
|
80
|
+
// TODO: Keep a state
|
|
81
|
+
stitchStage: 'encoding',
|
|
82
|
+
});
|
|
73
83
|
},
|
|
74
84
|
inputProps,
|
|
75
85
|
envVariables,
|
|
@@ -83,8 +93,8 @@ const renderMedia = async ({ parallelism, proResProfile, parallelEncoding, crf,
|
|
|
83
93
|
(_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
|
|
84
94
|
},
|
|
85
95
|
serveUrl,
|
|
86
|
-
dumpBrowserLogs,
|
|
87
96
|
});
|
|
97
|
+
const { assetsInfo } = await renderer;
|
|
88
98
|
if (stitcherFfmpeg) {
|
|
89
99
|
(_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
|
|
90
100
|
await stitcherFfmpeg;
|
|
@@ -92,7 +102,19 @@ const renderMedia = async ({ parallelism, proResProfile, parallelEncoding, crf,
|
|
|
92
102
|
}
|
|
93
103
|
const closeBrowserPromise = openedBrowser.close();
|
|
94
104
|
renderedDoneIn = Date.now() - renderStart;
|
|
95
|
-
|
|
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
|
+
}
|
|
96
118
|
if (typeof crf !== 'number') {
|
|
97
119
|
throw new TypeError('CRF is unexpectedly not a number');
|
|
98
120
|
}
|
|
@@ -120,19 +142,28 @@ const renderMedia = async ({ parallelism, proResProfile, parallelEncoding, crf,
|
|
|
120
142
|
parallelism,
|
|
121
143
|
ffmpegExecutable,
|
|
122
144
|
onProgress: (frame) => {
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
145
|
+
onProgress({
|
|
146
|
+
encodedFrames: frame,
|
|
147
|
+
renderedFrames,
|
|
148
|
+
renderedDoneIn,
|
|
149
|
+
encodedDoneIn,
|
|
150
|
+
stitchStage: 'muxing',
|
|
151
|
+
});
|
|
126
152
|
},
|
|
127
153
|
// TODO: Optimization, Now can download before!
|
|
128
154
|
onDownload,
|
|
129
155
|
webpackBundle: bundled,
|
|
130
156
|
verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
|
|
131
157
|
});
|
|
132
|
-
encodedFrames = config.durationInFrames;
|
|
133
158
|
encodedDoneIn = Date.now() - stitchStart;
|
|
134
|
-
|
|
159
|
+
onProgress({
|
|
160
|
+
encodedDoneIn,
|
|
161
|
+
encodedFrames,
|
|
162
|
+
renderedDoneIn,
|
|
163
|
+
renderedFrames,
|
|
164
|
+
stitchStage: 'muxing',
|
|
165
|
+
});
|
|
135
166
|
await closeBrowserPromise;
|
|
136
167
|
};
|
|
137
|
-
exports.
|
|
168
|
+
exports.renderVideo = renderVideo;
|
|
138
169
|
//# sourceMappingURL=render-video.js.map
|
package/dist/render-video.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-video.js","sourceRoot":"","sources":["../src/render-video.ts"],"names":[],"mappings":";;;;;;AACA,4CAAoB;AACpB,gDAAwB;AAExB,uCASkB;AAClB,yCAA4D;AAC5D,qCAAsC;
|
|
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,17 +1,18 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Browser as PuppeteerBrowser, Page } from 'puppeteer-core';
|
|
3
|
-
import { BrowserExecutable, FrameRange, ImageFormat,
|
|
3
|
+
import { BrowserExecutable, FrameRange, ImageFormat, SmallTCompMetadata } from 'remotion';
|
|
4
4
|
import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
|
|
5
5
|
import { BrowserLog } from './browser-log';
|
|
6
6
|
import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
|
|
7
|
+
import { ChromiumOptions } from './open-browser';
|
|
7
8
|
import { OnStartData, RenderFramesOutput } from './types';
|
|
8
9
|
declare type ConfigOrComposition = {
|
|
9
10
|
/**
|
|
10
11
|
* @deprecated This field has been renamed to `composition`
|
|
11
12
|
*/
|
|
12
|
-
config:
|
|
13
|
+
config: SmallTCompMetadata;
|
|
13
14
|
} | {
|
|
14
|
-
composition:
|
|
15
|
+
composition: SmallTCompMetadata;
|
|
15
16
|
};
|
|
16
17
|
declare type RenderFramesOptions = {
|
|
17
18
|
onStart: (data: OnStartData) => void;
|
|
@@ -29,12 +30,15 @@ declare type RenderFramesOptions = {
|
|
|
29
30
|
onBrowserLog?: (log: BrowserLog) => void;
|
|
30
31
|
onFrameBuffer?: (buffer: Buffer, frame: number) => void;
|
|
31
32
|
onDownload?: RenderMediaOnDownload;
|
|
33
|
+
timeoutInMilliseconds?: number;
|
|
34
|
+
chromiumOptions?: ChromiumOptions;
|
|
35
|
+
scale?: number;
|
|
32
36
|
} & ConfigOrComposition & ServeUrlOrWebpackBundle;
|
|
33
|
-
export declare const innerRenderFrames: ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, }: Omit<RenderFramesOptions, "url"> & {
|
|
37
|
+
export declare const innerRenderFrames: ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, }: Omit<RenderFramesOptions, "url"> & {
|
|
34
38
|
onError: (err: Error) => void;
|
|
35
39
|
pagesArray: Page[];
|
|
36
40
|
serveUrl: string;
|
|
37
|
-
composition:
|
|
41
|
+
composition: SmallTCompMetadata;
|
|
38
42
|
}) => Promise<RenderFramesOutput>;
|
|
39
43
|
export declare const renderFrames: (options: RenderFramesOptions) => Promise<RenderFramesOutput>;
|
|
40
44
|
export {};
|
package/dist/render.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";AAEA,OAAO,EACN,OAAO,IAAI,gBAAgB,EAE3B,IAAI,EACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,iBAAiB,EACjB,UAAU,EACV,WAAW,EAEX,
|
|
1
|
+
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";AAEA,OAAO,EACN,OAAO,IAAI,gBAAgB,EAE3B,IAAI,EACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,iBAAiB,EACjB,UAAU,EACV,WAAW,EAEX,kBAAkB,EAElB,MAAM,UAAU,CAAC;AAClB,OAAO,EAEN,qBAAqB,EACrB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAKzC,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAC,eAAe,EAAc,MAAM,gBAAgB,CAAC;AAM5D,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAGxD,aAAK,mBAAmB,GACrB;IACA;;OAEG;IACH,MAAM,EAAE,kBAAkB,CAAC;CAC1B,GACD;IACA,WAAW,EAAE,kBAAkB,CAAC;CAC/B,CAAC;AAEL,aAAK,mBAAmB,GAAG;IAC1B,OAAO,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACrC,aAAa,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IACpE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC;IACzC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,mBAAmB,GACtB,uBAAuB,CAAC;AAczB,eAAO,MAAM,iBAAiB;mBAqBd,KAAK,KAAK,IAAI;gBACjB,IAAI,EAAE;cACR,MAAM;iBACH,kBAAkB;MAC5B,QAAQ,kBAAkB,CAoM7B,CAAC;AAEF,eAAO,MAAM,YAAY,YACf,mBAAmB,KAC1B,QAAQ,kBAAkB,CAkF5B,CAAC"}
|
package/dist/render.js
CHANGED
|
@@ -21,6 +21,7 @@ const prepare_server_1 = require("./prepare-server");
|
|
|
21
21
|
const provide_screenshot_1 = require("./provide-screenshot");
|
|
22
22
|
const seek_to_frame_1 = require("./seek-to-frame");
|
|
23
23
|
const set_props_and_env_1 = require("./set-props-and-env");
|
|
24
|
+
const validate_scale_1 = require("./validate-scale");
|
|
24
25
|
const getComposition = (others) => {
|
|
25
26
|
if ('composition' in others) {
|
|
26
27
|
return others.composition;
|
|
@@ -30,7 +31,7 @@ const getComposition = (others) => {
|
|
|
30
31
|
}
|
|
31
32
|
return undefined;
|
|
32
33
|
};
|
|
33
|
-
const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, }) => {
|
|
34
|
+
const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, }) => {
|
|
34
35
|
if (!puppeteerInstance) {
|
|
35
36
|
throw new Error('weird');
|
|
36
37
|
}
|
|
@@ -50,7 +51,7 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
50
51
|
page.setViewport({
|
|
51
52
|
width: composition.width,
|
|
52
53
|
height: composition.height,
|
|
53
|
-
deviceScaleFactor: 1,
|
|
54
|
+
deviceScaleFactor: scale !== null && scale !== void 0 ? scale : 1,
|
|
54
55
|
});
|
|
55
56
|
const logCallback = (log) => {
|
|
56
57
|
onBrowserLog === null || onBrowserLog === void 0 ? void 0 : onBrowserLog({
|
|
@@ -73,6 +74,7 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
73
74
|
page,
|
|
74
75
|
serveUrl,
|
|
75
76
|
initialFrame,
|
|
77
|
+
timeoutInMilliseconds,
|
|
76
78
|
});
|
|
77
79
|
const site = `${(0, normalize_serve_url_1.normalizeServeUrl)(serveUrl)}?composition=${composition.id}`;
|
|
78
80
|
await page.goto(site);
|
|
@@ -90,7 +92,8 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
90
92
|
frameCount,
|
|
91
93
|
});
|
|
92
94
|
const downloadDir = (0, make_assets_download_dir_1.makeAssetsDownloadTmpDir)();
|
|
93
|
-
const assets =
|
|
95
|
+
const assets = new Array(frameCount).fill(undefined);
|
|
96
|
+
await Promise.all(new Array(frameCount)
|
|
94
97
|
.fill(Boolean)
|
|
95
98
|
.map((x, i) => i)
|
|
96
99
|
.map(async (index) => {
|
|
@@ -148,7 +151,9 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
148
151
|
const collectedAssets = await freePage.evaluate(() => {
|
|
149
152
|
return window.remotion_collectAssets();
|
|
150
153
|
});
|
|
151
|
-
collectedAssets.
|
|
154
|
+
const compressedAssets = collectedAssets.map((asset) => remotion_1.Internals.AssetCompression.compressAsset(assets.filter(remotion_1.Internals.truthy).flat(1), asset));
|
|
155
|
+
assets[index] = compressedAssets;
|
|
156
|
+
compressedAssets.forEach((asset) => {
|
|
152
157
|
(0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
|
|
153
158
|
asset,
|
|
154
159
|
downloadDir,
|
|
@@ -162,7 +167,7 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
162
167
|
onFrameUpdate(framesRendered, frame);
|
|
163
168
|
freePage.off('pageerror', errorCallbackOnFrame);
|
|
164
169
|
freePage.off('error', errorCallbackOnFrame);
|
|
165
|
-
return
|
|
170
|
+
return compressedAssets;
|
|
166
171
|
}));
|
|
167
172
|
const returnValue = {
|
|
168
173
|
assetsInfo: {
|
|
@@ -191,10 +196,12 @@ const renderFrames = async (options) => {
|
|
|
191
196
|
}
|
|
192
197
|
const selectedServeUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
|
|
193
198
|
remotion_1.Internals.validateQuality(options.quality);
|
|
199
|
+
(0, validate_scale_1.validateScale)(options.scale);
|
|
194
200
|
const { closeServer, serveUrl } = await (0, prepare_server_1.prepareServer)(selectedServeUrl);
|
|
195
201
|
const browserInstance = (_a = options.puppeteerInstance) !== null && _a !== void 0 ? _a : (await (0, open_browser_1.openBrowser)(remotion_1.Internals.DEFAULT_BROWSER, {
|
|
196
202
|
shouldDumpIo: options.dumpBrowserLogs,
|
|
197
203
|
browserExecutable: options.browserExecutable,
|
|
204
|
+
chromiumOptions: options.chromiumOptions,
|
|
198
205
|
}));
|
|
199
206
|
const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserInstance);
|
|
200
207
|
const openedPages = [];
|