@remotion/renderer 3.0.0-lambda.2 → 3.0.0-lambda.42

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.
Files changed (41) hide show
  1. package/dist/assets/calculate-asset-positions.d.ts.map +1 -1
  2. package/dist/assets/calculate-asset-positions.js +12 -3
  3. package/dist/assets/calculate-asset-positions.js.map +1 -1
  4. package/dist/assets-to-ffmpeg-inputs.d.ts +4 -1
  5. package/dist/assets-to-ffmpeg-inputs.d.ts.map +1 -1
  6. package/dist/browser-log.d.ts +7 -0
  7. package/dist/browser-log.d.ts.map +1 -0
  8. package/dist/browser-log.js +3 -0
  9. package/dist/browser-log.js.map +1 -0
  10. package/dist/create-ffmpeg-complex-filter.d.ts +4 -1
  11. package/dist/create-ffmpeg-complex-filter.d.ts.map +1 -1
  12. package/dist/ffmpeg-flags.d.ts +11 -3
  13. package/dist/ffmpeg-flags.d.ts.map +1 -1
  14. package/dist/ffmpeg-flags.js +19 -9
  15. package/dist/ffmpeg-flags.js.map +1 -1
  16. package/dist/get-compositions.d.ts +2 -0
  17. package/dist/get-compositions.d.ts.map +1 -1
  18. package/dist/get-compositions.js +10 -0
  19. package/dist/get-compositions.js.map +1 -1
  20. package/dist/index.d.ts +14 -5
  21. package/dist/index.d.ts.map +1 -1
  22. package/dist/index.js.map +1 -1
  23. package/dist/puppeteer-screenshot.d.ts +0 -1
  24. package/dist/puppeteer-screenshot.d.ts.map +1 -1
  25. package/dist/render.d.ts +3 -1
  26. package/dist/render.d.ts.map +1 -1
  27. package/dist/render.js +12 -1
  28. package/dist/render.js.map +1 -1
  29. package/dist/screenshot-dom-element.d.ts +0 -1
  30. package/dist/screenshot-dom-element.d.ts.map +1 -1
  31. package/dist/screenshot-task.d.ts +0 -1
  32. package/dist/screenshot-task.d.ts.map +1 -1
  33. package/dist/stitcher.d.ts +2 -1
  34. package/dist/stitcher.d.ts.map +1 -1
  35. package/dist/stitcher.js +9 -7
  36. package/dist/stitcher.js.map +1 -1
  37. package/dist/validate-ffmpeg.d.ts +2 -2
  38. package/dist/validate-ffmpeg.d.ts.map +1 -1
  39. package/dist/validate-ffmpeg.js +21 -4
  40. package/dist/validate-ffmpeg.js.map +1 -1
  41. 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;AAEhC,OAAO,EAAC,MAAM,EAA0B,MAAM,SAAS,CAAC;AAgBxD,eAAO,MAAM,uBAAuB,WAAY,MAAM,EAAE,EAAE,WAgDzD,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;AAEhC,OAAO,EAAC,MAAM,EAA0B,MAAM,SAAS,CAAC;AA2BxD,eAAO,MAAM,uBAAuB,WAAY,MAAM,EAAE,EAAE,WAgDzD,CAAC"}
@@ -13,13 +13,22 @@ const findFrom = (target, asset) => {
13
13
  target.splice(index, 1);
14
14
  return true;
15
15
  };
