@remotion/renderer 3.0.0-lambda.236 → 3.0.0-lambda.237
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 +3 -1
- package/dist/assets/calculate-asset-positions.js.map +1 -1
- package/dist/assets/download-and-map-assets-to-file.d.ts +1 -0
- package/dist/assets/download-and-map-assets-to-file.d.ts.map +1 -1
- package/dist/assets/download-and-map-assets-to-file.js +69 -4
- package/dist/assets/download-and-map-assets-to-file.js.map +1 -1
- package/dist/assets/types.d.ts +1 -0
- package/dist/assets/types.d.ts.map +1 -1
- package/dist/assets/types.js +19 -0
- package/dist/assets/types.js.map +1 -1
- package/dist/ensure-frames-in-order.d.ts +6 -0
- package/dist/ensure-frames-in-order.d.ts.map +1 -0
- package/dist/ensure-frames-in-order.js +39 -0
- package/dist/ensure-frames-in-order.js.map +1 -0
- package/dist/render-media.d.ts.map +1 -1
- package/dist/render-media.js +6 -24
- package/dist/render-media.js.map +1 -1
- package/dist/render.d.ts +2 -2
- package/dist/render.d.ts.map +1 -1
- package/dist/render.js +10 -7
- package/dist/render.js.map +1 -1
- package/dist/stitcher.d.ts.map +1 -1
- package/dist/stitcher.js +6 -7
- package/dist/stitcher.js.map +1 -1
- package/dist/stringify-ffmpeg-filter.d.ts.map +1 -1
- package/dist/stringify-ffmpeg-filter.js +0 -2
- package/dist/stringify-ffmpeg-filter.js.map +1 -1
- package/package.json +4 -4
|
@@ -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;
|
|
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,WA+CzD,CAAC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.calculateAssetPositions = void 0;
|
|
4
|
+
const resolve_asset_src_1 = require("../resolve-asset-src");
|
|
4
5
|
const split_assets_into_segments_1 = require("./split-assets-into-segments");
|
|
6
|
+
const types_1 = require("./types");
|
|
5
7
|
const areEqual = (a, b) => {
|
|
6
8
|
return a.id === b.id;
|
|
7
9
|
};
|
|
@@ -32,7 +34,7 @@ const calculateAssetPositions = (frames) => {
|
|
|
32
34
|
for (const asset of current) {
|
|
33
35
|
if (!findFrom(prev, asset)) {
|
|
34
36
|
assets.push({
|
|
35
|
-
src: asset.src,
|
|
37
|
+
src: (0, resolve_asset_src_1.resolveAssetSrc)((0, types_1.uncompressMediaAsset)(frames.flat(1), asset).src),
|
|
36
38
|
type: asset.type,
|
|
37
39
|
duration: null,
|
|
38
40
|
id: asset.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculate-asset-positions.js","sourceRoot":"","sources":["../../src/assets/calculate-asset-positions.ts"],"names":[],"mappings":";;;AACA,6EAAqE;
|
|
1
|
+
{"version":3,"file":"calculate-asset-positions.js","sourceRoot":"","sources":["../../src/assets/calculate-asset-positions.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { TAsset } from 'remotion';
|
|
|
2
2
|
export declare type RenderMediaOnDownload = (src: string) => ((progress: {
|
|
3
3
|
percent: number;
|
|
4
4
|
}) => void) | undefined | void;
|
|
5
|
+
export declare const validateMimeType: (mimeType: string, src: string) => void;
|
|
5
6
|
export declare const markAllAssetsAsDownloaded: () => void;
|
|
6
7
|
export declare const getSanitizedFilenameForAssetUrl: ({ src, downloadDir, }: {
|
|
7
8
|
src: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download-and-map-assets-to-file.d.ts","sourceRoot":"","sources":["../../src/assets/download-and-map-assets-to-file.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"download-and-map-assets-to-file.d.ts","sourceRoot":"","sources":["../../src/assets/download-and-map-assets-to-file.ts"],"names":[],"mappings":"AAKA,OAAO,EAAoB,MAAM,EAAC,MAAM,UAAU,CAAC;AAInD,oBAAY,qBAAqB,GAAG,CACnC,GAAG,EAAE,MAAM,KACP,CAAC,CAAC,QAAQ,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,KAAK,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AA0BhE,eAAO,MAAM,gBAAgB,aAAc,MAAM,OAAO,MAAM,SAW7D,CAAC;AA8FF,eAAO,MAAM,yBAAyB,YAQrC,CAAC;AAEF,eAAO,MAAM,+BAA+B;SAItC,MAAM;iBACE,MAAM;YAqBnB,CAAC;AAEF,eAAO,MAAM,6BAA6B;WAKlC,MAAM;iBACA,MAAM;gBACP,qBAAqB;MAC9B,QAAQ,MAAM,CAcjB,CAAC"}
|
|
@@ -3,8 +3,9 @@ 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.downloadAndMapAssetsToFileUrl = exports.getSanitizedFilenameForAssetUrl = exports.markAllAssetsAsDownloaded = void 0;
|
|
7
|
-
const fs_1 = require("fs");
|
|
6
|
+
exports.downloadAndMapAssetsToFileUrl = exports.getSanitizedFilenameForAssetUrl = exports.markAllAssetsAsDownloaded = exports.validateMimeType = void 0;
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
const fs_2 = require("fs");
|
|
8
9
|
const got_1 = __importDefault(require("got"));
|
|
9
10
|
const path_1 = __importDefault(require("path"));
|
|
10
11
|
const remotion_1 = require("remotion");
|
|
@@ -29,6 +30,46 @@ const notifyAssetIsDownloaded = (src) => {
|
|
|
29
30
|
isDownloadingMap[src] = false;
|
|
30
31
|
hasBeenDownloadedMap[src] = true;
|
|
31
32
|
};
|
|
33
|
+
const validateMimeType = (mimeType, src) => {
|
|
34
|
+
if (!mimeType.includes('/')) {
|
|
35
|
+
const errMessage = [
|
|
36
|
+
'A data URL was passed but did not have the correct format so that Remotion could convert it for the video to be rendered.',
|
|
37
|
+
'The format of the data URL must be `data:[mime-type];[encoding],[data]`.',
|
|
38
|
+
'The `mime-type` parameter must be a valid mime type.',
|
|
39
|
+
'The data that was received is (truncated to 100 characters):',
|
|
40
|
+
src.substr(0, 100),
|
|
41
|
+
].join(' ');
|
|
42
|
+
throw new TypeError(errMessage);
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
exports.validateMimeType = validateMimeType;
|
|
46
|
+
function validateBufferEncoding(potentialEncoding, dataUrl) {
|
|
47
|
+
const asserted = potentialEncoding;
|
|
48
|
+
const validEncodings = [
|
|
49
|
+
'ascii',
|
|
50
|
+
'base64',
|
|
51
|
+
'base64url',
|
|
52
|
+
'binary',
|
|
53
|
+
'hex',
|
|
54
|
+
'latin1',
|
|
55
|
+
'ucs-2',
|
|
56
|
+
'ucs2',
|
|
57
|
+
'utf-8',
|
|
58
|
+
'utf16le',
|
|
59
|
+
'utf8',
|
|
60
|
+
];
|
|
61
|
+
if (!validEncodings.find((en) => asserted === en)) {
|
|
62
|
+
const errMessage = [
|
|
63
|
+
'A data URL was passed but did not have the correct format so that Remotion could convert it for the video to be rendered.',
|
|
64
|
+
'The format of the data URL must be `data:[mime-type];[encoding],[data]`.',
|
|
65
|
+
'The `encoding` parameter must be one of the following:',
|
|
66
|
+
`${validEncodings.join(' ')}.`,
|
|
67
|
+
'The data that was received is (truncated to 100 characters):',
|
|
68
|
+
dataUrl.substr(0, 100),
|
|
69
|
+
].join(' ');
|
|
70
|
+
throw new TypeError(errMessage);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
32
73
|
const downloadAsset = async (src, to, onDownload) => {
|
|
33
74
|
if (hasBeenDownloadedMap[src]) {
|
|
34
75
|
return;
|
|
@@ -39,11 +80,30 @@ const downloadAsset = async (src, to, onDownload) => {
|
|
|
39
80
|
isDownloadingMap[src] = true;
|
|
40
81
|
const onProgress = onDownload(src);
|
|
41
82
|
(0, ensure_output_directory_1.ensureOutputDirectory)(to);
|
|
83
|
+
if (src.startsWith('data:')) {
|
|
84
|
+
const [assetDetails, assetData] = src.substring('data:'.length).split(',');
|
|
85
|
+
if (!assetDetails.includes(';')) {
|
|
86
|
+
const errMessage = [
|
|
87
|
+
'A data URL was passed but did not have the correct format so that Remotion could convert it for the video to be rendered.',
|
|
88
|
+
'The format of the data URL must be `data:[mime-type];[encoding],[data]`.',
|
|
89
|
+
'The data that was received is (truncated to 100 characters):',
|
|
90
|
+
src.substr(0, 100),
|
|
91
|
+
].join(' ');
|
|
92
|
+
throw new TypeError(errMessage);
|
|
93
|
+
}
|
|
94
|
+
const [mimeType, encoding] = assetDetails.split(';');
|
|
95
|
+
(0, exports.validateMimeType)(mimeType, src);
|
|
96
|
+
validateBufferEncoding(encoding, src);
|
|
97
|
+
const buff = Buffer.from(assetData, encoding);
|
|
98
|
+
await fs_1.default.promises.writeFile(to, buff);
|
|
99
|
+
notifyAssetIsDownloaded(src);
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
42
102
|
// Listen to 'close' event instead of more
|
|
43
103
|
// concise method to avoid this problem
|
|
44
104
|
// https://github.com/remotion-dev/remotion/issues/384#issuecomment-844398183
|
|
45
105
|
await new Promise((resolve, reject) => {
|
|
46
|
-
const writeStream = (0,
|
|
106
|
+
const writeStream = (0, fs_2.createWriteStream)(to);
|
|
47
107
|
writeStream.on('close', () => resolve());
|
|
48
108
|
writeStream.on('error', (err) => reject(err));
|
|
49
109
|
const stream = got_1.default.stream(src);
|
|
@@ -66,6 +126,9 @@ const markAllAssetsAsDownloaded = () => {
|
|
|
66
126
|
};
|
|
67
127
|
exports.markAllAssetsAsDownloaded = markAllAssetsAsDownloaded;
|
|
68
128
|
const getSanitizedFilenameForAssetUrl = ({ src, downloadDir, }) => {
|
|
129
|
+
if (remotion_1.Internals.AssetCompression.isAssetCompressed(src)) {
|
|
130
|
+
return src;
|
|
131
|
+
}
|
|
69
132
|
const { pathname, search } = new URL(src);
|
|
70
133
|
const split = pathname.split('.');
|
|
71
134
|
const fileExtension = split.length > 1 && split[split.length - 1]
|
|
@@ -80,7 +143,9 @@ const downloadAndMapAssetsToFileUrl = async ({ asset, downloadDir, onDownload, }
|
|
|
80
143
|
src: asset.src,
|
|
81
144
|
downloadDir,
|
|
82
145
|
});
|
|
83
|
-
|
|
146
|
+
if (!remotion_1.Internals.AssetCompression.isAssetCompressed(newSrc)) {
|
|
147
|
+
await downloadAsset(asset.src, newSrc, onDownload);
|
|
148
|
+
}
|
|
84
149
|
return {
|
|
85
150
|
...asset,
|
|
86
151
|
src: newSrc,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download-and-map-assets-to-file.js","sourceRoot":"","sources":["../../src/assets/download-and-map-assets-to-file.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAqC;AACrC,8CAAsB;AACtB,gDAAwB;
|
|
1
|
+
{"version":3,"file":"download-and-map-assets-to-file.js","sourceRoot":"","sources":["../../src/assets/download-and-map-assets-to-file.ts"],"names":[],"mappings":"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"}
|
package/dist/assets/types.d.ts
CHANGED
|
@@ -12,6 +12,7 @@ export declare type MediaAsset = Omit<UnsafeAsset, 'duration' | 'volume'> & {
|
|
|
12
12
|
duration: number;
|
|
13
13
|
volume: AssetVolume;
|
|
14
14
|
};
|
|
15
|
+
export declare const uncompressMediaAsset: (allAssets: TAsset[], assetToUncompress: TAsset) => TAsset;
|
|
15
16
|
export declare type AssetAudioDetails = {
|
|
16
17
|
channels: number;
|
|
17
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/assets/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAKhC,oBAAY,WAAW,GAAG,IAAI,CAC7B,MAAM,EACN,OAAO,GAAG,IAAI,GAAG,QAAQ,GAAG,YAAY,CACxC,GAAG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,oBAAY,WAAW,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;AAE5C,oBAAY,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,GAAG,QAAQ,CAAC,GAAG;IACnE,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF,oBAAY,iBAAiB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,MAAM,GAAG,UAAU,EAAE,CAAC"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/assets/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAKhC,oBAAY,WAAW,GAAG,IAAI,CAC7B,MAAM,EACN,OAAO,GAAG,IAAI,GAAG,QAAQ,GAAG,YAAY,CACxC,GAAG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,oBAAY,WAAW,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;AAE5C,oBAAY,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,GAAG,QAAQ,CAAC,GAAG;IACnE,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,oBAAoB,cACrB,MAAM,EAAE,qBACA,MAAM,KACvB,MAuBF,CAAC;AAEF,oBAAY,iBAAiB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,MAAM,GAAG,UAAU,EAAE,CAAC"}
|
package/dist/assets/types.js
CHANGED
|
@@ -1,3 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.uncompressMediaAsset = void 0;
|
|
4
|
+
const uncompressMediaAsset = (allAssets, assetToUncompress) => {
|
|
5
|
+
const isCompressed = assetToUncompress.src.match(/same-as-(.*)-([0-9]+)$/);
|
|
6
|
+
if (!isCompressed) {
|
|
7
|
+
return assetToUncompress;
|
|
8
|
+
}
|
|
9
|
+
const [, id, frame] = isCompressed;
|
|
10
|
+
const assetToFill = allAssets.find((a) => a.id === id && String(a.frame) === frame);
|
|
11
|
+
if (!assetToFill) {
|
|
12
|
+
console.log('List of assets:');
|
|
13
|
+
console.log(allAssets);
|
|
14
|
+
throw new TypeError(`Cannot uncompress asset, asset list seems corrupt. Please file a bug in the Remotion repo with the debug information above.`);
|
|
15
|
+
}
|
|
16
|
+
return {
|
|
17
|
+
...assetToUncompress,
|
|
18
|
+
src: assetToFill.src,
|
|
19
|
+
};
|
|
20
|
+
};
|
|
21
|
+
exports.uncompressMediaAsset = uncompressMediaAsset;
|
|
3
22
|
//# sourceMappingURL=types.js.map
|
package/dist/assets/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/assets/types.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/assets/types.ts"],"names":[],"mappings":";;;AA0BO,MAAM,oBAAoB,GAAG,CACnC,SAAmB,EACnB,iBAAyB,EAChB,EAAE;IACX,MAAM,YAAY,GAAG,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC3E,IAAI,CAAC,YAAY,EAAE;QAClB,OAAO,iBAAiB,CAAC;KACzB;IAED,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,GAAG,YAAY,CAAC;IAEnC,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,CAC/C,CAAC;IACF,IAAI,CAAC,WAAW,EAAE;QACjB,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvB,MAAM,IAAI,SAAS,CAClB,6HAA6H,CAC7H,CAAC;KACF;IAED,OAAO;QACN,GAAG,iBAAiB;QACpB,GAAG,EAAE,WAAW,CAAC,GAAG;KACpB,CAAC;AACH,CAAC,CAAC;AA1BW,QAAA,oBAAoB,wBA0B/B"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export declare const ensureFramesInOrder: (frameRange: [number, number]) => {
|
|
2
|
+
waitForRightTimeOfFrameToBeInserted: (frameToBe: number) => Promise<void>;
|
|
3
|
+
setFrameToStitch: (f: number) => void;
|
|
4
|
+
waitForFinish: () => Promise<void>;
|
|
5
|
+
};
|
|
6
|
+
//# sourceMappingURL=ensure-frames-in-order.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ensure-frames-in-order.d.ts","sourceRoot":"","sources":["../src/ensure-frames-in-order.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,mBAAmB,eAAgB,CAAC,MAAM,EAAE,MAAM,CAAC;qDAcD,MAAM;0BAWvC,MAAM;;CAcnC,CAAC"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ensureFramesInOrder = void 0;
|
|
4
|
+
const ensureFramesInOrder = (frameRange) => {
|
|
5
|
+
let [frameToStitch, finalFrame] = frameRange;
|
|
6
|
+
let waiters = [];
|
|
7
|
+
const resolveWaiters = () => {
|
|
8
|
+
for (const waiter of waiters.slice(0)) {
|
|
9
|
+
if (frameToStitch === waiter.forFrame) {
|
|
10
|
+
waiter.resolve();
|
|
11
|
+
waiters = waiters.filter((w) => w.id !== waiter.id);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
const waitForRightTimeOfFrameToBeInserted = async (frameToBe) => {
|
|
16
|
+
return new Promise((resolve) => {
|
|
17
|
+
waiters.push({
|
|
18
|
+
id: String(Math.random()),
|
|
19
|
+
forFrame: frameToBe,
|
|
20
|
+
resolve,
|
|
21
|
+
});
|
|
22
|
+
resolveWaiters();
|
|
23
|
+
});
|
|
24
|
+
};
|
|
25
|
+
const setFrameToStitch = (f) => {
|
|
26
|
+
frameToStitch = f;
|
|
27
|
+
resolveWaiters();
|
|
28
|
+
};
|
|
29
|
+
const waitForFinish = async () => {
|
|
30
|
+
await waitForRightTimeOfFrameToBeInserted(finalFrame + 1);
|
|
31
|
+
};
|
|
32
|
+
return {
|
|
33
|
+
waitForRightTimeOfFrameToBeInserted,
|
|
34
|
+
setFrameToStitch,
|
|
35
|
+
waitForFinish,
|
|
36
|
+
};
|
|
37
|
+
};
|
|
38
|
+
exports.ensureFramesInOrder = ensureFramesInOrder;
|
|
39
|
+
//# sourceMappingURL=ensure-frames-in-order.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ensure-frames-in-order.js","sourceRoot":"","sources":["../src/ensure-frames-in-order.ts"],"names":[],"mappings":";;;AAMO,MAAM,mBAAmB,GAAG,CAAC,UAA4B,EAAE,EAAE;IACnE,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,UAAU,CAAC;IAE7C,IAAI,OAAO,GAAa,EAAE,CAAC;IAE3B,MAAM,cAAc,GAAG,GAAG,EAAE;QAC3B,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;YACtC,IAAI,aAAa,KAAK,MAAM,CAAC,QAAQ,EAAE;gBACtC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC;aACpD;SACD;IACF,CAAC,CAAC;IAEF,MAAM,mCAAmC,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;QACvE,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YACpC,OAAO,CAAC,IAAI,CAAC;gBACZ,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACzB,QAAQ,EAAE,SAAS;gBACnB,OAAO;aACP,CAAC,CAAC;YACH,cAAc,EAAE,CAAC;QAClB,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,CAAC,CAAS,EAAE,EAAE;QACtC,aAAa,GAAG,CAAC,CAAC;QAClB,cAAc,EAAE,CAAC;IAClB,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;QAChC,MAAM,mCAAmC,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC;IAEF,OAAO;QACN,mCAAmC;QACnC,gBAAgB;QAChB,aAAa;KACb,CAAC;AACH,CAAC,CAAC;AAvCW,QAAA,mBAAmB,uBAuC9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-media.d.ts","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACN,KAAK,EACL,gBAAgB,EAChB,UAAU,EAEV,WAAW,EACX,aAAa,EACb,aAAa,EACb,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAG/E,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"render-media.d.ts","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACN,KAAK,EACL,gBAAgB,EAChB,UAAU,EAEV,WAAW,EACX,aAAa,EACb,aAAa,EACb,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAG/E,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AAKjC,oBAAY,cAAc,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEnD,oBAAY,qBAAqB,GAAG,CAAC,QAAQ,EAAE;IAC9C,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,cAAc,CAAC;CAC5B,KAAK,IAAI,CAAC;AAEX,oBAAY,kBAAkB,GAAG;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,aAAa,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/B,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACvD,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;CACtC,GAAG,uBAAuB,CAAC;AAI5B,eAAO,MAAM,WAAW,iRAsBrB,kBAAkB,kBAqJpB,CAAC"}
|
package/dist/render-media.js
CHANGED
|
@@ -13,6 +13,8 @@ const tmp_dir_1 = require("./tmp-dir");
|
|
|
13
13
|
const get_extension_from_codec_1 = require("./get-extension-from-codec");
|
|
14
14
|
const legacy_webpack_config_1 = require("./legacy-webpack-config");
|
|
15
15
|
const ensure_output_directory_1 = require("./ensure-output-directory");
|
|
16
|
+
const ensure_frames_in_order_1 = require("./ensure-frames-in-order");
|
|
17
|
+
const get_frame_to_render_1 = require("./get-frame-to-render");
|
|
16
18
|
const renderMedia = async ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, ...options }) => {
|
|
17
19
|
var _a, _b;
|
|
18
20
|
remotion_1.Internals.validateQuality(quality);
|
|
@@ -65,26 +67,7 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
65
67
|
});
|
|
66
68
|
stitcherFfmpeg = preStitcher.task;
|
|
67
69
|
}
|
|
68
|
-
|
|
69
|
-
? frameRange
|
|
70
|
-
: frameRange === null || frameRange === undefined
|
|
71
|
-
? 0
|
|
72
|
-
: frameRange[0];
|
|
73
|
-
let lastFrame = 0;
|
|
74
|
-
const waitForRightTimeOfFrameToBeInserted = async (frameToBe) => {
|
|
75
|
-
return new Promise((resolve) => {
|
|
76
|
-
if (frameToStitch === frameToBe) {
|
|
77
|
-
resolve();
|
|
78
|
-
return;
|
|
79
|
-
}
|
|
80
|
-
const interval = setInterval(() => {
|
|
81
|
-
if (frameToStitch === frameToBe) {
|
|
82
|
-
resolve();
|
|
83
|
-
clearInterval(interval);
|
|
84
|
-
}
|
|
85
|
-
}, 10);
|
|
86
|
-
});
|
|
87
|
-
};
|
|
70
|
+
const { waitForRightTimeOfFrameToBeInserted, setFrameToStitch, waitForFinish, } = (0, ensure_frames_in_order_1.ensureFramesInOrder)((0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null));
|
|
88
71
|
const { assetsInfo } = await (0, render_1.renderFrames)({
|
|
89
72
|
config: composition,
|
|
90
73
|
onFrameUpdate: (frame) => {
|
|
@@ -104,12 +87,11 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
104
87
|
quality,
|
|
105
88
|
frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
|
|
106
89
|
puppeteerInstance,
|
|
107
|
-
|
|
90
|
+
onFrameBuffer: async (buffer, frame) => {
|
|
108
91
|
var _a;
|
|
109
|
-
lastFrame = Math.max(lastFrame, frame);
|
|
110
92
|
await waitForRightTimeOfFrameToBeInserted(frame);
|
|
111
93
|
(_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
|
|
112
|
-
|
|
94
|
+
setFrameToStitch(frame + 1);
|
|
113
95
|
},
|
|
114
96
|
serveUrl,
|
|
115
97
|
dumpBrowserLogs,
|
|
@@ -117,7 +99,7 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
|
|
|
117
99
|
onDownload,
|
|
118
100
|
});
|
|
119
101
|
if (stitcherFfmpeg) {
|
|
120
|
-
await
|
|
102
|
+
await waitForFinish();
|
|
121
103
|
(_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
|
|
122
104
|
await stitcherFfmpeg;
|
|
123
105
|
(_b = preStitcher === null || preStitcher === void 0 ? void 0 : preStitcher.cleanup) === null || _b === void 0 ? void 0 : _b.call(preStitcher);
|
package/dist/render-media.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-media.js","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":";;;;;;AACA,4CAAoB;AACpB,gDAAwB;AAExB,uCAQkB;AAClB,yCAA4D;AAC5D,qCAAsC;AAItC,uCAAiC;AACjC,yEAAqE;AACrE,mEAGiC;AACjC,uEAAgE;
|
|
1
|
+
{"version":3,"file":"render-media.js","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"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"}
|
package/dist/render.d.ts
CHANGED
|
@@ -27,10 +27,10 @@ declare type RenderFramesOptions = {
|
|
|
27
27
|
puppeteerInstance?: PuppeteerBrowser;
|
|
28
28
|
browserExecutable?: BrowserExecutable;
|
|
29
29
|
onBrowserLog?: (log: BrowserLog) => void;
|
|
30
|
-
|
|
30
|
+
onFrameBuffer?: (buffer: Buffer, frame: number) => void;
|
|
31
31
|
onDownload?: RenderMediaOnDownload;
|
|
32
32
|
} & ConfigOrComposition & ServeUrlOrWebpackBundle;
|
|
33
|
-
export declare const innerRenderFrames: ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog,
|
|
33
|
+
export declare const innerRenderFrames: ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, }: Omit<RenderFramesOptions, "url"> & {
|
|
34
34
|
onError: (err: Error) => void;
|
|
35
35
|
pagesArray: Page[];
|
|
36
36
|
serveUrl: string;
|
package/dist/render.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";AAEA,OAAO,EACN,OAAO,IAAI,gBAAgB,EAE3B,IAAI,EACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,iBAAiB,EACjB,UAAU,EACV,WAAW,
|
|
1
|
+
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";AAEA,OAAO,EACN,OAAO,IAAI,gBAAgB,EAE3B,IAAI,EACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,iBAAiB,EACjB,UAAU,EACV,WAAW,EAGX,WAAW,EACX,MAAM,UAAU,CAAC;AAClB,OAAO,EAEN,qBAAqB,EACrB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAKzC,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AASjC,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAExD,aAAK,mBAAmB,GACrB;IACA;;OAEG;IACH,MAAM,EAAE,WAAW,CAAC;CACnB,GACD;IACA,WAAW,EAAE,WAAW,CAAC;CACxB,CAAC;AAEL,aAAK,mBAAmB,GAAG;IAC1B,OAAO,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACrC,aAAa,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IACpE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC;IACzC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,UAAU,CAAC,EAAE,qBAAqB,CAAC;CACnC,GAAG,mBAAmB,GACtB,uBAAuB,CAAC;AAczB,eAAO,MAAM,iBAAiB;mBAmBd,KAAK,KAAK,IAAI;gBACjB,IAAI,EAAE;cACR,MAAM;iBACH,WAAW;MACrB,QAAQ,kBAAkB,CAmM7B,CAAC;AAEF,eAAO,MAAM,YAAY,YACf,mBAAmB,KAC1B,QAAQ,kBAAkB,CAgF5B,CAAC"}
|
package/dist/render.js
CHANGED
|
@@ -30,7 +30,7 @@ const getComposition = (others) => {
|
|
|
30
30
|
}
|
|
31
31
|
return undefined;
|
|
32
32
|
};
|
|
33
|
-
const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog,
|
|
33
|
+
const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, }) => {
|
|
34
34
|
if (!puppeteerInstance) {
|
|
35
35
|
throw new Error('weird');
|
|
36
36
|
}
|
|
@@ -90,7 +90,8 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
90
90
|
frameCount,
|
|
91
91
|
});
|
|
92
92
|
const downloadDir = (0, make_assets_download_dir_1.makeAssetsDownloadTmpDir)();
|
|
93
|
-
const assets =
|
|
93
|
+
const assets = new Array(frameCount).fill(undefined);
|
|
94
|
+
await Promise.all(new Array(frameCount)
|
|
94
95
|
.fill(Boolean)
|
|
95
96
|
.map((x, i) => i)
|
|
96
97
|
.map(async (index) => {
|
|
@@ -117,7 +118,7 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
117
118
|
throw error;
|
|
118
119
|
}
|
|
119
120
|
if (imageFormat !== 'none') {
|
|
120
|
-
if (
|
|
121
|
+
if (onFrameBuffer) {
|
|
121
122
|
const buffer = await (0, provide_screenshot_1.provideScreenshot)({
|
|
122
123
|
page: freePage,
|
|
123
124
|
imageFormat,
|
|
@@ -127,11 +128,11 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
127
128
|
output: undefined,
|
|
128
129
|
},
|
|
129
130
|
});
|
|
130
|
-
|
|
131
|
+
onFrameBuffer(buffer, frame);
|
|
131
132
|
}
|
|
132
133
|
else {
|
|
133
134
|
if (!outputDir) {
|
|
134
|
-
throw new Error('Called renderFrames() without specifying either `outputDir` or `
|
|
135
|
+
throw new Error('Called renderFrames() without specifying either `outputDir` or `onFrameBuffer`');
|
|
135
136
|
}
|
|
136
137
|
const output = path_1.default.join(outputDir, `element-${paddedIndex}.${imageFormat}`);
|
|
137
138
|
await (0, provide_screenshot_1.provideScreenshot)({
|
|
@@ -148,7 +149,9 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
148
149
|
const collectedAssets = await freePage.evaluate(() => {
|
|
149
150
|
return window.remotion_collectAssets();
|
|
150
151
|
});
|
|
151
|
-
collectedAssets.
|
|
152
|
+
const compressedAssets = collectedAssets.map((asset) => remotion_1.Internals.AssetCompression.compressAsset(assets.filter(remotion_1.Internals.truthy).flat(1), asset));
|
|
153
|
+
assets[index] = compressedAssets;
|
|
154
|
+
compressedAssets.forEach((asset) => {
|
|
152
155
|
(0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
|
|
153
156
|
asset,
|
|
154
157
|
downloadDir,
|
|
@@ -162,7 +165,7 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
162
165
|
onFrameUpdate(framesRendered, frame);
|
|
163
166
|
freePage.off('pageerror', errorCallbackOnFrame);
|
|
164
167
|
freePage.off('error', errorCallbackOnFrame);
|
|
165
|
-
return
|
|
168
|
+
return compressedAssets;
|
|
166
169
|
}));
|
|
167
170
|
const returnValue = {
|
|
168
171
|
assetsInfo: {
|
package/dist/render.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AAMxB,
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AAMxB,uCAOkB;AAClB,8FAGkD;AAElD,6DAAsD;AACtD,uDAAuD;AACvD,+DAAwD;AACxD,iDAAoD;AACpD,mEAGiC;AACjC,yEAAoE;AACpE,+DAAwD;AACxD,iDAA2C;AAC3C,iCAA4B;AAC5B,qDAA+C;AAC/C,6DAAuD;AACvD,mDAA4C;AAC5C,2DAAmD;AAiCnD,MAAM,cAAc,GAAG,CAAC,MAA2B,EAAE,EAAE;IACtD,IAAI,aAAa,IAAI,MAAM,EAAE;QAC5B,OAAO,MAAM,CAAC,WAAW,CAAC;KAC1B;IAED,IAAI,QAAQ,IAAI,MAAM,EAAE;QACvB,OAAO,MAAM,CAAC,MAAM,CAAC;KACrB;IAED,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACvC,WAAW,EACX,aAAa,EACb,SAAS,EACT,OAAO,EACP,UAAU,EACV,OAAO,EACP,WAAW,GAAG,mCAAoB,EAClC,UAAU,EACV,iBAAiB,EACjB,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,UAAU,EACV,UAAU,EACV,QAAQ,EACR,WAAW,GAMX,EAA+B,EAAE;IACjC,IAAI,CAAC,iBAAiB,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;KACzB;IAED,MAAM,iBAAiB,GAAG,IAAA,sCAAoB,EAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,IAAI,CAAC,CAAC;IAEpE,IAAI,SAAS,EAAE;QACd,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC9B,YAAE,CAAC,SAAS,CAAC,SAAS,EAAE;gBACvB,SAAS,EAAE,IAAI;aACf,CAAC,CAAC;SACH;KACD;IAED,MAAM,cAAc,GAAG,IAAA,uCAAiB,EACvC,WAAW,CAAC,gBAAgB,EAC5B,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAI,CAClB,CAAC;IAEF,MAAM,UAAU,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAE7D,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;QACpE,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,CAAC;QAC/C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,WAAW,CAAC;YAChB,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,iBAAiB,EAAE,CAAC;SACpB,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,CAAC,GAAmB,EAAE,EAAE;YAC3C,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG;gBACd,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE;gBAC5B,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE;gBAChB,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE;aAChB,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,IAAI,YAAY,EAAE;YACjB,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;SAChC;QAED,MAAM,YAAY,GACjB,OAAO,UAAU,KAAK,QAAQ;YAC7B,CAAC,CAAC,UAAU;YACZ,CAAC,CAAC,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,SAAS;gBACjD,CAAC,CAAC,CAAC;gBACH,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAElB,MAAM,IAAA,kCAAc,EAAC;YACpB,UAAU;YACV,YAAY;YACZ,IAAI;YACJ,QAAQ;YACR,YAAY;SACZ,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,GAAG,IAAA,uCAAiB,EAAC,QAAQ,CAAC,gBAAgB,WAAW,CAAC,EAAE,EAAE,CAAC;QAC5E,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEtB,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,IAAI,WAAI,CAAC,cAAc,CAAC,CAAC;IAEtC,MAAM,CAAC,eAAe,EAAE,cAAc,CAAC,GAAG,cAAc,CAAC;IACzD,iDAAiD;IACjD,eAAe;IACf,MAAM,aAAa,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC;IACpD,IAAI,cAAc,GAAG,CAAC,CAAC;IAEvB,OAAO,CAAC;QACP,UAAU;KACV,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,IAAA,mDAAwB,GAAE,CAAC;IAC/C,MAAM,MAAM,GAAe,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACjE,MAAM,OAAO,CAAC,GAAG,CAChB,IAAI,KAAK,CAAC,UAAU,CAAC;SACnB,IAAI,CAAC,OAAO,CAAC;SACb,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SAChB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACpB,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;QACxC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAE/D,MAAM,oBAAoB,GAAG,CAAC,GAAU,EAAE,EAAE;YAC3C,OAAO,CACN,IAAI,KAAK,CACR,4BAA4B,KAAK,KAAK,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,OAAO,EAAE,CAChE,CACD,CAAC;QACH,CAAC,CAAC;QAEF,QAAQ,CAAC,EAAE,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;QAC/C,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;QAC3C,IAAI;YACH,MAAM,IAAA,2BAAW,EAAC,EAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAC,CAAC,CAAC;SAC3C;QAAC,OAAO,GAAG,EAAE;YACb,MAAM,KAAK,GAAG,GAAY,CAAC;YAC3B,IACC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBACjC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EACjC;gBACD,oBAAoB,CACnB,IAAI,KAAK,CACR,2FAA2F,CAC3F,CACD,CAAC;aACF;iBAAM;gBACN,oBAAoB,CAAC,KAAK,CAAC,CAAC;aAC5B;YAED,MAAM,KAAK,CAAC;SACZ;QAED,IAAI,WAAW,KAAK,MAAM,EAAE;YAC3B,IAAI,aAAa,EAAE;gBAClB,MAAM,MAAM,GAAG,MAAM,IAAA,sCAAiB,EAAC;oBACtC,IAAI,EAAE,QAAQ;oBACd,WAAW;oBACX,OAAO;oBACP,OAAO,EAAE;wBACR,KAAK;wBACL,MAAM,EAAE,SAAS;qBACjB;iBACD,CAAC,CAAC;gBACH,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;aAC7B;iBAAM;gBACN,IAAI,CAAC,SAAS,EAAE;oBACf,MAAM,IAAI,KAAK,CACd,gFAAgF,CAChF,CAAC;iBACF;gBAED,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CACvB,SAAS,EACT,WAAW,WAAW,IAAI,WAAW,EAAE,CACvC,CAAC;gBACF,MAAM,IAAA,sCAAiB,EAAC;oBACvB,IAAI,EAAE,QAAQ;oBACd,WAAW;oBACX,OAAO;oBACP,OAAO,EAAE;wBACR,KAAK;wBACL,MAAM;qBACN;iBACD,CAAC,CAAC;aACH;SACD;QAED,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE;YACpD,OAAO,MAAM,CAAC,sBAAsB,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACtD,oBAAS,CAAC,gBAAgB,CAAC,aAAa,CACvC,MAAM,CAAC,MAAM,CAAC,oBAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EACvC,KAAK,CACL,CACD,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,GAAG,gBAAgB,CAAC;QACjC,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAClC,IAAA,+DAA6B,EAAC;gBAC7B,KAAK;gBACL,WAAW;gBACX,UAAU,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;aACjD,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAChB,OAAO,CACN,IAAI,KAAK,CACR,kCAAmC,GAAa,CAAC,KAAK,EAAE,CACxD,CACD,CAAC;YACH,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvB,cAAc,EAAE,CAAC;QACjB,aAAa,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QACrC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;QAChD,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;QAC5C,OAAO,gBAAgB,CAAC;IACzB,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,WAAW,GAAuB;QACvC,UAAU,EAAE;YACX,MAAM;YACN,WAAW;YACX,eAAe;YACf,iBAAiB,EAAE,aAAa,aAAa,KAAK,WAAW,EAAE;SAC/D;QACD,UAAU;KACV,CAAC;IACF,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AA1NW,QAAA,iBAAiB,qBA0N5B;AAEK,MAAM,YAAY,GAAG,KAAK,EAChC,OAA4B,EACE,EAAE;;IAChC,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IAE5C,IAAI,CAAC,WAAW,EAAE;QACjB,MAAM,IAAI,KAAK,CACd,+DAA+D,CAC/D,CAAC;KACF;IAED,oBAAS,CAAC,iBAAiB,CAC1B,WAAW,CAAC,MAAM,EAClB,QAAQ,EACR,mDAAmD,CACnD,CAAC;IACF,oBAAS,CAAC,iBAAiB,CAC1B,WAAW,CAAC,KAAK,EACjB,OAAO,EACP,mDAAmD,CACnD,CAAC;IACF,oBAAS,CAAC,WAAW,CACpB,WAAW,CAAC,GAAG,EACf,4CAA4C,CAC5C,CAAC;IACF,oBAAS,CAAC,wBAAwB,CACjC,WAAW,CAAC,gBAAgB,EAC5B,mDAAmD,CACnD,CAAC;IACF,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,WAAW,KAAK,MAAM,EAAE;QACpE,MAAM,IAAI,KAAK,CACd,oEAAoE,CACpE,CAAC;KACF;IAED,MAAM,gBAAgB,GAAG,IAAA,+CAAuB,EAAC,OAAO,CAAC,CAAC;IAE1D,oBAAS,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3C,MAAM,EAAC,WAAW,EAAE,QAAQ,EAAC,GAAG,MAAM,IAAA,8BAAa,EAAC,gBAAgB,CAAC,CAAC;IAEtE,MAAM,eAAe,GACpB,MAAA,OAAO,CAAC,iBAAiB,mCACzB,CAAC,MAAM,IAAA,0BAAW,EAAC,oBAAS,CAAC,eAAe,EAAE;QAC7C,YAAY,EAAE,OAAO,CAAC,eAAe;QACrC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;KAC5C,CAAC,CAAC,CAAC;IACL,MAAM,EAAC,WAAW,EAAC,GAAG,IAAA,qCAAgB,EAAC,eAAe,CAAC,CAAC;IAExD,MAAM,WAAW,GAAW,EAAE,CAAC;IAE/B,OAAO,IAAI,OAAO,CAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1D,mDAAmD;QACnD,IAAA,yBAAiB,EAAC;YACjB,GAAG,OAAO;YACV,iBAAiB,EAAE,eAAe;YAClC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;YAC7B,UAAU,EAAE,WAAW;YACvB,QAAQ;YACR,WAAW;SACX,CAAC;aACA,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;aAC3B,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aAC3B,OAAO,CAAC,GAAG,EAAE;YACb,4DAA4D;YAC5D,aAAa;YACb,oEAAoE;YAEpE,IAAI,OAAO,CAAC,iBAAiB,EAAE;gBAC9B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC5D,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;gBACjD,CAAC,CAAC,CAAC;aACH;iBAAM;gBACN,eAAe,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACrC,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,GAAG,CAAC,CAAC;gBAC7C,CAAC,CAAC,CAAC;aACH;YAED,WAAW,EAAE,CAAC;YACd,WAAW,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAlFW,QAAA,YAAY,gBAkFvB"}
|
package/dist/stitcher.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stitcher.d.ts","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACN,KAAK,EACL,gBAAgB,EAEhB,WAAW,EACX,aAAa,EACb,eAAe,EACf,MAAM,UAAU,CAAC;AAIlB,OAAO,EAEN,qBAAqB,EACrB,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"stitcher.d.ts","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACN,KAAK,EACL,gBAAgB,EAEhB,WAAW,EACX,aAAa,EACb,eAAe,EACf,MAAM,UAAU,CAAC;AAIlB,OAAO,EAEN,qBAAqB,EACrB,MAAM,0CAA0C,CAAC;AAalD,oBAAY,eAAe,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,eAAe,GAAG,IAAI,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACpC,CAAC;AA+CF,eAAO,MAAM,WAAW,YAAmB,eAAe;;;EAmIzD,CAAC;AAEF,eAAO,MAAM,mBAAmB,YACtB,eAAe,KACtB,QAAQ,IAAI,CAId,CAAC"}
|
package/dist/stitcher.js
CHANGED
|
@@ -17,7 +17,6 @@ const get_audio_codec_name_1 = require("./get-audio-codec-name");
|
|
|
17
17
|
const get_codec_name_1 = require("./get-codec-name");
|
|
18
18
|
const get_prores_profile_name_1 = require("./get-prores-profile-name");
|
|
19
19
|
const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
|
|
20
|
-
const resolve_asset_src_1 = require("./resolve-asset-src");
|
|
21
20
|
const sample_rate_1 = require("./sample-rate");
|
|
22
21
|
const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
|
|
23
22
|
const validate_ffmpeg_1 = require("./validate-ffmpeg");
|
|
@@ -35,9 +34,9 @@ const getAssetsData = async (options) => {
|
|
|
35
34
|
: null);
|
|
36
35
|
(0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
|
|
37
36
|
const assetPositions = fileUrlAssets === null ? [] : (0, calculate_asset_positions_1.calculateAssetPositions)(fileUrlAssets);
|
|
38
|
-
|
|
37
|
+
(0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
|
|
39
38
|
const assetAudioDetails = await (0, get_asset_audio_details_1.getAssetAudioDetails)({
|
|
40
|
-
assetPaths,
|
|
39
|
+
assetPaths: assetPositions.map((a) => a.src),
|
|
41
40
|
});
|
|
42
41
|
const filters = (0, calculate_ffmpeg_filters_1.calculateFfmpegFilters)({
|
|
43
42
|
assetAudioDetails,
|
|
@@ -55,7 +54,7 @@ const getAssetsData = async (options) => {
|
|
|
55
54
|
return {
|
|
56
55
|
complexFilterFlag,
|
|
57
56
|
cleanup,
|
|
58
|
-
|
|
57
|
+
assetPositions,
|
|
59
58
|
};
|
|
60
59
|
};
|
|
61
60
|
const spawnFfmpeg = async (options) => {
|
|
@@ -91,7 +90,7 @@ const spawnFfmpeg = async (options) => {
|
|
|
91
90
|
}
|
|
92
91
|
remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
|
|
93
92
|
remotion_1.Internals.validateSelectedPixelFormatAndCodecCombination(pixelFormat, codec);
|
|
94
|
-
const { complexFilterFlag = undefined, cleanup = undefined,
|
|
93
|
+
const { complexFilterFlag = undefined, cleanup = undefined, assetPositions = undefined, } = options.parallelEncoding ? {} : await getAssetsData(options);
|
|
95
94
|
const ffmpegArgs = [
|
|
96
95
|
['-r', String(options.fps)],
|
|
97
96
|
...(options.preEncodedFileLocation
|
|
@@ -109,9 +108,9 @@ const spawnFfmpeg = async (options) => {
|
|
|
109
108
|
: null,
|
|
110
109
|
options.parallelEncoding ? ['-i', '-'] : null,
|
|
111
110
|
]),
|
|
112
|
-
...(options.assetsInfo &&
|
|
111
|
+
...(options.assetsInfo && assetPositions
|
|
113
112
|
? (0, assets_to_ffmpeg_inputs_1.assetsToFfmpegInputs)({
|
|
114
|
-
assets:
|
|
113
|
+
assets: assetPositions.map((a) => a.src),
|
|
115
114
|
isAudioOnly,
|
|
116
115
|
fps: options.fps,
|
|
117
116
|
frameCount: options.assetsInfo.assets.length,
|
package/dist/stitcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stitcher.js","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,uCAOkB;AAClB,uEAA+D;AAC/D,kFAA2E;AAC3E,sFAA6E;AAC7E,8FAGkD;AAClD,8EAAsE;AAEtE,yEAAkE;AAClE,iFAAyE;AACzE,iEAAyD;AACzD,qDAA8C;AAC9C,uEAA+D;AAC/D,mEAA4D;AAC5D
|
|
1
|
+
{"version":3,"file":"stitcher.js","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAE3C,eAAO,MAAM,qBAAqB;iBAWpB,MAAM;cACT,MAAM;eACL,MAAM;cACP,MAAM;kBACF,MAAM;wBACA,MAAM;YAClB,WAAW;SACd,MAAM;kBACG,MAAM;
|
|
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;AAE3C,eAAO,MAAM,qBAAqB;iBAWpB,MAAM;cACT,MAAM;eACL,MAAM;cACP,MAAM;kBACF,MAAM;wBACA,MAAM;YAClB,WAAW;SACd,MAAM;kBACG,MAAM;YA6BpB,CAAC"}
|
|
@@ -14,8 +14,6 @@ const stringifyFfmpegFilter = ({ streamIndex, trimLeft, trimRight, channels, sta
|
|
|
14
14
|
});
|
|
15
15
|
return (`[${streamIndex}:a]` +
|
|
16
16
|
[
|
|
17
|
-
// TODO: This will solve the issue of stitching videos together reported by Olli
|
|
18
|
-
// on Discord. But will it introduce other problems where the audio is not right? Pending investigation
|
|
19
17
|
'apad',
|
|
20
18
|
`atrim=${trimLeft}:${trimRight}`,
|
|
21
19
|
// For n channels, we delay n + 1 channels.
|
|
@@ -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;AAGlE,MAAM,qBAAqB,GAAG,CAAC,EACrC,WAAW,EACX,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,kBAAkB,EAClB,MAAM,EACN,GAAG,EACH,YAAY,GAWZ,EAAE,EAAE;IACJ,MAAM,mBAAmB,GAAG,CAAC,CAAC,YAAY,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,kBAAkB;IAEvF,MAAM,YAAY,GAAG,IAAA,iDAAsB,EAAC;QAC3C,MAAM;QACN,UAAU,EAAE,kBAAkB;QAC9B,YAAY;QACZ,GAAG;KACH,CAAC,CAAC;IACH,OAAO,CACN,IAAI,WAAW,KAAK;QACpB;YACC,
|
|
1
|
+
{"version":3,"file":"stringify-ffmpeg-filter.js","sourceRoot":"","sources":["../src/stringify-ffmpeg-filter.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AACnC,gEAA0D;AAC1D,gFAAyE;AAGlE,MAAM,qBAAqB,GAAG,CAAC,EACrC,WAAW,EACX,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,kBAAkB,EAClB,MAAM,EACN,GAAG,EACH,YAAY,GAWZ,EAAE,EAAE;IACJ,MAAM,mBAAmB,GAAG,CAAC,CAAC,YAAY,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,kBAAkB;IAEvF,MAAM,YAAY,GAAG,IAAA,iDAAsB,EAAC;QAC3C,MAAM;QACN,UAAU,EAAE,kBAAkB;QAC9B,YAAY;QACZ,GAAG;KACH,CAAC,CAAC;IACH,OAAO,CACN,IAAI,WAAW,KAAK;QACpB;YACC,MAAM;YACN,SAAS,QAAQ,IAAI,SAAS,EAAE;YAChC,2CAA2C;YAC3C,0EAA0E;YAC1E,eAAe;YACf,2DAA2D;YAC3D,4CAA4C;YAC5C,gDAAgD;YAChD,UAAU,IAAI,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACvE,IAAA,kCAAe,EAAC,YAAY,CAAC;YAC7B,UAAU,YAAY,CAAC,KAAK,SAAS,YAAY,CAAC,IAAI,EAAE;SACxD;aACC,MAAM,CAAC,oBAAS,CAAC,MAAM,CAAC;aACxB,IAAI,CAAC,GAAG,CAAC;QACX,KAAK,WAAW,GAAG,CACnB,CAAC;AACH,CAAC,CAAC;AAhDW,QAAA,qBAAqB,yBAgDhC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@remotion/renderer",
|
|
3
|
-
"version": "3.0.0-lambda.
|
|
3
|
+
"version": "3.0.0-lambda.237+8e8a607c9",
|
|
4
4
|
"description": "Renderer for Remotion",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -16,13 +16,13 @@
|
|
|
16
16
|
"url": "https://github.com/remotion-dev/remotion"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@remotion/bundler": "3.0.0-lambda.
|
|
19
|
+
"@remotion/bundler": "3.0.0-lambda.237+8e8a607c9",
|
|
20
20
|
"@testing-library/dom": "^8.7.2",
|
|
21
21
|
"execa": "^4.0.2",
|
|
22
22
|
"got": "11.8.2",
|
|
23
23
|
"p-limit": "^3.1.0",
|
|
24
24
|
"puppeteer-core": "^10.2.0",
|
|
25
|
-
"remotion": "3.0.0-lambda.
|
|
25
|
+
"remotion": "3.0.0-lambda.237+8e8a607c9",
|
|
26
26
|
"sanitize-filename": "^1.6.3",
|
|
27
27
|
"serve-handler": "^6.1.3"
|
|
28
28
|
},
|
|
@@ -46,5 +46,5 @@
|
|
|
46
46
|
"publishConfig": {
|
|
47
47
|
"access": "public"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "8e8a607c932fbf5be91ff069da04a054ab2c8d49"
|
|
50
50
|
}
|