@remotion/renderer 3.0.3 → 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 +2 -3
- 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 +1 -2
- 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 +1 -1
- package/dist/create-ffmpeg-merge-filter.d.ts.map +1 -1
- package/dist/create-ffmpeg-merge-filter.js +0 -5
- package/dist/create-ffmpeg-merge-filter.js.map +1 -1
- 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/delete-directory.d.ts.map +1 -1
- package/dist/delete-directory.js +7 -2
- package/dist/delete-directory.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-extension-from-codec.d.ts +1 -1
- package/dist/index.d.ts +1 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +0 -2
- package/dist/index.js.map +1 -1
- package/dist/merge-audio-track.d.ts +2 -2
- package/dist/merge-audio-track.d.ts.map +1 -1
- package/dist/merge-audio-track.js +49 -11
- package/dist/merge-audio-track.js.map +1 -1
- 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 +5 -4
- package/dist/preprocess-audio-track.d.ts.map +1 -1
- package/dist/preprocess-audio-track.js +28 -17
- package/dist/preprocess-audio-track.js.map +1 -1
- package/dist/prespawn-ffmpeg.d.ts +2 -1
- package/dist/prespawn-ffmpeg.d.ts.map +1 -1
- package/dist/prespawn-ffmpeg.js +0 -15
- package/dist/prespawn-ffmpeg.js.map +1 -1
- 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 -8
- package/dist/render-frames.d.ts.map +1 -1
- package/dist/render-frames.js +2 -3
- package/dist/render-frames.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 +5 -5
- package/dist/stitch-frames-to-video.d.ts.map +1 -1
- package/dist/stitch-frames-to-video.js +94 -77
- 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 -10
- 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
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { FfmpegExecutable } from 'remotion';
|
|
2
|
+
export declare const createSilentAudio: ({ ffmpegExecutable, numberOfSeconds, outName, }: {
|
|
3
|
+
ffmpegExecutable: FfmpegExecutable;
|
|
4
|
+
numberOfSeconds: number;
|
|
5
|
+
outName: string;
|
|
6
|
+
}) => Promise<void>;
|
|
7
|
+
//# sourceMappingURL=create-silent-audio.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-silent-audio.d.ts","sourceRoot":"","sources":["../src/create-silent-audio.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAG1C,eAAO,MAAM,iBAAiB;sBAKX,gBAAgB;qBACjB,MAAM;aACd,MAAM;mBAef,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.createSilentAudio = void 0;
|
|
7
|
+
const execa_1 = __importDefault(require("execa"));
|
|
8
|
+
const sample_rate_1 = require("./sample-rate");
|
|
9
|
+
const createSilentAudio = async ({ ffmpegExecutable, numberOfSeconds, outName, }) => {
|
|
10
|
+
await (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', [
|
|
11
|
+
'-f',
|
|
12
|
+
'lavfi',
|
|
13
|
+
'-i',
|
|
14
|
+
`anullsrc=r=${sample_rate_1.DEFAULT_SAMPLE_RATE}`,
|
|
15
|
+
'-c:a',
|
|
16
|
+
'pcm_s16le',
|
|
17
|
+
'-t',
|
|
18
|
+
String(numberOfSeconds),
|
|
19
|
+
'-ar',
|
|
20
|
+
String(sample_rate_1.DEFAULT_SAMPLE_RATE),
|
|
21
|
+
outName,
|
|
22
|
+
]);
|
|
23
|
+
};
|
|
24
|
+
exports.createSilentAudio = createSilentAudio;
|
|
25
|
+
//# sourceMappingURL=create-silent-audio.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-silent-audio.js","sourceRoot":"","sources":["../src/create-silent-audio.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,+CAAkD;AAE3C,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACvC,gBAAgB,EAChB,eAAe,EACf,OAAO,GAKP,EAAE,EAAE;IACJ,MAAM,IAAA,eAAK,EAAC,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,QAAQ,EAAE;QACzC,IAAI;QACJ,OAAO;QACP,IAAI;QACJ,cAAc,iCAAmB,EAAE;QACnC,MAAM;QACN,WAAW;QACX,IAAI;QACJ,MAAM,CAAC,eAAe,CAAC;QACvB,KAAK;QACL,MAAM,CAAC,iCAAmB,CAAC;QAC3B,OAAO;KACP,CAAC,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,iBAAiB,qBAsB5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete-directory.d.ts","sourceRoot":"","sources":["../src/delete-directory.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,cAAqB,MAAM,KAAG,QAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"delete-directory.d.ts","sourceRoot":"","sources":["../src/delete-directory.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,cAAqB,MAAM,KAAG,QAAQ,IAAI,CAmBrE,CAAC"}
|
package/dist/delete-directory.js
CHANGED
|
@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.deleteDirectory = void 0;
|
|
7
|
-
const fs_1 = __importDefault(require("fs"));
|
|
8
7
|
const execa_1 = __importDefault(require("execa"));
|
|
8
|
+
const fs_1 = __importDefault(require("fs"));
|
|
9
9
|
const is_serve_url_1 = require("./is-serve-url");
|
|
10
10
|
const deleteDirectory = async (directory) => {
|
|
11
11
|
var _a;
|
|
@@ -16,7 +16,12 @@ const deleteDirectory = async (directory) => {
|
|
|
16
16
|
// We use del before to remove all files inside the directories otherwise
|
|
17
17
|
// rmdir will throw an error.
|
|
18
18
|
await (0, execa_1.default)('cmd', ['/c', 'del', '/f', '/s', '/q', directory]);
|
|
19
|
-
|
|
19
|
+
try {
|
|
20
|
+
await (0, execa_1.default)('cmd', ['/c', 'rmdir', '/s', '/q', directory]);
|
|
21
|
+
}
|
|
22
|
+
catch (err) {
|
|
23
|
+
// Is not a directory
|
|
24
|
+
}
|
|
20
25
|
}
|
|
21
26
|
else {
|
|
22
27
|
await ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(directory, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete-directory.js","sourceRoot":"","sources":["../src/delete-directory.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,
|
|
1
|
+
{"version":3,"file":"delete-directory.js","sourceRoot":"","sources":["../src/delete-directory.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AACpB,iDAA0C;AAEnC,MAAM,eAAe,GAAG,KAAK,EAAE,SAAiB,EAAiB,EAAE;;IACzE,IAAI,IAAA,yBAAU,EAAC,SAAS,CAAC,EAAE;QAC1B,OAAO;KACP;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QACjC,yEAAyE;QACzE,6BAA6B;QAC7B,MAAM,IAAA,eAAK,EAAC,KAAK,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QAC/D,IAAI;YACH,MAAM,IAAA,eAAK,EAAC,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;SAC3D;QAAC,OAAO,GAAG,EAAE;YACb,qBAAqB;SACrB;KACD;SAAM;QACN,MAAM,CAAC,MAAA,YAAE,CAAC,QAAQ,CAAC,EAAE,mCAAI,YAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE;YACtD,SAAS,EAAE,IAAI;SACf,CAAC,CAAC;KACH;AACF,CAAC,CAAC;AAnBW,QAAA,eAAe,mBAmB1B"}
|
|
@@ -13,7 +13,6 @@ export declare class ErrorWithStackFrame extends Error {
|
|
|
13
13
|
delayRenderCall: SymbolicatedStackFrame[] | null;
|
|
14
14
|
});
|
|
15
15
|
}
|
|
16
|
-
export declare const removeDelayRenderStack: (message: string) => string;
|
|
17
16
|
export declare const handleJavascriptException: ({ page, onError, frame, }: {
|
|
18
17
|
page: Page;
|
|
19
18
|
frame: number | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-javascript-exception.d.ts","sourceRoot":"","sources":["../../src/error-handling/handle-javascript-exception.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,IAAI,EAAW,MAAM,gBAAgB,CAAC;AAG1D,OAAO,EAAC,sBAAsB,EAAC,MAAM,2BAA2B,CAAC;AAGjE,qBAAa,mBAAoB,SAAQ,KAAK;IAC7C,uBAAuB,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC;IACzD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC;gBAErC,EACX,OAAO,EACP,uBAAuB,EACvB,KAAK,EACL,IAAI,EACJ,eAAe,GACf,EAAE;QACF,OAAO,EAAE,MAAM,CAAC;QAChB,uBAAuB,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC;QACzD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,eAAe,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC;KACjD;CAOD;
|
|
1
|
+
{"version":3,"file":"handle-javascript-exception.d.ts","sourceRoot":"","sources":["../../src/error-handling/handle-javascript-exception.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,IAAI,EAAW,MAAM,gBAAgB,CAAC;AAG1D,OAAO,EAAC,sBAAsB,EAAC,MAAM,2BAA2B,CAAC;AAGjE,qBAAa,mBAAoB,SAAQ,KAAK;IAC7C,uBAAuB,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC;IACzD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC;gBAErC,EACX,OAAO,EACP,uBAAuB,EACvB,KAAK,EACL,IAAI,EACJ,eAAe,GACf,EAAE;QACF,OAAO,EAAE,MAAM,CAAC;QAChB,uBAAuB,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC;QACzD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,eAAe,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC;KACjD;CAOD;AAuCD,eAAO,MAAM,yBAAyB;UAK/B,IAAI;WACH,MAAM,GAAG,IAAI;mBACL,KAAK,KAAK,IAAI;gBAmC7B,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.handleJavascriptException = exports.
|
|
3
|
+
exports.handleJavascriptException = exports.ErrorWithStackFrame = void 0;
|
|
4
4
|
const remotion_1 = require("remotion");
|
|
5
5
|
const symbolicateable_error_1 = require("./symbolicateable-error");
|
|
6
6
|
class ErrorWithStackFrame extends Error {
|
|
@@ -32,7 +32,6 @@ const removeDelayRenderStack = (message) => {
|
|
|
32
32
|
}
|
|
33
33
|
return message.substring(0, index);
|
|
34
34
|
};
|
|
35
|
-
exports.removeDelayRenderStack = removeDelayRenderStack;
|
|
36
35
|
const callFrameToStackFrame = (callFrame) => {
|
|
37
36
|
return {
|
|
38
37
|
columnNumber: callFrame.columnNumber,
|
|
@@ -48,14 +47,14 @@ const handleJavascriptException = ({ page, onError, frame, }) => {
|
|
|
48
47
|
const rawErrorMessage = (_a = exception.exceptionDetails.exception) === null || _a === void 0 ? void 0 : _a.description;
|
|
49
48
|
const cleanErrorMessage = cleanUpErrorMessage(exception);
|
|
50
49
|
if (!exception.exceptionDetails.stackTrace) {
|
|
51
|
-
const err = new Error(
|
|
50
|
+
const err = new Error(removeDelayRenderStack(cleanErrorMessage));
|
|
52
51
|
err.stack = rawErrorMessage;
|
|
53
52
|
onError(err);
|
|
54
53
|
return;
|
|
55
54
|
}
|
|
56
55
|
const errorType = (_b = exception.exceptionDetails.exception) === null || _b === void 0 ? void 0 : _b.className;
|
|
57
56
|
const symbolicatedErr = new symbolicateable_error_1.SymbolicateableError({
|
|
58
|
-
message:
|
|
57
|
+
message: removeDelayRenderStack(cleanErrorMessage),
|
|
59
58
|
stackFrame: exception.exceptionDetails.stackTrace
|
|
60
59
|
.callFrames.map((f) => callFrameToStackFrame(f)),
|
|
61
60
|
frame,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-javascript-exception.js","sourceRoot":"","sources":["../../src/error-handling/handle-javascript-exception.ts"],"names":[],"mappings":";;;AACA,uCAAmC;AAGnC,mEAA6D;AAE7D,MAAa,mBAAoB,SAAQ,KAAK;IAM7C,YAAY,EACX,OAAO,EACP,uBAAuB,EACvB,KAAK,EACL,IAAI,EACJ,eAAe,GAOf;QACA,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;QACvD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACxC,CAAC;CACD;AAzBD,kDAyBC;AAED,MAAM,mBAAmB,GAAG,CAC3B,SAAgD,EAC/C,EAAE;;IACH,IAAI,YAAY,GAAG,MAAA,SAAS,CAAC,gBAAgB,CAAC,SAAS,0CACpD,WAAqB,CAAC;IACzB,MAAM,SAAS,GAAG,MAAA,SAAS,CAAC,gBAAgB,CAAC,SAAS,0CAAE,SAAmB,CAAC;IAC5E,MAAM,MAAM,GAAG,GAAG,SAAS,IAAI,CAAC;IAEhC,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;QACpC,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;KACrD;IAED,MAAM,MAAM,GAAG,MAAA,MAAA,SAAS,CAAC,gBAAgB,CAAC,UAAU,0CAAE,UAAU,CAAC,MAAM,mCAAI,CAAC,CAAC;IAC7E,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"handle-javascript-exception.js","sourceRoot":"","sources":["../../src/error-handling/handle-javascript-exception.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ffmpeg-filter-file.d.ts","sourceRoot":"","sources":["../src/ffmpeg-filter-file.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,oBAAoB,kBAAyB,MAAM;;;EAW/D,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// While an FFMPEG filter can be passed directly, if it's too long
|
|
3
|
+
// we run into Windows command length limits.
|
|
4
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
6
|
+
};
|
|
7
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
+
exports.makeFfmpegFilterFile = void 0;
|
|
9
|
+
const fs_1 = __importDefault(require("fs"));
|
|
10
|
+
const path_1 = __importDefault(require("path"));
|
|
11
|
+
const delete_directory_1 = require("./delete-directory");
|
|
12
|
+
const tmp_dir_1 = require("./tmp-dir");
|
|
13
|
+
const makeFfmpegFilterFile = async (complexFilter) => {
|
|
14
|
+
const tempPath = (0, tmp_dir_1.tmpDir)('remotion-complex-filter');
|
|
15
|
+
const filterFile = path_1.default.join(tempPath, 'complex-filter.txt');
|
|
16
|
+
await fs_1.default.promises.writeFile(filterFile, complexFilter);
|
|
17
|
+
return {
|
|
18
|
+
file: filterFile,
|
|
19
|
+
cleanup: () => {
|
|
20
|
+
(0, delete_directory_1.deleteDirectory)(filterFile);
|
|
21
|
+
},
|
|
22
|
+
};
|
|
23
|
+
};
|
|
24
|
+
exports.makeFfmpegFilterFile = makeFfmpegFilterFile;
|
|
25
|
+
//# sourceMappingURL=ffmpeg-filter-file.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ffmpeg-filter-file.js","sourceRoot":"","sources":["../src/ffmpeg-filter-file.ts"],"names":[],"mappings":";AAAA,kEAAkE;AAClE,6CAA6C;;;;;;AAE7C,4CAAoB;AACpB,gDAAwB;AACxB,yDAAmD;AACnD,uCAAiC;AAE1B,MAAM,oBAAoB,GAAG,KAAK,EAAE,aAAqB,EAAE,EAAE;IACnE,MAAM,QAAQ,GAAG,IAAA,gBAAM,EAAC,yBAAyB,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;IAC7D,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IAEvD,OAAO;QACN,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,GAAG,EAAE;YACb,IAAA,kCAAe,EAAC,UAAU,CAAC,CAAC;QAC7B,CAAC;KACD,CAAC;AACH,CAAC,CAAC;AAXW,QAAA,oBAAoB,wBAW/B"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Codec } from 'remotion';
|
|
2
|
-
export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "aac" | "wav" | "
|
|
2
|
+
export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "aac" | "wav" | "mp4" | "mkv" | "mov" | "webm";
|
|
3
3
|
//# sourceMappingURL=get-extension-from-codec.d.ts.map
|
package/dist/index.d.ts
CHANGED
|
@@ -35,12 +35,6 @@ export declare const RenderInternals: {
|
|
|
35
35
|
port: number;
|
|
36
36
|
close: () => Promise<void>;
|
|
37
37
|
}>;
|
|
38
|
-
addSilentAudioIfNecessary: ({ durationInFrames, fps, outputLocation, chunkCodec, }: {
|
|
39
|
-
outputLocation: string;
|
|
40
|
-
durationInFrames: number;
|
|
41
|
-
fps: number;
|
|
42
|
-
chunkCodec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv";
|
|
43
|
-
}) => Promise<void>;
|
|
44
38
|
validateEvenDimensionsWithCodec: ({ width, height, codec, scale, }: {
|
|
45
39
|
width: number;
|
|
46
40
|
height: number;
|
|
@@ -49,8 +43,7 @@ export declare const RenderInternals: {
|
|
|
49
43
|
}) => void;
|
|
50
44
|
normalizeServeUrl: (unnormalized: string) => string;
|
|
51
45
|
spawnFfmpeg: (options: import("./stitch-frames-to-video").StitcherOptions) => Promise<{
|
|
52
|
-
task:
|
|
53
|
-
cleanup: () => void;
|
|
46
|
+
task: Promise<unknown>;
|
|
54
47
|
getLogs: () => string;
|
|
55
48
|
}>;
|
|
56
49
|
getFileExtensionFromCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv", type: "chunk" | "final") => "mp3" | "aac" | "wav" | "mp4" | "mkv" | "mov" | "webm";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,oBAAoB,EAAC,MAAM,wCAAwC,CAAC;AAwB5E,YAAY,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAC,mBAAmB,EAAC,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,YAAY,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EACN,WAAW,EACX,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,GACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,eAAe,EAAE,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAExD,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4B3B,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RenderInternals = exports.stitchFramesToVideo = exports.renderStill = exports.renderMedia = exports.renderFrames = exports.openBrowser = exports.getCompositions = exports.ErrorWithStackFrame = exports.combineVideos = void 0;
|
|
4
|
-
const add_silent_audio_if_necessary_1 = require("./add-silent-audio-if-necessary");
|
|
5
4
|
const download_file_1 = require("./assets/download-file");
|
|
6
5
|
const delete_directory_1 = require("./delete-directory");
|
|
7
6
|
const ensure_output_directory_1 = require("./ensure-output-directory");
|
|
@@ -51,7 +50,6 @@ exports.RenderInternals = {
|
|
|
51
50
|
binaryExists: validate_ffmpeg_1.binaryExists,
|
|
52
51
|
getFfmpegBuildInfo: ffmpeg_flags_1.getFfmpegBuildInfo,
|
|
53
52
|
serveStatic: serve_static_1.serveStatic,
|
|
54
|
-
addSilentAudioIfNecessary: add_silent_audio_if_necessary_1.addSilentAudioIfNecessary,
|
|
55
53
|
validateEvenDimensionsWithCodec: validate_even_dimensions_with_codec_1.validateEvenDimensionsWithCodec,
|
|
56
54
|
normalizeServeUrl: normalize_serve_url_1.normalizeServeUrl,
|
|
57
55
|
spawnFfmpeg: stitch_frames_to_video_1.spawnFfmpeg,
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,0DAAoD;AACpD,yDAAmD;AACnD,uEAAgE;AAChE,0EAAoE;AACpE,kFAA4E;AAC5E,iDAIwB;AACxB,uDAAuD;AACvD,mFAA0E;AAC1E,yEAAqE;AACrE,+DAAwD;AACxD,iFAAkE;AAClE,iDAA0C;AAC1C,yEAAoE;AACpE,+DAAwD;AACxD,iDAA+C;AAC/C,2EAAuD;AACvD,qDAA+C;AAC/C,iDAA2C;AAC3C,qEAAqD;AACrD,uCAAiC;AACjC,+FAAsF;AACtF,uDAA+D;AAC/D,6EAAsE;AACtE,qDAA+C;AAG/C,mDAA+C;AAAvC,+GAAA,aAAa,OAAA;AACrB,4FAAiF;AAAzE,kIAAA,mBAAmB,OAAA;AAE3B,uDAAmD;AAA3C,mHAAA,eAAe,OAAA;AACvB,+CAA2C;AAAnC,2GAAA,WAAW,OAAA;AAEnB,iDAA6C;AAArC,6GAAA,YAAY,OAAA;AACpB,+CAKwB;AAJvB,2GAAA,WAAW,OAAA;AAKZ,+CAA2C;AAAnC,2GAAA,WAAW,OAAA;AACnB,mEAA8E;AAArD,6HAAA,mBAAmB,OAAA;AAI/B,QAAA,eAAe,GAAG;IAC9B,kBAAkB,EAAlB,iDAAkB;IAClB,gBAAgB,EAAhB,+BAAgB;IAChB,oBAAoB,EAApB,sCAAoB;IACpB,gBAAgB,EAAhB,+BAAgB;IAChB,cAAc,EAAd,gCAAc;IACd,YAAY,EAAZ,8BAAY;IACZ,kBAAkB,EAAlB,iCAAkB;IAClB,WAAW,EAAX,0BAAW;IACX,+BAA+B,EAA/B,qEAA+B;IAC/B,iBAAiB,EAAjB,uCAAiB;IACjB,WAAW,EAAX,oCAAW;IACX,yBAAyB,EAAzB,oDAAyB;IACzB,wBAAwB,EAAxB,mDAAwB;IACxB,MAAM,EAAN,gBAAM;IACN,eAAe,EAAf,kCAAe;IACf,aAAa,EAAb,8BAAa;IACb,UAAU,EAAV,yBAAU;IACV,qBAAqB,EAArB,+CAAqB;IACrB,iBAAiB,EAAjB,uCAAiB;IACjB,wBAAwB,EAAxB,qDAAwB;IACxB,YAAY,EAAZ,4BAAY;IACZ,aAAa,EAAb,8BAAa;IACb,eAAe,EAAf,8BAAe;IACf,UAAU,EAAV,sCAAU;IACV,gBAAgB,EAAhB,oCAAgB;IAChB,oBAAoB,EAApB,4CAAoB;IACpB,yBAAyB,EAAzB,yDAAyB;CACzB,CAAC"}
|
|
@@ -3,8 +3,8 @@ declare type Options = {
|
|
|
3
3
|
ffmpegExecutable: FfmpegExecutable;
|
|
4
4
|
files: string[];
|
|
5
5
|
outName: string;
|
|
6
|
-
|
|
6
|
+
numberOfSeconds: number;
|
|
7
7
|
};
|
|
8
|
-
export declare const mergeAudioTrack: (
|
|
8
|
+
export declare const mergeAudioTrack: (options: Options) => Promise<void>;
|
|
9
9
|
export {};
|
|
10
10
|
//# sourceMappingURL=merge-audio-track.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-audio-track.d.ts","sourceRoot":"","sources":["../src/merge-audio-track.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge-audio-track.d.ts","sourceRoot":"","sources":["../src/merge-audio-track.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,gBAAgB,EAAY,MAAM,UAAU,CAAC;AAQrD,aAAK,OAAO,GAAG;IACd,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;CACxB,CAAC;AAyEF,eAAO,MAAM,eAAe,YAAa,OAAO,kBAE/C,CAAC"}
|
|
@@ -5,31 +5,69 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.mergeAudioTrack = void 0;
|
|
7
7
|
const execa_1 = __importDefault(require("execa"));
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
8
9
|
const remotion_1 = require("remotion");
|
|
10
|
+
const chunk_1 = require("./chunk");
|
|
11
|
+
const convert_to_pcm_1 = require("./convert-to-pcm");
|
|
9
12
|
const create_ffmpeg_complex_filter_1 = require("./create-ffmpeg-complex-filter");
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
const
|
|
13
|
-
|
|
13
|
+
const create_silent_audio_1 = require("./create-silent-audio");
|
|
14
|
+
const p_limit_1 = require("./p-limit");
|
|
15
|
+
const tmp_dir_1 = require("./tmp-dir");
|
|
16
|
+
const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numberOfSeconds, }) => {
|
|
17
|
+
if (files.length === 0) {
|
|
18
|
+
await (0, create_silent_audio_1.createSilentAudio)({
|
|
19
|
+
outName,
|
|
20
|
+
ffmpegExecutable,
|
|
21
|
+
numberOfSeconds,
|
|
22
|
+
});
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
if (files.length === 1) {
|
|
26
|
+
await (0, convert_to_pcm_1.convertToPcm)({
|
|
27
|
+
outName,
|
|
28
|
+
ffmpegExecutable,
|
|
29
|
+
input: files[0],
|
|
30
|
+
});
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
// FFMPEG has a limit of 64 tracks that can be merged at once
|
|
34
|
+
if (files.length > 64) {
|
|
35
|
+
const chunked = (0, chunk_1.chunk)(files, 10);
|
|
36
|
+
const tempPath = (0, tmp_dir_1.tmpDir)('remotion-large-audio-mixing');
|
|
37
|
+
const chunkNames = await Promise.all(chunked.map(async (chunkFiles, i) => {
|
|
38
|
+
const chunkOutname = path_1.default.join(tempPath, `chunk-${i}.wav`);
|
|
39
|
+
await (0, exports.mergeAudioTrack)({
|
|
40
|
+
ffmpegExecutable,
|
|
41
|
+
files: chunkFiles,
|
|
42
|
+
numberOfSeconds,
|
|
43
|
+
outName: chunkOutname,
|
|
44
|
+
});
|
|
45
|
+
return chunkOutname;
|
|
46
|
+
}));
|
|
47
|
+
return (0, exports.mergeAudioTrack)({
|
|
48
|
+
ffmpegExecutable,
|
|
49
|
+
files: chunkNames,
|
|
50
|
+
numberOfSeconds,
|
|
51
|
+
outName,
|
|
52
|
+
});
|
|
53
|
+
}
|
|
14
54
|
const { complexFilterFlag: mergeFilter, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)(files.length);
|
|
15
55
|
const args = [
|
|
16
56
|
...files.map((f) => ['-i', f]),
|
|
17
57
|
mergeFilter,
|
|
58
|
+
['-c:a', 'pcm_s16le'],
|
|
18
59
|
['-map', '[a]'],
|
|
19
60
|
['-y', outName],
|
|
20
61
|
]
|
|
21
62
|
.filter(remotion_1.Internals.truthy)
|
|
22
63
|
.flat(2);
|
|
23
64
|
const task = (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', args);
|
|
24
|
-
(_a = task.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
|
|
25
|
-
const str = data.toString();
|
|
26
|
-
const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(str);
|
|
27
|
-
if (parsed !== undefined) {
|
|
28
|
-
onProgress(parsed);
|
|
29
|
-
}
|
|
30
|
-
});
|
|
31
65
|
await task;
|
|
32
66
|
cleanup();
|
|
33
67
|
};
|
|
68
|
+
const limit = (0, p_limit_1.pLimit)(2);
|
|
69
|
+
const mergeAudioTrack = (options) => {
|
|
70
|
+
return limit(mergeAudioTrackUnlimited, options);
|
|
71
|
+
};
|
|
34
72
|
exports.mergeAudioTrack = mergeAudioTrack;
|
|
35
73
|
//# sourceMappingURL=merge-audio-track.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-audio-track.js","sourceRoot":"","sources":["../src/merge-audio-track.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,uCAAqD;AACrD,iFAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"merge-audio-track.js","sourceRoot":"","sources":["../src/merge-audio-track.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,gDAAwB;AACxB,uCAAqD;AACrD,mCAA8B;AAC9B,qDAA8C;AAC9C,iFAAyE;AACzE,+DAAwD;AACxD,uCAAiC;AACjC,uCAAiC;AASjC,MAAM,wBAAwB,GAAG,KAAK,EAAE,EACvC,gBAAgB,EAChB,OAAO,EACP,KAAK,EACL,eAAe,GACN,EAAiB,EAAE;IAC5B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,MAAM,IAAA,uCAAiB,EAAC;YACvB,OAAO;YACP,gBAAgB;YAChB,eAAe;SACf,CAAC,CAAC;QACH,OAAO;KACP;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,MAAM,IAAA,6BAAY,EAAC;YAClB,OAAO;YACP,gBAAgB;YAChB,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;SACf,CAAC,CAAC;QACH,OAAO;KACP;IAED,6DAA6D;IAC7D,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,IAAA,aAAK,EAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjC,MAAM,QAAQ,GAAG,IAAA,gBAAM,EAAC,6BAA6B,CAAC,CAAC;QAEvD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE;YACnC,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;YAC3D,MAAM,IAAA,uBAAe,EAAC;gBACrB,gBAAgB;gBAChB,KAAK,EAAE,UAAU;gBACjB,eAAe;gBACf,OAAO,EAAE,YAAY;aACrB,CAAC,CAAC;YACH,OAAO,YAAY,CAAC;QACrB,CAAC,CAAC,CACF,CAAC;QAEF,OAAO,IAAA,uBAAe,EAAC;YACtB,gBAAgB;YAChB,KAAK,EAAE,UAAU;YACjB,eAAe;YACf,OAAO;SACP,CAAC,CAAC;KACH;IAED,MAAM,EAAC,iBAAiB,EAAE,WAAW,EAAE,OAAO,EAAC,GAC9C,MAAM,IAAA,wDAAyB,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE/C,MAAM,IAAI,GAAG;QACZ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9B,WAAW;QACX,CAAC,MAAM,EAAE,WAAW,CAAC;QACrB,CAAC,MAAM,EAAE,KAAK,CAAC;QACf,CAAC,IAAI,EAAE,OAAO,CAAC;KACf;SACC,MAAM,CAAC,oBAAS,CAAC,MAAM,CAAC;SACxB,IAAI,CAAC,CAAC,CAAC,CAAC;IAEV,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,QAAQ,EAAE,IAAI,CAAC,CAAC;IAEvD,MAAM,IAAI,CAAC;IACX,OAAO,EAAE,CAAC;AACX,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,IAAA,gBAAM,EAAC,CAAC,CAAC,CAAC;AAEjB,MAAM,eAAe,GAAG,CAAC,OAAgB,EAAE,EAAE;IACnD,OAAO,KAAK,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;AACjD,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"p-limit.d.ts","sourceRoot":"","sources":["../src/p-limit.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM,gBAAiB,MAAM,yKA0EzC,CAAC"}
|
package/dist/p-limit.js
ADDED
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.pLimit = void 0;
|
|
4
|
+
const pLimit = (concurrency) => {
|
|
5
|
+
const queue = [];
|
|
6
|
+
let activeCount = 0;
|
|
7
|
+
const next = () => {
|
|
8
|
+
var _a;
|
|
9
|
+
activeCount--;
|
|
10
|
+
if (queue.length > 0) {
|
|
11
|
+
(_a = queue.shift()) === null || _a === void 0 ? void 0 : _a();
|
|
12
|
+
}
|
|
13
|
+
};
|
|
14
|
+
const run = async (fn, resolve, ...args) => {
|
|
15
|
+
activeCount++;
|
|
16
|
+
// eslint-disable-next-line require-await
|
|
17
|
+
const result = (async () => fn(...args))();
|
|
18
|
+
resolve(result);
|
|
19
|
+
try {
|
|
20
|
+
await result;
|
|
21
|
+
}
|
|
22
|
+
catch (_a) { }
|
|
23
|
+
next();
|
|
24
|
+
};
|
|
25
|
+
const enqueue = (fn, resolve, ...args) => {
|
|
26
|
+
queue.push(() => run(fn, resolve, ...args));
|
|
27
|
+
(async () => {
|
|
28
|
+
var _a;
|
|
29
|
+
// This function needs to wait until the next microtask before comparing
|
|
30
|
+
// `activeCount` to `concurrency`, because `activeCount` is updated asynchronously
|
|
31
|
+
// when the run function is dequeued and called. The comparison in the if-statement
|
|
32
|
+
// needs to happen asynchronously as well to get an up-to-date value for `activeCount`.
|
|
33
|
+
await Promise.resolve();
|
|
34
|
+
if (activeCount < concurrency && queue.length > 0) {
|
|
35
|
+
(_a = queue.shift()) === null || _a === void 0 ? void 0 : _a();
|
|
36
|
+
}
|
|
37
|
+
})();
|
|
38
|
+
};
|
|
39
|
+
const generator = (fn, ...args) => new Promise((resolve) => {
|
|
40
|
+
enqueue(fn, resolve, ...args);
|
|
41
|
+
});
|
|
42
|
+
Object.defineProperties(generator, {
|
|
43
|
+
activeCount: {
|
|
44
|
+
get: () => activeCount,
|
|
45
|
+
},
|
|
46
|
+
pendingCount: {
|
|
47
|
+
get: () => queue.length,
|
|
48
|
+
},
|
|
49
|
+
clearQueue: {
|
|
50
|
+
value: () => {
|
|
51
|
+
queue.length = 0;
|
|
52
|
+
},
|
|
53
|
+
},
|
|
54
|
+
});
|
|
55
|
+
return generator;
|
|
56
|
+
};
|
|
57
|
+
exports.pLimit = pLimit;
|
|
58
|
+
//# sourceMappingURL=p-limit.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"p-limit.js","sourceRoot":"","sources":["../src/p-limit.ts"],"names":[],"mappings":";;;AAAO,MAAM,MAAM,GAAG,CAAC,WAAmB,EAAE,EAAE;IAC7C,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,IAAI,WAAW,GAAG,CAAC,CAAC;IAEpB,MAAM,IAAI,GAAG,GAAG,EAAE;;QACjB,WAAW,EAAE,CAAC;QAEd,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAA,KAAK,CAAC,KAAK,EAAE,2CAAI,CAAC;SAClB;IACF,CAAC,CAAC;IAEF,MAAM,GAAG,GAAG,KAAK,EAChB,EAAsE,EACtE,OAA2C,EAC3C,GAAG,IAAe,EACjB,EAAE;QACH,WAAW,EAAE,CAAC;QAEd,yCAAyC;QACzC,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC;QAE3C,OAAO,CAAC,MAAM,CAAC,CAAC;QAEhB,IAAI;YACH,MAAM,MAAM,CAAC;SACb;QAAC,WAAM,GAAE;QAEV,IAAI,EAAE,CAAC;IACR,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,CACf,EAAsE,EACtE,OAA2C,EAC3C,GAAG,IAAe,EACjB,EAAE;QACH,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAE5C,CAAC,KAAK,IAAI,EAAE;;YACX,wEAAwE;YACxE,kFAAkF;YAClF,mFAAmF;YACnF,uFAAuF;YACvF,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;YAExB,IAAI,WAAW,GAAG,WAAW,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClD,MAAA,KAAK,CAAC,KAAK,EAAE,2CAAI,CAAC;aAClB;QACF,CAAC,CAAC,EAAE,CAAC;IACN,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,CACjB,EAAsE,EACtE,GAAG,IAAe,EACjB,EAAE,CACH,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,EAAE;QACnC,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEJ,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE;QAClC,WAAW,EAAE;YACZ,GAAG,EAAE,GAAG,EAAE,CAAC,WAAW;SACtB;QACD,YAAY,EAAE;YACb,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM;SACvB;QACD,UAAU,EAAE;YACX,KAAK,EAAE,GAAG,EAAE;gBACX,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;YAClB,CAAC;SACD;KACD,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AA1EW,QAAA,MAAM,UA0EjB"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { FfmpegExecutable } from 'remotion';
|
|
2
|
+
import { MediaAsset } from './assets/types';
|
|
2
3
|
declare type Options = {
|
|
3
4
|
ffmpegExecutable: FfmpegExecutable;
|
|
4
|
-
audioFile: string;
|
|
5
|
-
filter: string;
|
|
6
5
|
outName: string;
|
|
7
|
-
|
|
6
|
+
asset: MediaAsset;
|
|
7
|
+
expectedFrames: number;
|
|
8
|
+
fps: number;
|
|
8
9
|
};
|
|
9
|
-
export declare const preprocessAudioTrack: (
|
|
10
|
+
export declare const preprocessAudioTrack: (options: Options) => Promise<string | null>;
|
|
10
11
|
export {};
|
|
11
12
|
//# sourceMappingURL=preprocess-audio-track.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preprocess-audio-track.d.ts","sourceRoot":"","sources":["../src/preprocess-audio-track.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"preprocess-audio-track.d.ts","sourceRoot":"","sources":["../src/preprocess-audio-track.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAE1C,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAM1C,aAAK,OAAO,GAAG;IACd,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,UAAU,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;CACZ,CAAC;AA2CF,eAAO,MAAM,oBAAoB,YAAa,OAAO,2BAEpD,CAAC"}
|
|
@@ -5,27 +5,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.preprocessAudioTrack = void 0;
|
|
7
7
|
const execa_1 = __importDefault(require("execa"));
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
|
|
8
|
+
const get_audio_channels_1 = require("./assets/get-audio-channels");
|
|
9
|
+
const calculate_ffmpeg_filters_1 = require("./calculate-ffmpeg-filters");
|
|
10
|
+
const ffmpeg_filter_file_1 = require("./ffmpeg-filter-file");
|
|
11
|
+
const p_limit_1 = require("./p-limit");
|
|
12
|
+
const resolve_asset_src_1 = require("./resolve-asset-src");
|
|
13
|
+
const preprocessAudioTrackUnlimited = async ({ ffmpegExecutable, outName, asset, expectedFrames, fps, }) => {
|
|
14
|
+
const { channels, duration } = await (0, get_audio_channels_1.getAudioChannelsAndDuration)((0, resolve_asset_src_1.resolveAssetSrc)(asset.src));
|
|
15
|
+
const filter = (0, calculate_ffmpeg_filters_1.calculateFfmpegFilter)({
|
|
16
|
+
asset,
|
|
17
|
+
durationInFrames: expectedFrames,
|
|
18
|
+
fps,
|
|
19
|
+
channels,
|
|
20
|
+
assetDuration: duration,
|
|
21
|
+
});
|
|
22
|
+
if (filter === null) {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
const { cleanup, file } = await (0, ffmpeg_filter_file_1.makeFfmpegFilterFile)(filter);
|
|
12
26
|
const args = [
|
|
13
|
-
['-i',
|
|
27
|
+
['-i', (0, resolve_asset_src_1.resolveAssetSrc)(asset.src)],
|
|
14
28
|
['-ac', '2'],
|
|
15
|
-
['-
|
|
16
|
-
['-
|
|
17
|
-
['-c:a', 'aac'],
|
|
29
|
+
['-filter_script:a', file],
|
|
30
|
+
['-c:a', 'pcm_s16le'],
|
|
18
31
|
['-y', outName],
|
|
19
32
|
].flat(2);
|
|
20
|
-
|
|
21
|
-
(
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
});
|
|
28
|
-
await task;
|
|
33
|
+
await (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', args);
|
|
34
|
+
cleanup();
|
|
35
|
+
return outName;
|
|
36
|
+
};
|
|
37
|
+
const limit = (0, p_limit_1.pLimit)(2);
|
|
38
|
+
const preprocessAudioTrack = (options) => {
|
|
39
|
+
return limit(preprocessAudioTrackUnlimited, options);
|
|
29
40
|
};
|
|
30
41
|
exports.preprocessAudioTrack = preprocessAudioTrack;
|
|
31
42
|
//# sourceMappingURL=preprocess-audio-track.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preprocess-audio-track.js","sourceRoot":"","sources":["../src/preprocess-audio-track.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"preprocess-audio-track.js","sourceRoot":"","sources":["../src/preprocess-audio-track.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,oEAAwE;AAExE,yEAAiE;AACjE,6DAA0D;AAC1D,uCAAiC;AACjC,2DAAoD;AAUpD,MAAM,6BAA6B,GAAG,KAAK,EAAE,EAC5C,gBAAgB,EAChB,OAAO,EACP,KAAK,EACL,cAAc,EACd,GAAG,GACM,EAA0B,EAAE;IACrC,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAC,GAAG,MAAM,IAAA,gDAA2B,EAC7D,IAAA,mCAAe,EAAC,KAAK,CAAC,GAAG,CAAC,CAC1B,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,gDAAqB,EAAC;QACpC,KAAK;QACL,gBAAgB,EAAE,cAAc;QAChC,GAAG;QACH,QAAQ;QACR,aAAa,EAAE,QAAQ;KACvB,CAAC,CAAC;IAEH,IAAI,MAAM,KAAK,IAAI,EAAE;QACpB,OAAO,IAAI,CAAC;KACZ;IAED,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,MAAM,IAAA,yCAAoB,EAAC,MAAM,CAAC,CAAC;IAE3D,MAAM,IAAI,GAAG;QACZ,CAAC,IAAI,EAAE,IAAA,mCAAe,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,CAAC,KAAK,EAAE,GAAG,CAAC;QACZ,CAAC,kBAAkB,EAAE,IAAI,CAAC;QAC1B,CAAC,MAAM,EAAE,WAAW,CAAC;QACrB,CAAC,IAAI,EAAE,OAAO,CAAC;KACf,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAEV,MAAM,IAAA,eAAK,EAAC,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,QAAQ,EAAE,IAAI,CAAC,CAAC;IAEhD,OAAO,EAAE,CAAC;IACV,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,IAAA,gBAAM,EAAC,CAAC,CAAC,CAAC;AAEjB,MAAM,oBAAoB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACxD,OAAO,KAAK,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC,CAAC;AAFW,QAAA,oBAAoB,wBAE/B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import execa from 'execa';
|
|
2
2
|
import { Codec, FfmpegExecutable, ImageFormat, PixelFormat, ProResProfile } from 'remotion';
|
|
3
|
-
|
|
3
|
+
declare type PreSticherOptions = {
|
|
4
4
|
fps: number;
|
|
5
5
|
width: number;
|
|
6
6
|
height: number;
|
|
@@ -18,4 +18,5 @@ export declare const prespawnFfmpeg: (options: PreSticherOptions) => Promise<{
|
|
|
18
18
|
task: execa.ExecaChildProcess<string>;
|
|
19
19
|
getLogs: () => string;
|
|
20
20
|
}>;
|
|
21
|
+
export {};
|
|
21
22
|
//# sourceMappingURL=prespawn-ffmpeg.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prespawn-ffmpeg.d.ts","sourceRoot":"","sources":["../src/prespawn-ffmpeg.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACN,KAAK,EACL,gBAAgB,EAChB,WAAW,EAEX,WAAW,EACX,aAAa,EACb,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"prespawn-ffmpeg.d.ts","sourceRoot":"","sources":["../src/prespawn-ffmpeg.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACN,KAAK,EACL,gBAAgB,EAChB,WAAW,EAEX,WAAW,EACX,aAAa,EACb,MAAM,UAAU,CAAC;AAOlB,aAAK,iBAAiB,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IACzB,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAC/B,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IACzC,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAC/C,WAAW,EAAE,WAAW,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,cAAc,YAAmB,iBAAiB;;;EAiG9D,CAAC"}
|
package/dist/prespawn-ffmpeg.js
CHANGED
|
@@ -6,11 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.prespawnFfmpeg = void 0;
|
|
7
7
|
const execa_1 = __importDefault(require("execa"));
|
|
8
8
|
const remotion_1 = require("remotion");
|
|
9
|
-
const get_audio_codec_name_1 = require("./get-audio-codec-name");
|
|
10
9
|
const get_codec_name_1 = require("./get-codec-name");
|
|
11
10
|
const get_prores_profile_name_1 = require("./get-prores-profile-name");
|
|
12
11
|
const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
|
|
13
|
-
const sample_rate_1 = require("./sample-rate");
|
|
14
12
|
const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
|
|
15
13
|
const validate_ffmpeg_1 = require("./validate-ffmpeg");
|
|
16
14
|
const prespawnFfmpeg = async (options) => {
|
|
@@ -29,7 +27,6 @@ const prespawnFfmpeg = async (options) => {
|
|
|
29
27
|
const pixelFormat = (_c = options.pixelFormat) !== null && _c !== void 0 ? _c : remotion_1.Internals.DEFAULT_PIXEL_FORMAT;
|
|
30
28
|
await (0, validate_ffmpeg_1.validateFfmpeg)((_d = options.ffmpegExecutable) !== null && _d !== void 0 ? _d : null);
|
|
31
29
|
const encoderName = (0, get_codec_name_1.getCodecName)(codec);
|
|
32
|
-
const audioCodecName = (0, get_audio_codec_name_1.getAudioCodecName)(codec);
|
|
33
30
|
const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
|
|
34
31
|
if (encoderName === null) {
|
|
35
32
|
throw new TypeError('encoderName is null: ' + JSON.stringify(options));
|
|
@@ -38,7 +35,6 @@ const prespawnFfmpeg = async (options) => {
|
|
|
38
35
|
if (options.verbose) {
|
|
39
36
|
console.log('[verbose] ffmpeg', (_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : 'ffmpeg in PATH');
|
|
40
37
|
console.log('[verbose] encoder', encoderName);
|
|
41
|
-
console.log('[verbose] audioCodec', audioCodecName);
|
|
42
38
|
console.log('[verbose] pixelFormat', pixelFormat);
|
|
43
39
|
if (supportsCrf) {
|
|
44
40
|
console.log('[verbose] crf', crf);
|
|
@@ -70,17 +66,6 @@ const prespawnFfmpeg = async (options) => {
|
|
|
70
66
|
pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
|
|
71
67
|
['-b:v', '1M'],
|
|
72
68
|
],
|
|
73
|
-
'-ar',
|
|
74
|
-
String(sample_rate_1.DEFAULT_SAMPLE_RATE),
|
|
75
|
-
// Stereo sound, even force mono to be stereo
|
|
76
|
-
// Otherwise mixing mono + stereo ends up speeding up the audio
|
|
77
|
-
'-ac',
|
|
78
|
-
'2',
|
|
79
|
-
audioCodecName ? ['-c:a', audioCodecName] : null,
|
|
80
|
-
// Ignore audio from image sequence
|
|
81
|
-
['-map', '0:v'],
|
|
82
|
-
// Ignore metadata that may come from remote media
|
|
83
|
-
['-map_metadata', '-1'],
|
|
84
69
|
'-y',
|
|
85
70
|
options.outputLocation,
|
|
86
71
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prespawn-ffmpeg.js","sourceRoot":"","sources":["../src/prespawn-ffmpeg.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,uCAOkB;AAClB,
|
|
1
|
+
{"version":3,"file":"prespawn-ffmpeg.js","sourceRoot":"","sources":["../src/prespawn-ffmpeg.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,uCAOkB;AAClB,qDAA8C;AAC9C,uEAA+D;AAC/D,mEAA4D;AAC5D,+FAAsF;AACtF,uDAAiD;AAiB1C,MAAM,cAAc,GAAG,KAAK,EAAE,OAA0B,EAAE,EAAE;;IAClE,oBAAS,CAAC,iBAAiB,CAC1B,OAAO,CAAC,MAAM,EACd,QAAQ,EACR,mCAAmC,CACnC,CAAC;IACF,oBAAS,CAAC,iBAAiB,CAC1B,OAAO,CAAC,KAAK,EACb,OAAO,EACP,mCAAmC,CACnC,CAAC;IACF,oBAAS,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,mCAAmC,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,MAAA,OAAO,CAAC,KAAK,mCAAI,oBAAS,CAAC,aAAa,CAAC;IACvD,IAAA,qEAA+B,EAAC;QAC/B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK;QACL,KAAK,EAAE,CAAC;KACR,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,MAAA,OAAO,CAAC,GAAG,mCAAI,oBAAS,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,MAAA,OAAO,CAAC,WAAW,mCAAI,oBAAS,CAAC,oBAAoB,CAAC;IAC1E,MAAM,IAAA,gCAAc,EAAC,MAAA,OAAO,CAAC,gBAAgB,mCAAI,IAAI,CAAC,CAAC;IAEvD,MAAM,WAAW,GAAG,IAAA,6BAAY,EAAC,KAAK,CAAC,CAAC;IACxC,MAAM,iBAAiB,GAAG,IAAA,8CAAoB,EAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAE7E,IAAI,WAAW,KAAK,IAAI,EAAE;QACzB,MAAM,IAAI,SAAS,CAAC,uBAAuB,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;KACvE;IAED,MAAM,WAAW,GAAG,KAAK,KAAK,QAAQ,CAAC;IAEvC,IAAI,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,GAAG,CACV,kBAAkB,EAClB,MAAA,OAAO,CAAC,gBAAgB,mCAAI,gBAAgB,CAC5C,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;QAClD,IAAI,WAAW,EAAE;YAChB,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;SAClC;QAED,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,iBAAiB,CAAC,CAAC;KAC9D;IAED,oBAAS,CAAC,sCAAsC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC7D,oBAAS,CAAC,8CAA8C,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAE7E,MAAM,UAAU,GAAG;QAClB,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,GAAG;YACF,CAAC,IAAI,EAAE,YAAY,CAAC;YACpB,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YAC5C,wEAAwE;YACxE,oDAAoD;YACpD,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;YAC7D,CAAC,IAAI,EAAE,GAAG,CAAC;SACX;QACD,8CAA8C;QAC9C,iCAAiC;QACjC,CAAC,MAAM,EAAE,WAAW,CAAC;QACrB,GAAG;YACF,iBAAiB,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI;YAC5D,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;YAC1C,CAAC,UAAU,EAAE,WAAW,CAAC;YAEzB,6CAA6C;YAC7C,2CAA2C;YAC3C,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;YAC1D,CAAC,MAAM,EAAE,IAAI,CAAC;SACd;QACD,IAAI;QACJ,OAAO,CAAC,cAAc;KACtB,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KACxB;IAED,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAa,CAAC;IAEpE,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,MAAA,OAAO,CAAC,gBAAgB,mCAAI,QAAQ,EAAE,YAAY,CAAC,CAAC;IACvE,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,MAAA,IAAI,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;QACxC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5B,YAAY,IAAI,GAAG,CAAC;QACpB,IAAI,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,MAAM,GAAG,IAAA,2CAAmB,EAAC,GAAG,CAAC,CAAC;YACxC,IAAI,MAAM,KAAK,SAAS,EAAE;gBACzB,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aAC3B;SACD;IACF,CAAC,CAAC,CAAC;IACH,OAAO,EAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,YAAY,EAAC,CAAC;AAC5C,CAAC,CAAC;AAjGW,QAAA,cAAc,kBAiGzB"}
|