@remotion/renderer 3.0.0-processing.8 → 3.0.0-wrapped.208

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 (81) hide show
  1. package/dist/assets/calculate-asset-positions.d.ts.map +1 -1
  2. package/dist/assets/calculate-asset-positions.js +0 -1
  3. package/dist/assets/calculate-asset-positions.js.map +1 -1
  4. package/dist/assets/convert-assets-to-file-urls.d.ts +4 -3
  5. package/dist/assets/convert-assets-to-file-urls.d.ts.map +1 -1
  6. package/dist/assets/convert-assets-to-file-urls.js +3 -3
  7. package/dist/assets/convert-assets-to-file-urls.js.map +1 -1
  8. package/dist/assets/download-and-map-assets-to-file.d.ts +9 -7
  9. package/dist/assets/download-and-map-assets-to-file.d.ts.map +1 -1
  10. package/dist/assets/download-and-map-assets-to-file.js +17 -21
  11. package/dist/assets/download-and-map-assets-to-file.js.map +1 -1
  12. package/dist/assets/get-asset-audio-details.d.ts +0 -1
  13. package/dist/assets/get-asset-audio-details.d.ts.map +1 -1
  14. package/dist/assets/get-asset-audio-details.js +1 -3
  15. package/dist/assets/get-asset-audio-details.js.map +1 -1
  16. package/dist/create-ffmpeg-complex-filter.d.ts.map +1 -1
  17. package/dist/create-ffmpeg-complex-filter.js +2 -2
  18. package/dist/create-ffmpeg-complex-filter.js.map +1 -1
  19. package/dist/cycle-browser-tabs.d.ts +1 -1
  20. package/dist/cycle-browser-tabs.d.ts.map +1 -1
  21. package/dist/cycle-browser-tabs.js +27 -14
  22. package/dist/cycle-browser-tabs.js.map +1 -1
  23. package/dist/ffmpeg-flags.d.ts +5 -1
  24. package/dist/ffmpeg-flags.d.ts.map +1 -1
  25. package/dist/ffmpeg-flags.js +5 -1
  26. package/dist/ffmpeg-flags.js.map +1 -1
  27. package/dist/get-audio-codec-name.d.ts.map +1 -1
  28. package/dist/get-audio-codec-name.js +3 -0
  29. package/dist/get-audio-codec-name.js.map +1 -1
  30. package/dist/get-compositions.d.ts +6 -5
  31. package/dist/get-compositions.d.ts.map +1 -1
  32. package/dist/get-compositions.js +55 -47
  33. package/dist/get-compositions.js.map +1 -1
  34. package/dist/get-frame-to-render.d.ts +1 -1
  35. package/dist/get-frame-to-render.d.ts.map +1 -1
  36. package/dist/get-frame-to-render.js +13 -7
  37. package/dist/get-frame-to-render.js.map +1 -1
  38. package/dist/index.d.ts +36 -7
  39. package/dist/index.d.ts.map +1 -1
  40. package/dist/index.js +38 -5
  41. package/dist/index.js.map +1 -1
  42. package/dist/open-browser.d.ts.map +1 -1
  43. package/dist/open-browser.js +13 -0
  44. package/dist/open-browser.js.map +1 -1
  45. package/dist/provide-screenshot.d.ts +2 -2
  46. package/dist/provide-screenshot.d.ts.map +1 -1
  47. package/dist/provide-screenshot.js +1 -1
  48. package/dist/provide-screenshot.js.map +1 -1
  49. package/dist/puppeteer-screenshot.d.ts.map +1 -1
  50. package/dist/puppeteer-screenshot.js.map +1 -1
  51. package/dist/render-still.d.ts +18 -17
  52. package/dist/render-still.d.ts.map +1 -1
  53. package/dist/render-still.js +44 -33
  54. package/dist/render-still.js.map +1 -1
  55. package/dist/render.d.ts +35 -17
  56. package/dist/render.d.ts.map +1 -1
  57. package/dist/render.js +150 -69
  58. package/dist/render.js.map +1 -1
  59. package/dist/screenshot-dom-element.d.ts.map +1 -1
  60. package/dist/screenshot-dom-element.js +1 -3
  61. package/dist/screenshot-dom-element.js.map +1 -1
  62. package/dist/screenshot-task.d.ts +2 -1
  63. package/dist/screenshot-task.d.ts.map +1 -1
  64. package/dist/screenshot-task.js.map +1 -1
  65. package/dist/set-props-and-env.d.ts +2 -2
  66. package/dist/set-props-and-env.d.ts.map +1 -1
  67. package/dist/set-props-and-env.js +3 -2
  68. package/dist/set-props-and-env.js.map +1 -1
  69. package/dist/stitcher.d.ts +21 -15
  70. package/dist/stitcher.d.ts.map +1 -1
  71. package/dist/stitcher.js +97 -72
  72. package/dist/stitcher.js.map +1 -1
  73. package/dist/stringify-ffmpeg-filter.d.ts.map +1 -1
  74. package/dist/stringify-ffmpeg-filter.js +3 -0
  75. package/dist/stringify-ffmpeg-filter.js.map +1 -1
  76. package/dist/types.d.ts +0 -4
  77. package/dist/types.d.ts.map +1 -1
  78. package/dist/validate-ffmpeg.d.ts.map +1 -1
  79. package/dist/validate-ffmpeg.js +7 -2
  80. package/dist/validate-ffmpeg.js.map +1 -1
  81. package/package.json +4 -4
