@remotion/renderer 2.5.6 → 2.6.0
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.map +1 -1
- package/dist/assets/download-and-map-assets-to-file.js +5 -1
- 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/create-ffmpeg-complex-filter.d.ts +1 -4
- package/dist/create-ffmpeg-complex-filter.d.ts.map +1 -1
- package/dist/render.d.ts.map +1 -1
- package/dist/render.js +4 -2
- package/dist/render.js.map +1 -1
- package/dist/stitcher.d.ts +1 -1
- package/dist/stitcher.d.ts.map +1 -1
- package/dist/stitcher.js +2 -4
- package/dist/stitcher.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,WAgDzD,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":";;;AACA,4DAAqD;AACrD,6EAAqE;AACrE,mCAA8E;AAE9E,MAAM,QAAQ,GAAG,CAAC,CAAuB,EAAE,CAAS,EAAE,EAAE;IACvD,OAAO,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,MAAgB,EAAE,KAAa,EAAE,EAAE;IACpD,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1D,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;QACjB,OAAO,KAAK,CAAC;KACb;IAED,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACxB,OAAO,IAAI,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,MAAgB,EAAE,EAAE;IACrD,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC3B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC,EAAE;YACjD,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACzB;KACD;IAED,OAAO,YAAY,CAAC;AACrB,CAAC,CAAC;AAEK,MAAM,uBAAuB,GAAG,CAAC,MAAkB,EAAU,EAAE;;IACrE,MAAM,MAAM,GAAkB,EAAE,CAAC;IAEjC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACnD,MAAM,IAAI,GAAG,wBAAwB,CAAC,MAAA,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,OAAO,GAAG,wBAAwB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACxD,MAAM,IAAI,GAAG,wBAAwB,CAAC,MAAA,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC;QAE/D,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;YAC5B,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;gBAC3B,MAAM,CAAC,IAAI,CAAC;oBACX,GAAG,EAAE,IAAA,mCAAe,EAAC,IAAA,4BAAoB,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC;oBACrE,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,QAAQ,EAAE,IAAI;oBACd,EAAE,EAAE,KAAK,CAAC,EAAE;oBACZ,YAAY,EAAE,KAAK;oBACnB,QAAQ,EAAE,KAAK,CAAC,UAAU;oBAC1B,MAAM,EAAE,EAAE;oBACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;oBACxB,YAAY,EAAE,KAAK,CAAC,YAAY;iBAChC,CAAC,CAAC;aACH;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CACxB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAChD,CAAC;YACF,IAAI,CAAC,KAAK;gBAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;YAC/C,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;gBAC3B,wBAAwB;gBACxB,uBAAuB;gBACvB,oCAAoC;gBACpC,KAAK,CAAC,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC;aAChD;YAED,KAAK,CAAC,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;SAC/C;KACD;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC3B,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;SACjD;KACD;IAED,OAAO,IAAA,oDAAuB,EAAC;QAC9B,MAAM,EAAE,MAAsB;QAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM;KACvB,CAAC,CAAC;AACJ,CAAC,CAAC;AAhDW,QAAA,uBAAuB,2BAgDlC"}
|
|
@@ -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":"AAKA,OAAO,
|
|
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;AA2BnD,eAAO,MAAM,gBAAgB,aAAc,MAAM,OAAO,MAAM,SAW7D,CAAC;AA4FF,eAAO,MAAM,yBAAyB,YAQrC,CAAC;AAEF,eAAO,MAAM,+BAA+B;SAKtC,MAAM;cACD,OAAO;mBACF,MAAM;YAyBrB,CAAC;AAEF,eAAO,MAAM,6BAA6B;oBAKzB,MAAM;mBACP,MAAM;sBACH,MAAM,KAAK,IAAI;MAC9B,QAAQ,MAAM,CAkBjB,CAAC"}
|
|
@@ -124,6 +124,9 @@ const markAllAssetsAsDownloaded = () => {
|
|
|
124
124
|
};
|
|
125
125
|
exports.markAllAssetsAsDownloaded = markAllAssetsAsDownloaded;
|
|
126
126
|
const getSanitizedFilenameForAssetUrl = ({ src, isRemote, webpackBundle, }) => {
|
|
127
|
+
if (remotion_1.Internals.AssetCompression.isAssetCompressed(src)) {
|
|
128
|
+
return src;
|
|
129
|
+
}
|
|
127
130
|
const { pathname, search } = new URL(src);
|
|
128
131
|
if (!isRemote) {
|
|
129
132
|
return path_1.default.join(webpackBundle, (0, sanitize_filename_1.default)(pathname));
|
|
@@ -142,7 +145,8 @@ const downloadAndMapAssetsToFileUrl = async ({ localhostAsset, webpackBundle, on
|
|
|
142
145
|
isRemote: localhostAsset.isRemote,
|
|
143
146
|
webpackBundle,
|
|
144
147
|
});
|
|
145
|
-
if (localhostAsset.isRemote
|
|
148
|
+
if (localhostAsset.isRemote &&
|
|
149
|
+
!remotion_1.Internals.AssetCompression.isAssetCompressed(newSrc)) {
|
|
146
150
|
await downloadAsset(localhostAsset.src, newSrc, onDownload);
|
|
147
151
|
}
|
|
148
152
|
return {
|
|
@@ -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,4CAAoB;AACpB,2BAAgD;AAChD,8CAAsB;AACtB,gDAAwB;AAExB,
|
|
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"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import { FfmpegFilterCalculation } from './calculate-ffmpeg-filters';
|
|
2
2
|
export declare const createFfmpegComplexFilter: (filters: FfmpegFilterCalculation[]) => Promise<{
|
|
3
|
-
complexFilterFlag: [
|
|
4
|
-
string,
|
|
5
|
-
string
|
|
6
|
-
] | null;
|
|
3
|
+
complexFilterFlag: [string, string] | null;
|
|
7
4
|
cleanup: () => void;
|
|
8
5
|
}>;
|
|
9
6
|
//# sourceMappingURL=create-ffmpeg-complex-filter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-ffmpeg-complex-filter.d.ts","sourceRoot":"","sources":["../src/create-ffmpeg-complex-filter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AAmBnE,eAAO,MAAM,yBAAyB,YAC5B,uBAAuB,EAAE,KAChC,QAAQ;IACV,iBAAiB,EAAE
|
|
1
|
+
{"version":3,"file":"create-ffmpeg-complex-filter.d.ts","sourceRoot":"","sources":["../src/create-ffmpeg-complex-filter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AAmBnE,eAAO,MAAM,yBAAyB,YAC5B,uBAAuB,EAAE,KAChC,QAAQ;IACV,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAC3C,OAAO,EAAE,MAAM,IAAI,CAAC;CACpB,CA2BA,CAAC"}
|
package/dist/render.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACN,OAAO,EACP,iBAAiB,EACjB,UAAU,EACV,WAAW,
|
|
1
|
+
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACN,OAAO,EACP,iBAAiB,EACjB,UAAU,EACV,WAAW,EAGX,WAAW,EACX,MAAM,UAAU,CAAC;AAYlB,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAErE,eAAO,MAAM,YAAY;YAmBhB,WAAW;mBACJ,MAAM;oBACL,WAAW,KAAK,IAAI;uBACjB,MAAM,KAAK,IAAI;eACvB,MAAM;gBACL,OAAO;;mBAEJ,MAAM;iBACR,WAAW;;;;;;;;sBAQP,WAAW,KAAK,IAAI;MAClC,QAAQ,kBAAkB,CAmL7B,CAAC"}
|
package/dist/render.js
CHANGED
|
@@ -76,7 +76,8 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
|
|
|
76
76
|
onStart({
|
|
77
77
|
frameCount,
|
|
78
78
|
});
|
|
79
|
-
const assets =
|
|
79
|
+
const assets = new Array(frameCount).fill(undefined);
|
|
80
|
+
await Promise.all(new Array(frameCount)
|
|
80
81
|
.fill(Boolean)
|
|
81
82
|
.map((x, i) => i)
|
|
82
83
|
.map(async (index) => {
|
|
@@ -115,11 +116,12 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
|
|
|
115
116
|
const collectedAssets = await freePage.evaluate(() => {
|
|
116
117
|
return window.remotion_collectAssets();
|
|
117
118
|
});
|
|
119
|
+
const compressedAssets = collectedAssets.map((asset) => remotion_1.Internals.AssetCompression.compressAsset(assets.filter(remotion_1.Internals.truthy).flat(1), asset));
|
|
120
|
+
assets[index] = compressedAssets;
|
|
118
121
|
pool.release(freePage);
|
|
119
122
|
framesRendered++;
|
|
120
123
|
onFrameUpdate(framesRendered);
|
|
121
124
|
freePage.off('pageerror', errorCallback);
|
|
122
|
-
return collectedAssets;
|
|
123
125
|
}));
|
|
124
126
|
close().catch((err) => {
|
|
125
127
|
console.log('Unable to close web server', err);
|
package/dist/render.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"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"}
|
package/dist/stitcher.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ export declare const stitchFramesToVideo: (options: {
|
|
|
7
7
|
outputLocation: string;
|
|
8
8
|
force: boolean;
|
|
9
9
|
assetsInfo: RenderAssetInfo;
|
|
10
|
-
imageFormat?: "
|
|
10
|
+
imageFormat?: "none" | "png" | "jpeg" | undefined;
|
|
11
11
|
pixelFormat?: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le" | undefined;
|
|
12
12
|
codec?: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | undefined;
|
|
13
13
|
crf?: number | undefined;
|
package/dist/stitcher.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stitcher.d.ts","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"AACA,OAAO,EACN,KAAK,EACL,gBAAgB,EAChB,WAAW,EAEX,WAAW,EACX,aAAa,EACb,eAAe,EACf,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"stitcher.d.ts","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"AACA,OAAO,EACN,KAAK,EACL,gBAAgB,EAChB,WAAW,EAEX,WAAW,EACX,aAAa,EACb,eAAe,EACf,MAAM,UAAU,CAAC;AAiBlB,eAAO,MAAM,mBAAmB;SAC1B,MAAM;SACN,MAAM;WACJ,MAAM;YACL,MAAM;oBACE,MAAM;WACf,OAAO;gBACF,eAAe;;;;;;6BAQH,MAAM,KAAK,IAAI;wBACpB,MAAM,KAAK,IAAI;;;;MAI/B,QAAQ,IAAI,CAuJf,CAAC"}
|
package/dist/stitcher.js
CHANGED
|
@@ -19,7 +19,6 @@ const get_frame_number_length_1 = require("./get-frame-number-length");
|
|
|
19
19
|
const get_prores_profile_name_1 = require("./get-prores-profile-name");
|
|
20
20
|
const image_format_1 = require("./image-format");
|
|
21
21
|
const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
|
|
22
|
-
const resolve_asset_src_1 = require("./resolve-asset-src");
|
|
23
22
|
const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
|
|
24
23
|
const validate_ffmpeg_1 = require("./validate-ffmpeg");
|
|
25
24
|
const stitchFramesToVideo = async (options) => {
|
|
@@ -71,9 +70,8 @@ const stitchFramesToVideo = async (options) => {
|
|
|
71
70
|
]);
|
|
72
71
|
(0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
|
|
73
72
|
const assetPositions = (0, calculate_asset_positions_1.calculateAssetPositions)(fileUrlAssets);
|
|
74
|
-
const assetPaths = assetPositions.map((asset) => (0, resolve_asset_src_1.resolveAssetSrc)(asset.src));
|
|
75
73
|
const assetAudioDetails = await (0, get_asset_audio_details_1.getAssetAudioDetails)({
|
|
76
|
-
assetPaths,
|
|
74
|
+
assetPaths: assetPositions.map((a) => a.src),
|
|
77
75
|
parallelism: options.parallelism,
|
|
78
76
|
});
|
|
79
77
|
const filters = (0, calculate_ffmpeg_filters_1.calculateFfmpegFilters)({
|
|
@@ -98,7 +96,7 @@ const stitchFramesToVideo = async (options) => {
|
|
|
98
96
|
? ['-i', `element-%0${frameInfo.numberLength}d.${imageFormat}`]
|
|
99
97
|
: null,
|
|
100
98
|
...(0, assets_to_ffmpeg_inputs_1.assetsToFfmpegInputs)({
|
|
101
|
-
assets:
|
|
99
|
+
assets: assetPositions.map((a) => a.src),
|
|
102
100
|
isAudioOnly,
|
|
103
101
|
fps: options.fps,
|
|
104
102
|
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,uCAQkB;AAClB,uEAA+D;AAC/D,kFAA2E;AAC3E,sFAA6E;AAC7E,8FAAmF;AACnF,8EAAsE;AACtE,yEAAkE;AAClE,iFAAyE;AACzE,iEAAyD;AACzD,qDAA8C;AAC9C,uEAAuD;AACvD,uEAA+D;AAC/D,iDAAoD;AACpD,mEAA4D;AAC5D
|
|
1
|
+
{"version":3,"file":"stitcher.js","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@remotion/renderer",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.6.0",
|
|
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": "2.
|
|
19
|
+
"@remotion/bundler": "2.6.0",
|
|
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": "2.
|
|
25
|
+
"remotion": "2.6.0",
|
|
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": "643d795d9a64b2e338ee7179a2133927ea31387e"
|
|
50
50
|
}
|