@remotion/renderer 3.0.0-lambda.295 → 3.0.0-lambda.329
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/download-and-map-assets-to-file.d.ts.map +1 -1
- package/dist/assets/download-and-map-assets-to-file.js +4 -15
- 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/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/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 +2 -0
- package/dist/get-compositions.d.ts.map +1 -1
- package/dist/get-compositions.js +2 -1
- package/dist/get-compositions.js.map +1 -1
- package/dist/index.d.ts +17 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -8
- package/dist/index.js.map +1 -1
- 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/render-media.d.ts +4 -1
- package/dist/render-media.d.ts.map +1 -1
- package/dist/render-media.js +29 -12
- package/dist/render-media.js.map +1 -1
- package/dist/render-still.d.ts +3 -0
- package/dist/render-still.d.ts.map +1 -1
- package/dist/render-still.js +5 -2
- package/dist/render-still.js.map +1 -1
- package/dist/render.d.ts +4 -1
- package/dist/render.d.ts.map +1 -1
- package/dist/render.js +5 -2
- package/dist/render.js.map +1 -1
- package/dist/stitcher.d.ts +5 -2
- package/dist/stitcher.d.ts.map +1 -1
- package/dist/stitcher.js +23 -17
- package/dist/stitcher.js.map +1 -1
- package/dist/tmp-dir.d.ts.map +1 -1
- package/dist/tmp-dir.js +11 -3
- package/dist/tmp-dir.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-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 -7
package/dist/open-browser.js
CHANGED
|
@@ -3,12 +3,31 @@ 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.openBrowser = void 0;
|
|
6
|
+
exports.openBrowser = exports.killAllBrowsers = void 0;
|
|
7
|
+
const os_1 = __importDefault(require("os"));
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const fs_1 = __importDefault(require("fs"));
|
|
7
10
|
const puppeteer_core_1 = __importDefault(require("puppeteer-core"));
|
|
8
11
|
const remotion_1 = require("remotion");
|
|
9
12
|
const get_local_browser_executable_1 = require("./get-local-browser-executable");
|
|
13
|
+
const validRenderers = ['angle', 'egl', 'swiftshader'];
|
|
14
|
+
const getOpenGlRenderer = (option) => {
|
|
15
|
+
const renderer = option !== null && option !== void 0 ? option : remotion_1.Internals.DEFAULT_OPENGL_RENDERER;
|
|
16
|
+
remotion_1.Internals.validateOpenGlRenderer(renderer);
|
|
17
|
+
return renderer;
|
|
18
|
+
};
|
|
19
|
+
const browserInstances = [];
|
|
20
|
+
const killAllBrowsers = async () => {
|
|
21
|
+
for (const browser of browserInstances) {
|
|
22
|
+
try {
|
|
23
|
+
await browser.close();
|
|
24
|
+
}
|
|
25
|
+
catch (err) { }
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
exports.killAllBrowsers = killAllBrowsers;
|
|
10
29
|
const openBrowser = async (browser, options) => {
|
|
11
|
-
var _a, _b, _c;
|
|
30
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
12
31
|
if (browser === 'firefox' && !remotion_1.Internals.FEATURE_FLAG_FIREFOX_SUPPORT) {
|
|
13
32
|
throw new TypeError('Firefox supported is not yet turned on. Stay tuned for the future.');
|
|
14
33
|
}
|
|
@@ -18,11 +37,11 @@ const openBrowser = async (browser, options) => {
|
|
|
18
37
|
executablePath,
|
|
19
38
|
product: browser,
|
|
20
39
|
dumpio: (_c = options === null || options === void 0 ? void 0 : options.shouldDumpIo) !== null && _c !== void 0 ? _c : false,
|
|
40
|
+
headless: (_e = (_d = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _d === void 0 ? void 0 : _d.headless) !== null && _e !== void 0 ? _e : true,
|
|
21
41
|
args: [
|
|
22
42
|
'--no-sandbox',
|
|
23
43
|
'--disable-setuid-sandbox',
|
|
24
44
|
'--disable-dev-shm-usage',
|
|
25
|
-
remotion_1.Internals.isInLambda() ? '--use-gl=swiftshader' : '--use-gl=angle',
|
|
26
45
|
'--disable-background-media-suspend',
|
|
27
46
|
process.platform === 'linux' ? '--single-process' : null,
|
|
28
47
|
'--allow-running-insecure-content',
|
|
@@ -35,11 +54,24 @@ const openBrowser = async (browser, options) => {
|
|
|
35
54
|
'--hide-scrollbars',
|
|
36
55
|
'--no-default-browser-check',
|
|
37
56
|
'--no-pings',
|
|
38
|
-
'--no-zygote',
|
|
57
|
+
'--no-zygote',
|
|
58
|
+
`--use-gl=${getOpenGlRenderer((_f = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _f === void 0 ? void 0 : _f.gl)}`,
|
|
59
|
+
'--disable-background-media-suspend',
|
|
60
|
+
((_g = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _g === void 0 ? void 0 : _g.ignoreCertificateErrors)
|
|
61
|
+
? '--ignore-certificate-errors'
|
|
62
|
+
: null,
|
|
63
|
+
...(((_h = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _h === void 0 ? void 0 : _h.disableWebSecurity)
|
|
64
|
+
? [
|
|
65
|
+
'--disable-web-security',
|
|
66
|
+
'--user-data-dir=' +
|
|
67
|
+
(await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'chrome-user-dir'))),
|
|
68
|
+
]
|
|
69
|
+
: []),
|
|
39
70
|
].filter(Boolean),
|
|
40
71
|
});
|
|
41
72
|
const pages = await browserInstance.pages();
|
|
42
73
|
pages.forEach((p) => p.close());
|
|
74
|
+
browserInstances.push(browserInstance);
|
|
43
75
|
return browserInstance;
|
|
44
76
|
};
|
|
45
77
|
exports.openBrowser = openBrowser;
|
package/dist/open-browser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-browser.js","sourceRoot":"","sources":["../src/open-browser.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAuC;AACvC,uCAA4C;AAC5C,iFAGwC;
|
|
1
|
+
{"version":3,"file":"open-browser.js","sourceRoot":"","sources":["../src/open-browser.ts"],"names":[],"mappings":"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"}
|
package/dist/render-media.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ 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;
|
|
@@ -34,6 +35,8 @@ export declare type RenderMediaOptions = {
|
|
|
34
35
|
onBrowserLog?: ((log: BrowserLog) => void) | undefined;
|
|
35
36
|
onStart?: (data: OnStartData) => void;
|
|
36
37
|
timeoutInMilliseconds?: number;
|
|
38
|
+
chromiumOptions?: ChromiumOptions;
|
|
39
|
+
scale?: number;
|
|
37
40
|
} & ServeUrlOrWebpackBundle;
|
|
38
|
-
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, ...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>;
|
|
39
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");
|
|
@@ -15,12 +16,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
18
|
const get_frame_to_render_1 = require("./get-frame-to-render");
|
|
18
|
-
const
|
|
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 }) => {
|
|
19
22
|
var _a, _b;
|
|
20
23
|
remotion_1.Internals.validateQuality(quality);
|
|
21
24
|
if (typeof crf !== 'undefined' && crf !== null) {
|
|
22
25
|
remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
|
|
23
26
|
}
|
|
27
|
+
(0, validate_scale_1.validateScale)(scale);
|
|
24
28
|
const serveUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
|
|
25
29
|
let stitchStage = 'encoding';
|
|
26
30
|
let stitcherFfmpeg;
|
|
@@ -31,10 +35,13 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
31
35
|
let encodedDoneIn = null;
|
|
32
36
|
const renderStart = Date.now();
|
|
33
37
|
const tmpdir = (0, tmp_dir_1.tmpDir)('pre-encode');
|
|
34
|
-
const parallelEncoding =
|
|
38
|
+
const parallelEncoding = (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec);
|
|
35
39
|
const preEncodedFileLocation = parallelEncoding
|
|
36
40
|
? path_1.default.join(tmpdir, 'pre-encode.' + (0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'chunk'))
|
|
37
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'));
|
|
38
45
|
try {
|
|
39
46
|
const callUpdate = () => {
|
|
40
47
|
onProgress === null || onProgress === void 0 ? void 0 : onProgress({
|
|
@@ -61,8 +68,11 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
61
68
|
callUpdate();
|
|
62
69
|
},
|
|
63
70
|
verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
|
|
64
|
-
parallelEncoding,
|
|
65
71
|
ffmpegExecutable,
|
|
72
|
+
internalOptions: {
|
|
73
|
+
parallelEncoding,
|
|
74
|
+
preEncodedFileLocation: null,
|
|
75
|
+
},
|
|
66
76
|
assetsInfo: null,
|
|
67
77
|
});
|
|
68
78
|
stitcherFfmpeg = preStitcher.task;
|
|
@@ -75,7 +85,7 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
75
85
|
callUpdate();
|
|
76
86
|
},
|
|
77
87
|
parallelism,
|
|
78
|
-
outputDir
|
|
88
|
+
outputDir,
|
|
79
89
|
onStart: (data) => {
|
|
80
90
|
renderedFrames = 0;
|
|
81
91
|
callUpdate();
|
|
@@ -87,17 +97,21 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
87
97
|
quality,
|
|
88
98
|
frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
|
|
89
99
|
puppeteerInstance,
|
|
90
|
-
onFrameBuffer:
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
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,
|
|
96
108
|
serveUrl,
|
|
97
109
|
dumpBrowserLogs,
|
|
98
110
|
onBrowserLog,
|
|
99
111
|
onDownload,
|
|
100
112
|
timeoutInMilliseconds,
|
|
113
|
+
chromiumOptions,
|
|
114
|
+
scale,
|
|
101
115
|
});
|
|
102
116
|
if (stitcherFfmpeg) {
|
|
103
117
|
await waitForFinish();
|
|
@@ -114,7 +128,10 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
114
128
|
height: composition.height,
|
|
115
129
|
fps: composition.fps,
|
|
116
130
|
outputLocation,
|
|
117
|
-
|
|
131
|
+
internalOptions: {
|
|
132
|
+
parallelEncoding,
|
|
133
|
+
preEncodedFileLocation,
|
|
134
|
+
},
|
|
118
135
|
force: overwrite !== null && overwrite !== void 0 ? overwrite : remotion_1.Internals.DEFAULT_OVERWRITE,
|
|
119
136
|
pixelFormat,
|
|
120
137
|
codec,
|
|
@@ -129,7 +146,7 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
129
146
|
},
|
|
130
147
|
onDownload,
|
|
131
148
|
verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
|
|
132
|
-
|
|
149
|
+
dir: outputDir !== null && outputDir !== void 0 ? outputDir : undefined,
|
|
133
150
|
});
|
|
134
151
|
encodedFrames = composition.durationInFrames;
|
|
135
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;AAC7D,+DAAwD;
|
|
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;
|
|
@@ -14,6 +15,8 @@ declare type InnerStillOptions = {
|
|
|
14
15
|
overwrite?: boolean;
|
|
15
16
|
browserExecutable?: BrowserExecutable;
|
|
16
17
|
timeoutInMilliseconds?: number;
|
|
18
|
+
chromiumOptions?: ChromiumOptions;
|
|
19
|
+
scale?: number;
|
|
17
20
|
};
|
|
18
21
|
export declare type RenderStillOptions = InnerStillOptions & ServeUrlOrWebpackBundle;
|
|
19
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
|
@@ -35,7 +35,8 @@ 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
37
|
const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
|
|
38
|
-
const
|
|
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, }) => {
|
|
39
40
|
remotion_1.Internals.validateDimension(composition.height, 'height', 'in the `config` object passed to `renderStill()`');
|
|
40
41
|
remotion_1.Internals.validateDimension(composition.width, 'width', 'in the `config` object passed to `renderStill()`');
|
|
41
42
|
remotion_1.Internals.validateFps(composition.fps, 'in the `config` object of `renderStill()`');
|
|
@@ -43,6 +44,7 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
|
|
|
43
44
|
remotion_1.Internals.validateNonNullImageFormat(imageFormat);
|
|
44
45
|
remotion_1.Internals.validateFrame(frame, composition.durationInFrames);
|
|
45
46
|
(0, validate_puppeteer_timeout_1.validatePuppeteerTimeout)(timeoutInMilliseconds);
|
|
47
|
+
(0, validate_scale_1.validateScale)(scale);
|
|
46
48
|
if (typeof output !== 'string') {
|
|
47
49
|
throw new TypeError('`output` parameter was not passed or is not a string');
|
|
48
50
|
}
|
|
@@ -64,12 +66,13 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
|
|
|
64
66
|
const browserInstance = puppeteerInstance !== null && puppeteerInstance !== void 0 ? puppeteerInstance : (await (0, open_browser_1.openBrowser)(remotion_1.Internals.DEFAULT_BROWSER, {
|
|
65
67
|
browserExecutable,
|
|
66
68
|
shouldDumpIo: dumpBrowserLogs,
|
|
69
|
+
chromiumOptions,
|
|
67
70
|
}));
|
|
68
71
|
const page = await browserInstance.newPage();
|
|
69
72
|
page.setViewport({
|
|
70
73
|
width: composition.width,
|
|
71
74
|
height: composition.height,
|
|
72
|
-
deviceScaleFactor: 1,
|
|
75
|
+
deviceScaleFactor: scale !== null && scale !== void 0 ? scale : 1,
|
|
73
76
|
});
|
|
74
77
|
const cleanup = async () => {
|
|
75
78
|
page.off('pageerror', errorCallback);
|
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.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { BrowserExecutable, FrameRange, ImageFormat, SmallTCompMetadata } from '
|
|
|
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
|
/**
|
|
@@ -30,8 +31,10 @@ declare type RenderFramesOptions = {
|
|
|
30
31
|
onFrameBuffer?: (buffer: Buffer, frame: number) => void;
|
|
31
32
|
onDownload?: RenderMediaOnDownload;
|
|
32
33
|
timeoutInMilliseconds?: number;
|
|
34
|
+
chromiumOptions?: ChromiumOptions;
|
|
35
|
+
scale?: number;
|
|
33
36
|
} & ConfigOrComposition & ServeUrlOrWebpackBundle;
|
|
34
|
-
export declare const innerRenderFrames: ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, }: 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"> & {
|
|
35
38
|
onError: (err: Error) => void;
|
|
36
39
|
pagesArray: Page[];
|
|
37
40
|
serveUrl: string;
|
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,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;
|
|
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, timeoutInMilliseconds, }) => {
|
|
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({
|
|
@@ -195,10 +196,12 @@ const renderFrames = async (options) => {
|
|
|
195
196
|
}
|
|
196
197
|
const selectedServeUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
|
|
197
198
|
remotion_1.Internals.validateQuality(options.quality);
|
|
199
|
+
(0, validate_scale_1.validateScale)(options.scale);
|
|
198
200
|
const { closeServer, serveUrl } = await (0, prepare_server_1.prepareServer)(selectedServeUrl);
|
|
199
201
|
const browserInstance = (_a = options.puppeteerInstance) !== null && _a !== void 0 ? _a : (await (0, open_browser_1.openBrowser)(remotion_1.Internals.DEFAULT_BROWSER, {
|
|
200
202
|
shouldDumpIo: options.dumpBrowserLogs,
|
|
201
203
|
browserExecutable: options.browserExecutable,
|
|
204
|
+
chromiumOptions: options.chromiumOptions,
|
|
202
205
|
}));
|
|
203
206
|
const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserInstance);
|
|
204
207
|
const openedPages = [];
|
package/dist/render.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AAMxB,uCAOkB;AAClB,8FAGkD;AAElD,6DAAsD;AACtD,uDAAuD;AACvD,+DAAwD;AACxD,iDAAoD;AACpD,mEAGiC;AACjC,yEAAoE;AACpE,+DAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"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"}
|
package/dist/stitcher.d.ts
CHANGED
|
@@ -15,9 +15,12 @@ export declare type StitcherOptions = {
|
|
|
15
15
|
onDownload?: RenderMediaOnDownload;
|
|
16
16
|
proResProfile?: ProResProfile;
|
|
17
17
|
verbose?: boolean;
|
|
18
|
-
parallelEncoding?: boolean;
|
|
19
|
-
preEncodedFileLocation?: string | null;
|
|
20
18
|
ffmpegExecutable?: FfmpegExecutable;
|
|
19
|
+
dir?: string;
|
|
20
|
+
internalOptions?: {
|
|
21
|
+
preEncodedFileLocation: string | null;
|
|
22
|
+
parallelEncoding: boolean;
|
|
23
|
+
};
|
|
21
24
|
};
|
|
22
25
|
export declare const spawnFfmpeg: (options: StitcherOptions) => Promise<{
|
|
23
26
|
task: execa.ExecaChildProcess<string>;
|
package/dist/stitcher.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stitcher.d.ts","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACN,KAAK,EACL,gBAAgB,EAEhB,WAAW,EACX,aAAa,EACb,eAAe,EACf,MAAM,UAAU,CAAC;AAIlB,OAAO,EAEN,qBAAqB,EACrB,MAAM,0CAA0C,CAAC;AAalD,oBAAY,eAAe,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,eAAe,GAAG,IAAI,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"stitcher.d.ts","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACN,KAAK,EACL,gBAAgB,EAEhB,WAAW,EACX,aAAa,EACb,eAAe,EACf,MAAM,UAAU,CAAC;AAIlB,OAAO,EAEN,qBAAqB,EACrB,MAAM,0CAA0C,CAAC;AAalD,oBAAY,eAAe,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,eAAe,GAAG,IAAI,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE;QACjB,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;QACtC,gBAAgB,EAAE,OAAO,CAAC;KAC1B,CAAC;CACF,CAAC;AA+CF,eAAO,MAAM,WAAW,YAAmB,eAAe;;;EAyIzD,CAAC;AAEF,eAAO,MAAM,mBAAmB,YACtB,eAAe,KACtB,QAAQ,IAAI,CAId,CAAC"}
|
package/dist/stitcher.js
CHANGED
|
@@ -58,7 +58,7 @@ const getAssetsData = async (options) => {
|
|
|
58
58
|
};
|
|
59
59
|
};
|
|
60
60
|
const spawnFfmpeg = async (options) => {
|
|
61
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
61
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
|
|
62
62
|
remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
|
|
63
63
|
remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
|
|
64
64
|
remotion_1.Internals.validateFps(options.fps, 'passed to `stitchFramesToVideo()`');
|
|
@@ -67,6 +67,7 @@ const spawnFfmpeg = async (options) => {
|
|
|
67
67
|
width: options.width,
|
|
68
68
|
height: options.height,
|
|
69
69
|
codec,
|
|
70
|
+
scale: 1,
|
|
70
71
|
});
|
|
71
72
|
const crf = (_b = options.crf) !== null && _b !== void 0 ? _b : remotion_1.Internals.getDefaultCrfForCodec(codec);
|
|
72
73
|
const pixelFormat = (_c = options.pixelFormat) !== null && _c !== void 0 ? _c : remotion_1.Internals.DEFAULT_PIXEL_FORMAT;
|
|
@@ -90,15 +91,20 @@ const spawnFfmpeg = async (options) => {
|
|
|
90
91
|
}
|
|
91
92
|
remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
|
|
92
93
|
remotion_1.Internals.validateSelectedPixelFormatAndCodecCombination(pixelFormat, codec);
|
|
93
|
-
const { complexFilterFlag = undefined, cleanup = undefined, assetPositions = undefined, } = options.
|
|
94
|
+
const { complexFilterFlag = undefined, cleanup = undefined, assetPositions = undefined, } = ((_f = options.internalOptions) === null || _f === void 0 ? void 0 : _f.parallelEncoding)
|
|
95
|
+
? {}
|
|
96
|
+
: await getAssetsData(options);
|
|
94
97
|
const ffmpegArgs = [
|
|
95
98
|
['-r', String(options.fps)],
|
|
96
|
-
...(options.preEncodedFileLocation
|
|
97
|
-
? [['-i', options.preEncodedFileLocation]]
|
|
99
|
+
...(((_g = options.internalOptions) === null || _g === void 0 ? void 0 : _g.preEncodedFileLocation)
|
|
100
|
+
? [['-i', (_h = options.internalOptions) === null || _h === void 0 ? void 0 : _h.preEncodedFileLocation]]
|
|
98
101
|
: isAudioOnly
|
|
99
102
|
? []
|
|
100
103
|
: [
|
|
101
|
-
[
|
|
104
|
+
[
|
|
105
|
+
'-f',
|
|
106
|
+
((_j = options.internalOptions) === null || _j === void 0 ? void 0 : _j.parallelEncoding) ? 'image2pipe' : 'image2',
|
|
107
|
+
],
|
|
102
108
|
['-s', `${options.width}x${options.height}`],
|
|
103
109
|
options.assetsInfo
|
|
104
110
|
? ['-start_number', String(options.assetsInfo.firstFrameIndex)]
|
|
@@ -106,7 +112,7 @@ const spawnFfmpeg = async (options) => {
|
|
|
106
112
|
options.assetsInfo
|
|
107
113
|
? ['-i', options.assetsInfo.imageSequenceName]
|
|
108
114
|
: null,
|
|
109
|
-
options.parallelEncoding ? ['-i', '-'] : null,
|
|
115
|
+
((_k = options.internalOptions) === null || _k === void 0 ? void 0 : _k.parallelEncoding) ? ['-i', '-'] : null,
|
|
110
116
|
]),
|
|
111
117
|
...(options.assetsInfo && assetPositions
|
|
112
118
|
? (0, assets_to_ffmpeg_inputs_1.assetsToFfmpegInputs)({
|
|
@@ -116,15 +122,13 @@ const spawnFfmpeg = async (options) => {
|
|
|
116
122
|
frameCount: options.assetsInfo.assets.length,
|
|
117
123
|
})
|
|
118
124
|
: []),
|
|
119
|
-
|
|
120
|
-
?
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
['-vn'],
|
|
127
|
-
...(options.preEncodedFileLocation
|
|
125
|
+
encoderName
|
|
126
|
+
? // -c:v is the same as -vcodec as -codec:video
|
|
127
|
+
// and specified the video codec.
|
|
128
|
+
['-c:v', encoderName]
|
|
129
|
+
: // If only exporting audio, we drop the video explicitly
|
|
130
|
+
['-vn'],
|
|
131
|
+
...(((_l = options.internalOptions) === null || _l === void 0 ? void 0 : _l.preEncodedFileLocation)
|
|
128
132
|
? []
|
|
129
133
|
: [
|
|
130
134
|
proResProfileName ? ['-profile:v', proResProfileName] : null,
|
|
@@ -153,8 +157,10 @@ const spawnFfmpeg = async (options) => {
|
|
|
153
157
|
const ffmpegString = ffmpegArgs
|
|
154
158
|
.reduce((acc, val) => acc.concat(val), [])
|
|
155
159
|
.filter(Boolean);
|
|
156
|
-
const task = (0, execa_1.default)((
|
|
157
|
-
|
|
160
|
+
const task = (0, execa_1.default)((_m = options.ffmpegExecutable) !== null && _m !== void 0 ? _m : 'ffmpeg', ffmpegString, {
|
|
161
|
+
cwd: ((_o = options.internalOptions) === null || _o === void 0 ? void 0 : _o.parallelEncoding) ? undefined : options.dir,
|
|
162
|
+
});
|
|
163
|
+
(_p = task.stderr) === null || _p === void 0 ? void 0 : _p.on('data', (data) => {
|
|
158
164
|
if (options.onProgress) {
|
|
159
165
|
const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(data.toString());
|
|
160
166
|
if (parsed !== undefined) {
|
package/dist/stitcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stitcher.js","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,uCAOkB;AAClB,uEAA+D;AAC/D,kFAA2E;AAC3E,sFAA6E;AAC7E,8FAGkD;AAClD,8EAAsE;AAEtE,yEAAkE;AAClE,iFAAyE;AACzE,iEAAyD;AACzD,qDAA8C;AAC9C,uEAA+D;AAC/D,mEAA4D;AAC5D,+CAAkD;AAClD,+FAAsF;AACtF,uDAAiD;
|
|
1
|
+
{"version":3,"file":"stitcher.js","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"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"}
|
package/dist/tmp-dir.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tmp-dir.d.ts","sourceRoot":"","sources":["../src/tmp-dir.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tmp-dir.d.ts","sourceRoot":"","sources":["../src/tmp-dir.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,MAAM,QAAS,MAAM,WAkBjC,CAAC"}
|