package/dist/stitcher.js CHANGED
@@ -3,7 +3,7 @@ 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.stitchFramesToVideo = void 0;
6
+ exports.stitchFramesToVideo = exports.spawnFfmpeg = void 0;
7
7
  const execa_1 = __importDefault(require("execa"));
8
8
  const remotion_1 = require("remotion");
9
9
  const assets_to_ffmpeg_inputs_1 = require("./assets-to-ffmpeg-inputs");
@@ -15,15 +15,51 @@ const calculate_ffmpeg_filters_1 = require("./calculate-ffmpeg-filters");
15
15
  const create_ffmpeg_complex_filter_1 = require("./create-ffmpeg-complex-filter");
16
16
  const get_audio_codec_name_1 = require("./get-audio-codec-name");
17
17
  const get_codec_name_1 = require("./get-codec-name");
18
- const get_frame_number_length_1 = require("./get-frame-number-length");
19
18
  const get_prores_profile_name_1 = require("./get-prores-profile-name");
20
- const image_format_1 = require("./image-format");
21
19
  const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
22
20
  const resolve_asset_src_1 = require("./resolve-asset-src");
21
+ const sample_rate_1 = require("./sample-rate");
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
- const stitchFramesToVideo = async (options) => {
26
- var _a, _b, _c, _d, _e, _f, _g, _h, _j;
24
+ const getAssetsData = async (options) => {
25
+ var _a, _b;
26
+ const codec = (_a = options.codec) !== null && _a !== void 0 ? _a : remotion_1.Internals.DEFAULT_CODEC;
27
+ const encoderName = (0, get_codec_name_1.getCodecName)(codec);
28
+ const isAudioOnly = encoderName === null;
29
+ const fileUrlAssets = await (options.assetsInfo
30
+ ? (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
31
+ assets: options.assetsInfo.assets,
32
+ downloadDir: options.assetsInfo.downloadDir,
33
+ onDownload: (_b = options.onDownload) !== null && _b !== void 0 ? _b : (() => () => undefined),
34
+ })
35
+ : null);
36
+ (0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
37
+ const assetPositions = fileUrlAssets === null ? [] : (0, calculate_asset_positions_1.calculateAssetPositions)(fileUrlAssets);
38
+ const assetPaths = assetPositions.map((asset) => (0, resolve_asset_src_1.resolveAssetSrc)(asset.src));
39
+ const assetAudioDetails = await (0, get_asset_audio_details_1.getAssetAudioDetails)({
40
+ assetPaths,
41
+ });
42
+ const filters = (0, calculate_ffmpeg_filters_1.calculateFfmpegFilters)({
43
+ assetAudioDetails,
44
+ assetPositions,
45
+ fps: options.fps,
46
+ videoTrackCount: isAudioOnly ? 0 : 1,
47
+ });
48
+ if (options.verbose) {
49
+ console.log('asset positions', assetPositions);
50
+ }
51
+ if (options.verbose) {
52
+ console.log('filters', filters);
53
+ }
54
+ const { complexFilterFlag, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)(filters);
55
+ return {
56
+ complexFilterFlag,
57
+ cleanup,
58
+ assetPaths,
59
+ };
60
+ };
61
+ const spawnFfmpeg = async (options) => {
62
+ var _a, _b, _c, _d, _e, _f, _g;
27
63
  remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
28
64
  remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
29
65
  remotion_1.Internals.validateFps(options.fps, 'passed to `stitchFramesToVideo()`');
@@ -34,20 +70,18 @@ const stitchFramesToVideo = async (options) => {
34
70
  codec,
35
71
  });
36
72
  const crf = (_b = options.crf) !== null && _b !== void 0 ? _b : remotion_1.Internals.getDefaultCrfForCodec(codec);
37
- const imageFormat = (_c = options.imageFormat) !== null && _c !== void 0 ? _c : image_format_1.DEFAULT_IMAGE_FORMAT;
38
- const pixelFormat = (_d = options.pixelFormat) !== null && _d !== void 0 ? _d : remotion_1.Internals.DEFAULT_PIXEL_FORMAT;
39
- await (0, validate_ffmpeg_1.validateFfmpeg)((_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : null);
73
+ const pixelFormat = (_c = options.pixelFormat) !== null && _c !== void 0 ? _c : remotion_1.Internals.DEFAULT_PIXEL_FORMAT;
74
+ await (0, validate_ffmpeg_1.validateFfmpeg)((_d = options.ffmpegExecutable) !== null && _d !== void 0 ? _d : null);
40
75
  const encoderName = (0, get_codec_name_1.getCodecName)(codec);
41
76
  const audioCodecName = (0, get_audio_codec_name_1.getAudioCodecName)(codec);
42
77
  const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
43
78
  const isAudioOnly = encoderName === null;
44
79
  const supportsCrf = encoderName && codec !== 'prores';
45
80
  if (options.verbose) {
46
- console.log('[verbose] ffmpeg', (_f = options.ffmpegExecutable) !== null && _f !== void 0 ? _f : 'ffmpeg in PATH');
81
+ console.log('[verbose] ffmpeg', (_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : 'ffmpeg in PATH');
47
82
  console.log('[verbose] encoder', encoderName);
48
83
  console.log('[verbose] audioCodec', audioCodecName);
49
84
  console.log('[verbose] pixelFormat', pixelFormat);
50
- console.log('[verbose] imageFormat', imageFormat);
51
85
  if (supportsCrf) {
52
86
  console.log('[verbose] crf', crf);
53
87
  }
@@ -56,66 +90,54 @@ const stitchFramesToVideo = async (options) => {
56
90
  console.log('[verbose] proResProfileName', proResProfileName);
57
91
  }
58
92
  remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
59
- remotion_1.Internals.validateSelectedPixelFormatAndImageFormatCombination(pixelFormat, imageFormat);
60
93
  remotion_1.Internals.validateSelectedPixelFormatAndCodecCombination(pixelFormat, codec);
61
- const [frameInfo, fileUrlAssets] = await Promise.all([
62
- (0, get_frame_number_length_1.getFrameInfo)({
63
- dir: options.dir,
64
- isAudioOnly,
65
- }),
66
- (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
67
- assets: options.assetsInfo.assets,
68
- dir: options.assetsInfo.bundleDir,
69
- onDownload: (_g = options.onDownload) !== null && _g !== void 0 ? _g : (() => undefined),
70
- }),
71
- ]);
72
- (0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
73
- const assetPositions = (0, calculate_asset_positions_1.calculateAssetPositions)(fileUrlAssets);
74
- const assetPaths = assetPositions.map((asset) => (0, resolve_asset_src_1.resolveAssetSrc)(asset.src));
75
- const assetAudioDetails = await (0, get_asset_audio_details_1.getAssetAudioDetails)({
76
- assetPaths,
77
- parallelism: options.parallelism,
78
- });
79
- const filters = (0, calculate_ffmpeg_filters_1.calculateFfmpegFilters)({
80
- assetAudioDetails,
81
- assetPositions,
82
- fps: options.fps,
83
- videoTrackCount: isAudioOnly ? 0 : 1,
84
- });
85
- if (options.verbose) {
86
- console.log('asset positions', assetPositions);
87
- }
88
- if (options.verbose) {
89
- console.log('filters', filters);
90
- }
91
- const { complexFilterFlag, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)(filters);
94
+ const { complexFilterFlag = undefined, cleanup = undefined, assetPaths = undefined, } = options.parallelEncoding ? {} : await getAssetsData(options);
92
95
  const ffmpegArgs = [
93
96
  ['-r', String(options.fps)],
94
- isAudioOnly ? null : ['-f', 'image2'],
95
- isAudioOnly ? null : ['-s', `${options.width}x${options.height}`],
96
- frameInfo ? ['-start_number', String(frameInfo.startNumber)] : null,
97
- frameInfo
98
- ? ['-i', `element-%0${frameInfo.numberLength}d.${imageFormat}`]
99
- : null,
100
- ...(0, assets_to_ffmpeg_inputs_1.assetsToFfmpegInputs)({
101
- assets: assetPaths,
102
- isAudioOnly,
103
- fps: options.fps,
104
- frameCount: options.assetsInfo.assets.length,
105
- }),
106
- encoderName
107
- ? // -c:v is the same as -vcodec as -codec:video
108
- // and specified the video codec.
109
- ['-c:v', encoderName]
110
- : // If only exporting audio, we drop the video explicitly
111
- ['-vn'],
112
- proResProfileName ? ['-profile:v', proResProfileName] : null,
113
- supportsCrf ? ['-crf', String(crf)] : null,
114
- isAudioOnly ? null : ['-pix_fmt', pixelFormat],
115
- // Without explicitly disabling auto-alt-ref,
116
- // transparent WebM generation doesn't work
117
- pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
118
- isAudioOnly ? null : ['-b:v', '1M'],
97
+ ...(options.preEncodedFileLocation
98
+ ? [['-i', options.preEncodedFileLocation]]
99
+ : isAudioOnly
100
+ ? []
101
+ : [
102
+ ['-f', options.parallelEncoding ? 'image2pipe' : 'image2'],
103
+ ['-s', `${options.width}x${options.height}`],
104
+ options.assetsInfo
105
+ ? ['-start_number', String(options.assetsInfo.firstFrameIndex)]
106
+ : null,
107
+ options.assetsInfo
108
+ ? ['-i', options.assetsInfo.imageSequenceName]
109
+ : null,
110
+ options.parallelEncoding ? ['-i', '-'] : null,
111
+ ]),
112
+ ...(options.assetsInfo && assetPaths
113
+ ? (0, assets_to_ffmpeg_inputs_1.assetsToFfmpegInputs)({
114
+ assets: assetPaths,
115
+ isAudioOnly,
116
+ fps: options.fps,
117
+ frameCount: options.assetsInfo.assets.length,
118
+ })
119
+ : []),
120
+ options.preEncodedFileLocation
121
+ ? ['-c:v', 'copy']
122
+ : encoderName
123
+ ? // -c:v is the same as -vcodec as -codec:video
124
+ // and specified the video codec.
125
+ ['-c:v', encoderName]
126
+ : // If only exporting audio, we drop the video explicitly
127
+ ['-vn'],
128
+ ...(options.preEncodedFileLocation
129
+ ? []
130
+ : [
131
+ proResProfileName ? ['-profile:v', proResProfileName] : null,
132
+ supportsCrf ? ['-crf', String(crf)] : null,
133
+ isAudioOnly ? null : ['-pix_fmt', pixelFormat],
134
+ // Without explicitly disabling auto-alt-ref,
135
+ // transparent WebM generation doesn't work
136
+ pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
137
+ isAudioOnly ? null : ['-b:v', '1M'],
138
+ ]),
139
+ '-ar',
140
+ String(sample_rate_1.DEFAULT_SAMPLE_RATE),
119
141
  audioCodecName ? ['-c:a', audioCodecName] : null,
120
142
  complexFilterFlag,
121
143
  // Ignore audio from image sequence
@@ -132,10 +154,8 @@ const stitchFramesToVideo = async (options) => {
132
154
  const ffmpegString = ffmpegArgs
133
155
  .reduce((acc, val) => acc.concat(val), [])
134
156
  .filter(Boolean);
135
- const task = (0, execa_1.default)((_h = options.ffmpegExecutable) !== null && _h !== void 0 ? _h : 'ffmpeg', ffmpegString, {
136
- cwd: options.dir,
137
- });
138
- (_j = task.stderr) === null || _j === void 0 ? void 0 : _j.on('data', (data) => {
157
+ const task = (0, execa_1.default)((_f = options.ffmpegExecutable) !== null && _f !== void 0 ? _f : 'ffmpeg', ffmpegString);
158
+ (_g = task.stderr) === null || _g === void 0 ? void 0 : _g.on('data', (data) => {
139
159
  if (options.onProgress) {
140
160
  const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(data.toString());
141
161
  if (parsed !== undefined) {
@@ -143,8 +163,13 @@ const stitchFramesToVideo = async (options) => {
143
163
  }
144
164
  }
145
165
  });
166
+ return { task, cleanup };
167
+ };
168
+ exports.spawnFfmpeg = spawnFfmpeg;
169
+ const stitchFramesToVideo = async (options) => {
170
+ const { task, cleanup } = await (0, exports.spawnFfmpeg)(options);
146
171
  await task;
147
- cleanup();
172
+ cleanup === null || cleanup === void 0 ? void 0 : cleanup();
148
173
  };
149
174
  exports.stitchFramesToVideo = stitchFramesToVideo;
150
175
  //# sourceMappingURL=stitcher.js.map
@@ -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":"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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;YA4BpB,CAAC"}
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;YA+BpB,CAAC"}
@@ -14,6 +14,9 @@ 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
+ 'apad',
17
20
  `atrim=${trimLeft}:${trimRight}`,
18
21
  // For n channels, we delay n + 1 channels.
19
22
  // This is because `ffprobe` for some audio files reports the wrong amount
@@ -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,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;AA/CW,QAAA,qBAAqB,yBA+ChC"}
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,gFAAgF;YAChF,uGAAuG;YACvG,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;AAlDW,QAAA,qBAAqB,yBAkDhC"}
package/dist/types.d.ts CHANGED
@@ -6,8 +6,4 @@ export declare type RenderFramesOutput = {
6
6
  export declare type OnStartData = {
7
7
  frameCount: number;
8
8
  };
9
- export declare type OnErrorInfo = {
10
- error: Error;
11
- frame: number | null;
12
- };
13
9
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC;AAEzC,oBAAY,kBAAkB,GAAG;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,eAAe,CAAC;CAC5B,CAAC;AAEF,oBAAY,WAAW,GAAG;IACzB,UAAU,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,oBAAY,WAAW,GAAG;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAC,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC;AAEzC,oBAAY,kBAAkB,GAAG;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,eAAe,CAAC;CAC5B,CAAC;AAEF,oBAAY,WAAW,GAAG;IACzB,UAAU,EAAE,MAAM,CAAC;CACnB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"validate-ffmpeg.d.ts","sourceRoot":"","sources":["../src/validate-ffmpeg.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY,SAClB,QAAQ,GAAG,MAAM,eACV,MAAM,GAAG,IAAI,qBA2B1B,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAa,QAAQ,OAAO,CAE3D,CAAC;AAEF,eAAO,MAAM,cAAc,uBACN,MAAM,GAAG,IAAI,KAC/B,QAAQ,IAAI,CAsCd,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"}
@@ -5,17 +5,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.validateFfmpeg = exports.isHomebrewInstalled = exports.binaryExists = void 0;
7
7
  const execa_1 = __importDefault(require("execa"));
8
+ const fs_1 = __importDefault(require("fs"));
8
9
  const os_1 = __importDefault(require("os"));
9
- const fs_1 = require("fs");
10
+ const fs_2 = require("fs");
10
11
  const remotion_1 = require("remotion");
11
12
  const existsMap = {};
12
13
  const binaryExists = async (name, localFFmpeg) => {
13
14
  if (typeof existsMap[name] !== 'undefined') {
14
15
  return existsMap[name];
15
16
  }
17
+ // On AWS lambda, look for a specific path
18
+ if (name === 'ffmpeg' && process.env.LAMBDA_TASK_ROOT) {
19
+ return fs_1.default.existsSync('/opt/bin/ffmpeg');
20
+ }
16
21
  if (name === 'ffmpeg' && localFFmpeg) {
17
22
  try {
18
- (0, fs_1.statSync)(localFFmpeg);
23
+ (0, fs_2.statSync)(localFFmpeg);
19
24
  existsMap[name] = true;
20
25
  }
21
26
  catch (err) {
@@ -1 +1 @@
1
- {"version":3,"file":"validate-ffmpeg.js","sourceRoot":"","sources":["../src/validate-ffmpeg.ts"],"names":[],"mappings":"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"}
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-processing.8+0286800b9",
3
+ "version": "3.0.0-wrapped.208+8f00d07f6",
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-processing.8+0286800b9",
19
+ "@remotion/bundler": "3.0.0-wrapped.208+8f00d07f6",
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-processing.8+0286800b9",
25
+ "remotion": "3.0.0-wrapped.208+8f00d07f6",
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": "0286800b926f04315c479608567714beb6bd2049"
49
+ "gitHead": "8f00d07f683fd727e3a7fdf4b988d57053dbdf5d"
50
50
  }