@remotion/renderer 3.0.1 → 3.0.4
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/assets/calculate-asset-positions.d.ts.map +1 -1
- package/dist/assets/calculate-asset-positions.js +2 -5
- package/dist/assets/calculate-asset-positions.js.map +1 -1
- package/dist/assets/calculate-atempo.d.ts +1 -1
- package/dist/assets/calculate-atempo.d.ts.map +1 -1
- package/dist/assets/calculate-atempo.js +3 -0
- package/dist/assets/calculate-atempo.js.map +1 -1
- package/dist/assets/download-and-map-assets-to-file.d.ts +0 -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 +3 -4
- package/dist/assets/download-and-map-assets-to-file.js.map +1 -1
- package/dist/assets/ffmpeg-volume-expression.d.ts +1 -2
- package/dist/assets/ffmpeg-volume-expression.d.ts.map +1 -1
- package/dist/assets/ffmpeg-volume-expression.js +3 -5
- package/dist/assets/ffmpeg-volume-expression.js.map +1 -1
- package/dist/assets/get-audio-channels.d.ts +4 -1
- package/dist/assets/get-audio-channels.d.ts.map +1 -1
- package/dist/assets/get-audio-channels.js +10 -12
- package/dist/assets/get-audio-channels.js.map +1 -1
- package/dist/assets/round-volume-to-avoid-stack-overflow.d.ts +0 -1
- package/dist/assets/round-volume-to-avoid-stack-overflow.d.ts.map +1 -1
- package/dist/assets/round-volume-to-avoid-stack-overflow.js +4 -4
- package/dist/assets/round-volume-to-avoid-stack-overflow.js.map +1 -1
- package/dist/assets/types.d.ts +0 -3
- package/dist/assets/types.d.ts.map +1 -1
- package/dist/calculate-ffmpeg-filters.d.ts +7 -10
- package/dist/calculate-ffmpeg-filters.d.ts.map +1 -1
- package/dist/calculate-ffmpeg-filters.js +19 -30
- package/dist/calculate-ffmpeg-filters.js.map +1 -1
- package/dist/chunk.d.ts +2 -0
- package/dist/chunk.d.ts.map +1 -0
- package/dist/chunk.js +12 -0
- package/dist/chunk.js.map +1 -0
- package/dist/convert-to-pcm.d.ts +7 -0
- package/dist/convert-to-pcm.d.ts.map +1 -0
- package/dist/convert-to-pcm.js +21 -0
- package/dist/convert-to-pcm.js.map +1 -0
- package/dist/create-ffmpeg-complex-filter.d.ts +5 -3
- package/dist/create-ffmpeg-complex-filter.d.ts.map +1 -1
- package/dist/create-ffmpeg-complex-filter.js +8 -33
- package/dist/create-ffmpeg-complex-filter.js.map +1 -1
- package/dist/create-ffmpeg-merge-filter.d.ts +2 -0
- package/dist/create-ffmpeg-merge-filter.d.ts.map +1 -0
- package/dist/create-ffmpeg-merge-filter.js +19 -0
- package/dist/create-ffmpeg-merge-filter.js.map +1 -0
- package/dist/create-silent-audio.d.ts +7 -0
- package/dist/create-silent-audio.d.ts.map +1 -0
- package/dist/create-silent-audio.js +25 -0
- package/dist/create-silent-audio.js.map +1 -0
- package/dist/cycle-browser-tabs.d.ts +1 -1
- package/dist/cycle-browser-tabs.d.ts.map +1 -1
- package/dist/cycle-browser-tabs.js +6 -1
- package/dist/cycle-browser-tabs.js.map +1 -1
- package/dist/delete-directory.d.ts.map +1 -1
- package/dist/delete-directory.js +7 -2
- package/dist/delete-directory.js.map +1 -1
- package/dist/ensure-frames-in-order.d.ts.map +1 -1
- package/dist/ensure-frames-in-order.js +1 -1
- package/dist/ensure-frames-in-order.js.map +1 -1
- package/dist/error-handling/handle-javascript-exception.d.ts +0 -1
- package/dist/error-handling/handle-javascript-exception.d.ts.map +1 -1
- package/dist/error-handling/handle-javascript-exception.js +3 -4
- package/dist/error-handling/handle-javascript-exception.js.map +1 -1
- package/dist/ffmpeg-filter-file.d.ts +5 -0
- package/dist/ffmpeg-filter-file.d.ts.map +1 -0
- package/dist/ffmpeg-filter-file.js +25 -0
- package/dist/ffmpeg-filter-file.js.map +1 -0
- package/dist/get-duration-from-frame-range.d.ts +3 -0
- package/dist/get-duration-from-frame-range.d.ts.map +1 -0
- package/dist/get-duration-from-frame-range.js +14 -0
- package/dist/get-duration-from-frame-range.js.map +1 -0
- package/dist/get-extension-from-codec.d.ts +1 -1
- package/dist/index.d.ts +3 -9
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/merge-audio-track.d.ts +10 -0
- package/dist/merge-audio-track.d.ts.map +1 -0
- package/dist/merge-audio-track.js +73 -0
- package/dist/merge-audio-track.js.map +1 -0
- package/dist/p-limit.d.ts +2 -0
- package/dist/p-limit.d.ts.map +1 -0
- package/dist/p-limit.js +58 -0
- package/dist/p-limit.js.map +1 -0
- package/dist/preprocess-audio-track.d.ts +12 -0
- package/dist/preprocess-audio-track.d.ts.map +1 -0
- package/dist/preprocess-audio-track.js +42 -0
- package/dist/preprocess-audio-track.js.map +1 -0
- package/dist/prespawn-ffmpeg.d.ts +22 -0
- package/dist/prespawn-ffmpeg.d.ts.map +1 -0
- package/dist/prespawn-ffmpeg.js +92 -0
- package/dist/prespawn-ffmpeg.js.map +1 -0
- package/dist/puppeteer-evaluate.d.ts +0 -1
- package/dist/puppeteer-evaluate.d.ts.map +1 -1
- package/dist/puppeteer-evaluate.js +3 -3
- package/dist/puppeteer-evaluate.js.map +1 -1
- package/dist/render-frames.d.ts +1 -7
- package/dist/render-frames.d.ts.map +1 -1
- package/dist/render-frames.js +9 -8
- package/dist/render-frames.js.map +1 -1
- package/dist/render-media.d.ts.map +1 -1
- package/dist/render-media.js +8 -15
- package/dist/render-media.js.map +1 -1
- package/dist/render-still.d.ts +1 -1
- package/dist/render-still.d.ts.map +1 -1
- package/dist/stitch-frames-to-video.d.ts +6 -7
- package/dist/stitch-frames-to-video.d.ts.map +1 -1
- package/dist/stitch-frames-to-video.js +112 -107
- package/dist/stitch-frames-to-video.js.map +1 -1
- package/dist/stringify-ffmpeg-filter.d.ts +5 -5
- package/dist/stringify-ffmpeg-filter.d.ts.map +1 -1
- package/dist/stringify-ffmpeg-filter.js +29 -10
- package/dist/stringify-ffmpeg-filter.js.map +1 -1
- package/dist/symbolicate-stacktrace.d.ts +2 -3
- package/dist/symbolicate-stacktrace.d.ts.map +1 -1
- package/dist/symbolicate-stacktrace.js +1 -2
- package/dist/symbolicate-stacktrace.js.map +1 -1
- package/dist/tmp-dir.d.ts.map +1 -1
- package/dist/tmp-dir.js +21 -3
- package/dist/tmp-dir.js.map +1 -1
- package/dist/validate-ffmpeg.d.ts +0 -1
- package/dist/validate-ffmpeg.d.ts.map +1 -1
- package/dist/validate-ffmpeg.js +2 -3
- package/dist/validate-ffmpeg.js.map +1 -1
- package/dist/validate-scale.d.ts.map +1 -1
- package/dist/validate-scale.js.map +1 -1
- package/package.json +4 -5
- package/dist/add-silent-audio-if-necessary.d.ts +0 -8
- package/dist/add-silent-audio-if-necessary.d.ts.map +0 -1
- package/dist/add-silent-audio-if-necessary.js +0 -51
- package/dist/add-silent-audio-if-necessary.js.map +0 -1
- package/dist/assets/asset-is-used-at-time.d.ts +0 -3
- package/dist/assets/asset-is-used-at-time.d.ts.map +0 -1
- package/dist/assets/asset-is-used-at-time.js +0 -8
- package/dist/assets/asset-is-used-at-time.js.map +0 -1
- package/dist/assets/get-asset-audio-details.d.ts +0 -5
- package/dist/assets/get-asset-audio-details.d.ts.map +0 -1
- package/dist/assets/get-asset-audio-details.js +0 -21
- package/dist/assets/get-asset-audio-details.js.map +0 -1
- package/dist/assets/get-simulatenous-assets.d.ts +0 -3
- package/dist/assets/get-simulatenous-assets.d.ts.map +0 -1
- package/dist/assets/get-simulatenous-assets.js +0 -14
- package/dist/assets/get-simulatenous-assets.js.map +0 -1
- package/dist/assets/split-assets-into-segments.d.ts +0 -6
- package/dist/assets/split-assets-into-segments.d.ts.map +0 -1
- package/dist/assets/split-assets-into-segments.js +0 -89
- package/dist/assets/split-assets-into-segments.js.map +0 -1
- package/dist/assets-to-ffmpeg-inputs.d.ts +0 -7
- package/dist/assets-to-ffmpeg-inputs.d.ts.map +0 -1
- package/dist/assets-to-ffmpeg-inputs.js +0 -15
- package/dist/assets-to-ffmpeg-inputs.js.map +0 -1
- package/dist/render.d.ts +0 -45
- package/dist/render.d.ts.map +0 -1
- package/dist/render.js +0 -245
- package/dist/render.js.map +0 -1
- package/dist/stitcher.d.ts +0 -32
- package/dist/stitcher.d.ts.map +0 -1
- package/dist/stitcher.js +0 -204
- package/dist/stitcher.js.map +0 -1
|
@@ -5,60 +5,65 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.stitchFramesToVideo = exports.spawnFfmpeg = void 0;
|
|
7
7
|
const execa_1 = __importDefault(require("execa"));
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
8
9
|
const remotion_1 = require("remotion");
|
|
9
|
-
const assets_to_ffmpeg_inputs_1 = require("./assets-to-ffmpeg-inputs");
|
|
10
10
|
const calculate_asset_positions_1 = require("./assets/calculate-asset-positions");
|
|
11
11
|
const convert_assets_to_file_urls_1 = require("./assets/convert-assets-to-file-urls");
|
|
12
12
|
const download_and_map_assets_to_file_1 = require("./assets/download-and-map-assets-to-file");
|
|
13
|
-
const
|
|
14
|
-
const calculate_ffmpeg_filters_1 = require("./calculate-ffmpeg-filters");
|
|
15
|
-
const create_ffmpeg_complex_filter_1 = require("./create-ffmpeg-complex-filter");
|
|
13
|
+
const delete_directory_1 = require("./delete-directory");
|
|
16
14
|
const get_audio_codec_name_1 = require("./get-audio-codec-name");
|
|
17
15
|
const get_codec_name_1 = require("./get-codec-name");
|
|
18
16
|
const get_prores_profile_name_1 = require("./get-prores-profile-name");
|
|
17
|
+
const merge_audio_track_1 = require("./merge-audio-track");
|
|
19
18
|
const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
|
|
20
|
-
const
|
|
19
|
+
const preprocess_audio_track_1 = require("./preprocess-audio-track");
|
|
20
|
+
const tmp_dir_1 = require("./tmp-dir");
|
|
21
21
|
const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
|
|
22
22
|
const validate_ffmpeg_1 = require("./validate-ffmpeg");
|
|
23
|
-
const getAssetsData = async (
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const fileUrlAssets = await (options.assetsInfo
|
|
29
|
-
? (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
|
|
30
|
-
assets: options.assetsInfo.assets,
|
|
31
|
-
downloadDir: options.assetsInfo.downloadDir,
|
|
32
|
-
onDownload: (_b = options.onDownload) !== null && _b !== void 0 ? _b : (() => () => undefined),
|
|
33
|
-
})
|
|
34
|
-
: null);
|
|
35
|
-
(0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
|
|
36
|
-
const assetPositions = fileUrlAssets === null ? [] : (0, calculate_asset_positions_1.calculateAssetPositions)(fileUrlAssets);
|
|
37
|
-
(0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
|
|
38
|
-
const assetAudioDetails = await (0, get_asset_audio_details_1.getAssetAudioDetails)({
|
|
39
|
-
assetPaths: assetPositions.map((a) => a.src),
|
|
23
|
+
const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, onProgress, }) => {
|
|
24
|
+
const fileUrlAssets = await (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
|
|
25
|
+
assets,
|
|
26
|
+
downloadDir,
|
|
27
|
+
onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : (() => () => undefined),
|
|
40
28
|
});
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
fps: options.fps,
|
|
45
|
-
videoTrackCount: isAudioOnly ? 0 : 1,
|
|
46
|
-
});
|
|
47
|
-
if (options.verbose) {
|
|
29
|
+
(0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
|
|
30
|
+
const assetPositions = (0, calculate_asset_positions_1.calculateAssetPositions)(fileUrlAssets);
|
|
31
|
+
if (verbose) {
|
|
48
32
|
console.log('asset positions', assetPositions);
|
|
49
33
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
return {
|
|
55
|
-
complexFilterFlag,
|
|
56
|
-
cleanup,
|
|
57
|
-
assetPositions,
|
|
34
|
+
const tempPath = (0, tmp_dir_1.tmpDir)('remotion-audio-mixing');
|
|
35
|
+
const preprocessProgress = new Array(assetPositions.length).fill(0);
|
|
36
|
+
const updateProgress = () => {
|
|
37
|
+
onProgress(preprocessProgress.reduce((a, b) => a + b, 0) / assetPositions.length);
|
|
58
38
|
};
|
|
39
|
+
const preprocessed = (await Promise.all(assetPositions.map(async (asset, index) => {
|
|
40
|
+
const filterFile = path_1.default.join(tempPath, `${index}.wav`);
|
|
41
|
+
const result = await (0, preprocess_audio_track_1.preprocessAudioTrack)({
|
|
42
|
+
ffmpegExecutable: ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : null,
|
|
43
|
+
outName: filterFile,
|
|
44
|
+
asset,
|
|
45
|
+
expectedFrames,
|
|
46
|
+
fps,
|
|
47
|
+
});
|
|
48
|
+
preprocessProgress[index] = 1;
|
|
49
|
+
updateProgress();
|
|
50
|
+
return result;
|
|
51
|
+
}))).filter(remotion_1.Internals.truthy);
|
|
52
|
+
const outName = path_1.default.join(tempPath, `audio.wav`);
|
|
53
|
+
await (0, merge_audio_track_1.mergeAudioTrack)({
|
|
54
|
+
ffmpegExecutable: ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : null,
|
|
55
|
+
files: preprocessed,
|
|
56
|
+
outName,
|
|
57
|
+
numberOfSeconds: Number((expectedFrames / fps).toFixed(3)),
|
|
58
|
+
});
|
|
59
|
+
onProgress(1);
|
|
60
|
+
preprocessed.forEach((p) => {
|
|
61
|
+
(0, delete_directory_1.deleteDirectory)(p);
|
|
62
|
+
});
|
|
63
|
+
return outName;
|
|
59
64
|
};
|
|
60
65
|
const spawnFfmpeg = async (options) => {
|
|
61
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o
|
|
66
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
62
67
|
remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
|
|
63
68
|
remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
|
|
64
69
|
remotion_1.Internals.validateFps(options.fps, 'passed to `stitchFramesToVideo()`');
|
|
@@ -91,78 +96,68 @@ const spawnFfmpeg = async (options) => {
|
|
|
91
96
|
}
|
|
92
97
|
remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
|
|
93
98
|
remotion_1.Internals.validateSelectedPixelFormatAndCodecCombination(pixelFormat, codec);
|
|
94
|
-
const
|
|
95
|
-
|
|
96
|
-
|
|
99
|
+
const expectedFrames = options.assetsInfo.assets.length;
|
|
100
|
+
const updateProgress = (preStitchProgress, muxProgress) => {
|
|
101
|
+
var _a;
|
|
102
|
+
const totalFrameProgress = 0.5 * preStitchProgress * expectedFrames + muxProgress * 0.5;
|
|
103
|
+
(_a = options.onProgress) === null || _a === void 0 ? void 0 : _a.call(options, Math.round(totalFrameProgress));
|
|
104
|
+
};
|
|
105
|
+
const audio = await getAssetsData({
|
|
106
|
+
assets: options.assetsInfo.assets,
|
|
107
|
+
downloadDir: options.assetsInfo.downloadDir,
|
|
108
|
+
onDownload: options.onDownload,
|
|
109
|
+
fps: options.fps,
|
|
110
|
+
expectedFrames,
|
|
111
|
+
verbose: (_f = options.verbose) !== null && _f !== void 0 ? _f : false,
|
|
112
|
+
ffmpegExecutable: (_g = options.ffmpegExecutable) !== null && _g !== void 0 ? _g : null,
|
|
113
|
+
onProgress: (prog) => updateProgress(prog, 0),
|
|
114
|
+
});
|
|
115
|
+
if (isAudioOnly) {
|
|
116
|
+
if (!audioCodecName) {
|
|
117
|
+
throw new TypeError('exporting audio but has no audio codec name. Report this in the Remotion repo.');
|
|
118
|
+
}
|
|
119
|
+
await (0, execa_1.default)('ffmpeg', [
|
|
120
|
+
'-i',
|
|
121
|
+
audio,
|
|
122
|
+
'-c:a',
|
|
123
|
+
audioCodecName,
|
|
124
|
+
options.force ? '-y' : null,
|
|
125
|
+
options.outputLocation,
|
|
126
|
+
].filter(remotion_1.Internals.truthy));
|
|
127
|
+
(_h = options.onProgress) === null || _h === void 0 ? void 0 : _h.call(options, expectedFrames);
|
|
128
|
+
return {
|
|
129
|
+
getLogs: () => '',
|
|
130
|
+
task: Promise.resolve(),
|
|
131
|
+
};
|
|
132
|
+
}
|
|
97
133
|
const ffmpegArgs = [
|
|
98
134
|
['-r', String(options.fps)],
|
|
99
|
-
...(((
|
|
100
|
-
? [['-i', (
|
|
101
|
-
:
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
? ['-start_number', String(options.assetsInfo.firstFrameIndex)]
|
|
113
|
-
: null,
|
|
114
|
-
options.assetsInfo
|
|
115
|
-
? ['-i', options.assetsInfo.imageSequenceName]
|
|
116
|
-
: null,
|
|
117
|
-
// If scale is very small (like 0.1), FFMPEG cannot figure out the image
|
|
118
|
-
// format on it's own and we need to hint the format
|
|
119
|
-
((_k = options.internalOptions) === null || _k === void 0 ? void 0 : _k.parallelEncoding)
|
|
120
|
-
? [
|
|
121
|
-
'-vcodec',
|
|
122
|
-
options.internalOptions.imageFormat === 'jpeg'
|
|
123
|
-
? 'mjpeg'
|
|
124
|
-
: 'png',
|
|
125
|
-
]
|
|
126
|
-
: null,
|
|
127
|
-
((_l = options.internalOptions) === null || _l === void 0 ? void 0 : _l.parallelEncoding) ? ['-i', '-'] : null,
|
|
128
|
-
]),
|
|
129
|
-
...(options.assetsInfo && assetPositions
|
|
130
|
-
? (0, assets_to_ffmpeg_inputs_1.assetsToFfmpegInputs)({
|
|
131
|
-
assets: assetPositions.map((a) => a.src),
|
|
132
|
-
isAudioOnly,
|
|
133
|
-
fps: options.fps,
|
|
134
|
-
frameCount: options.assetsInfo.assets.length,
|
|
135
|
-
})
|
|
136
|
-
: []),
|
|
137
|
-
encoderName
|
|
138
|
-
? // -c:v is the same as -vcodec as -codec:video
|
|
139
|
-
// and specified the video codec.
|
|
140
|
-
['-c:v', encoderName]
|
|
141
|
-
: // If only exporting audio, we drop the video explicitly
|
|
142
|
-
['-vn'],
|
|
143
|
-
...(((_m = options.internalOptions) === null || _m === void 0 ? void 0 : _m.preEncodedFileLocation)
|
|
135
|
+
...(((_j = options.internalOptions) === null || _j === void 0 ? void 0 : _j.preEncodedFileLocation)
|
|
136
|
+
? [['-i', (_k = options.internalOptions) === null || _k === void 0 ? void 0 : _k.preEncodedFileLocation]]
|
|
137
|
+
: [
|
|
138
|
+
['-f', 'image2'],
|
|
139
|
+
['-s', `${options.width}x${options.height}`],
|
|
140
|
+
['-start_number', String(options.assetsInfo.firstFrameIndex)],
|
|
141
|
+
['-i', options.assetsInfo.imageSequenceName],
|
|
142
|
+
]),
|
|
143
|
+
['-i', audio],
|
|
144
|
+
// -c:v is the same as -vcodec as -codec:video
|
|
145
|
+
// and specified the video codec.
|
|
146
|
+
['-c:v', encoderName],
|
|
147
|
+
...(((_l = options.internalOptions) === null || _l === void 0 ? void 0 : _l.preEncodedFileLocation)
|
|
144
148
|
? []
|
|
145
149
|
: [
|
|
146
150
|
proResProfileName ? ['-profile:v', proResProfileName] : null,
|
|
147
151
|
supportsCrf ? ['-crf', String(crf)] : null,
|
|
148
|
-
|
|
152
|
+
['-pix_fmt', pixelFormat],
|
|
149
153
|
// Without explicitly disabling auto-alt-ref,
|
|
150
154
|
// transparent WebM generation doesn't work
|
|
151
155
|
pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
|
|
152
|
-
|
|
156
|
+
['-b:v', '1M'],
|
|
153
157
|
]),
|
|
154
|
-
'-ar',
|
|
155
|
-
String(sample_rate_1.DEFAULT_SAMPLE_RATE),
|
|
156
|
-
// Stereo sound, even force mono to be stereo
|
|
157
|
-
// Otherwise mixing mono + stereo ends up speeding up the audio
|
|
158
|
-
'-ac',
|
|
159
|
-
'2',
|
|
160
158
|
audioCodecName ? ['-c:a', audioCodecName] : null,
|
|
161
|
-
complexFilterFlag,
|
|
162
|
-
// Ignore audio from image sequence
|
|
163
|
-
isAudioOnly ? null : ['-map', '0:v'],
|
|
164
159
|
// Ignore metadata that may come from remote media
|
|
165
|
-
|
|
160
|
+
['-map_metadata', '-1'],
|
|
166
161
|
options.force ? '-y' : null,
|
|
167
162
|
options.outputLocation,
|
|
168
163
|
];
|
|
@@ -171,34 +166,44 @@ const spawnFfmpeg = async (options) => {
|
|
|
171
166
|
console.log(ffmpegArgs);
|
|
172
167
|
}
|
|
173
168
|
const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
|
|
174
|
-
const task = (0, execa_1.default)((
|
|
175
|
-
cwd:
|
|
169
|
+
const task = (0, execa_1.default)((_m = options.ffmpegExecutable) !== null && _m !== void 0 ? _m : 'ffmpeg', ffmpegString, {
|
|
170
|
+
cwd: options.dir,
|
|
176
171
|
});
|
|
177
172
|
let ffmpegOutput = '';
|
|
178
|
-
|
|
173
|
+
let isFinished = false;
|
|
174
|
+
(_o = task.stderr) === null || _o === void 0 ? void 0 : _o.on('data', (data) => {
|
|
175
|
+
var _a;
|
|
179
176
|
const str = data.toString();
|
|
180
177
|
ffmpegOutput += str;
|
|
181
178
|
if (options.onProgress) {
|
|
182
179
|
const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(str);
|
|
180
|
+
// FFMPEG bug: In some cases, FFMPEG does hang after it is finished with it's job
|
|
181
|
+
// Example repo: https://github.com/JonnyBurger/ffmpeg-repro (access can be given upon request)
|
|
183
182
|
if (parsed !== undefined) {
|
|
184
|
-
|
|
183
|
+
// If two times in a row the finishing frame is logged, we quit the render
|
|
184
|
+
if (parsed === expectedFrames) {
|
|
185
|
+
if (isFinished) {
|
|
186
|
+
(_a = task.stdin) === null || _a === void 0 ? void 0 : _a.write('q');
|
|
187
|
+
}
|
|
188
|
+
else {
|
|
189
|
+
isFinished = true;
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
updateProgress(1, parsed);
|
|
185
193
|
}
|
|
186
194
|
}
|
|
187
195
|
});
|
|
188
|
-
return { task,
|
|
196
|
+
return { task, getLogs: () => ffmpegOutput };
|
|
189
197
|
};
|
|
190
198
|
exports.spawnFfmpeg = spawnFfmpeg;
|
|
191
199
|
const stitchFramesToVideo = async (options) => {
|
|
192
|
-
const { task,
|
|
200
|
+
const { task, getLogs } = await (0, exports.spawnFfmpeg)(options);
|
|
193
201
|
try {
|
|
194
202
|
await task;
|
|
195
203
|
}
|
|
196
204
|
catch (err) {
|
|
197
205
|
throw new Error(getLogs());
|
|
198
206
|
}
|
|
199
|
-
finally {
|
|
200
|
-
cleanup === null || cleanup === void 0 ? void 0 : cleanup();
|
|
201
|
-
}
|
|
202
207
|
};
|
|
203
208
|
exports.stitchFramesToVideo = stitchFramesToVideo;
|
|
204
209
|
//# sourceMappingURL=stitch-frames-to-video.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stitch-frames-to-video.js","sourceRoot":"","sources":["../src/stitch-frames-to-video.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"stitch-frames-to-video.js","sourceRoot":"","sources":["../src/stitch-frames-to-video.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { AssetVolume } from './assets/types';
|
|
2
|
-
export declare const stringifyFfmpegFilter: ({
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
trimRight: string;
|
|
2
|
+
export declare const stringifyFfmpegFilter: ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, durationInFrames, assetDuration, }: {
|
|
3
|
+
trimLeft: number;
|
|
4
|
+
trimRight: number;
|
|
6
5
|
channels: number;
|
|
7
6
|
startInVideo: number;
|
|
8
|
-
simulatenousAssets: number;
|
|
9
7
|
volume: AssetVolume;
|
|
10
8
|
fps: number;
|
|
9
|
+
durationInFrames: number;
|
|
11
10
|
playbackRate: number;
|
|
11
|
+
assetDuration: number | null;
|
|
12
12
|
}) => string;
|
|
13
13
|
//# sourceMappingURL=stringify-ffmpeg-filter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stringify-ffmpeg-filter.d.ts","sourceRoot":"","sources":["../src/stringify-ffmpeg-filter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"stringify-ffmpeg-filter.d.ts","sourceRoot":"","sources":["../src/stringify-ffmpeg-filter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAG3C,eAAO,MAAM,qBAAqB;cAWvB,MAAM;eACL,MAAM;cACP,MAAM;kBACF,MAAM;YACZ,WAAW;SACd,MAAM;sBACO,MAAM;kBACV,MAAM;mBACL,MAAM,GAAG,IAAI;YAqD5B,CAAC"}
|
|
@@ -4,31 +4,50 @@ exports.stringifyFfmpegFilter = void 0;
|
|
|
4
4
|
const remotion_1 = require("remotion");
|
|
5
5
|
const calculate_atempo_1 = require("./assets/calculate-atempo");
|
|
6
6
|
const ffmpeg_volume_expression_1 = require("./assets/ffmpeg-volume-expression");
|
|
7
|
-
const
|
|
8
|
-
|
|
7
|
+
const sample_rate_1 = require("./sample-rate");
|
|
8
|
+
const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, durationInFrames, assetDuration, }) => {
|
|
9
|
+
const startInVideoSeconds = startInVideo / fps;
|
|
9
10
|
const volumeFilter = (0, ffmpeg_volume_expression_1.ffmpegVolumeExpression)({
|
|
10
11
|
volume,
|
|
11
|
-
multiplier: simulatenousAssets,
|
|
12
12
|
startInVideo,
|
|
13
13
|
fps,
|
|
14
14
|
});
|
|
15
|
-
|
|
15
|
+
// Avoid setting filters if possible, as combining them can create noise
|
|
16
|
+
const chunkLength = durationInFrames / fps;
|
|
17
|
+
const actualTrimRight = assetDuration
|
|
18
|
+
? Math.min(trimRight, assetDuration)
|
|
19
|
+
: trimRight;
|
|
20
|
+
const padAtEnd = chunkLength - (actualTrimRight - trimLeft) - startInVideoSeconds;
|
|
21
|
+
return (`[0:a]` +
|
|
16
22
|
[
|
|
17
|
-
|
|
18
|
-
|
|
23
|
+
`aformat=sample_fmts=s32:sample_rates=${sample_rate_1.DEFAULT_SAMPLE_RATE}`,
|
|
24
|
+
// Order matters! First trim the audio
|
|
25
|
+
`atrim=${trimLeft.toFixed(6)}:${actualTrimRight.toFixed(6)}`,
|
|
26
|
+
// then set the tempo
|
|
27
|
+
(0, calculate_atempo_1.calculateATempo)(playbackRate),
|
|
19
28
|
// For n channels, we delay n + 1 channels.
|
|
20
29
|
// This is because `ffprobe` for some audio files reports the wrong amount
|
|
21
30
|
// of channels.
|
|
22
31
|
// This should be fine because FFMPEG documentation states:
|
|
23
32
|
// "Unused delays will be silently ignored."
|
|
24
33
|
// https://ffmpeg.org/ffmpeg-filters.html#adelay
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
34
|
+
startInVideoSeconds === 0
|
|
35
|
+
? null
|
|
36
|
+
: `adelay=${new Array(channels + 1)
|
|
37
|
+
.fill((startInVideoSeconds * 1000).toFixed(0))
|
|
38
|
+
.join('|')}`,
|
|
39
|
+
// set the volume if needed
|
|
40
|
+
volumeFilter.value === '1'
|
|
41
|
+
? null
|
|
42
|
+
: `volume=${volumeFilter.value}:eval=${volumeFilter.eval}`,
|
|
43
|
+
// Only in the end, we pad to the full length.
|
|
44
|
+
padAtEnd > 0.0000001
|
|
45
|
+
? 'apad=pad_len=' + Math.round(padAtEnd * sample_rate_1.DEFAULT_SAMPLE_RATE)
|
|
46
|
+
: null,
|
|
28
47
|
]
|
|
29
48
|
.filter(remotion_1.Internals.truthy)
|
|
30
49
|
.join(',') +
|
|
31
|
-
`[
|
|
50
|
+
`[a0]`);
|
|
32
51
|
};
|
|
33
52
|
exports.stringifyFfmpegFilter = stringifyFfmpegFilter;
|
|
34
53
|
//# sourceMappingURL=stringify-ffmpeg-filter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stringify-ffmpeg-filter.js","sourceRoot":"","sources":["../src/stringify-ffmpeg-filter.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AACnC,gEAA0D;AAC1D,gFAAyE;
|
|
1
|
+
{"version":3,"file":"stringify-ffmpeg-filter.js","sourceRoot":"","sources":["../src/stringify-ffmpeg-filter.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AACnC,gEAA0D;AAC1D,gFAAyE;AAEzE,+CAAkD;AAE3C,MAAM,qBAAqB,GAAG,CAAC,EACrC,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,MAAM,EACN,GAAG,EACH,YAAY,EACZ,gBAAgB,EAChB,aAAa,GAWb,EAAE,EAAE;IACJ,MAAM,mBAAmB,GAAG,YAAY,GAAG,GAAG,CAAC;IAE/C,MAAM,YAAY,GAAG,IAAA,iDAAsB,EAAC;QAC3C,MAAM;QACN,YAAY;QACZ,GAAG;KACH,CAAC,CAAC;IAEH,wEAAwE;IAExE,MAAM,WAAW,GAAG,gBAAgB,GAAG,GAAG,CAAC;IAE3C,MAAM,eAAe,GAAG,aAAa;QACpC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,aAAa,CAAC;QACpC,CAAC,CAAC,SAAS,CAAC;IAEb,MAAM,QAAQ,GACb,WAAW,GAAG,CAAC,eAAe,GAAG,QAAQ,CAAC,GAAG,mBAAmB,CAAC;IAElE,OAAO,CACN,OAAO;QACP;YACC,wCAAwC,iCAAmB,EAAE;YAC7D,sCAAsC;YACtC,SAAS,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC5D,qBAAqB;YACrB,IAAA,kCAAe,EAAC,YAAY,CAAC;YAC7B,2CAA2C;YAC3C,0EAA0E;YAC1E,eAAe;YACf,2DAA2D;YAC3D,4CAA4C;YAC5C,gDAAgD;YAChD,mBAAmB,KAAK,CAAC;gBACxB,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,UAAU,IAAI,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC;qBAChC,IAAI,CAAC,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;qBAC7C,IAAI,CAAC,GAAG,CAAC,EAAE;YACf,2BAA2B;YAC3B,YAAY,CAAC,KAAK,KAAK,GAAG;gBACzB,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,UAAU,YAAY,CAAC,KAAK,SAAS,YAAY,CAAC,IAAI,EAAE;YAC3D,8CAA8C;YAC9C,QAAQ,GAAG,SAAS;gBACnB,CAAC,CAAC,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,iCAAmB,CAAC;gBAC9D,CAAC,CAAC,IAAI;SACP;aACC,MAAM,CAAC,oBAAS,CAAC,MAAM,CAAC;aACxB,IAAI,CAAC,GAAG,CAAC;QACX,MAAM,CACN,CAAC;AACH,CAAC,CAAC;AAxEW,QAAA,qBAAqB,yBAwEhC"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import { SourceMapConsumer } from 'source-map';
|
|
2
1
|
import { UnsymbolicatedStackFrame } from './parse-browser-error-stack';
|
|
3
|
-
|
|
4
|
-
export declare type ScriptLine = {
|
|
2
|
+
declare type ScriptLine = {
|
|
5
3
|
lineNumber: number;
|
|
6
4
|
content: string;
|
|
7
5
|
highlight: boolean;
|
|
@@ -14,4 +12,5 @@ export declare type SymbolicatedStackFrame = {
|
|
|
14
12
|
originalScriptCode: ScriptLine[] | null;
|
|
15
13
|
};
|
|
16
14
|
export declare const symbolicateStackTrace: (frames: UnsymbolicatedStackFrame[]) => Promise<SymbolicatedStackFrame[]>;
|
|
15
|
+
export {};
|
|
17
16
|
//# sourceMappingURL=symbolicate-stacktrace.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"symbolicate-stacktrace.d.ts","sourceRoot":"","sources":["../src/symbolicate-stacktrace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"symbolicate-stacktrace.d.ts","sourceRoot":"","sources":["../src/symbolicate-stacktrace.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,wBAAwB,EAAC,MAAM,6BAA6B,CAAC;AAgErE,aAAK,UAAU,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,oBAAY,sBAAsB,GAAG;IACpC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,kBAAkB,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;CACxC,CAAC;AAmCF,eAAO,MAAM,qBAAqB,WACzB,wBAAwB,EAAE,KAChC,QAAQ,sBAAsB,EAAE,CAmDlC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.symbolicateStackTrace =
|
|
3
|
+
exports.symbolicateStackTrace = void 0;
|
|
4
4
|
const remotion_1 = require("remotion");
|
|
5
5
|
const source_map_1 = require("source-map");
|
|
6
6
|
const read_file_1 = require("./assets/read-file");
|
|
@@ -38,7 +38,6 @@ async function getSourceMap(fileUri, fileContents) {
|
|
|
38
38
|
const obj = await fetchUrl(url);
|
|
39
39
|
return new source_map_1.SourceMapConsumer(obj);
|
|
40
40
|
}
|
|
41
|
-
exports.getSourceMap = getSourceMap;
|
|
42
41
|
const fetchUrl = async (url) => {
|
|
43
42
|
const res = await (0, read_file_1.readFile)(url);
|
|
44
43
|
return new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"symbolicate-stacktrace.js","sourceRoot":"","sources":["../src/symbolicate-stacktrace.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AACnC,2CAA2D;AAC3D,kDAA4C;AAG5C,SAAS,mBAAmB,CAAC,YAAoB;IAChD,MAAM,KAAK,GAAG,6CAA6C,CAAC;IAC5D,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,SAAS;QACR,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtC,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE;YACxC,MAAM;SACN;QAED,KAAK,GAAG,IAAI,CAAC;KACb;IAED,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,CAAC,CAAC,CAAA,EAAE;QAChB,OAAO,IAAI,CAAC;KACZ;IAED,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC5B,CAAC;
|
|
1
|
+
{"version":3,"file":"symbolicate-stacktrace.js","sourceRoot":"","sources":["../src/symbolicate-stacktrace.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":"AAeA,eAAO,MAAM,MAAM,QAAS,MAAM,WAYjC,CAAC"}
|
package/dist/tmp-dir.js
CHANGED
|
@@ -1,11 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
2
21
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
22
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
23
|
};
|
|
5
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
25
|
exports.tmpDir = void 0;
|
|
7
|
-
const fs_1 =
|
|
8
|
-
const fs_2 = require("fs");
|
|
26
|
+
const fs_1 = __importStar(require("fs"));
|
|
9
27
|
const os_1 = __importDefault(require("os"));
|
|
10
28
|
const path_1 = __importDefault(require("path"));
|
|
11
29
|
const alphabet = 'abcdefghijklmnopqrstuvwxyz0123456789';
|
|
@@ -26,7 +44,7 @@ const tmpDir = (str) => {
|
|
|
26
44
|
force: true,
|
|
27
45
|
});
|
|
28
46
|
}
|
|
29
|
-
(0,
|
|
47
|
+
(0, fs_1.mkdirSync)(newDir);
|
|
30
48
|
return newDir;
|
|
31
49
|
};
|
|
32
50
|
exports.tmpDir = tmpDir;
|
package/dist/tmp-dir.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tmp-dir.js","sourceRoot":"","sources":["../src/tmp-dir.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tmp-dir.js","sourceRoot":"","sources":["../src/tmp-dir.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAAiC;AACjC,4CAAoB;AACpB,gDAAwB;AAExB,MAAM,QAAQ,GAAG,sCAAsC,CAAC;AAExD,MAAM,UAAU,GAAG,GAAW,EAAE;IAC/B,OAAO,IAAI,KAAK,CAAC,EAAE,CAAC;SAClB,IAAI,CAAC,CAAC,CAAC;SACP,GAAG,CAAC,GAAG,EAAE;QACT,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAC;AACZ,CAAC,CAAC;AAEK,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE;;IACrC,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,GAAG,GAAG,UAAU,EAAE,CAAC,CAAC;IAE1D,IAAI,YAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QAC1B,CAAC,MAAA,YAAE,CAAC,MAAM,mCAAI,YAAE,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE;YACnC,SAAS,EAAE,IAAI;YACf,KAAK,EAAE,IAAI;SACX,CAAC,CAAC;KACH;IAED,IAAA,cAAS,EAAC,MAAM,CAAC,CAAC;IAClB,OAAO,MAAM,CAAC;AACf,CAAC,CAAC;AAZW,QAAA,MAAM,UAYjB"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
1
|
export declare const binaryExists: (name: 'ffmpeg' | 'brew', localFFmpeg: string | null) => Promise<boolean>;
|
|
2
|
-
export declare const isHomebrewInstalled: () => Promise<boolean>;
|
|
3
2
|
export declare const validateFfmpeg: (customFfmpegBinary: string | null) => Promise<void>;
|
|
4
3
|
//# sourceMappingURL=validate-ffmpeg.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-ffmpeg.d.ts","sourceRoot":"","sources":["../src/validate-ffmpeg.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY,SAClB,QAAQ,GAAG,MAAM,eACV,MAAM,GAAG,IAAI,qBA2B1B,CAAC;
|
|
1
|
+
{"version":3,"file":"validate-ffmpeg.d.ts","sourceRoot":"","sources":["../src/validate-ffmpeg.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY,SAClB,QAAQ,GAAG,MAAM,eACV,MAAM,GAAG,IAAI,qBA2B1B,CAAC;AAMF,eAAO,MAAM,cAAc,uBACN,MAAM,GAAG,IAAI,KAC/B,QAAQ,IAAI,CAsCd,CAAC"}
|
package/dist/validate-ffmpeg.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.validateFfmpeg = exports.
|
|
6
|
+
exports.validateFfmpeg = exports.binaryExists = void 0;
|
|
7
7
|
const execa_1 = __importDefault(require("execa"));
|
|
8
8
|
const fs_1 = require("fs");
|
|
9
9
|
const os_1 = __importDefault(require("os"));
|
|
@@ -39,7 +39,6 @@ exports.binaryExists = binaryExists;
|
|
|
39
39
|
const isHomebrewInstalled = () => {
|
|
40
40
|
return (0, exports.binaryExists)('brew', null);
|
|
41
41
|
};
|
|
42
|
-
exports.isHomebrewInstalled = isHomebrewInstalled;
|
|
43
42
|
const validateFfmpeg = async (customFfmpegBinary) => {
|
|
44
43
|
const ffmpegExists = await (0, exports.binaryExists)('ffmpeg', customFfmpegBinary);
|
|
45
44
|
if (!ffmpegExists) {
|
|
@@ -49,7 +48,7 @@ const validateFfmpeg = async (customFfmpegBinary) => {
|
|
|
49
48
|
process.exit(1);
|
|
50
49
|
}
|
|
51
50
|
console.error('It looks like FFMPEG is not installed');
|
|
52
|
-
if (os_1.default.platform() === 'darwin' && (await
|
|
51
|
+
if (os_1.default.platform() === 'darwin' && (await isHomebrewInstalled())) {
|
|
53
52
|
console.error('Run `brew install ffmpeg` to install ffmpeg');
|
|
54
53
|
}
|
|
55
54
|
else if (os_1.default.platform() === 'win32') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-ffmpeg.js","sourceRoot":"","sources":["../src/validate-ffmpeg.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,2BAA4B;AAC5B,4CAAoB;AACpB,uCAAmC;AAEnC,MAAM,SAAS,GAA6B,EAAE,CAAC;AAExC,MAAM,YAAY,GAAG,KAAK,EAChC,IAAuB,EACvB,WAA0B,EACzB,EAAE;IACH,IAAI,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,WAAW,EAAE;QAC3C,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC;KACvB;IAED,IAAI,IAAI,KAAK,QAAQ,IAAI,WAAW,EAAE;QACrC,IAAI;YACH,IAAA,aAAQ,EAAC,WAAW,CAAC,CAAC;YACtB,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;SACvB;QAAC,OAAO,GAAG,EAAE;YACb,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;SACxB;QAED,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC;KACvB;IAED,MAAM,KAAK,GAAG,YAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;IACxC,IAAI;QACH,MAAM,IAAA,eAAK,EAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3B,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC;KACZ;IAAC,OAAO,GAAG,EAAE;QACb,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;QACxB,OAAO,KAAK,CAAC;KACb;AACF,CAAC,CAAC;AA7BW,QAAA,YAAY,gBA6BvB;
|
|
1
|
+
{"version":3,"file":"validate-ffmpeg.js","sourceRoot":"","sources":["../src/validate-ffmpeg.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-scale.d.ts","sourceRoot":"","sources":["../src/validate-scale.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,UAAW,OAAO,
|
|
1
|
+
{"version":3,"file":"validate-scale.d.ts","sourceRoot":"","sources":["../src/validate-scale.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,UAAW,OAAO,SA8B3C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-scale.js","sourceRoot":"","sources":["../src/validate-scale.ts"],"names":[],"mappings":";;;AAAO,MAAM,aAAa,GAAG,CAAC,KAAc,EAAE,EAAE;IAC/C,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;QACjC,OAAO;KACP;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC9B,MAAM,IAAI,KAAK,CACd,iDAAiD;YAChD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YACrB,GAAG,CACJ,CAAC;KACF;IAED,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;KACzD;IAED,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,kCAAkC,KAAK,EAAE,CAAC,CAAC;KAC3D;IAED,IAAI,KAAK,IAAI,CAAC,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,yCAAyC,KAAK,EAAE,CAAC,CAAC;KAClE;IAED,IAAI,KAAK,GAAG,EAAE,EAAE;QACf,MAAM,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"validate-scale.js","sourceRoot":"","sources":["../src/validate-scale.ts"],"names":[],"mappings":";;;AAAO,MAAM,aAAa,GAAG,CAAC,KAAc,EAAE,EAAE;IAC/C,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;QACjC,OAAO;KACP;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC9B,MAAM,IAAI,KAAK,CACd,iDAAiD;YAChD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YACrB,GAAG,CACJ,CAAC;KACF;IAED,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;KACzD;IAED,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,kCAAkC,KAAK,EAAE,CAAC,CAAC;KAC3D;IAED,IAAI,KAAK,IAAI,CAAC,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,yCAAyC,KAAK,EAAE,CAAC,CAAC;KAClE;IAED,IAAI,KAAK,GAAG,EAAE,EAAE;QACf,MAAM,IAAI,KAAK,CACd,oDAAoD,KAAK,EAAE,CAC3D,CAAC;KACF;AACF,CAAC,CAAC;AA9BW,QAAA,aAAa,iBA8BxB"}
|