@remotion/cli 3.0.0-lambda.99 → 3.0.0-wrapped.209
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/editor/components/IFrameWrapper.d.ts +6 -0
- package/dist/editor/components/IFrameWrapper.d.ts.map +1 -0
- package/dist/editor/components/IFrameWrapper.js +19 -0
- package/dist/editor/components/IFrameWrapper.js.map +1 -0
- package/dist/editor/components/KeyboardShortcuts.d.ts +1 -0
- package/dist/editor/components/KeyboardShortcuts.d.ts.map +1 -0
- package/dist/editor/components/KeyboardShortcuts.js +2 -0
- package/dist/editor/components/KeyboardShortcuts.js.map +1 -0
- package/dist/editor/components/LoopToggle.d.ts.map +1 -1
- package/dist/editor/components/LoopToggle.js +5 -0
- package/dist/editor/components/LoopToggle.js.map +1 -1
- package/dist/editor/components/MenuToolbar.js +1 -1
- package/dist/editor/components/MenuToolbar.js.map +1 -1
- package/dist/editor/components/NewComposition/ModalHeader.d.ts +3 -0
- package/dist/editor/components/NewComposition/ModalHeader.d.ts.map +1 -0
- package/dist/editor/components/NewComposition/ModalHeader.js +29 -0
- package/dist/editor/components/NewComposition/ModalHeader.js.map +1 -0
- package/dist/editor/helpers/css-reset.d.ts +3 -0
- package/dist/editor/helpers/css-reset.d.ts.map +1 -0
- package/dist/editor/helpers/css-reset.js +9 -0
- package/dist/editor/helpers/css-reset.js.map +1 -0
- package/dist/empty-audio.d.ts +2 -0
- package/dist/empty-audio.d.ts.map +1 -0
- package/dist/empty-audio.js +5 -0
- package/dist/empty-audio.js.map +1 -0
- package/dist/get-cli-options.d.ts +1 -1
- package/dist/get-cli-options.d.ts.map +1 -1
- package/dist/get-cli-options.js +1 -3
- package/dist/get-cli-options.js.map +1 -1
- package/dist/index.d.ts +1 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +0 -2
- package/dist/index.js.map +1 -1
- package/dist/lambda-command.js +1 -1
- package/dist/lambda-command.js.map +1 -1
- package/dist/log.d.ts.map +1 -1
- package/dist/log.js +4 -4
- package/dist/log.js.map +1 -1
- package/dist/preview.d.ts.map +1 -1
- package/dist/preview.js +4 -4
- package/dist/preview.js.map +1 -1
- package/dist/progress-bar.d.ts +14 -5
- package/dist/progress-bar.d.ts.map +1 -1
- package/dist/progress-bar.js +15 -6
- package/dist/progress-bar.js.map +1 -1
- package/dist/render.d.ts.map +1 -1
- package/dist/render.js +129 -202
- package/dist/render.js.map +1 -1
- package/dist/setup-cache.d.ts +2 -1
- package/dist/setup-cache.d.ts.map +1 -1
- package/dist/setup-cache.js +5 -1
- package/dist/setup-cache.js.map +1 -1
- package/dist/step.d.ts +2 -0
- package/dist/step.d.ts.map +1 -0
- package/dist/step.js +3 -0
- package/dist/step.js.map +1 -0
- package/dist/still.d.ts.map +1 -1
- package/dist/still.js +19 -15
- package/dist/still.js.map +1 -1
- package/dist/upgrade.d.ts.map +1 -1
- package/dist/upgrade.js +1 -1
- package/dist/upgrade.js.map +1 -1
- package/package.json +8 -9
- package/dist/cycle-browser-tabs.d.ts +0 -7
- package/dist/cycle-browser-tabs.d.ts.map +0 -1
- package/dist/cycle-browser-tabs.js +0 -24
- package/dist/cycle-browser-tabs.js.map +0 -1
- package/dist/editor/components/FramePersister.d.ts +0 -4
- package/dist/editor/components/FramePersister.d.ts.map +0 -1
- package/dist/editor/components/FramePersister.js +0 -28
- package/dist/editor/components/FramePersister.js.map +0 -1
- package/dist/editor/components/MediaVolumeSlider.d.ts +0 -3
- package/dist/editor/components/MediaVolumeSlider.d.ts.map +0 -1
- package/dist/editor/components/MediaVolumeSlider.js +0 -113
- package/dist/editor/components/MediaVolumeSlider.js.map +0 -1
- package/dist/editor/components/Menu/Checkmark.d.ts +0 -2
- package/dist/editor/components/Menu/Checkmark.d.ts.map +0 -1
- package/dist/editor/components/Menu/Checkmark.js +0 -11
- package/dist/editor/components/Menu/Checkmark.js.map +0 -1
- package/dist/editor/components/Menu/is-menu-click.d.ts +0 -1
- package/dist/editor/components/Menu/is-menu-click.d.ts.map +0 -1
- package/dist/editor/components/Menu/is-menu-click.js +0 -2
- package/dist/editor/components/Menu/is-menu-click.js.map +0 -1
- package/dist/editor/components/NewComposition/LazyLoadNewComposition.d.ts +0 -6
- package/dist/editor/components/NewComposition/LazyLoadNewComposition.d.ts.map +0 -1
- package/dist/editor/components/NewComposition/LazyLoadNewComposition.js +0 -32
- package/dist/editor/components/NewComposition/LazyLoadNewComposition.js.map +0 -1
- package/dist/editor/components/NewComposition.d.ts +0 -3
- package/dist/editor/components/NewComposition.d.ts.map +0 -1
- package/dist/editor/components/NewComposition.js +0 -47
- package/dist/editor/components/NewComposition.js.map +0 -1
- package/dist/editor/components/NewSequence.d.ts +0 -3
- package/dist/editor/components/NewSequence.d.ts.map +0 -1
- package/dist/editor/components/NewSequence.js +0 -47
- package/dist/editor/components/NewSequence.js.map +0 -1
- package/dist/editor/components/Spacing.d.ts +0 -7
- package/dist/editor/components/Spacing.d.ts.map +0 -1
- package/dist/editor/components/Spacing.js +0 -18
- package/dist/editor/components/Spacing.js.map +0 -1
- package/dist/editor/components/Timeline/LoopIndicator.d.ts +0 -5
- package/dist/editor/components/Timeline/LoopIndicator.d.ts.map +0 -1
- package/dist/editor/components/Timeline/LoopIndicator.js +0 -37
- package/dist/editor/components/Timeline/LoopIndicator.js.map +0 -1
- package/dist/editor/helpers/isCompositionStill.d.ts +0 -1
- package/dist/editor/helpers/isCompositionStill.d.ts.map +0 -1
- package/dist/editor/helpers/isCompositionStill.js +0 -2
- package/dist/editor/helpers/isCompositionStill.js.map +0 -1
- package/dist/editor/helpers/validate-composition-name.d.ts +0 -3
- package/dist/editor/helpers/validate-composition-name.d.ts.map +0 -1
- package/dist/editor/helpers/validate-composition-name.js +0 -15
- package/dist/editor/helpers/validate-composition-name.js.map +0 -1
- package/dist/editor/hooks/get-el-size.d.ts +0 -8
- package/dist/editor/hooks/get-el-size.d.ts.map +0 -1
- package/dist/editor/hooks/get-el-size.js +0 -43
- package/dist/editor/hooks/get-el-size.js.map +0 -1
- package/dist/editor/icons/fast-back.d.ts +0 -3
- package/dist/editor/icons/fast-back.d.ts.map +0 -1
- package/dist/editor/icons/fast-back.js +0 -9
- package/dist/editor/icons/fast-back.js.map +0 -1
- package/dist/editor/icons/fast-forward.d.ts +0 -3
- package/dist/editor/icons/fast-forward.d.ts.map +0 -1
- package/dist/editor/icons/fast-forward.js +0 -9
- package/dist/editor/icons/fast-forward.js.map +0 -1
- package/dist/editor/state/global-menu-id.d.ts +0 -4
- package/dist/editor/state/global-menu-id.d.ts.map +0 -1
- package/dist/editor/state/global-menu-id.js +0 -11
- package/dist/editor/state/global-menu-id.js.map +0 -1
- package/dist/editor/state/menu-selection.d.ts +0 -8
- package/dist/editor/state/menu-selection.d.ts.map +0 -1
- package/dist/editor/state/menu-selection.js +0 -14
- package/dist/editor/state/menu-selection.js.map +0 -1
package/dist/progress-bar.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress-bar.js","sourceRoot":"","sources":["../src/progress-bar.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"progress-bar.js","sourceRoot":"","sources":["../src/progress-bar.ts"],"names":[],"mappings":"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"}
|
package/dist/render.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":"AA2BA,eAAO,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":"AA2BA,eAAO,MAAM,MAAM,qBAiPlB,CAAC"}
|
package/dist/render.js
CHANGED
|
@@ -10,7 +10,6 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
10
10
|
const os_1 = __importDefault(require("os"));
|
|
11
11
|
const path_1 = __importDefault(require("path"));
|
|
12
12
|
const remotion_1 = require("remotion");
|
|
13
|
-
const delete_directory_1 = require("./delete-directory");
|
|
14
13
|
const get_cli_options_1 = require("./get-cli-options");
|
|
15
14
|
const get_composition_id_1 = require("./get-composition-id");
|
|
16
15
|
const initialize_render_cli_1 = require("./initialize-render-cli");
|
|
@@ -18,40 +17,38 @@ const log_1 = require("./log");
|
|
|
18
17
|
const parse_command_line_1 = require("./parse-command-line");
|
|
19
18
|
const progress_bar_1 = require("./progress-bar");
|
|
20
19
|
const setup_cache_1 = require("./setup-cache");
|
|
21
|
-
const user_passed_output_location_1 = require("./user-passed-output-location");
|
|
22
20
|
const validate_ffmpeg_version_1 = require("./validate-ffmpeg-version");
|
|
23
21
|
const render = async () => {
|
|
24
|
-
var _a, _b, _c, _d;
|
|
25
22
|
const startTime = Date.now();
|
|
26
23
|
const file = parse_command_line_1.parsedCli._[1];
|
|
27
|
-
const fullPath =
|
|
24
|
+
const fullPath = renderer_1.RenderInternals.isServeUrl(file)
|
|
25
|
+
? file
|
|
26
|
+
: path_1.default.join(process.cwd(), file);
|
|
28
27
|
await (0, initialize_render_cli_1.initializeRenderCli)('sequence');
|
|
29
|
-
const { codec, proResProfile, parallelism,
|
|
28
|
+
const { codec, proResProfile, parallelism, frameRange, shouldOutputImageSequence, absoluteOutputFile, overwrite, inputProps, envVariables, quality, browser, crf, pixelFormat, imageFormat, browserExecutable, ffmpegExecutable, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'series' });
|
|
30
29
|
if (!absoluteOutputFile) {
|
|
31
30
|
throw new Error('assertion error - expected absoluteOutputFile to not be null');
|
|
32
31
|
}
|
|
33
32
|
await (0, validate_ffmpeg_version_1.checkAndValidateFfmpegVersion)({
|
|
34
33
|
ffmpegExecutable: remotion_1.Internals.getCustomFfmpegExecutable(),
|
|
35
34
|
});
|
|
36
|
-
const browserInstance = renderer_1.
|
|
35
|
+
const browserInstance = (0, renderer_1.openBrowser)(browser, {
|
|
37
36
|
browserExecutable,
|
|
38
|
-
shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
|
|
37
|
+
shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
|
|
39
38
|
});
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
const {
|
|
49
|
-
const
|
|
50
|
-
const openedBrowser = await browserInstance;
|
|
39
|
+
const steps = [
|
|
40
|
+
renderer_1.RenderInternals.isServeUrl(fullPath) ? null : 'bundling',
|
|
41
|
+
'rendering',
|
|
42
|
+
shouldOutputImageSequence ? null : 'stitching',
|
|
43
|
+
].filter(remotion_1.Internals.truthy);
|
|
44
|
+
const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
|
|
45
|
+
? Promise.resolve(fullPath)
|
|
46
|
+
: await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
|
|
47
|
+
const { serveUrl, closeServer } = await renderer_1.RenderInternals.prepareServer(await urlOrBundle);
|
|
48
|
+
const puppeteerInstance = await browserInstance;
|
|
51
49
|
const comps = await (0, renderer_1.getCompositions)(serveUrl, {
|
|
52
|
-
browser,
|
|
53
50
|
inputProps,
|
|
54
|
-
|
|
51
|
+
puppeteerInstance,
|
|
55
52
|
envVariables,
|
|
56
53
|
});
|
|
57
54
|
const compositionId = (0, get_composition_id_1.getCompositionId)(comps);
|
|
@@ -67,203 +64,122 @@ const render = async () => {
|
|
|
67
64
|
const outputDir = shouldOutputImageSequence
|
|
68
65
|
? absoluteOutputFile
|
|
69
66
|
: await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-render'));
|
|
70
|
-
if (!outputDir) {
|
|
71
|
-
throw new Error('Assertion error: Expected outputDir to not be null');
|
|
72
|
-
}
|
|
73
67
|
log_1.Log.verbose('Output dir', outputDir);
|
|
74
68
|
const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)();
|
|
75
69
|
let totalFrames = 0;
|
|
76
|
-
|
|
77
|
-
let stitcherFfmpeg;
|
|
78
|
-
let preStitcher;
|
|
79
|
-
let encodedFrames = null;
|
|
70
|
+
let encodedFrames = 0;
|
|
80
71
|
let renderedFrames = 0;
|
|
81
|
-
let
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
72
|
+
let encodedDoneIn = null;
|
|
73
|
+
let renderedDoneIn = null;
|
|
74
|
+
let stitchStage = 'encoding';
|
|
75
|
+
const downloads = [];
|
|
76
|
+
const updateRenderProgress = () => {
|
|
77
|
+
if (totalFrames === null) {
|
|
78
|
+
throw new Error('totalFrames should not be 0');
|
|
79
|
+
}
|
|
80
|
+
return renderProgress.update((0, progress_bar_1.makeRenderingAndStitchingProgress)({
|
|
81
|
+
rendering: {
|
|
82
|
+
frames: renderedFrames,
|
|
83
|
+
totalFrames,
|
|
84
|
+
concurrency: renderer_1.RenderInternals.getActualConcurrency(parallelism),
|
|
85
|
+
doneIn: renderedDoneIn,
|
|
86
|
+
steps,
|
|
87
|
+
},
|
|
88
|
+
stitching: shouldOutputImageSequence
|
|
89
|
+
? null
|
|
90
|
+
: {
|
|
91
|
+
doneIn: encodedDoneIn,
|
|
92
|
+
frames: encodedFrames,
|
|
93
|
+
stage: stitchStage,
|
|
94
|
+
steps,
|
|
95
|
+
totalFrames,
|
|
96
|
+
},
|
|
97
|
+
downloads,
|
|
98
|
+
}));
|
|
99
|
+
};
|
|
100
|
+
if (shouldOutputImageSequence) {
|
|
101
|
+
fs_1.default.mkdirSync(absoluteOutputFile, {
|
|
102
|
+
recursive: true,
|
|
103
|
+
});
|
|
104
|
+
if (imageFormat === 'none') {
|
|
105
|
+
log_1.Log.error('Cannot render an image sequence with a codec that renders no images.');
|
|
106
|
+
log_1.Log.error(`codec = ${codec}, imageFormat = ${imageFormat}`);
|
|
107
|
+
process.exit(1);
|
|
101
108
|
}
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
dir: outputDir,
|
|
105
|
-
width: config.width,
|
|
106
|
-
height: config.height,
|
|
107
|
-
fps: config.fps,
|
|
108
|
-
outputLocation: preEncodedFileLocation,
|
|
109
|
-
force: true,
|
|
109
|
+
await (0, renderer_1.renderFrames)({
|
|
110
|
+
config,
|
|
110
111
|
imageFormat,
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
crf,
|
|
115
|
-
parallelism,
|
|
116
|
-
onProgress: (frame) => {
|
|
117
|
-
encodedFrames = frame;
|
|
112
|
+
inputProps,
|
|
113
|
+
onFrameUpdate: (rendered) => {
|
|
114
|
+
renderedFrames = rendered;
|
|
118
115
|
updateRenderProgress();
|
|
119
116
|
},
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
117
|
+
onStart: ({ frameCount }) => {
|
|
118
|
+
totalFrames = frameCount;
|
|
119
|
+
return updateRenderProgress();
|
|
120
|
+
},
|
|
121
|
+
outputDir,
|
|
122
|
+
serveUrl,
|
|
123
|
+
dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
|
|
124
|
+
envVariables,
|
|
125
|
+
frameRange,
|
|
126
|
+
parallelism,
|
|
127
|
+
puppeteerInstance,
|
|
128
|
+
quality,
|
|
125
129
|
});
|
|
126
|
-
|
|
130
|
+
renderedDoneIn = Date.now() - startTime;
|
|
131
|
+
updateRenderProgress();
|
|
132
|
+
log_1.Log.info();
|
|
133
|
+
log_1.Log.info();
|
|
134
|
+
log_1.Log.info(chalk_1.default.green('\nYour image sequence is ready!'));
|
|
135
|
+
return;
|
|
127
136
|
}
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
137
|
+
await (0, renderer_1.renderMedia)({
|
|
138
|
+
outputLocation: absoluteOutputFile,
|
|
139
|
+
codec,
|
|
140
|
+
composition: config,
|
|
141
|
+
crf,
|
|
142
|
+
envVariables,
|
|
143
|
+
ffmpegExecutable,
|
|
144
|
+
frameRange,
|
|
145
|
+
imageFormat,
|
|
146
|
+
inputProps,
|
|
147
|
+
onProgress: (update) => {
|
|
148
|
+
encodedDoneIn = update.encodedDoneIn;
|
|
149
|
+
encodedFrames = update.encodedFrames;
|
|
150
|
+
renderedDoneIn = update.renderedDoneIn;
|
|
151
|
+
stitchStage = update.stitchStage;
|
|
152
|
+
renderedFrames = update.renderedFrames;
|
|
132
153
|
updateRenderProgress();
|
|
133
154
|
},
|
|
155
|
+
puppeteerInstance,
|
|
156
|
+
overwrite,
|
|
134
157
|
parallelism,
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
158
|
+
pixelFormat,
|
|
159
|
+
proResProfile,
|
|
160
|
+
quality,
|
|
161
|
+
serveUrl,
|
|
162
|
+
onDownload: (src) => {
|
|
163
|
+
const id = Math.random();
|
|
164
|
+
const download = {
|
|
165
|
+
id,
|
|
166
|
+
name: src,
|
|
167
|
+
progress: 0,
|
|
168
|
+
};
|
|
169
|
+
downloads.push(download);
|
|
142
170
|
updateRenderProgress();
|
|
171
|
+
return ({ percent }) => {
|
|
172
|
+
download.progress = percent;
|
|
173
|
+
updateRenderProgress();
|
|
174
|
+
};
|
|
143
175
|
},
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
quality,
|
|
148
|
-
browser,
|
|
149
|
-
frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
|
|
150
|
-
puppeteerInstance: openedBrowser,
|
|
151
|
-
writeFrame: async (buffer) => {
|
|
152
|
-
var _a;
|
|
153
|
-
(_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
|
|
176
|
+
dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
|
|
177
|
+
onStart: ({ frameCount }) => {
|
|
178
|
+
totalFrames = frameCount;
|
|
154
179
|
},
|
|
155
|
-
serveUrl,
|
|
156
180
|
});
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
(_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
|
|
160
|
-
await stitcherFfmpeg;
|
|
161
|
-
(_b = preStitcher === null || preStitcher === void 0 ? void 0 : preStitcher.cleanup) === null || _b === void 0 ? void 0 : _b.call(preStitcher);
|
|
162
|
-
}
|
|
163
|
-
const closeBrowserPromise = openedBrowser.close();
|
|
164
|
-
const finalizedRenderProgress = {
|
|
165
|
-
frames: totalFrames,
|
|
166
|
-
totalFrames,
|
|
167
|
-
steps,
|
|
168
|
-
concurrency: renderer_1.RenderInternals.getActualConcurrency(parallelism),
|
|
169
|
-
doneIn: Date.now() - renderStart,
|
|
170
|
-
};
|
|
171
|
-
renderProgress.update((0, progress_bar_1.makeRenderingAndStitchingProgress)({
|
|
172
|
-
rendering: finalizedRenderProgress,
|
|
173
|
-
stitching: {
|
|
174
|
-
doneIn: null,
|
|
175
|
-
frames: encodedFrames !== null && encodedFrames !== void 0 ? encodedFrames : 0,
|
|
176
|
-
steps: 0,
|
|
177
|
-
stage: 'encoding',
|
|
178
|
-
totalFrames,
|
|
179
|
-
},
|
|
180
|
-
}) + '\n');
|
|
181
|
-
if (process.env.DEBUG) {
|
|
182
|
-
remotion_1.Internals.perf.logPerf();
|
|
183
|
-
}
|
|
184
|
-
if (shouldOutputImageSequence) {
|
|
185
|
-
log_1.Log.info(chalk_1.default.green('\nYour image sequence is ready!'));
|
|
186
|
-
}
|
|
187
|
-
else {
|
|
188
|
-
if (typeof crf !== 'number') {
|
|
189
|
-
throw new TypeError('CRF is unexpectedly not a number');
|
|
190
|
-
}
|
|
191
|
-
const dirName = path_1.default.dirname(absoluteOutputFile);
|
|
192
|
-
if (!fs_1.default.existsSync(dirName)) {
|
|
193
|
-
fs_1.default.mkdirSync(dirName, {
|
|
194
|
-
recursive: true,
|
|
195
|
-
});
|
|
196
|
-
}
|
|
197
|
-
const stitchStart = Date.now();
|
|
198
|
-
await (0, renderer_1.stitchFramesToVideo)({
|
|
199
|
-
dir: outputDir,
|
|
200
|
-
width: config.width,
|
|
201
|
-
height: config.height,
|
|
202
|
-
fps: config.fps,
|
|
203
|
-
outputLocation: absoluteOutputFile,
|
|
204
|
-
preEncodedFileLocation,
|
|
205
|
-
force: overwrite,
|
|
206
|
-
imageFormat,
|
|
207
|
-
pixelFormat,
|
|
208
|
-
codec,
|
|
209
|
-
proResProfile,
|
|
210
|
-
crf,
|
|
211
|
-
assetsInfo,
|
|
212
|
-
parallelism,
|
|
213
|
-
ffmpegExecutable,
|
|
214
|
-
onProgress: (frame) => {
|
|
215
|
-
(0, progress_bar_1.makeRenderingAndStitchingProgress)({
|
|
216
|
-
rendering: finalizedRenderProgress,
|
|
217
|
-
stitching: {
|
|
218
|
-
doneIn: null,
|
|
219
|
-
frames: frame,
|
|
220
|
-
steps,
|
|
221
|
-
totalFrames,
|
|
222
|
-
stage: 'encoding',
|
|
223
|
-
},
|
|
224
|
-
});
|
|
225
|
-
},
|
|
226
|
-
onDownload: (src) => {
|
|
227
|
-
log_1.Log.info('Downloading asset... ', src);
|
|
228
|
-
},
|
|
229
|
-
webpackBundle: bundled,
|
|
230
|
-
verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
|
|
231
|
-
});
|
|
232
|
-
renderProgress.update((0, progress_bar_1.makeRenderingAndStitchingProgress)({
|
|
233
|
-
rendering: finalizedRenderProgress,
|
|
234
|
-
stitching: {
|
|
235
|
-
doneIn: Date.now() - stitchStart,
|
|
236
|
-
frames: totalFrames,
|
|
237
|
-
steps,
|
|
238
|
-
totalFrames,
|
|
239
|
-
stage: 'muxing',
|
|
240
|
-
},
|
|
241
|
-
}) + '\n');
|
|
242
|
-
log_1.Log.verbose('Cleaning up...');
|
|
243
|
-
try {
|
|
244
|
-
if (process.platform === 'win32') {
|
|
245
|
-
// Properly delete directories because Windows doesn't seem to like fs.
|
|
246
|
-
await (0, delete_directory_1.deleteDirectory)(outputDir);
|
|
247
|
-
await (0, delete_directory_1.deleteDirectory)(bundled);
|
|
248
|
-
}
|
|
249
|
-
else {
|
|
250
|
-
await Promise.all([
|
|
251
|
-
((_c = fs_1.default.promises.rm) !== null && _c !== void 0 ? _c : fs_1.default.promises.rmdir)(outputDir, {
|
|
252
|
-
recursive: true,
|
|
253
|
-
}),
|
|
254
|
-
((_d = fs_1.default.promises.rm) !== null && _d !== void 0 ? _d : fs_1.default.promises.rmdir)(bundled, {
|
|
255
|
-
recursive: true,
|
|
256
|
-
}),
|
|
257
|
-
]);
|
|
258
|
-
}
|
|
259
|
-
}
|
|
260
|
-
catch (err) {
|
|
261
|
-
log_1.Log.warn('Could not clean up directory.');
|
|
262
|
-
log_1.Log.warn(err);
|
|
263
|
-
log_1.Log.warn('Do you have minimum required Node.js version?');
|
|
264
|
-
}
|
|
265
|
-
log_1.Log.info(chalk_1.default.green('\nYour video is ready!'));
|
|
266
|
-
}
|
|
181
|
+
log_1.Log.info();
|
|
182
|
+
log_1.Log.info();
|
|
267
183
|
const seconds = Math.round((Date.now() - startTime) / 1000);
|
|
268
184
|
log_1.Log.info([
|
|
269
185
|
'- Total render time:',
|
|
@@ -272,8 +188,19 @@ const render = async () => {
|
|
|
272
188
|
].join(' '));
|
|
273
189
|
log_1.Log.info('-', 'Output can be found at:');
|
|
274
190
|
log_1.Log.info(chalk_1.default.cyan(`▶️ ${absoluteOutputFile}`));
|
|
275
|
-
|
|
276
|
-
|
|
191
|
+
log_1.Log.verbose('Cleaning up...');
|
|
192
|
+
try {
|
|
193
|
+
await renderer_1.RenderInternals.deleteDirectory(await urlOrBundle);
|
|
194
|
+
}
|
|
195
|
+
catch (err) {
|
|
196
|
+
log_1.Log.warn('Could not clean up directory.');
|
|
197
|
+
log_1.Log.warn(err);
|
|
198
|
+
log_1.Log.warn('Do you have minimum required Node.js version?');
|
|
199
|
+
}
|
|
200
|
+
log_1.Log.info(chalk_1.default.green('\nYour video is ready!'));
|
|
201
|
+
closeServer().catch((err) => {
|
|
202
|
+
log_1.Log.error('Could not close web server', err);
|
|
203
|
+
});
|
|
277
204
|
};
|
|
278
205
|
exports.render = render;
|
|
279
206
|
//# sourceMappingURL=render.js.map
|
package/dist/render.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":"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"}
|
package/dist/setup-cache.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-cache.d.ts","sourceRoot":"","sources":["../src/setup-cache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup-cache.d.ts","sourceRoot":"","sources":["../src/setup-cache.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,UAAU,EAAC,MAAM,QAAQ,CAAC;AAElC,eAAO,MAAM,WAAW,aAAoB,MAAM,SAAS,UAAU,EAAE,oBAuCtE,CAAC"}
|
package/dist/setup-cache.js
CHANGED
|
@@ -15,7 +15,11 @@ const bundleOnCli = async (fullPath, steps) => {
|
|
|
15
15
|
const bundleStartTime = Date.now();
|
|
16
16
|
const bundlingProgress = (0, progress_bar_1.createOverwriteableCliOutput)();
|
|
17
17
|
const bundled = await (0, bundler_1.bundle)(fullPath, (progress) => {
|
|
18
|
-
bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({
|
|
18
|
+
bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({
|
|
19
|
+
progress: progress / 100,
|
|
20
|
+
steps,
|
|
21
|
+
doneIn: null,
|
|
22
|
+
}));
|
|
19
23
|
}, {
|
|
20
24
|
enableCaching: shouldCache,
|
|
21
25
|
});
|
package/dist/setup-cache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-cache.js","sourceRoot":"","sources":["../src/setup-cache.ts"],"names":[],"mappings":";;;AAAA,+CAA2D;AAC3D,uCAAmC;AACnC,+BAA0B;AAC1B,iDAGwB;
|
|
1
|
+
{"version":3,"file":"setup-cache.js","sourceRoot":"","sources":["../src/setup-cache.ts"],"names":[],"mappings":";;;AAAA,+CAA2D;AAC3D,uCAAmC;AACnC,+BAA0B;AAC1B,iDAGwB;AAGjB,MAAM,WAAW,GAAG,KAAK,EAAE,QAAgB,EAAE,KAAmB,EAAE,EAAE;IAC1E,MAAM,WAAW,GAAG,oBAAS,CAAC,iBAAiB,EAAE,CAAC;IAClD,MAAM,kBAAkB,GAAG,0BAAgB,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC5E,IAAI,kBAAkB,IAAI,CAAC,WAAW,EAAE;QACvC,SAAG,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QACtD,MAAM,0BAAgB,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;KACtD;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACnC,MAAM,gBAAgB,GAAG,IAAA,2CAA4B,GAAE,CAAC;IACxD,MAAM,OAAO,GAAG,MAAM,IAAA,gBAAM,EAC3B,QAAQ,EACR,CAAC,QAAQ,EAAE,EAAE;QACZ,gBAAgB,CAAC,MAAM,CACtB,IAAA,mCAAoB,EAAC;YACpB,QAAQ,EAAE,QAAQ,GAAG,GAAG;YACxB,KAAK;YACL,MAAM,EAAE,IAAI;SACZ,CAAC,CACF,CAAC;IACH,CAAC,EACD;QACC,aAAa,EAAE,WAAW;KAC1B,CACD,CAAC;IACF,gBAAgB,CAAC,MAAM,CACtB,IAAA,mCAAoB,EAAC;QACpB,QAAQ,EAAE,CAAC;QACX,KAAK;QACL,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe;KACpC,CAAC,GAAG,IAAI,CACT,CAAC;IACF,SAAG,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACtC,MAAM,iBAAiB,GAAG,0BAAgB,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC3E,IAAI,iBAAiB,IAAI,CAAC,kBAAkB,EAAE;QAC7C,SAAG,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;KAChE;IAED,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AAvCW,QAAA,WAAW,eAuCtB"}
|
package/dist/step.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../src/step.ts"],"names":[],"mappings":"AAAA,oBAAY,UAAU,GAAG,UAAU,GAAG,WAAW,GAAG,WAAW,CAAC"}
|
package/dist/step.js
ADDED
package/dist/step.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"step.js","sourceRoot":"","sources":["../src/step.ts"],"names":[],"mappings":""}
|
package/dist/still.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"still.d.ts","sourceRoot":"","sources":["../src/still.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"still.d.ts","sourceRoot":"","sources":["../src/still.ts"],"names":[],"mappings":"AAwBA,eAAO,MAAM,KAAK,qBAoJjB,CAAC"}
|
package/dist/still.js
CHANGED
|
@@ -21,7 +21,9 @@ const user_passed_output_location_1 = require("./user-passed-output-location");
|
|
|
21
21
|
const still = async () => {
|
|
22
22
|
const startTime = Date.now();
|
|
23
23
|
const file = parse_command_line_1.parsedCli._[1];
|
|
24
|
-
const fullPath =
|
|
24
|
+
const fullPath = renderer_1.RenderInternals.isServeUrl(file)
|
|
25
|
+
? file
|
|
26
|
+
: path_1.default.join(process.cwd(), file);
|
|
25
27
|
await (0, initialize_render_cli_1.initializeRenderCli)('still');
|
|
26
28
|
const userOutput = path_1.default.resolve(process.cwd(), (0, user_passed_output_location_1.getUserPassedOutputLocation)());
|
|
27
29
|
if (userOutput.endsWith('.jpeg') || userOutput.endsWith('.jpg')) {
|
|
@@ -45,20 +47,25 @@ const still = async () => {
|
|
|
45
47
|
!userOutput.endsWith('.jpeg')) {
|
|
46
48
|
log_1.Log.warn(`Rendering a JPEG, expected a .jpg or .jpeg extension but got ${userOutput}`);
|
|
47
49
|
}
|
|
48
|
-
const browserInstance = renderer_1.
|
|
50
|
+
const browserInstance = (0, renderer_1.openBrowser)(browser, {
|
|
49
51
|
browserExecutable,
|
|
50
|
-
shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
|
|
52
|
+
shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
|
|
51
53
|
});
|
|
52
54
|
(0, fs_1.mkdirSync)(path_1.default.join(userOutput, '..'), {
|
|
53
55
|
recursive: true,
|
|
54
56
|
});
|
|
55
|
-
const steps =
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
const steps = [
|
|
58
|
+
renderer_1.RenderInternals.isServeUrl(fullPath) ? null : 'bundling',
|
|
59
|
+
'rendering',
|
|
60
|
+
].filter(remotion_1.Internals.truthy);
|
|
61
|
+
const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
|
|
62
|
+
? Promise.resolve(fullPath)
|
|
63
|
+
: await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
|
|
64
|
+
const { serveUrl, closeServer } = await renderer_1.RenderInternals.prepareServer(await urlOrBundle);
|
|
65
|
+
const puppeteerInstance = await browserInstance;
|
|
66
|
+
const comps = await (0, renderer_1.getCompositions)(serveUrl, {
|
|
60
67
|
inputProps,
|
|
61
|
-
|
|
68
|
+
puppeteerInstance,
|
|
62
69
|
envVariables,
|
|
63
70
|
});
|
|
64
71
|
const compositionId = (0, get_composition_id_1.getCompositionId)(comps);
|
|
@@ -68,8 +75,6 @@ const still = async () => {
|
|
|
68
75
|
}
|
|
69
76
|
const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)();
|
|
70
77
|
const renderStart = Date.now();
|
|
71
|
-
const { port, close } = await renderer_1.RenderInternals.serveStatic(bundled);
|
|
72
|
-
const serveUrl = `http://localhost:${port}`;
|
|
73
78
|
try {
|
|
74
79
|
await (0, renderer_1.renderStill)({
|
|
75
80
|
composition,
|
|
@@ -77,8 +82,7 @@ const still = async () => {
|
|
|
77
82
|
output: userOutput,
|
|
78
83
|
serveUrl,
|
|
79
84
|
quality,
|
|
80
|
-
|
|
81
|
-
dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
|
|
85
|
+
dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
|
|
82
86
|
envVariables,
|
|
83
87
|
imageFormat,
|
|
84
88
|
inputProps,
|
|
@@ -90,8 +94,8 @@ const still = async () => {
|
|
|
90
94
|
(0, handle_common_errors_1.handleCommonError)(err);
|
|
91
95
|
process.exit(1);
|
|
92
96
|
}
|
|
93
|
-
const closeBrowserPromise =
|
|
94
|
-
|
|
97
|
+
const closeBrowserPromise = puppeteerInstance.close();
|
|
98
|
+
closeServer().catch((err) => {
|
|
95
99
|
log_1.Log.error('Could not close web server', err);
|
|
96
100
|
});
|
|
97
101
|
renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
|
package/dist/still.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"still.js","sourceRoot":"","sources":["../src/still.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"still.js","sourceRoot":"","sources":["../src/still.ts"],"names":[],"mappings":"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"}
|
package/dist/upgrade.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":"AAuCA,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":"AAuCA,eAAO,MAAM,OAAO,qBAuCnB,CAAC"}
|
package/dist/upgrade.js
CHANGED
|
@@ -55,7 +55,7 @@ const upgrade = async () => {
|
|
|
55
55
|
'remotion',
|
|
56
56
|
].filter((u) => dependencies.includes(u));
|
|
57
57
|
const prom = (0, execa_1.default)(tool, ['upgrade', ...toUpgrade]);
|
|
58
|
-
if (remotion_1.Internals.Logging.isEqualOrBelowLogLevel('info')) {
|
|
58
|
+
if (remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'info')) {
|
|
59
59
|
(_a = prom.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);
|
|
60
60
|
}
|
|
61
61
|
await prom;
|