16
+ const copyAndDeduplicateAssets = (assets) => {
17
+ const deduplicated = [];
18
+ for (const asset of assets) {
19
+ if (!deduplicated.find((d) => d.id === asset.id)) {
20
+ deduplicated.push(asset);
21
+ }
22
+ }
23
+ return deduplicated;
24
+ };
16
25
  const calculateAssetPositions = (frames) => {
17
26
  var _a, _b;
18
27
  const assets = [];
19
28
  for (let frame = 0; frame < frames.length; frame++) {
20
- const prev = ((_a = frames[frame - 1]) !== null && _a !== void 0 ? _a : []).slice();
21
- const current = frames[frame];
22
- const next = ((_b = frames[frame + 1]) !== null && _b !== void 0 ? _b : []).slice();
29
+ const prev = copyAndDeduplicateAssets((_a = frames[frame - 1]) !== null && _a !== void 0 ? _a : []);
30
+ const current = copyAndDeduplicateAssets(frames[frame]);
31
+ const next = copyAndDeduplicateAssets((_b = frames[frame + 1]) !== null && _b !== void 0 ? _b : []);
23
32
  for (const asset of current) {
24
33
  if (!findFrom(prev, asset)) {
25
34
  assets.push({
@@ -1 +1 @@
1
- {"version":3,"file":"calculate-asset-positions.js","sourceRoot":"","sources":["../../src/assets/calculate-asset-positions.ts"],"names":[],"mappings":";;;AACA,6EAAqE;AAGrE,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;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,CAAC,MAAA,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,CAAC,MAAA,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAE/C,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;YAC5B,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;gBAC3B,MAAM,CAAC,IAAI,CAAC;oBACX,GAAG,EAAE,KAAK,CAAC,GAAG;oBACd,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
+ {"version":3,"file":"calculate-asset-positions.js","sourceRoot":"","sources":["../../src/assets/calculate-asset-positions.ts"],"names":[],"mappings":"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"}
@@ -3,5 +3,8 @@ export declare const assetsToFfmpegInputs: ({ assets, isAudioOnly, frameCount, f
3
3
  isAudioOnly: boolean;
4
4
  frameCount: number;
5
5
  fps: number;
6
- }) => [string, string][];
6
+ }) => [
7
+ string,
8
+ string
9
+ ][];
7
10
  //# sourceMappingURL=assets-to-ffmpeg-inputs.d.ts.map
@@ -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;YAMxB,MAAM,EAAE;iBACH,OAAO;gBACR,MAAM;SACb,MAAM;MACR,CAAC,MAAM,EAAE,MAAM,CAAC,EAUnB,CAAC"}
1
+ {"version":3,"file":"assets-to-ffmpeg-inputs.d.ts","sourceRoot":"","sources":["../src/assets-to-ffmpeg-inputs.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB;YAMxB,MAAM,EAAE;iBACH,OAAO;gBACR,MAAM;SACb,MAAM;MACR;IAAC,MAAM;IAAE,MAAM;CAAC,EAUnB,CAAC"}
@@ -0,0 +1,7 @@
1
+ import { ConsoleMessageLocation, ConsoleMessageType } from 'puppeteer-core';
2
+ export declare type BrowserLog = {
3
+ text: string;
4
+ stackTrace: ConsoleMessageLocation[];
5
+ type: ConsoleMessageType;
6
+ };
7
+ //# sourceMappingURL=browser-log.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"browser-log.d.ts","sourceRoot":"","sources":["../src/browser-log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,sBAAsB,EAAE,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAE1E,oBAAY,UAAU,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,sBAAsB,EAAE,CAAC;IACrC,IAAI,EAAE,kBAAkB,CAAC;CACzB,CAAC"}
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=browser-log.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"browser-log.js","sourceRoot":"","sources":["../src/browser-log.ts"],"names":[],"mappings":""}
@@ -1,6 +1,9 @@
1
1
  import { FfmpegFilterCalculation } from './calculate-ffmpeg-filters';
2
2
  export declare const createFfmpegComplexFilter: (filters: FfmpegFilterCalculation[]) => Promise<{
3
- complexFilterFlag: [string, string] | null;
3
+ complexFilterFlag: [
4
+ string,
5
+ string
6
+ ] | null;
4
7
  cleanup: () => void;
5
8
  }>;
6
9
  //# 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,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAC3C,OAAO,EAAE,MAAM,IAAI,CAAC;CACpB,CA2BA,CAAC"}
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;QAAC,MAAM;QAAE,MAAM;KAAC,GAAG,IAAI,CAAC;IAC3C,OAAO,EAAE,MAAM,IAAI,CAAC;CACpB,CA2BA,CAAC"}
@@ -1,6 +1,14 @@
1
1
  export declare type FfmpegVersion = [number, number, number] | null;
2
- export declare const getFfmpegBuildInfo: () => Promise<string>;
3
- export declare const ffmpegHasFeature: (feature: 'enable-gpl' | 'enable-libx265' | 'enable-libvpx') => Promise<boolean>;
2
+ export declare const getFfmpegBuildInfo: (options: {
3
+ ffmpegExecutable: string | null;
4
+ }) => Promise<string>;
5
+ export declare const ffmpegHasFeature: ({ ffmpegExecutable, feature, isLambda, }: {
6
+ ffmpegExecutable: string | null;
7
+ feature: 'enable-gpl' | 'enable-libx265' | 'enable-libvpx';
8
+ isLambda: boolean;
9
+ }) => Promise<boolean>;
4
10
  export declare const parseFfmpegVersion: (buildconf: string) => FfmpegVersion;
5
- export declare const getFfmpegVersion: () => Promise<FfmpegVersion>;
11
+ export declare const getFfmpegVersion: (options: {
12
+ ffmpegExecutable: string | null;
13
+ }) => Promise<FfmpegVersion>;
6
14
  //# sourceMappingURL=ffmpeg-flags.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ffmpeg-flags.d.ts","sourceRoot":"","sources":["../src/ffmpeg-flags.ts"],"names":[],"mappings":"AAKA,oBAAY,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;AAE5D,eAAO,MAAM,kBAAkB,uBAQ9B,CAAC;AAEF,eAAO,MAAM,gBAAgB,YACnB,YAAY,GAAG,gBAAgB,GAAG,eAAe,qBAQ1D,CAAC;AAEF,eAAO,MAAM,kBAAkB,cAAe,MAAM,KAAG,aAOtD,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAa,QAAQ,aAAa,CAG9D,CAAC"}
1
+ {"version":3,"file":"ffmpeg-flags.d.ts","sourceRoot":"","sources":["../src/ffmpeg-flags.ts"],"names":[],"mappings":"AAKA,oBAAY,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;AAE5D,eAAO,MAAM,kBAAkB,YAAmB;IACjD,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,oBAUA,CAAC;AAEF,eAAO,MAAM,gBAAgB;sBAKV,MAAM,GAAG,IAAI;aACtB,YAAY,GAAG,gBAAgB,GAAG,eAAe;cAChD,OAAO;sBAajB,CAAC;AAEF,eAAO,MAAM,kBAAkB,cAAe,MAAM,KAAG,aAStD,CAAC;AAEF,eAAO,MAAM,gBAAgB,YAAmB;IAC/C,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,KAAG,QAAQ,aAAa,CAKxB,CAAC"}
@@ -7,33 +7,43 @@ exports.getFfmpegVersion = exports.parseFfmpegVersion = exports.ffmpegHasFeature
7
7
  const execa_1 = __importDefault(require("execa"));
8
8
  const validate_ffmpeg_1 = require("./validate-ffmpeg");
9
9
  let buildConfig = null;
10
- const getFfmpegBuildInfo = async () => {
10
+ const getFfmpegBuildInfo = async (options) => {
11
+ var _a;
11
12
  if (buildConfig !== null) {
12
13
  return buildConfig;
13
14
  }
14
- const data = await (0, execa_1.default)('ffmpeg', ['-buildconf']);
15
+ const data = await (0, execa_1.default)((_a = options.ffmpegExecutable) !== null && _a !== void 0 ? _a : 'ffmpeg', [
16
+ '-buildconf',
17
+ ]);
15
18
  buildConfig = data.stderr;
16
19
  return buildConfig;
17
20
  };
18
21
  exports.getFfmpegBuildInfo = getFfmpegBuildInfo;
19
- const ffmpegHasFeature = async (feature) => {
20
- if (!(0, validate_ffmpeg_1.binaryExists)('ffmpeg')) {
22
+ const ffmpegHasFeature = async ({ ffmpegExecutable, feature, isLambda, }) => {
23
+ if (isLambda) {
24
+ // When rendering in the cloud, we don't need a local binary
25
+ return true;
26
+ }
27
+ if (!(await (0, validate_ffmpeg_1.binaryExists)('ffmpeg', ffmpegExecutable))) {
21
28
  return false;
22
29
  }
23
- const config = await (0, exports.getFfmpegBuildInfo)();
30
+ const config = await (0, exports.getFfmpegBuildInfo)({ ffmpegExecutable });
24
31
  return config.includes(feature);
25
32
  };
26
33
  exports.ffmpegHasFeature = ffmpegHasFeature;
27
34
  const parseFfmpegVersion = (buildconf) => {
28
- const match = buildconf.match(/ffmpeg version ([0-9]+).([0-9]+).([0-9]+)/);
35
+ var _a;
36
+ const match = buildconf.match(/ffmpeg version ([0-9]+).([0-9]+)(?:.([0-9]+))?/);
29
37
  if (!match) {
30
38
  return null;
31
39
  }
32
- return [Number(match[1]), Number(match[2]), Number(match[3])];
40
+ return [Number(match[1]), Number(match[2]), Number((_a = match[3]) !== null && _a !== void 0 ? _a : 0)];
33
41
  };
34
42
  exports.parseFfmpegVersion = parseFfmpegVersion;
35
- const getFfmpegVersion = async () => {
36
- const buildInfo = await (0, exports.getFfmpegBuildInfo)();
43
+ const getFfmpegVersion = async (options) => {
44
+ const buildInfo = await (0, exports.getFfmpegBuildInfo)({
45
+ ffmpegExecutable: options.ffmpegExecutable,
46
+ });
37
47
  return (0, exports.parseFfmpegVersion)(buildInfo);
38
48
  };
39
49
  exports.getFfmpegVersion = getFfmpegVersion;
@@ -1 +1 @@
1
- {"version":3,"file":"ffmpeg-flags.js","sourceRoot":"","sources":["../src/ffmpeg-flags.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,uDAA+C;AAE/C,IAAI,WAAW,GAAkB,IAAI,CAAC;AAI/B,MAAM,kBAAkB,GAAG,KAAK,IAAI,EAAE;IAC5C,IAAI,WAAW,KAAK,IAAI,EAAE;QACzB,OAAO,WAAW,CAAC;KACnB;IAED,MAAM,IAAI,GAAG,MAAM,IAAA,eAAK,EAAC,QAAQ,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IACnD,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC;IAC1B,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AARW,QAAA,kBAAkB,sBAQ7B;AAEK,MAAM,gBAAgB,GAAG,KAAK,EACpC,OAA0D,EACzD,EAAE;IACH,IAAI,CAAC,IAAA,8BAAY,EAAC,QAAQ,CAAC,EAAE;QAC5B,OAAO,KAAK,CAAC;KACb;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAkB,GAAE,CAAC;IAC1C,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC,CAAC;AATW,QAAA,gBAAgB,oBAS3B;AAEK,MAAM,kBAAkB,GAAG,CAAC,SAAiB,EAAiB,EAAE;IACtE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC3E,IAAI,CAAC,KAAK,EAAE;QACX,OAAO,IAAI,CAAC;KACZ;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/D,CAAC,CAAC;AAPW,QAAA,kBAAkB,sBAO7B;AAEK,MAAM,gBAAgB,GAAG,KAAK,IAA4B,EAAE;IAClE,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAkB,GAAE,CAAC;IAC7C,OAAO,IAAA,0BAAkB,EAAC,SAAS,CAAC,CAAC;AACtC,CAAC,CAAC;AAHW,QAAA,gBAAgB,oBAG3B"}
1
+ {"version":3,"file":"ffmpeg-flags.js","sourceRoot":"","sources":["../src/ffmpeg-flags.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,uDAA+C;AAE/C,IAAI,WAAW,GAAkB,IAAI,CAAC;AAI/B,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAExC,EAAE,EAAE;;IACJ,IAAI,WAAW,KAAK,IAAI,EAAE;QACzB,OAAO,WAAW,CAAC;KACnB;IAED,MAAM,IAAI,GAAG,MAAM,IAAA,eAAK,EAAC,MAAA,OAAO,CAAC,gBAAgB,mCAAI,QAAQ,EAAE;QAC9D,YAAY;KACZ,CAAC,CAAC;IACH,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC;IAC1B,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AAZW,QAAA,kBAAkB,sBAY7B;AAEK,MAAM,gBAAgB,GAAG,KAAK,EAAE,EACtC,gBAAgB,EAChB,OAAO,EACP,QAAQ,GAKR,EAAE,EAAE;IACJ,IAAI,QAAQ,EAAE;QACb,4DAA4D;QAC5D,OAAO,IAAI,CAAC;KACZ;IAED,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAY,EAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC,EAAE;QACtD,OAAO,KAAK,CAAC;KACb;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAkB,EAAC,EAAC,gBAAgB,EAAC,CAAC,CAAC;IAC5D,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC,CAAC;AApBW,QAAA,gBAAgB,oBAoB3B;AAEK,MAAM,kBAAkB,GAAG,CAAC,SAAiB,EAAiB,EAAE;;IACtE,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAC5B,gDAAgD,CAChD,CAAC;IACF,IAAI,CAAC,KAAK,EAAE;QACX,OAAO,IAAI,CAAC;KACZ;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,MAAA,KAAK,CAAC,CAAC,CAAC,mCAAI,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC,CAAC;AATW,QAAA,kBAAkB,sBAS7B;AAEK,MAAM,gBAAgB,GAAG,KAAK,EAAE,OAEtC,EAA0B,EAAE;IAC5B,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAkB,EAAC;QAC1C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;KAC1C,CAAC,CAAC;IACH,OAAO,IAAA,0BAAkB,EAAC,SAAS,CAAC,CAAC;AACtC,CAAC,CAAC;AAPW,QAAA,gBAAgB,oBAO3B"}
@@ -1,5 +1,6 @@
1
1
  import { Browser as PuppeteerBrowser } from 'puppeteer-core';
2
2
  import { Browser, BrowserExecutable, TCompMetadata } from 'remotion';
3
+ import { BrowserLog } from './browser-log';
3
4
  declare type GetCompositionsConfig = {
4
5
  browser?: Browser;
5
6
  inputProps?: object | null;
@@ -8,6 +9,7 @@ declare type GetCompositionsConfig = {
8
9
  onError?: (errorData: {
9
10
  err: Error;
10
11
  }) => void;
12
+ onBrowserLog?: (log: BrowserLog) => void;
11
13
  browserExecutable?: BrowserExecutable;
12
14
  };
13
15
  export declare const getCompositions: (serveUrl: string, config?: GetCompositionsConfig | undefined) => Promise<TCompMetadata[]>;
@@ -1 +1 @@
1
- {"version":3,"file":"get-compositions.d.ts","sourceRoot":"","sources":["../src/get-compositions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAO,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAC,OAAO,EAAE,iBAAiB,EAAa,aAAa,EAAC,MAAM,UAAU,CAAC;AAI9E,aAAK,qBAAqB,GAAG;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,gBAAgB,CAAC;IACnC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE;QAAC,GAAG,EAAE,KAAK,CAAA;KAAC,KAAK,IAAI,CAAC;IAC5C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACtC,CAAC;AA+CF,eAAO,MAAM,eAAe,aACjB,MAAM,iDAEd,QAAQ,aAAa,EAAE,CA6CzB,CAAC"}
1
+ {"version":3,"file":"get-compositions.d.ts","sourceRoot":"","sources":["../src/get-compositions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAO,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAC,OAAO,EAAE,iBAAiB,EAAa,aAAa,EAAC,MAAM,UAAU,CAAC;AAC9E,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAIzC,aAAK,qBAAqB,GAAG;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,gBAAgB,CAAC;IACnC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE;QAAC,GAAG,EAAE,KAAK,CAAA;KAAC,KAAK,IAAI,CAAC;IAC5C,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC;IACzC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACtC,CAAC;AA+CF,eAAO,MAAM,eAAe,aACjB,MAAM,iDAEd,QAAQ,aAAa,EAAE,CAsDzB,CAAC"}
@@ -49,6 +49,16 @@ const getCompositions = async (serveUrl, config) => {
49
49
  console.log(err);
50
50
  (_a = config === null || config === void 0 ? void 0 : config.onError) === null || _a === void 0 ? void 0 : _a.call(config, { err: err });
51
51
  });
52
+ if (config === null || config === void 0 ? void 0 : config.onBrowserLog) {
53
+ page.on('console', (log) => {
54
+ var _a;
55
+ (_a = config.onBrowserLog) === null || _a === void 0 ? void 0 : _a.call(config, {
56
+ stackTrace: log.stackTrace(),
57
+ text: log.text(),
58
+ type: log.type(),
59
+ });
60
+ });
61
+ }
52
62
  await (0, set_props_and_env_1.setPropsAndEnv)({
53
63
  inputProps: config === null || config === void 0 ? void 0 : config.inputProps,
54
64
  envVariables: config === null || config === void 0 ? void 0 : config.envVariables,
@@ -1 +1 @@
1
- {"version":3,"file":"get-compositions.js","sourceRoot":"","sources":["../src/get-compositions.ts"],"names":[],"mappings":";;;AACA,uCAA8E;AAC9E,iDAA2C;AAC3C,2DAAmD;AAWnD,MAAM,mBAAmB,GAAG,KAAK,EAAE,EAClC,gBAAgB,EAChB,OAAO,EACP,iBAAiB,GAKjB,EAGE,EAAE;IACJ,IAAI,gBAAgB,EAAE;QACrB,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC9C,OAAO;YACN,IAAI;YACJ,OAAO,EAAE,GAAG,EAAE;gBACb,wDAAwD;gBACxD,qBAAqB;gBACrB,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC1B,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC;gBAC5D,CAAC,CAAC,CAAC;YACJ,CAAC;SACD,CAAC;KACF;IAED,MAAM,eAAe,GAAG,MAAM,IAAA,0BAAW,EACxC,OAAO,IAAI,oBAAS,CAAC,eAAe,EACpC;QACC,iBAAiB;KACjB,CACD,CAAC;IACF,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,CAAC;IAEpD,OAAO;QACN,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,GAAG,EAAE;YACb,6EAA6E;YAC7E,eAAe,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACrC,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;QACJ,CAAC;KACD,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,EACnC,QAAgB,EAChB,MAA8B,EACH,EAAE;;IAC7B,MAAM,EAAC,IAAI,EAAE,OAAO,EAAC,GAAG,MAAM,mBAAmB,CAAC;QACjD,gBAAgB,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,eAAe;QACzC,OAAO,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,mCAAI,oBAAS,CAAC,eAAe;QACrD,iBAAiB,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,iBAAiB,mCAAI,IAAI;KACpD,CAAC,CAAC;IAEH,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;;QACxB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,+CAAf,MAAM,EAAY,EAAC,GAAG,EAAE,GAAY,EAAC,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE;;QAC5B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,+CAAf,MAAM,EAAY,EAAC,GAAG,EAAE,GAAY,EAAC,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,MAAM,IAAA,kCAAc,EAAC;QACpB,UAAU,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU;QAC9B,YAAY,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY;QAClC,IAAI;QACJ,QAAQ;QACR,YAAY,EAAE,CAAC;KACf,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,GAAG,QAAQ,6BAA6B,CAAC;IAC5D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5C,IAAI,OAAO,CAAC,MAAM,EAAE,KAAK,GAAG,EAAE;QAC7B,MAAM,IAAI,KAAK,CACd,oDAAoD,UAAU,qDAAqD,OAAO,CAAC,MAAM,EAAE,sCAAsC,CACzK,CAAC;KACF;IAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,8BAA8B,CAAC,CAAC;IACzE,IAAI,YAAY,KAAK,SAAS,EAAE;QAC/B,MAAM,IAAI,KAAK,CACd,oDAAoD,UAAU,oOAAoO,CAClS,CAAC;KACF;IAED,MAAM,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAAC;IAErE,OAAO,EAAE,CAAC;IAEV,OAAO,MAAyB,CAAC;AAClC,CAAC,CAAC;AAhDW,QAAA,eAAe,mBAgD1B"}
1
+ {"version":3,"file":"get-compositions.js","sourceRoot":"","sources":["../src/get-compositions.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -14,18 +14,27 @@ export { renderFrames } from './render';
14
14
  export { renderStill } from './render-still';
15
15
  export { stitchFramesToVideo } from './stitcher';
16
16
  export { OnErrorInfo, OnStartData, RenderFramesOutput } from './types';
17
+ export { BrowserLog } from './browser-log';
17
18
  export declare const RenderInternals: {
18
19
  ensureLocalBrowser: (browser: import("remotion").Browser, preferredBrowserExecutable: import("remotion").BrowserExecutable) => Promise<void>;
19
- ffmpegHasFeature: (feature: "enable-gpl" | "enable-libx265" | "enable-libvpx") => Promise<boolean>;
20
+ ffmpegHasFeature: ({ ffmpegExecutable, feature, isLambda, }: {
21
+ ffmpegExecutable: string | null;
22
+ feature: "enable-gpl" | "enable-libx265" | "enable-libvpx";
23
+ isLambda: boolean;
24
+ }) => Promise<boolean>;
20
25
  getActualConcurrency: (userPreference: number | null) => number;
21
- getFfmpegVersion: () => Promise<import("./ffmpeg-flags").FfmpegVersion>;
26
+ getFfmpegVersion: (options: {
27
+ ffmpegExecutable: string | null;
28
+ }) => Promise<import("./ffmpeg-flags").FfmpegVersion>;
22
29
  openBrowser: (browser: import("remotion").Browser, options?: {
23
30
  shouldDumpIo?: boolean | undefined;
24
31
  browserExecutable?: string | null | undefined;
25
32
  } | undefined) => Promise<import("puppeteer-core").Browser>;
26
- validateFfmpeg: () => Promise<void>;
27
- binaryExists: (name: "ffmpeg" | "brew") => Promise<boolean>;
28
- getFfmpegBuildInfo: () => Promise<string>;
33
+ validateFfmpeg: (customFfmpegBinary: string | null) => Promise<void>;
34
+ binaryExists: (name: "ffmpeg" | "brew", localFFmpeg: string | null) => Promise<boolean>;
35
+ getFfmpegBuildInfo: (options: {
36
+ ffmpegExecutable: string | null;
37
+ }) => Promise<string>;
29
38
  serveStatic: (path: string, options?: {
30
39
  port?: number | undefined;
31
40
  } | undefined) => Promise<{
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AAe/C,OAAO,CAAC,MAAM,CAAC;IACd,UAAU,MAAM;QACf,KAAK,EAAE,OAAO,CAAC;QACf,qBAAqB,EAAE,MAAM,aAAa,EAAE,CAAC;QAC7C,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;QAC3C,sBAAsB,EAAE,MAAM,MAAM,EAAE,CAAC;KACvC;CACD;AAED,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAErE,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;CAc3B,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AAe/C,OAAO,CAAC,MAAM,CAAC;IACd,UAAU,MAAM;QACf,KAAK,EAAE,OAAO,CAAC;QACf,qBAAqB,EAAE,MAAM,aAAa,EAAE,CAAC;QAC7C,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;QAC3C,sBAAsB,EAAE,MAAM,MAAM,EAAE,CAAC;KACvC;CACD;AAED,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AACrE,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAc3B,CAAC"}
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,mFAA0E;AAC1E,iDAIwB;AACxB,uDAAuD;AACvD,iFAAkE;AAClE,uCAAmC;AACnC,iDAA2C;AAC3C,iDAA2C;AAC3C,+FAAsF;AACtF,uDAA+D;AAW/D,mDAA+C;AAAvC,+GAAA,aAAa,OAAA;AAErB,uDAAmD;AAA3C,mHAAA,eAAe,OAAA;AACvB,mCAAsC;AAA9B,sGAAA,YAAY,OAAA;AACpB,+CAA2C;AAAnC,2GAAA,WAAW,OAAA;AACnB,uCAA+C;AAAvC,+GAAA,mBAAmB,OAAA;AAGd,QAAA,eAAe,GAAG;IAC9B,kBAAkB,EAAlB,iDAAkB;IAClB,gBAAgB,EAAhB,+BAAgB;IAChB,oBAAoB,EAApB,sCAAoB;IACpB,gBAAgB,EAAhB,+BAAgB;IAChB,WAAW,EAAX,0BAAW;IACX,cAAc,EAAd,gCAAc;IACd,YAAY,EAAZ,8BAAY;IACZ,kBAAkB,EAAlB,iCAAkB;IAClB,WAAW,EAAX,0BAAW;IACX,yBAAyB,EAAzB,yDAAyB;IACzB,+BAA+B,EAA/B,qEAA+B;IAC/B,GAAG,EAAH,aAAG;IACH,GAAG,EAAH,aAAG;CACH,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,mFAA0E;AAC1E,iDAIwB;AACxB,uDAAuD;AACvD,iFAAkE;AAClE,uCAAmC;AACnC,iDAA2C;AAC3C,iDAA2C;AAC3C,+FAAsF;AACtF,uDAA+D;AAW/D,mDAA+C;AAAvC,+GAAA,aAAa,OAAA;AAErB,uDAAmD;AAA3C,mHAAA,eAAe,OAAA;AACvB,mCAAsC;AAA9B,sGAAA,YAAY,OAAA;AACpB,+CAA2C;AAAnC,2GAAA,WAAW,OAAA;AACnB,uCAA+C;AAAvC,+GAAA,mBAAmB,OAAA;AAId,QAAA,eAAe,GAAG;IAC9B,kBAAkB,EAAlB,iDAAkB;IAClB,gBAAgB,EAAhB,+BAAgB;IAChB,oBAAoB,EAApB,sCAAoB;IACpB,gBAAgB,EAAhB,+BAAgB;IAChB,WAAW,EAAX,0BAAW;IACX,cAAc,EAAd,gCAAc;IACd,YAAY,EAAZ,8BAAY;IACZ,kBAAkB,EAAlB,iCAAkB;IAClB,WAAW,EAAX,0BAAW;IACX,yBAAyB,EAAzB,yDAAyB;IACzB,+BAA+B,EAA/B,qEAA+B;IAC/B,GAAG,EAAH,aAAG;IACH,GAAG,EAAH,aAAG;CACH,CAAC"}
@@ -1,4 +1,3 @@
1
- /// <reference types="node" />
2
1
  import { Page, ScreenshotOptions } from 'puppeteer-core';
3
2
  export declare const screenshot: (page: Page, options?: ScreenshotOptions) => Promise<Buffer | string | void>;
4
3
  //# sourceMappingURL=puppeteer-screenshot.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"puppeteer-screenshot.d.ts","sourceRoot":"","sources":["../src/puppeteer-screenshot.ts"],"names":[],"mappings":";AACA,OAAO,EAAC,IAAI,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAIvD,eAAO,MAAM,UAAU,SAChB,IAAI,YACD,iBAAiB,KACxB,QAAQ,MAAM,GAAG,MAAM,GAAG,IAAI,CAyFhC,CAAC"}
1
+ {"version":3,"file":"puppeteer-screenshot.d.ts","sourceRoot":"","sources":["../src/puppeteer-screenshot.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAIvD,eAAO,MAAM,UAAU,SAChB,IAAI,YACD,iBAAiB,KACxB,QAAQ,MAAM,GAAG,MAAM,GAAG,IAAI,CAyFhC,CAAC"}
package/dist/render.d.ts CHANGED
@@ -1,7 +1,8 @@
1
1
  import { Browser as PuppeteerBrowser } from 'puppeteer-core';
2
2
  import { Browser, BrowserExecutable, FrameRange, ImageFormat, VideoConfig } from 'remotion';
3
+ import { BrowserLog } from './browser-log';
3
4
  import { OnErrorInfo, OnStartData, RenderFramesOutput } from './types';
4
- export declare const renderFrames: ({ config, parallelism, onFrameUpdate, compositionId, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, serveUrl, onError, envVariables, browserExecutable, dumpBrowserLogs, browser, }: {
5
+ export declare const renderFrames: ({ config, parallelism, onFrameUpdate, compositionId, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, serveUrl, onError, envVariables, browserExecutable, dumpBrowserLogs, browser, onBrowserLog, }: {
5
6
  config: VideoConfig;
6
7
  compositionId: string;
7
8
  onStart: (data: OnStartData) => void;
@@ -19,5 +20,6 @@ export declare const renderFrames: ({ config, parallelism, onFrameUpdate, compos
19
20
  puppeteerInstance?: PuppeteerBrowser | undefined;
20
21
  browserExecutable?: BrowserExecutable | undefined;
21
22
  onError?: ((info: OnErrorInfo) => void) | undefined;
23
+ onBrowserLog?: ((log: BrowserLog) => void) | undefined;
22
24
  }) => Promise<RenderFramesOutput>;
23
25
  //# sourceMappingURL=render.d.ts.map
@@ -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,EAEX,WAAW,EACX,MAAM,UAAU,CAAC;AAWlB,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAErE,eAAO,MAAM,YAAY;YAmBhB,WAAW;mBACJ,MAAM;oBACL,WAAW,KAAK,IAAI;oCAEnB,MAAM,OACjB,MAAM,cACC,MAAM,KACd,IAAI;eACE,MAAM;gBACL,OAAO;;iBAEN,WAAW;;;;;cAKd,MAAM;;;;sBAIC,WAAW,KAAK,IAAI;MAClC,QAAQ,kBAAkB,CAwK7B,CAAC"}
1
+ {"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAiB,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EACN,OAAO,EACP,iBAAiB,EACjB,UAAU,EACV,WAAW,EAEX,WAAW,EACX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAWzC,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAErE,eAAO,MAAM,YAAY;YAoBhB,WAAW;mBACJ,MAAM;oBACL,WAAW,KAAK,IAAI;oCAEnB,MAAM,OACjB,MAAM,cACC,MAAM,KACd,IAAI;eACE,MAAM;gBACL,OAAO;;iBAEN,WAAW;;;;;cAKd,MAAM;;;;sBAIC,WAAW,KAAK,IAAI;0BAChB,UAAU,KAAK,IAAI;MACrC,QAAQ,kBAAkB,CAqL7B,CAAC"}
package/dist/render.js CHANGED
@@ -16,7 +16,7 @@ const pool_1 = require("./pool");
16
16
  const provide_screenshot_1 = require("./provide-screenshot");
17
17
  const seek_to_frame_1 = require("./seek-to-frame");
18
18
  const set_props_and_env_1 = require("./set-props-and-env");
19
- const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, serveUrl, onError, envVariables, browserExecutable, dumpBrowserLogs, browser, }) => {
19
+ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, serveUrl, onError, envVariables, browserExecutable, dumpBrowserLogs, browser, onBrowserLog, }) => {
20
20
  remotion_1.Internals.validateDimension(config.height, 'height', 'in the `config` object passed to `renderFrames()`');
21
21
  remotion_1.Internals.validateDimension(config.width, 'width', 'in the `config` object passed to `renderFrames()`');
22
22
  remotion_1.Internals.validateFps(config.fps, 'in the `config` object of `renderFrames()`');
@@ -40,6 +40,16 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
40
40
  const errorCallback = (err) => {
41
41
  onError === null || onError === void 0 ? void 0 : onError({ error: err, frame: null });
42
42
  };
43
+ const logCallback = (log) => {
44
+ onBrowserLog === null || onBrowserLog === void 0 ? void 0 : onBrowserLog({
45
+ stackTrace: log.stackTrace(),
46
+ text: log.text(),
47
+ type: log.type(),
48
+ });
49
+ };
50
+ if (onBrowserLog) {
51
+ page.on('console', logCallback);
52
+ }
43
53
  page.on('error', errorCallback);
44
54
  page.on('pageerror', errorCallback);
45
55
  const initialFrame = typeof frameRange === 'number'
@@ -58,6 +68,7 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
58
68
  await page.goto(site);
59
69
  page.off('error', errorCallback);
60
70
  page.off('pageerror', errorCallback);
71
+ page.off('console', logCallback);
61
72
  return page;
62
73
  });
63
74
  const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserInstance);
@@ -1 +1 @@
1
- {"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,uCAOkB;AAClB,6DAAsD;AACtD,uDAAuD;AACvD,uDAAgD;AAChD,+DAAuD;AACvD,iDAAoD;AACpD,iDAA2C;AAC3C,iCAA4B;AAC5B,6DAAuD;AACvD,mDAA4C;AAC5C,2DAAmD;AAG5C,MAAM,YAAY,GAAG,KAAK,EAAE,EAClC,MAAM,EACN,WAAW,EACX,aAAa,EACb,aAAa,EACb,SAAS,EACT,OAAO,EACP,UAAU,EACV,OAAO,EACP,WAAW,GAAG,mCAAoB,EAClC,UAAU,EACV,iBAAiB,EACjB,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,OAAO,GAuBP,EAA+B,EAAE;IACjC,oBAAS,CAAC,iBAAiB,CAC1B,MAAM,CAAC,MAAM,EACb,QAAQ,EACR,mDAAmD,CACnD,CAAC;IACF,oBAAS,CAAC,iBAAiB,CAC1B,MAAM,CAAC,KAAK,EACZ,OAAO,EACP,mDAAmD,CACnD,CAAC;IACF,oBAAS,CAAC,WAAW,CACpB,MAAM,CAAC,GAAG,EACV,4CAA4C,CAC5C,CAAC;IACF,oBAAS,CAAC,wBAAwB,CACjC,MAAM,CAAC,gBAAgB,EACvB,mDAAmD,CACnD,CAAC;IACF,IAAI,OAAO,KAAK,SAAS,IAAI,WAAW,KAAK,MAAM,EAAE;QACpD,MAAM,IAAI,KAAK,CACd,oEAAoE,CACpE,CAAC;KACF;IAED,oBAAS,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAEnC,MAAM,iBAAiB,GAAG,IAAA,sCAAoB,EAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,IAAI,CAAC,CAAC;IAEpE,MAAM,eAAe,GACpB,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GACjB,CAAC,MAAM,IAAA,0BAAW,EAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,oBAAS,CAAC,eAAe,EAAE;QACxD,YAAY,EAAE,eAAe;QAC7B,iBAAiB;KACjB,CAAC,CAAC,CAAC;IAEL,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;QACpE,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,CAAC;QAC7C,IAAI,CAAC,WAAW,CAAC;YAChB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,iBAAiB,EAAE,CAAC;SACpB,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,CAAC,GAAU,EAAE,EAAE;YACpC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,EAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;QACtC,CAAC,CAAC;QAEF,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAChC,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAEpC,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,QAAQ,2BAA2B,aAAa,EAAE,CAAC;QACnE,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;IACH,MAAM,EAAC,WAAW,EAAC,GAAG,IAAA,qCAAgB,EAAC,eAAe,CAAC,CAAC;IAExD,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,IAAI,WAAI,CAAC,cAAc,CAAC,CAAC;IAEtC,MAAM,UAAU,GAAG,IAAA,+BAAa,EAAC,MAAM,CAAC,gBAAgB,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAI,CAAC,CAAC;IAC9E,MAAM,cAAc,GAAG,IAAA,sCAAgB,EAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAI,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC;IAC5E,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,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,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,IAAA,sCAAgB,EAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAI,EAAE,KAAK,CAAC,CAAC;QAC1D,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,aAAa,GAAG,CAAC,GAAU,EAAE,EAAE;YACpC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,EAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAC,CAAC,CAAC;QAChC,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CACvB,SAAS,EACT,WAAW,WAAW,IAAI,WAAW,EAAE,CACvC,CAAC;QAEF,QAAQ,CAAC,EAAE,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACxC,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,aAAa,CACZ,IAAI,KAAK,CACR,2FAA2F,CAC3F,CACD,CAAC;aACF;iBAAM;gBACN,aAAa,CAAC,KAAK,CAAC,CAAC;aACrB;YAED,MAAM,KAAK,CAAC;SACZ;QAED,IAAI,WAAW,KAAK,MAAM,EAAE;YAC3B,MAAM,IAAA,sCAAiB,EAAC;gBACvB,IAAI,EAAE,QAAQ;gBACd,WAAW;gBACX,OAAO;gBACP,OAAO,EAAE;oBACR,KAAK;oBACL,MAAM;iBACN;aACD,CAAC,CAAC;SACH;QAED,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE;YACpD,OAAO,MAAM,CAAC,sBAAsB,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvB,cAAc,EAAE,CAAC;QACjB,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAC7C,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACzC,OAAO,eAAe,CAAC;IACxB,CAAC,CAAC,CACH,CAAC;IACF,WAAW,EAAE,CAAC;IACd,4DAA4D;IAC5D,aAAa;IACb,oEAAoE;IAEpE,IAAI,iBAAiB,EAAE;QACtB,MAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACrE,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;KACH;SAAM;QACN,eAAe,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACrC,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,GAAG,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;KACH;IAED,OAAO;QACN,UAAU,EAAE;YACX,MAAM;SACN;QACD,UAAU;KACV,CAAC;AACH,CAAC,CAAC;AAhNW,QAAA,YAAY,gBAgNvB"}
1
+ {"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
- /// <reference types="node" />
2
1
  import puppeteer from 'puppeteer-core';
3
2
  import { ImageFormat } from 'remotion';
4
3
  export declare const screenshotDOMElement: ({ page, imageFormat, quality, opts, }: {
@@ -1 +1 @@
1
- {"version":3,"file":"screenshot-dom-element.d.ts","sourceRoot":"","sources":["../src/screenshot-dom-element.ts"],"names":[],"mappings":";AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAGrC,eAAO,MAAM,oBAAoB;UAM1B,UAAU,IAAI;iBACP,WAAW;aACf,MAAM,GAAG,SAAS;;;;;MAKxB,QAAQ,MAAM,CAuBjB,CAAC"}
1
+ {"version":3,"file":"screenshot-dom-element.d.ts","sourceRoot":"","sources":["../src/screenshot-dom-element.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAGrC,eAAO,MAAM,oBAAoB;UAM1B,UAAU,IAAI;iBACP,WAAW;aACf,MAAM,GAAG,SAAS;;;;;MAKxB,QAAQ,MAAM,CAuBjB,CAAC"}
@@ -1,4 +1,3 @@
1
- /// <reference types="node" />
2
1
  import { Page, ScreenshotOptions } from 'puppeteer-core';
3
2
  import { StillImageFormat } from 'remotion';
4
3
  export declare const _screenshotTask: (page: Page, format: StillImageFormat, options: ScreenshotOptions) => Promise<Buffer | string>;
@@ -1 +1 @@
1
- {"version":3,"file":"screenshot-task.d.ts","sourceRoot":"","sources":["../src/screenshot-task.ts"],"names":[],"mappings":";AACA,OAAO,EAAa,IAAI,EAAE,iBAAiB,EAAS,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAY,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAErD,eAAO,MAAM,eAAe,SACrB,IAAI,UACF,gBAAgB,WACf,iBAAiB,KACxB,QAAQ,MAAM,GAAG,MAAM,CAqCzB,CAAC"}
1
+ {"version":3,"file":"screenshot-task.d.ts","sourceRoot":"","sources":["../src/screenshot-task.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,IAAI,EAAE,iBAAiB,EAAS,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAY,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAErD,eAAO,MAAM,eAAe,SACrB,IAAI,UACF,gBAAgB,WACf,iBAAiB,KACxB,QAAQ,MAAM,GAAG,MAAM,CAqCzB,CAAC"}
@@ -1,4 +1,4 @@
1
- import { Codec, ImageFormat, PixelFormat, ProResProfile, RenderAssetInfo } from 'remotion';
1
+ import { Codec, FfmpegExecutable, ImageFormat, PixelFormat, ProResProfile, RenderAssetInfo } from 'remotion';
2
2
  export declare const stitchFramesToVideo: (options: {
3
3
  dir: string;
4
4
  fps: number;
@@ -18,5 +18,6 @@ export declare const stitchFramesToVideo: (options: {
18
18
  verbose?: boolean | undefined;
19
19
  downloadDir?: string | undefined;
20
20
  webpackBundle: string | null;
21
+ ffmpegExecutable?: FfmpegExecutable | undefined;
21
22
  }) => Promise<void>;
22
23
  //# sourceMappingURL=stitcher.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"stitcher.d.ts","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"AAIA,OAAO,EACN,KAAK,EACL,WAAW,EAEX,WAAW,EACX,aAAa,EACb,eAAe,EACf,MAAM,UAAU,CAAC;AAuBlB,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;;;;mBAInB,MAAM,GAAG,IAAI;MACzB,QAAQ,IAAI,CAsJf,CAAC"}
1
+ {"version":3,"file":"stitcher.d.ts","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"AAIA,OAAO,EACN,KAAK,EACL,gBAAgB,EAChB,WAAW,EAEX,WAAW,EACX,aAAa,EACb,eAAe,EACf,MAAM,UAAU,CAAC;AAsBlB,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;;;;mBAInB,MAAM,GAAG,IAAI;;MAEzB,QAAQ,IAAI,CA4Jf,CAAC"}
package/dist/stitcher.js CHANGED
@@ -28,9 +28,8 @@ const validate_ffmpeg_1 = require("./validate-ffmpeg");
28
28
  const makeAssetsDownloadTmpDir = () => {
29
29
  return fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'remotion-assets-dir'));
30
30
  };
31
- // eslint-disable-next-line complexity
32
31
  const stitchFramesToVideo = async (options) => {
33
- var _a, _b, _c, _d, _e, _f, _g;
32
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
34
33
  remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
35
34
  remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
36
35
  remotion_1.Internals.validateFps(options.fps, 'passed to `stitchFramesToVideo()`');
@@ -43,13 +42,14 @@ const stitchFramesToVideo = async (options) => {
43
42
  const crf = (_b = options.crf) !== null && _b !== void 0 ? _b : remotion_1.Internals.getDefaultCrfForCodec(codec);
44
43
  const imageFormat = (_c = options.imageFormat) !== null && _c !== void 0 ? _c : image_format_1.DEFAULT_IMAGE_FORMAT;
45
44
  const pixelFormat = (_d = options.pixelFormat) !== null && _d !== void 0 ? _d : remotion_1.Internals.DEFAULT_PIXEL_FORMAT;
46
- await (0, validate_ffmpeg_1.validateFfmpeg)();
45
+ await (0, validate_ffmpeg_1.validateFfmpeg)((_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : null);
47
46
  const encoderName = (0, get_codec_name_1.getCodecName)(codec);
48
47
  const audioCodecName = (0, get_audio_codec_name_1.getAudioCodecName)(codec);
49
48
  const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
50
49
  const isAudioOnly = encoderName === null;
51
50
  const supportsCrf = encoderName && codec !== 'prores';
52
51
  if (options.verbose) {
52
+ console.log('[verbose] ffmpeg', (_f = options.ffmpegExecutable) !== null && _f !== void 0 ? _f : 'ffmpeg in PATH');
53
53
  console.log('[verbose] encoder', encoderName);
54
54
  console.log('[verbose] audioCodec', audioCodecName);
55
55
  console.log('[verbose] pixelFormat', pixelFormat);
@@ -71,8 +71,8 @@ const stitchFramesToVideo = async (options) => {
71
71
  }),
72
72
  (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
73
73
  assets: options.assetsInfo.assets,
74
- downloadDir: (_e = options.downloadDir) !== null && _e !== void 0 ? _e : (await makeAssetsDownloadTmpDir()),
75
- onDownload: (_f = options.onDownload) !== null && _f !== void 0 ? _f : (() => undefined),
74
+ downloadDir: (_g = options.downloadDir) !== null && _g !== void 0 ? _g : (await makeAssetsDownloadTmpDir()),
75
+ onDownload: (_h = options.onDownload) !== null && _h !== void 0 ? _h : (() => undefined),
76
76
  webpackBundle: options.webpackBundle,
77
77
  }),
78
78
  ]);
@@ -141,8 +141,10 @@ const stitchFramesToVideo = async (options) => {
141
141
  const ffmpegString = ffmpegArgs
142
142
  .reduce((acc, val) => acc.concat(val), [])
143
143
  .filter(Boolean);
144
- const task = (0, execa_1.default)('ffmpeg', ffmpegString, { cwd: options.dir });
145
- (_g = task.stderr) === null || _g === void 0 ? void 0 : _g.on('data', (data) => {
144
+ const task = (0, execa_1.default)((_j = options.ffmpegExecutable) !== null && _j !== void 0 ? _j : 'ffmpeg', ffmpegString, {
145
+ cwd: options.dir,
146
+ });
147
+ (_k = task.stderr) === null || _k === void 0 ? void 0 : _k.on('data', (data) => {
146
148
  if (options.onProgress) {
147
149
  const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(data.toString());
148
150
  if (parsed !== undefined) {
@@ -1 +1 @@
1
- {"version":3,"file":"stitcher.js","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stitcher.js","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AACpB,4CAAoB;AACpB,gDAAwB;AACxB,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,2DAAoD;AACpD,+FAAsF;AACtF,uDAAiD;AAEjD,MAAM,wBAAwB,GAAG,GAAoB,EAAE;IACtD,OAAO,YAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC;AAC3E,CAAC,CAAC;AAEK,MAAM,mBAAmB,GAAG,KAAK,EAAE,OAsBzC,EAAiB,EAAE;;IACnB,oBAAS,CAAC,iBAAiB,CAC1B,OAAO,CAAC,MAAM,EACd,QAAQ,EACR,mCAAmC,CACnC,CAAC;IACF,oBAAS,CAAC,iBAAiB,CAC1B,OAAO,CAAC,KAAK,EACb,OAAO,EACP,mCAAmC,CACnC,CAAC;IACF,oBAAS,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,mCAAmC,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,MAAA,OAAO,CAAC,KAAK,mCAAI,oBAAS,CAAC,aAAa,CAAC;IACvD,IAAA,qEAA+B,EAAC;QAC/B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK;KACL,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,MAAA,OAAO,CAAC,GAAG,mCAAI,oBAAS,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,MAAA,OAAO,CAAC,WAAW,mCAAI,mCAAoB,CAAC;IAChE,MAAM,WAAW,GAAG,MAAA,OAAO,CAAC,WAAW,mCAAI,oBAAS,CAAC,oBAAoB,CAAC;IAC1E,MAAM,IAAA,gCAAc,EAAC,MAAA,OAAO,CAAC,gBAAgB,mCAAI,IAAI,CAAC,CAAC;IAEvD,MAAM,WAAW,GAAG,IAAA,6BAAY,EAAC,KAAK,CAAC,CAAC;IACxC,MAAM,cAAc,GAAG,IAAA,wCAAiB,EAAC,KAAK,CAAC,CAAC;IAChD,MAAM,iBAAiB,GAAG,IAAA,8CAAoB,EAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAE7E,MAAM,WAAW,GAAG,WAAW,KAAK,IAAI,CAAC;IACzC,MAAM,WAAW,GAAG,WAAW,IAAI,KAAK,KAAK,QAAQ,CAAC;IAEtD,IAAI,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,GAAG,CACV,kBAAkB,EAClB,MAAA,OAAO,CAAC,gBAAgB,mCAAI,gBAAgB,CAC5C,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,CAAC,CAAC;QACpD,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;QAClD,IAAI,WAAW,EAAE;YAChB,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;SAClC;QAED,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,iBAAiB,CAAC,CAAC;KAC9D;IAED,oBAAS,CAAC,sCAAsC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC7D,oBAAS,CAAC,oDAAoD,CAC7D,WAAW,EACX,WAAW,CACX,CAAC;IACF,oBAAS,CAAC,8CAA8C,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAE7E,MAAM,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpD,IAAA,sCAAY,EAAC;YACZ,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,WAAW;SACX,CAAC;QACF,IAAA,qDAAuB,EAAC;YACvB,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM;YACjC,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,CAAC,MAAM,wBAAwB,EAAE,CAAC;YACtE,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;YACnD,aAAa,EAAE,OAAO,CAAC,aAAa;SACpC,CAAC;KACF,CAAC,CAAC;IAEH,IAAA,2DAAyB,GAAE,CAAC;IAC5B,MAAM,cAAc,GAAG,IAAA,mDAAuB,EAAC,aAAa,CAAC,CAAC;IAE9D,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,mCAAe,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAE7E,MAAM,iBAAiB,GAAG,MAAM,IAAA,8CAAoB,EAAC;QACpD,UAAU;QACV,WAAW,EAAE,OAAO,CAAC,WAAW;KAChC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAA,iDAAsB,EAAC;QACtC,iBAAiB;QACjB,cAAc;QACd,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACpC,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC;KAC/C;IAED,IAAI,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;KAChC;IAED,MAAM,EAAC,iBAAiB,EAAE,OAAO,EAAC,GAAG,MAAM,IAAA,wDAAyB,EAAC,OAAO,CAAC,CAAC;IAC9E,MAAM,UAAU,GAAG;QAClB,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC;QACrC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACjE,SAAS,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;QACnE,SAAS;YACR,CAAC,CAAC,CAAC,IAAI,EAAE,aAAa,SAAS,CAAC,YAAY,KAAK,WAAW,EAAE,CAAC;YAC/D,CAAC,CAAC,IAAI;QACP,GAAG,IAAA,8CAAoB,EAAC;YACvB,MAAM,EAAE,UAAU;YAClB,WAAW;YACX,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM;SAC5C,CAAC;QACF,WAAW;YACV,CAAC,CAAC,8CAA8C;gBAC9C,iCAAiC;gBACjC,CAAC,MAAM,EAAE,WAAW,CAAC;YACvB,CAAC,CAAC,wDAAwD;gBACxD,CAAC,KAAK,CAAC;QACV,CAAC,KAAK,EAAE,OAAO,CAAC;QAChB,CAAC,KAAK,EAAE,GAAG,CAAC;QACZ,iBAAiB,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI;QAC5D,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;QAC1C,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,WAAW,CAAC;QAE9C,6CAA6C;QAC7C,2CAA2C;QAC3C,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;QAC1D,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC;QACnC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI;QAChD,iBAAiB;QACjB,mCAAmC;QACnC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC;QACpC,kDAAkD;QAClD,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,IAAI,CAAC;QAC5C,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;QAC3B,OAAO,CAAC,cAAc;KACtB,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KACxB;IAED,MAAM,YAAY,GAAG,UAAU;SAC7B,MAAM,CAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;SAC5D,MAAM,CAAC,OAAO,CAAa,CAAC;IAE9B,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,MAAA,OAAO,CAAC,gBAAgB,mCAAI,QAAQ,EAAE,YAAY,EAAE;QACtE,GAAG,EAAE,OAAO,CAAC,GAAG;KAChB,CAAC,CAAC;IAEH,MAAA,IAAI,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;QACxC,IAAI,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,MAAM,GAAG,IAAA,2CAAmB,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpD,IAAI,MAAM,KAAK,SAAS,EAAE;gBACzB,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aAC3B;SACD;IACF,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,CAAC;IACX,OAAO,EAAE,CAAC;AACX,CAAC,CAAC;AAlLW,QAAA,mBAAmB,uBAkL9B"}
@@ -1,4 +1,4 @@
1
- export declare const binaryExists: (name: 'ffmpeg' | 'brew') => Promise<boolean>;
1
+ export declare const binaryExists: (name: 'ffmpeg' | 'brew', localFFmpeg: string | null) => Promise<boolean>;
2
2
  export declare const isHomebrewInstalled: () => Promise<boolean>;
3
- export declare const validateFfmpeg: () => Promise<void>;
3
+ export declare const validateFfmpeg: (customFfmpegBinary: string | null) => Promise<void>;
4
4
  //# sourceMappingURL=validate-ffmpeg.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"validate-ffmpeg.d.ts","sourceRoot":"","sources":["../src/validate-ffmpeg.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,YAAY,SAAgB,QAAQ,GAAG,MAAM,qBAoBzD,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAa,QAAQ,OAAO,CAE3D,CAAC;AAEF,eAAO,MAAM,cAAc,QAAa,QAAQ,IAAI,CAgCnD,CAAC"}
1
+ {"version":3,"file":"validate-ffmpeg.d.ts","sourceRoot":"","sources":["../src/validate-ffmpeg.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,YAAY,SAClB,QAAQ,GAAG,MAAM,eACV,MAAM,GAAG,IAAI,qBAgC1B,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAa,QAAQ,OAAO,CAE3D,CAAC;AAEF,eAAO,MAAM,cAAc,uBACN,MAAM,GAAG,IAAI,KAC/B,QAAQ,IAAI,CAsCd,CAAC"}
@@ -7,8 +7,10 @@ exports.validateFfmpeg = exports.isHomebrewInstalled = exports.binaryExists = vo
7
7
  const execa_1 = __importDefault(require("execa"));
8
8
  const fs_1 = __importDefault(require("fs"));
9
9
  const os_1 = __importDefault(require("os"));
10
+ const fs_2 = require("fs");
11
+ const remotion_1 = require("remotion");
10
12
  const existsMap = {};
11
- const binaryExists = async (name) => {
13
+ const binaryExists = async (name, localFFmpeg) => {
12
14
  if (typeof existsMap[name] !== 'undefined') {
13
15
  return existsMap[name];
14
16
  }
@@ -16,6 +18,16 @@ const binaryExists = async (name) => {
16
18
  if (name === 'ffmpeg' && process.env.LAMBDA_TASK_ROOT) {
17
19
  return fs_1.default.existsSync('/opt/bin/ffmpeg');
18
20
  }
21
+ if (name === 'ffmpeg' && localFFmpeg) {
22
+ try {
23
+ (0, fs_2.statSync)(localFFmpeg);
24
+ existsMap[name] = true;
25
+ }
26
+ catch (err) {
27
+ existsMap[name] = false;
28
+ }
29
+ return existsMap[name];
30
+ }
19
31
  const isWin = os_1.default.platform() === 'win32';
20
32
  const where = isWin ? 'where' : 'which';
21
33
  try {
@@ -30,12 +42,17 @@ const binaryExists = async (name) => {
30
42
  };
31
43
  exports.binaryExists = binaryExists;
32
44
  const isHomebrewInstalled = async () => {
33
- return (0, exports.binaryExists)('brew');
45
+ return (0, exports.binaryExists)('brew', null);
34
46
  };
35
47
  exports.isHomebrewInstalled = isHomebrewInstalled;
36
- const validateFfmpeg = async () => {
37
- const ffmpegExists = await (0, exports.binaryExists)('ffmpeg');
48
+ const validateFfmpeg = async (customFfmpegBinary) => {
49
+ const ffmpegExists = await (0, exports.binaryExists)('ffmpeg', customFfmpegBinary);
38
50
  if (!ffmpegExists) {
51
+ if (remotion_1.Internals.getCustomFfmpegExecutable()) {
52
+ console.error('FFmpeg executable not found:');
53
+ console.error(remotion_1.Internals.getCustomFfmpegExecutable());
54
+ process.exit(1);
55
+ }
39
56
  console.error('It looks like FFMPEG is not installed');
40
57
  if (os_1.default.platform() === 'darwin' && (await (0, exports.isHomebrewInstalled)())) {
41
58
  console.error('Run `brew install ffmpeg` to install ffmpeg');
@@ -1 +1 @@
1
- {"version":3,"file":"validate-ffmpeg.js","sourceRoot":"","sources":["../src/validate-ffmpeg.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AACpB,4CAAoB;AAEpB,MAAM,SAAS,GAA6B,EAAE,CAAC;AAExC,MAAM,YAAY,GAAG,KAAK,EAAE,IAAuB,EAAE,EAAE;IAC7D,IAAI,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,WAAW,EAAE;QAC3C,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC;KACvB;IAED,0CAA0C;IAC1C,IAAI,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE;QACtD,OAAO,YAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;KACxC;IAED,MAAM,KAAK,GAAG,YAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;IACxC,IAAI;QACH,MAAM,IAAA,eAAK,EAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3B,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QACvB,OAAO,IAAI,CAAC;KACZ;IAAC,OAAO,GAAG,EAAE;QACb,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;QACxB,OAAO,KAAK,CAAC;KACb;AACF,CAAC,CAAC;AApBW,QAAA,YAAY,gBAoBvB;AAEK,MAAM,mBAAmB,GAAG,KAAK,IAAsB,EAAE;IAC/D,OAAO,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC;AAC7B,CAAC,CAAC;AAFW,QAAA,mBAAmB,uBAE9B;AAEK,MAAM,cAAc,GAAG,KAAK,IAAmB,EAAE;IACvD,MAAM,YAAY,GAAG,MAAM,IAAA,oBAAY,EAAC,QAAQ,CAAC,CAAC;IAClD,IAAI,CAAC,YAAY,EAAE;QAClB,OAAO,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;QACvD,IAAI,YAAE,CAAC,QAAQ,EAAE,KAAK,QAAQ,IAAI,CAAC,MAAM,IAAA,2BAAmB,GAAE,CAAC,EAAE;YAChE,OAAO,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAC7D;aAAM,IAAI,YAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,EAAE;YACrC,OAAO,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACrD,OAAO,CAAC,KAAK,CACZ,sGAAsG,CACtG,CAAC;YACF,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAC5C,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAC9C,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACpC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACnC,OAAO,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;YACtD,OAAO,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACnD,OAAO,CAAC,KAAK,CACZ,kGAAkG,CAClG,CAAC;YACF,OAAO,CAAC,KAAK,CACZ,yEAAyE,CACzE,CAAC;YACF,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;SACzC;aAAM;YACN,OAAO,CAAC,KAAK,CACZ,uGAAuG,CACvG,CAAC;SACF;QAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;AACF,CAAC,CAAC;AAhCW,QAAA,cAAc,kBAgCzB"}
1
+ {"version":3,"file":"validate-ffmpeg.js","sourceRoot":"","sources":["../src/validate-ffmpeg.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@remotion/renderer",
3
- "version": "3.0.0-lambda.2+a97302554",
3
+ "version": "3.0.0-lambda.42+838a7a013",
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.2+a97302554",
19
+ "@remotion/bundler": "^3.0.0-lambda.42+838a7a013",
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.2+a97302554",
25
+ "remotion": "^3.0.0-lambda.42+838a7a013",
26
26
  "sanitize-filename": "^1.6.3",
27
27
  "serve-handler": "^6.1.3",
28
28
  "xns": "^2.0.7"
@@ -47,5 +47,5 @@
47
47
  "publishConfig": {
48
48
  "access": "public"
49
49
  },
50
- "gitHead": "a97302554ea1cc85a8682345f2ace2c30e4a9e8b"
50
+ "gitHead": "838a7a01375dde46ec7ff5c4c868512c3621047d"
51
51
  }