@remotion/renderer 3.0.3 → 4.0.0-audio.21
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/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-asset-audio-details.js +2 -5
- package/dist/assets/get-asset-audio-details.js.map +1 -1
- package/dist/assets-to-ffmpeg-inputs.d.ts +2 -2
- package/dist/assets-to-ffmpeg-inputs.d.ts.map +1 -1
- package/dist/assets-to-ffmpeg-inputs.js +3 -3
- package/dist/assets-to-ffmpeg-inputs.js.map +1 -1
- package/dist/calculate-ffmpeg-filters.d.ts +6 -10
- package/dist/calculate-ffmpeg-filters.d.ts.map +1 -1
- package/dist/calculate-ffmpeg-filters.js +20 -30
- package/dist/calculate-ffmpeg-filters.js.map +1 -1
- 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 +10 -32
- package/dist/create-ffmpeg-complex-filter.js.map +1 -1
- package/dist/create-ffmpeg-merge-filter.d.ts.map +1 -1
- package/dist/create-ffmpeg-merge-filter.js +0 -2
- package/dist/create-ffmpeg-merge-filter.js.map +1 -1
- package/dist/create-silent-audio.d.ts +8 -0
- package/dist/create-silent-audio.d.ts.map +1 -0
- package/dist/create-silent-audio.js +22 -0
- package/dist/create-silent-audio.js.map +1 -0
- package/dist/delete-directory.js +1 -1
- package/dist/delete-directory.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 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/merge-audio-track.d.ts +4 -3
- package/dist/merge-audio-track.d.ts.map +1 -1
- package/dist/merge-audio-track.js +17 -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 +7 -4
- package/dist/preprocess-audio-track.d.ts.map +1 -1
- package/dist/preprocess-audio-track.js +27 -4
- package/dist/preprocess-audio-track.js.map +1 -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/provide-screenshot.d.ts +0 -1
- package/dist/provide-screenshot.d.ts.map +1 -1
- package/dist/puppeteer-screenshot.d.ts +0 -1
- package/dist/puppeteer-screenshot.d.ts.map +1 -1
- package/dist/screenshot-dom-element.d.ts +0 -1
- package/dist/screenshot-dom-element.d.ts.map +1 -1
- package/dist/screenshot-task.d.ts +0 -1
- package/dist/screenshot-task.d.ts.map +1 -1
- package/dist/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 +92 -71
- package/dist/stitch-frames-to-video.js.map +1 -1
- package/dist/stringify-ffmpeg-filter.d.ts +2 -3
- package/dist/stringify-ffmpeg-filter.d.ts.map +1 -1
- package/dist/stringify-ffmpeg-filter.js +4 -5
- package/dist/stringify-ffmpeg-filter.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-scale.d.ts.map +1 -1
- package/dist/validate-scale.js.map +1 -1
- package/package.json +4 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculate-asset-positions.d.ts","sourceRoot":"","sources":["../../src/assets/calculate-asset-positions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAGhC,OAAO,EAAC,MAAM,EAAgD,MAAM,SAAS,CAAC;AA2B9E,eAAO,MAAM,uBAAuB,WAAY,MAAM,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"calculate-asset-positions.d.ts","sourceRoot":"","sources":["../../src/assets/calculate-asset-positions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAGhC,OAAO,EAAC,MAAM,EAAgD,MAAM,SAAS,CAAC;AA2B9E,eAAO,MAAM,uBAAuB,WAAY,MAAM,EAAE,EAAE,WA4CzD,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.calculateAssetPositions = void 0;
|
|
4
4
|
const resolve_asset_src_1 = require("../resolve-asset-src");
|
|
5
|
-
const
|
|
5
|
+
const flatten_volume_array_1 = require("./flatten-volume-array");
|
|
6
6
|
const types_1 = require("./types");
|
|
7
7
|
const areEqual = (a, b) => {
|
|
8
8
|
return a.id === b.id;
|
|
@@ -61,10 +61,7 @@ const calculateAssetPositions = (frames) => {
|
|
|
61
61
|
throw new Error('duration is unexpectedly null');
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
|
-
return (0,
|
|
65
|
-
assets: assets,
|
|
66
|
-
duration: frames.length,
|
|
67
|
-
});
|
|
64
|
+
return assets.map((a) => (0, flatten_volume_array_1.convertAssetToFlattenedVolume)(a));
|
|
68
65
|
};
|
|
69
66
|
exports.calculateAssetPositions = calculateAssetPositions;
|
|
70
67
|
//# sourceMappingURL=calculate-asset-positions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculate-asset-positions.js","sourceRoot":"","sources":["../../src/assets/calculate-asset-positions.ts"],"names":[],"mappings":";;;AACA,4DAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"calculate-asset-positions.js","sourceRoot":"","sources":["../../src/assets/calculate-asset-positions.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,8 @@ declare type FfmpegVolumeExpression = {
|
|
|
4
4
|
eval: FfmpegEval;
|
|
5
5
|
value: string;
|
|
6
6
|
};
|
|
7
|
-
export declare const ffmpegVolumeExpression: ({ volume,
|
|
7
|
+
export declare const ffmpegVolumeExpression: ({ volume, startInVideo, fps, }: {
|
|
8
8
|
volume: AssetVolume;
|
|
9
|
-
multiplier: number;
|
|
10
9
|
startInVideo: number;
|
|
11
10
|
fps: number;
|
|
12
11
|
}) => FfmpegVolumeExpression;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ffmpeg-volume-expression.d.ts","sourceRoot":"","sources":["../../src/assets/ffmpeg-volume-expression.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,aAAK,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC;AA8DnC,aAAK,sBAAsB,GAAG;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACd,CAAC;
|
|
1
|
+
{"version":3,"file":"ffmpeg-volume-expression.d.ts","sourceRoot":"","sources":["../../src/assets/ffmpeg-volume-expression.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,aAAK,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC;AA8DnC,aAAK,sBAAsB,GAAG;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,sBAAsB;YAK1B,WAAW;kBACL,MAAM;SACf,MAAM;MACR,sBA+CH,CAAC"}
|
|
@@ -46,20 +46,18 @@ const ffmpegBuildVolumeExpression = (arr, fps) => {
|
|
|
46
46
|
const [volume, frames] = first;
|
|
47
47
|
return ffmpegIfOrElse(ffmpegIsOneOfFrames(frames, fps), String(volume), ffmpegBuildVolumeExpression(rest, fps));
|
|
48
48
|
};
|
|
49
|
-
|
|
50
|
-
const ffmpegVolumeExpression = ({ volume, multiplier, startInVideo, fps, }) => {
|
|
49
|
+
const ffmpegVolumeExpression = ({ volume, startInVideo, fps, }) => {
|
|
51
50
|
// If it's a static volume, we return it and tell
|
|
52
51
|
// FFMPEG it only has to evaluate it once
|
|
53
52
|
if (typeof volume === 'number') {
|
|
54
53
|
return {
|
|
55
54
|
eval: 'once',
|
|
56
|
-
value: String(Math.min(1, volume)
|
|
55
|
+
value: String(Math.min(1, volume)),
|
|
57
56
|
};
|
|
58
57
|
}
|
|
59
58
|
if ([...new Set(volume)].length === 1) {
|
|
60
59
|
return (0, exports.ffmpegVolumeExpression)({
|
|
61
60
|
volume: volume[0],
|
|
62
|
-
multiplier,
|
|
63
61
|
startInVideo,
|
|
64
62
|
fps,
|
|
65
63
|
});
|
|
@@ -71,7 +69,7 @@ const ffmpegVolumeExpression = ({ volume, multiplier, startInVideo, fps, }) => {
|
|
|
71
69
|
const volumeMap = {};
|
|
72
70
|
volume.forEach((baseVolume, frame) => {
|
|
73
71
|
// Adjust volume based on how many other tracks have not yet finished
|
|
74
|
-
const actualVolume = (0, round_volume_to_avoid_stack_overflow_1.roundVolumeToAvoidStackOverflow)(Math.min(1, baseVolume))
|
|
72
|
+
const actualVolume = (0, round_volume_to_avoid_stack_overflow_1.roundVolumeToAvoidStackOverflow)(Math.min(1, baseVolume));
|
|
75
73
|
if (!volumeMap[actualVolume]) {
|
|
76
74
|
volumeMap[actualVolume] = [];
|
|
77
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ffmpeg-volume-expression.js","sourceRoot":"","sources":["../../src/assets/ffmpeg-volume-expression.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,qFAAqF;;;AAErF,oDAAoD;AACpD,2CAA2C;AAC3C,iGAAuF;AAOvF,gEAAgE;AAChE,8CAA8C;AAC9C,MAAM,oBAAoB,GAAG,GAAG,CAAC;AAEjC,MAAM,cAAc,GAAG,CAAC,SAAiB,EAAE,IAAY,EAAE,MAAc,EAAE,EAAE;IAC1E,OAAO,MAAM,SAAS,IAAI,IAAI,IAAI,MAAM,GAAG,CAAC;AAC7C,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,MAAgB,EAAE,GAAW,EAAE,EAAE;IAC7D,MAAM,iBAAiB,GAAe,EAAE,CAAC;IACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACvC,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACpC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,CAAC,aAAa,IAAI,KAAK,KAAK,aAAa,GAAG,CAAC,EAAE;YAClD,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC3B;QAED,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAC5D;IAED,OAAO,iBAAiB;SACtB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACV,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;QACxC,MAAM,KAAK,GAAG,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;QACtC,OAAO,WAAW,oBAAoB,IAAI,MAAM,CAAC,OAAO,CACvD,CAAC,CACD,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAC1B,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAAC,GAAgB,EAAE,GAAW,EAAU,EAAE;IAC7E,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;KACtE;IAED,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,8DAA8D;QAC9D,kCAAkC;QAClC,2DAA2D;QAC3D,OAAO,cAAc,CACpB,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EACnC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACjB,MAAM,CAAC,CAAC,CAAC,CACT,CAAC;KACF;IAED,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC;IAC7B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC;IAC/B,OAAO,cAAc,CACpB,mBAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,MAAM,CAAC,MAAM,CAAC,EACd,2BAA2B,CAAC,IAAI,EAAE,GAAG,CAAC,CACtC,CAAC;AACH,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ffmpeg-volume-expression.js","sourceRoot":"","sources":["../../src/assets/ffmpeg-volume-expression.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.getAssetAudioDetails = void 0;
|
|
7
|
-
const p_limit_1 =
|
|
4
|
+
const p_limit_1 = require("../p-limit");
|
|
8
5
|
const get_audio_channels_1 = require("./get-audio-channels");
|
|
9
6
|
async function getAssetAudioDetails(options) {
|
|
10
7
|
const uniqueAssets = [...new Set(options.assetPaths)];
|
|
11
8
|
const actualParallelism = 2;
|
|
12
|
-
const parallelLimit = (0, p_limit_1.
|
|
9
|
+
const parallelLimit = (0, p_limit_1.pLimit)(actualParallelism);
|
|
13
10
|
const audioChannelTasks = uniqueAssets.map((path) => parallelLimit(() => (0, get_audio_channels_1.getAudioChannels)(path)));
|
|
14
11
|
const result = await Promise.all(audioChannelTasks);
|
|
15
12
|
const mappedResults = result.map((channels, index) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-asset-audio-details.js","sourceRoot":"","sources":["../../src/assets/get-asset-audio-details.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-asset-audio-details.js","sourceRoot":"","sources":["../../src/assets/get-asset-audio-details.ts"],"names":[],"mappings":";;;AAAA,wCAAkC;AAClC,6DAAsD;AAG/C,KAAK,UAAU,oBAAoB,CAAC,OAE1C;IACA,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IACtD,MAAM,iBAAiB,GAAG,CAAC,CAAC;IAC5B,MAAM,aAAa,GAAG,IAAA,gBAAM,EAAC,iBAAiB,CAAC,CAAC;IAChD,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACnD,aAAa,CAAC,GAAG,EAAE,CAAC,IAAA,qCAAgB,EAAC,IAAI,CAAC,CAAC,CAC3C,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAkC,MAAM,CAAC,GAAG,CAC9D,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;QACnB,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAC,QAAQ,EAAC,CAAC,CAAC;IAC1C,CAAC,CACD,CAAC;IAEF,OAAO,IAAI,GAAG,CAA4B,aAAa,CAAC,CAAC;AAC1D,CAAC;AAlBD,oDAkBC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export declare const assetsToFfmpegInputs: ({
|
|
2
|
-
|
|
1
|
+
export declare const assetsToFfmpegInputs: ({ asset: audioMixFile, isAudioOnly, frameCount, fps, }: {
|
|
2
|
+
asset: string | null;
|
|
3
3
|
isAudioOnly: boolean;
|
|
4
4
|
frameCount: number;
|
|
5
5
|
fps: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets-to-ffmpeg-inputs.d.ts","sourceRoot":"","sources":["../src/assets-to-ffmpeg-inputs.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB;
|
|
1
|
+
{"version":3,"file":"assets-to-ffmpeg-inputs.d.ts","sourceRoot":"","sources":["../src/assets-to-ffmpeg-inputs.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB;WAMzB,MAAM,GAAG,IAAI;iBACP,OAAO;gBACR,MAAM;SACb,MAAM;MACR;IAAC,MAAM;IAAE,MAAM;CAAC,EAUnB,CAAC"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.assetsToFfmpegInputs = void 0;
|
|
4
|
-
const assetsToFfmpegInputs = ({
|
|
5
|
-
if (isAudioOnly &&
|
|
4
|
+
const assetsToFfmpegInputs = ({ asset: audioMixFile, isAudioOnly, frameCount, fps, }) => {
|
|
5
|
+
if (isAudioOnly && audioMixFile === null) {
|
|
6
6
|
return [
|
|
7
7
|
['-f', 'lavfi'],
|
|
8
8
|
['-i', 'anullsrc'],
|
|
9
9
|
['-t', (frameCount / fps).toFixed(4)],
|
|
10
10
|
];
|
|
11
11
|
}
|
|
12
|
-
return
|
|
12
|
+
return [['-i', audioMixFile]];
|
|
13
13
|
};
|
|
14
14
|
exports.assetsToFfmpegInputs = assetsToFfmpegInputs;
|
|
15
15
|
//# sourceMappingURL=assets-to-ffmpeg-inputs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets-to-ffmpeg-inputs.js","sourceRoot":"","sources":["../src/assets-to-ffmpeg-inputs.ts"],"names":[],"mappings":";;;AAAO,MAAM,oBAAoB,GAAG,CAAC,EACpC,
|
|
1
|
+
{"version":3,"file":"assets-to-ffmpeg-inputs.js","sourceRoot":"","sources":["../src/assets-to-ffmpeg-inputs.ts"],"names":[],"mappings":";;;AAAO,MAAM,oBAAoB,GAAG,CAAC,EACpC,KAAK,EAAE,YAAY,EACnB,WAAW,EACX,UAAU,EACV,GAAG,GAMH,EAAsB,EAAE;IACxB,IAAI,WAAW,IAAI,YAAY,KAAK,IAAI,EAAE;QACzC,OAAO;YACN,CAAC,IAAI,EAAE,OAAO,CAAC;YACf,CAAC,IAAI,EAAE,UAAU,CAAC;YAClB,CAAC,IAAI,EAAE,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SACrC,CAAC;KACF;IAED,OAAO,CAAC,CAAC,IAAI,EAAE,YAAsB,CAAC,CAAC,CAAC;AACzC,CAAC,CAAC;AApBW,QAAA,oBAAoB,wBAoB/B"}
|
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare
|
|
3
|
-
|
|
4
|
-
streamIndex: number;
|
|
5
|
-
};
|
|
6
|
-
export declare const calculateFfmpegFilters: ({ assetPositions, assetAudioDetails, fps, videoTrackCount, }: {
|
|
7
|
-
assetPositions: Assets;
|
|
8
|
-
assetAudioDetails: Map<string, AssetAudioDetails>;
|
|
1
|
+
import { MediaAsset } from './assets/types';
|
|
2
|
+
export declare const calculateFfmpegFilter: ({ asset, fps, durationInFrames, channels, }: {
|
|
3
|
+
asset: MediaAsset;
|
|
9
4
|
fps: number;
|
|
10
|
-
|
|
11
|
-
|
|
5
|
+
durationInFrames: number;
|
|
6
|
+
channels: number;
|
|
7
|
+
}) => string | null;
|
|
12
8
|
//# sourceMappingURL=calculate-ffmpeg-filters.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculate-ffmpeg-filters.d.ts","sourceRoot":"","sources":["../src/calculate-ffmpeg-filters.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"calculate-ffmpeg-filters.d.ts","sourceRoot":"","sources":["../src/calculate-ffmpeg-filters.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAS1C,eAAO,MAAM,qBAAqB;WAM1B,UAAU;SACZ,MAAM;sBACO,MAAM;cACd,MAAM;MACb,MAAM,GAAG,IAuBZ,CAAC"}
|
|
@@ -1,36 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const
|
|
5
|
-
const resolve_asset_src_1 = require("./resolve-asset-src");
|
|
3
|
+
exports.calculateFfmpegFilter = void 0;
|
|
4
|
+
const flatten_volume_array_1 = require("./assets/flatten-volume-array");
|
|
6
5
|
const stringify_ffmpeg_filter_1 = require("./stringify-ffmpeg-filter");
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
startInVideo: asset.startInVideo,
|
|
24
|
-
trimLeft: assetTrimLeft,
|
|
25
|
-
trimRight: assetTrimRight,
|
|
26
|
-
simulatenousAssets: simultaneousAssets.length,
|
|
27
|
-
volume: asset.volume,
|
|
28
|
-
fps,
|
|
29
|
-
playbackRate: asset.playbackRate,
|
|
30
|
-
}),
|
|
31
|
-
streamIndex,
|
|
32
|
-
};
|
|
6
|
+
const calculateFfmpegFilter = ({ asset, fps, durationInFrames, channels, }) => {
|
|
7
|
+
if (channels === 0) {
|
|
8
|
+
null;
|
|
9
|
+
}
|
|
10
|
+
const assetTrimLeft = (asset.trimLeft / fps).toFixed(3);
|
|
11
|
+
const assetTrimRight = ((asset.trimLeft + asset.duration * asset.playbackRate) /
|
|
12
|
+
fps).toFixed(3);
|
|
13
|
+
const filter = (0, stringify_ffmpeg_filter_1.stringifyFfmpegFilter)({
|
|
14
|
+
channels,
|
|
15
|
+
startInVideo: asset.startInVideo,
|
|
16
|
+
trimLeft: assetTrimLeft,
|
|
17
|
+
trimRight: assetTrimRight,
|
|
18
|
+
volume: (0, flatten_volume_array_1.flattenVolumeArray)(asset.volume),
|
|
19
|
+
fps,
|
|
20
|
+
playbackRate: asset.playbackRate,
|
|
21
|
+
durationInFrames,
|
|
33
22
|
});
|
|
23
|
+
return filter;
|
|
34
24
|
};
|
|
35
|
-
exports.
|
|
25
|
+
exports.calculateFfmpegFilter = calculateFfmpegFilter;
|
|
36
26
|
//# sourceMappingURL=calculate-ffmpeg-filters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculate-ffmpeg-filters.js","sourceRoot":"","sources":["../src/calculate-ffmpeg-filters.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"calculate-ffmpeg-filters.js","sourceRoot":"","sources":["../src/calculate-ffmpeg-filters.ts"],"names":[],"mappings":";;;AAAA,wEAAiE;AAEjE,uEAAgE;AAQzD,MAAM,qBAAqB,GAAG,CAAC,EACrC,KAAK,EACL,GAAG,EACH,gBAAgB,EAChB,QAAQ,GAMR,EAAiB,EAAE;IACnB,IAAI,QAAQ,KAAK,CAAC,EAAE;QACnB,IAAI,CAAC;KACL;IAED,MAAM,aAAa,GAAG,CAAC,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACxD,MAAM,cAAc,GAAG,CACtB,CAAC,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,YAAY,CAAC;QACtD,GAAG,CACH,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAEb,MAAM,MAAM,GAAG,IAAA,+CAAqB,EAAC;QACpC,QAAQ;QACR,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,QAAQ,EAAE,aAAa;QACvB,SAAS,EAAE,cAAc;QACzB,MAAM,EAAE,IAAA,yCAAkB,EAAC,KAAK,CAAC,MAAM,CAAC;QACxC,GAAG;QACH,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,gBAAgB;KAChB,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AACf,CAAC,CAAC;AAjCW,QAAA,qBAAqB,yBAiChC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
export declare const createFfmpegComplexFilter: (filters: FfmpegFilterCalculation[]) => Promise<{
|
|
1
|
+
export declare const createFfmpegComplexFilter: (filters: number) => Promise<{
|
|
3
2
|
complexFilterFlag: [
|
|
4
3
|
string,
|
|
5
4
|
string
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-ffmpeg-complex-filter.d.ts","sourceRoot":"","sources":["../src/create-ffmpeg-complex-filter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create-ffmpeg-complex-filter.d.ts","sourceRoot":"","sources":["../src/create-ffmpeg-complex-filter.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,yBAAyB,YAC5B,MAAM;uBAEI;QAAC,MAAM;QAAE,MAAM;KAAC,GAAG,IAAI;aACjC,MAAM,IAAI;EAqBnB,CAAC"}
|
|
@@ -6,46 +6,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.createFfmpegComplexFilter = void 0;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const create_ffmpeg_merge_filter_1 = require("./create-ffmpeg-merge-filter");
|
|
10
|
+
const ffmpeg_filter_file_1 = require("./ffmpeg-filter-file");
|
|
9
11
|
const tmp_dir_1 = require("./tmp-dir");
|
|
10
|
-
const createMix = (filters) => {
|
|
11
|
-
const baseFilter = filters
|
|
12
|
-
.map((asset) => {
|
|
13
|
-
return `[a${asset.streamIndex}]`;
|
|
14
|
-
})
|
|
15
|
-
.join('');
|
|
16
|
-
const options = [
|
|
17
|
-
// Specify the number of inputs we give
|
|
18
|
-
`inputs=${filters.length}`,
|
|
19
|
-
// Disable any fade in transitions when a track stops
|
|
20
|
-
'dropout_transition=0',
|
|
21
|
-
// Audio track is as long as the longest input
|
|
22
|
-
'duration=longest',
|
|
23
|
-
];
|
|
24
|
-
return `${baseFilter}amix=${options.join(':')}`;
|
|
25
|
-
};
|
|
26
12
|
const createFfmpegComplexFilter = async (filters) => {
|
|
27
|
-
if (
|
|
13
|
+
if (filters === 0) {
|
|
14
|
+
return { complexFilterFlag: null, cleanup: () => undefined };
|
|
15
|
+
}
|
|
16
|
+
const complexFilter = (0, create_ffmpeg_merge_filter_1.createFfmpegMergeFilter)(filters);
|
|
17
|
+
if (complexFilter === null) {
|
|
28
18
|
return { complexFilterFlag: null, cleanup: () => undefined };
|
|
29
19
|
}
|
|
30
|
-
const
|
|
31
|
-
...filters.map((f) => f.filter),
|
|
32
|
-
createMix(filters),
|
|
33
|
-
].join(';');
|
|
20
|
+
const { file, cleanup } = await (0, ffmpeg_filter_file_1.makeFfmpegFilterFile)(complexFilter);
|
|
34
21
|
const tempPath = (0, tmp_dir_1.tmpDir)('remotion-complex-filter');
|
|
35
22
|
const filterFile = path_1.default.join(tempPath, 'complex-filter.txt');
|
|
36
23
|
await fs_1.default.promises.writeFile(filterFile, complexFilter);
|
|
37
24
|
return {
|
|
38
|
-
complexFilterFlag: ['-filter_complex_script',
|
|
39
|
-
cleanup
|
|
40
|
-
var _a;
|
|
41
|
-
((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(tempPath, {
|
|
42
|
-
recursive: true,
|
|
43
|
-
}).catch((err) => {
|
|
44
|
-
console.error('Could not delete a temp file');
|
|
45
|
-
console.error(err);
|
|
46
|
-
console.error('Do you have the minimum Node.JS installed?');
|
|
47
|
-
});
|
|
48
|
-
},
|
|
25
|
+
complexFilterFlag: ['-filter_complex_script', file],
|
|
26
|
+
cleanup,
|
|
49
27
|
};
|
|
50
28
|
};
|
|
51
29
|
exports.createFfmpegComplexFilter = createFfmpegComplexFilter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-ffmpeg-complex-filter.js","sourceRoot":"","sources":["../src/create-ffmpeg-complex-filter.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;
|
|
1
|
+
{"version":3,"file":"create-ffmpeg-complex-filter.js","sourceRoot":"","sources":["../src/create-ffmpeg-complex-filter.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,6EAAqE;AACrE,6DAA0D;AAC1D,uCAAiC;AAE1B,MAAM,yBAAyB,GAAG,KAAK,EAC7C,OAAe,EAIb,EAAE;IACJ,IAAI,OAAO,KAAK,CAAC,EAAE;QAClB,OAAO,EAAC,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,EAAC,CAAC;KAC3D;IAED,MAAM,aAAa,GAAG,IAAA,oDAAuB,EAAC,OAAO,CAAC,CAAC;IACvD,IAAI,aAAa,KAAK,IAAI,EAAE;QAC3B,OAAO,EAAC,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,EAAC,CAAC;KAC3D;IAED,MAAM,EAAC,IAAI,EAAE,OAAO,EAAC,GAAG,MAAM,IAAA,yCAAoB,EAAC,aAAa,CAAC,CAAC;IAElE,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,iBAAiB,EAAE,CAAC,wBAAwB,EAAE,IAAI,CAAC;QACnD,OAAO;KACP,CAAC;AACH,CAAC,CAAC;AAzBW,QAAA,yBAAyB,6BAyBpC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-ffmpeg-merge-filter.d.ts","sourceRoot":"","sources":["../src/create-ffmpeg-merge-filter.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,uBAAuB,WAAY,MAAM,
|
|
1
|
+
{"version":3,"file":"create-ffmpeg-merge-filter.d.ts","sourceRoot":"","sources":["../src/create-ffmpeg-merge-filter.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,uBAAuB,WAAY,MAAM,kBAkBrD,CAAC"}
|
|
@@ -16,8 +16,6 @@ const createFfmpegMergeFilter = (inputs) => {
|
|
|
16
16
|
.map((_, i) => (i % 2 === 1 ? `c${i}` : null))
|
|
17
17
|
.filter(remotion_1.Internals.truthy)
|
|
18
18
|
.join('+');
|
|
19
|
-
// TODO: This command will normalize the volume to 1 again. Should it be the default or be configurable?
|
|
20
|
-
// return `[0:a][1:a]amerge=inputs=${inputs},pan=stereo|c0<${leftChannel}|c1<${rightChannel}[a]`;
|
|
21
19
|
return `[0:a][1:a]amerge=inputs=${inputs},pan=stereo|c0=${leftChannel}|c1=${rightChannel}[a]`;
|
|
22
20
|
};
|
|
23
21
|
exports.createFfmpegMergeFilter = createFfmpegMergeFilter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-ffmpeg-merge-filter.js","sourceRoot":"","sources":["../src/create-ffmpeg-merge-filter.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AAE5B,MAAM,uBAAuB,GAAG,CAAC,MAAc,EAAE,EAAE;IACzD,IAAI,MAAM,KAAK,CAAC,EAAE;QACjB,OAAO,IAAI,CAAC;KACZ;IAED,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;SACvC,IAAI,CAAC,IAAI,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAC7C,MAAM,CAAC,oBAAS,CAAC,MAAM,CAAC;SACxB,IAAI,CAAC,GAAG,CAAC,CAAC;IAEZ,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;SACxC,IAAI,CAAC,IAAI,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAC7C,MAAM,CAAC,oBAAS,CAAC,MAAM,CAAC;SACxB,IAAI,CAAC,GAAG,CAAC,CAAC;IAEZ,
|
|
1
|
+
{"version":3,"file":"create-ffmpeg-merge-filter.js","sourceRoot":"","sources":["../src/create-ffmpeg-merge-filter.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AAE5B,MAAM,uBAAuB,GAAG,CAAC,MAAc,EAAE,EAAE;IACzD,IAAI,MAAM,KAAK,CAAC,EAAE;QACjB,OAAO,IAAI,CAAC;KACZ;IAED,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;SACvC,IAAI,CAAC,IAAI,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAC7C,MAAM,CAAC,oBAAS,CAAC,MAAM,CAAC;SACxB,IAAI,CAAC,GAAG,CAAC,CAAC;IAEZ,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;SACxC,IAAI,CAAC,IAAI,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAC7C,MAAM,CAAC,oBAAS,CAAC,MAAM,CAAC;SACxB,IAAI,CAAC,GAAG,CAAC,CAAC;IAEZ,OAAO,2BAA2B,MAAM,kBAAkB,WAAW,OAAO,YAAY,KAAK,CAAC;AAC/F,CAAC,CAAC;AAlBW,QAAA,uBAAuB,2BAkBlC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { FfmpegExecutable } from 'remotion';
|
|
2
|
+
export declare const createSilentAudio: ({ ffmpegExecutable, audioCodec, numberOfSeconds, outName, }: {
|
|
3
|
+
ffmpegExecutable: FfmpegExecutable;
|
|
4
|
+
audioCodec: string;
|
|
5
|
+
numberOfSeconds: number;
|
|
6
|
+
outName: string;
|
|
7
|
+
}) => Promise<void>;
|
|
8
|
+
//# 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;AAE1C,eAAO,MAAM,iBAAiB;sBAMX,gBAAgB;gBACtB,MAAM;qBACD,MAAM;aACd,MAAM;mBAaf,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
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 createSilentAudio = async ({ ffmpegExecutable, audioCodec, numberOfSeconds, outName, }) => {
|
|
9
|
+
await (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', [
|
|
10
|
+
'-f',
|
|
11
|
+
'lavfi',
|
|
12
|
+
'-i',
|
|
13
|
+
'anullsrc',
|
|
14
|
+
'-c:a',
|
|
15
|
+
audioCodec,
|
|
16
|
+
'-t',
|
|
17
|
+
String(numberOfSeconds),
|
|
18
|
+
outName,
|
|
19
|
+
]);
|
|
20
|
+
};
|
|
21
|
+
exports.createSilentAudio = createSilentAudio;
|
|
22
|
+
//# 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;AAGnB,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACvC,gBAAgB,EAChB,UAAU,EACV,eAAe,EACf,OAAO,GAMP,EAAE,EAAE;IACJ,MAAM,IAAA,eAAK,EAAC,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,QAAQ,EAAE;QACzC,IAAI;QACJ,OAAO;QACP,IAAI;QACJ,UAAU;QACV,MAAM;QACN,UAAU;QACV,IAAI;QACJ,MAAM,CAAC,eAAe,CAAC;QACvB,OAAO;KACP,CAAC,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,iBAAiB,qBAsB5B"}
|
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;
|
|
@@ -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,MAAM,IAAA,eAAK,EAAC,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;KAC3D;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;AAfW,QAAA,eAAe,mBAe1B"}
|
|
@@ -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
|
@@ -49,8 +49,7 @@ export declare const RenderInternals: {
|
|
|
49
49
|
}) => void;
|
|
50
50
|
normalizeServeUrl: (unnormalized: string) => string;
|
|
51
51
|
spawnFfmpeg: (options: import("./stitch-frames-to-video").StitcherOptions) => Promise<{
|
|
52
|
-
task:
|
|
53
|
-
cleanup: () => void;
|
|
52
|
+
task: Promise<unknown>;
|
|
54
53
|
getLogs: () => string;
|
|
55
54
|
}>;
|
|
56
55
|
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":"AAKA,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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6B3B,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { FfmpegExecutable } from 'remotion';
|
|
1
|
+
import { Codec, FfmpegExecutable } from 'remotion';
|
|
2
2
|
declare type Options = {
|
|
3
3
|
ffmpegExecutable: FfmpegExecutable;
|
|
4
4
|
files: string[];
|
|
5
5
|
outName: string;
|
|
6
|
-
|
|
6
|
+
codec: Codec;
|
|
7
|
+
numberOfSeconds: number;
|
|
7
8
|
};
|
|
8
|
-
export declare const mergeAudioTrack: ({ ffmpegExecutable, outName, files,
|
|
9
|
+
export declare const mergeAudioTrack: ({ ffmpegExecutable, outName, files, codec, numberOfSeconds, }: Options) => Promise<void>;
|
|
9
10
|
export {};
|
|
10
11
|
//# 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,KAAK,EAAE,gBAAgB,EAAY,MAAM,UAAU,CAAC;AAK5D,aAAK,OAAO,GAAG;IACd,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,eAAe,kEAMzB,OAAO,kBAgCT,CAAC"}
|
|
@@ -5,13 +5,26 @@ 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 fs_1 = __importDefault(require("fs"));
|
|
8
9
|
const remotion_1 = require("remotion");
|
|
9
10
|
const create_ffmpeg_complex_filter_1 = require("./create-ffmpeg-complex-filter");
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
const mergeAudioTrack = async ({ ffmpegExecutable, outName, files,
|
|
13
|
-
var _a;
|
|
11
|
+
const create_silent_audio_1 = require("./create-silent-audio");
|
|
12
|
+
const get_audio_codec_name_1 = require("./get-audio-codec-name");
|
|
13
|
+
const mergeAudioTrack = async ({ ffmpegExecutable, outName, files, codec, numberOfSeconds, }) => {
|
|
14
14
|
const { complexFilterFlag: mergeFilter, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)(files.length);
|
|
15
|
+
if (files.length === 0) {
|
|
16
|
+
await (0, create_silent_audio_1.createSilentAudio)({
|
|
17
|
+
outName,
|
|
18
|
+
audioCodec: (0, get_audio_codec_name_1.getAudioCodecName)(codec),
|
|
19
|
+
ffmpegExecutable: ffmpegExecutable,
|
|
20
|
+
numberOfSeconds,
|
|
21
|
+
});
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
if (files.length === 1) {
|
|
25
|
+
await fs_1.default.promises.copyFile(files[0], outName);
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
15
28
|
const args = [
|
|
16
29
|
...files.map((f) => ['-i', f]),
|
|
17
30
|
mergeFilter,
|
|
@@ -21,13 +34,6 @@ const mergeAudioTrack = async ({ ffmpegExecutable, outName, files, onProgress, }
|
|
|
21
34
|
.filter(remotion_1.Internals.truthy)
|
|
22
35
|
.flat(2);
|
|
23
36
|
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
37
|
await task;
|
|
32
38
|
cleanup();
|
|
33
39
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-audio-track.js","sourceRoot":"","sources":["../src/merge-audio-track.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"merge-audio-track.js","sourceRoot":"","sources":["../src/merge-audio-track.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AACpB,uCAA4D;AAC5D,iFAAyE;AACzE,+DAAwD;AACxD,iEAAyD;AAUlD,MAAM,eAAe,GAAG,KAAK,EAAE,EACrC,gBAAgB,EAChB,OAAO,EACP,KAAK,EACL,KAAK,EACL,eAAe,GACN,EAAE,EAAE;IACb,MAAM,EAAC,iBAAiB,EAAE,WAAW,EAAE,OAAO,EAAC,GAC9C,MAAM,IAAA,wDAAyB,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE/C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,MAAM,IAAA,uCAAiB,EAAC;YACvB,OAAO;YACP,UAAU,EAAE,IAAA,wCAAiB,EAAC,KAAK,CAAW;YAC9C,gBAAgB,EAAE,gBAAgB;YAClC,eAAe;SACf,CAAC,CAAC;QACH,OAAO;KACP;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO;KACP;IAED,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,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;AAtCW,QAAA,eAAe,mBAsC1B"}
|
|
@@ -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"}
|