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

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 (156) hide show
  1. package/dist/add-silent-audio-if-necessary.d.ts +1 -1
  2. package/dist/add-silent-audio-if-necessary.d.ts.map +1 -1
  3. package/dist/add-silent-audio-if-necessary.js +6 -2
  4. package/dist/add-silent-audio-if-necessary.js.map +1 -1
  5. package/dist/assets/calculate-asset-positions.d.ts.map +1 -1
  6. package/dist/assets/calculate-asset-positions.js +12 -4
  7. package/dist/assets/calculate-asset-positions.js.map +1 -1
  8. package/dist/assets/convert-assets-to-file-urls.d.ts +3 -3
  9. package/dist/assets/convert-assets-to-file-urls.d.ts.map +1 -1
  10. package/dist/assets/convert-assets-to-file-urls.js +2 -3
  11. package/dist/assets/convert-assets-to-file-urls.js.map +1 -1
  12. package/dist/assets/download-and-map-assets-to-file.d.ts +7 -7
  13. package/dist/assets/download-and-map-assets-to-file.d.ts.map +1 -1
  14. package/dist/assets/download-and-map-assets-to-file.js +15 -27
  15. package/dist/assets/download-and-map-assets-to-file.js.map +1 -1
  16. package/dist/assets/get-asset-audio-details.d.ts +0 -1
  17. package/dist/assets/get-asset-audio-details.d.ts.map +1 -1
  18. package/dist/assets/get-asset-audio-details.js +1 -3
  19. package/dist/assets/get-asset-audio-details.js.map +1 -1
  20. package/dist/assets-to-ffmpeg-inputs.d.ts +4 -1
  21. package/dist/assets-to-ffmpeg-inputs.d.ts.map +1 -1
  22. package/dist/browser-log.d.ts +7 -0
  23. package/dist/browser-log.d.ts.map +1 -0
  24. package/dist/browser-log.js +3 -0
  25. package/dist/browser-log.js.map +1 -0
  26. package/dist/create-ffmpeg-complex-filter.d.ts.map +1 -1
  27. package/dist/create-ffmpeg-complex-filter.js +2 -2
  28. package/dist/create-ffmpeg-complex-filter.js.map +1 -1
  29. package/dist/cycle-browser-tabs.d.ts +1 -1
  30. package/dist/cycle-browser-tabs.d.ts.map +1 -1
  31. package/dist/cycle-browser-tabs.js +27 -14
  32. package/dist/cycle-browser-tabs.js.map +1 -1
  33. package/dist/delete-directory.d.ts +2 -0
  34. package/dist/delete-directory.d.ts.map +1 -0
  35. package/dist/delete-directory.js +28 -0
  36. package/dist/delete-directory.js.map +1 -0
  37. package/dist/ensure-output-directory.d.ts +2 -0
  38. package/dist/ensure-output-directory.d.ts.map +1 -0
  39. package/dist/ensure-output-directory.js +18 -0
  40. package/dist/ensure-output-directory.js.map +1 -0
  41. package/dist/ffmpeg-flags.d.ts +11 -3
  42. package/dist/ffmpeg-flags.d.ts.map +1 -1
  43. package/dist/ffmpeg-flags.js +19 -9
  44. package/dist/ffmpeg-flags.js.map +1 -1
  45. package/dist/get-browser-instance.d.ts +10 -0
  46. package/dist/get-browser-instance.d.ts.map +1 -0
  47. package/dist/get-browser-instance.js +35 -0
  48. package/dist/get-browser-instance.js.map +1 -0
  49. package/dist/get-compositions.d.ts +6 -8
  50. package/dist/get-compositions.d.ts.map +1 -1
  51. package/dist/get-compositions.js +42 -43
  52. package/dist/get-compositions.js.map +1 -1
  53. package/dist/get-extension-from-codec.d.ts +3 -0
  54. package/dist/get-extension-from-codec.d.ts.map +1 -0
  55. package/dist/get-extension-from-codec.js +33 -0
  56. package/dist/get-extension-from-codec.js.map +1 -0
  57. package/dist/get-frame-to-render.d.ts +1 -1
  58. package/dist/get-frame-to-render.d.ts.map +1 -1
  59. package/dist/get-frame-to-render.js +13 -7
  60. package/dist/get-frame-to-render.js.map +1 -1
  61. package/dist/get-pro-res-profile-name.d.ts +3 -0
  62. package/dist/get-pro-res-profile-name.d.ts.map +1 -0
  63. package/dist/get-pro-res-profile-name.js +26 -0
  64. package/dist/get-pro-res-profile-name.js.map +1 -0
  65. package/dist/index.d.ts +37 -14
  66. package/dist/index.d.ts.map +1 -1
  67. package/dist/index.js +32 -8
  68. package/dist/index.js.map +1 -1
  69. package/dist/is-serve-url.d.ts +2 -0
  70. package/dist/is-serve-url.d.ts.map +1 -0
  71. package/dist/is-serve-url.js +13 -0
  72. package/dist/is-serve-url.js.map +1 -0
  73. package/dist/legacy-webpack-config.d.ts +10 -0
  74. package/dist/legacy-webpack-config.d.ts.map +1 -0
  75. package/dist/legacy-webpack-config.js +14 -0
  76. package/dist/legacy-webpack-config.js.map +1 -0
  77. package/dist/make-assets-download-dir.d.ts +2 -0
  78. package/dist/make-assets-download-dir.d.ts.map +1 -0
  79. package/dist/make-assets-download-dir.js +9 -0
  80. package/dist/make-assets-download-dir.js.map +1 -0
  81. package/dist/normalize-serve-url.d.ts +2 -0
  82. package/dist/normalize-serve-url.d.ts.map +1 -0
  83. package/dist/normalize-serve-url.js +20 -0
  84. package/dist/normalize-serve-url.js.map +1 -0
  85. package/dist/open-browser.d.ts.map +1 -1
  86. package/dist/open-browser.js +2 -0
  87. package/dist/open-browser.js.map +1 -1
  88. package/dist/prepare-server.d.ts +5 -0
  89. package/dist/prepare-server.d.ts.map +1 -0
  90. package/dist/prepare-server.js +20 -0
  91. package/dist/prepare-server.js.map +1 -0
  92. package/dist/provide-screenshot.d.ts +3 -2
  93. package/dist/provide-screenshot.d.ts.map +1 -1
  94. package/dist/provide-screenshot.js +1 -1
  95. package/dist/provide-screenshot.js.map +1 -1
  96. package/dist/render-media.d.ts +38 -0
  97. package/dist/render-media.d.ts.map +1 -0
  98. package/dist/render-media.js +163 -0
  99. package/dist/render-media.js.map +1 -0
  100. package/dist/render-still.d.ts +18 -17
  101. package/dist/render-still.d.ts.map +1 -1
  102. package/dist/render-still.js +41 -23
  103. package/dist/render-still.js.map +1 -1
  104. package/dist/render-video.d.ts +39 -0
  105. package/dist/render-video.d.ts.map +1 -0
  106. package/dist/render-video.js +138 -0
  107. package/dist/render-video.js.map +1 -0
  108. package/dist/render.d.ts +34 -16
  109. package/dist/render.d.ts.map +1 -1
  110. package/dist/render.js +148 -60
  111. package/dist/render.js.map +1 -1
  112. package/dist/run-ffmpeg-command.d.ts +6 -0
  113. package/dist/run-ffmpeg-command.d.ts.map +1 -0
  114. package/dist/run-ffmpeg-command.js +25 -0
  115. package/dist/run-ffmpeg-command.js.map +1 -0
  116. package/dist/sample-rate.d.ts +2 -0
  117. package/dist/sample-rate.d.ts.map +1 -0
  118. package/dist/sample-rate.js +5 -0
  119. package/dist/sample-rate.js.map +1 -0
  120. package/dist/screenshot-dom-element.d.ts.map +1 -1
  121. package/dist/screenshot-dom-element.js +6 -3
  122. package/dist/screenshot-dom-element.js.map +1 -1
  123. package/dist/set-props-and-env.d.ts.map +1 -1
  124. package/dist/set-props-and-env.js +2 -1
  125. package/dist/set-props-and-env.js.map +1 -1
  126. package/dist/stitcher.d.ts +21 -16
  127. package/dist/stitcher.d.ts.map +1 -1
  128. package/dist/stitcher.js +94 -76
  129. package/dist/stitcher.js.map +1 -1
  130. package/dist/tmp-dir.d.ts +2 -0
  131. package/dist/tmp-dir.d.ts.map +1 -0
  132. package/dist/tmp-dir.js +31 -0
  133. package/dist/tmp-dir.js.map +1 -0
  134. package/dist/types.d.ts +0 -4
  135. package/dist/types.d.ts.map +1 -1
  136. package/dist/validate-ffmpeg.d.ts +2 -2
  137. package/dist/validate-ffmpeg.d.ts.map +1 -1
  138. package/dist/validate-ffmpeg.js +21 -4
  139. package/dist/validate-ffmpeg.js.map +1 -1
  140. package/package.json +5 -6
  141. package/dist/convert-mp3-to-pcm.d.ts +0 -7
  142. package/dist/convert-mp3-to-pcm.d.ts.map +0 -1
  143. package/dist/convert-mp3-to-pcm.js +0 -41
  144. package/dist/convert-mp3-to-pcm.js.map +0 -1
  145. package/dist/handle-null-audio.d.ts +0 -1
  146. package/dist/handle-null-audio.d.ts.map +0 -1
  147. package/dist/handle-null-audio.js +0 -2
  148. package/dist/handle-null-audio.js.map +0 -1
  149. package/dist/validate-frame.d.ts +0 -2
  150. package/dist/validate-frame.d.ts.map +0 -1
  151. package/dist/validate-frame.js +0 -25
  152. package/dist/validate-frame.js.map +0 -1
  153. package/dist/validate-quality.d.ts +0 -1
  154. package/dist/validate-quality.d.ts.map +0 -1
  155. package/dist/validate-quality.js +0 -2
  156. package/dist/validate-quality.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"set-props-and-env.d.ts","sourceRoot":"","sources":["../src/set-props-and-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAGpC,eAAO,MAAM,cAAc;gBAOd,OAAO;kBACL,OAAO,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;UAC1C,IAAI;cACA,MAAM;kBACF,MAAM;mBAiCpB,CAAC"}
1
+ {"version":3,"file":"set-props-and-env.d.ts","sourceRoot":"","sources":["../src/set-props-and-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAIpC,eAAO,MAAM,cAAc;gBAOd,OAAO;kBACL,OAAO,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;UAC1C,IAAI;cACA,MAAM;kBACF,MAAM;mBAiCpB,CAAC"}
@@ -2,9 +2,10 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.setPropsAndEnv = void 0;
4
4
  const remotion_1 = require("remotion");
5
+ const normalize_serve_url_1 = require("./normalize-serve-url");
5
6
  const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initialFrame, }) => {
6
7
  if (inputProps || envVariables) {
7
- await page.goto(`${serveUrl}/index.html`);
8
+ await page.goto((0, normalize_serve_url_1.normalizeServeUrl)(serveUrl));
8
9
  if (inputProps) {
9
10
  await page.evaluate((key, input) => {
10
11
  window.localStorage.setItem(key, input);
@@ -1 +1 @@
1
- {"version":3,"file":"set-props-and-env.js","sourceRoot":"","sources":["../src/set-props-and-env.ts"],"names":[],"mappings":";;;AACA,uCAAmC;AAE5B,MAAM,cAAc,GAAG,KAAK,EAAE,EACpC,UAAU,EACV,YAAY,EACZ,IAAI,EACJ,QAAQ,EACR,YAAY,GAOZ,EAAE,EAAE;IACJ,IAAI,UAAU,IAAI,YAAY,EAAE;QAC/B,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,aAAa,CAAC,CAAC;QAE1C,IAAI,UAAU,EAAE;YACf,MAAM,IAAI,CAAC,QAAQ,CAClB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACd,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACzC,CAAC,EACD,oBAAS,CAAC,eAAe,EACzB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAC1B,CAAC;SACF;QAED,IAAI,YAAY,EAAE;YACjB,MAAM,IAAI,CAAC,QAAQ,CAClB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACd,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACzC,CAAC,EACD,oBAAS,CAAC,+BAA+B,EACzC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAC5B,CAAC;SACF;QAED,MAAM,IAAI,CAAC,QAAQ,CAClB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACd,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC,EACD,oBAAS,CAAC,+BAA+B,EACzC,YAAY,CACZ,CAAC;KACF;AACF,CAAC,CAAC;AA5CW,QAAA,cAAc,kBA4CzB"}
1
+ {"version":3,"file":"set-props-and-env.js","sourceRoot":"","sources":["../src/set-props-and-env.ts"],"names":[],"mappings":";;;AACA,uCAAmC;AACnC,+DAAwD;AAEjD,MAAM,cAAc,GAAG,KAAK,EAAE,EACpC,UAAU,EACV,YAAY,EACZ,IAAI,EACJ,QAAQ,EACR,YAAY,GAOZ,EAAE,EAAE;IACJ,IAAI,UAAU,IAAI,YAAY,EAAE;QAC/B,MAAM,IAAI,CAAC,IAAI,CAAC,IAAA,uCAAiB,EAAC,QAAQ,CAAC,CAAC,CAAC;QAE7C,IAAI,UAAU,EAAE;YACf,MAAM,IAAI,CAAC,QAAQ,CAClB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACd,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACzC,CAAC,EACD,oBAAS,CAAC,eAAe,EACzB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAC1B,CAAC;SACF;QAED,IAAI,YAAY,EAAE;YACjB,MAAM,IAAI,CAAC,QAAQ,CAClB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACd,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACzC,CAAC,EACD,oBAAS,CAAC,+BAA+B,EACzC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAC5B,CAAC;SACF;QAED,MAAM,IAAI,CAAC,QAAQ,CAClB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACd,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC,EACD,oBAAS,CAAC,+BAA+B,EACzC,YAAY,CACZ,CAAC;KACF;AACF,CAAC,CAAC;AA5CW,QAAA,cAAc,kBA4CzB"}
@@ -1,22 +1,27 @@
1
- import { Codec, ImageFormat, PixelFormat, ProResProfile, RenderAssetInfo } from 'remotion';
2
- export declare const stitchFramesToVideo: (options: {
3
- dir: string;
1
+ import execa from 'execa';
2
+ import { Codec, FfmpegExecutable, PixelFormat, ProResProfile, RenderAssetInfo } from 'remotion';
3
+ import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
4
+ export declare type StitcherOptions = {
4
5
  fps: number;
5
6
  width: number;
6
7
  height: number;
7
8
  outputLocation: string;
8
9
  force: boolean;
9
- assetsInfo: RenderAssetInfo;
10
- imageFormat?: "png" | "jpeg" | "none" | undefined;
11
- pixelFormat?: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le" | undefined;
12
- codec?: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | undefined;
13
- crf?: number | undefined;
14
- parallelism?: number | null | undefined;
15
- onProgress?: ((progress: number) => void) | undefined;
16
- onDownload?: ((src: string) => void) | undefined;
17
- proResProfile?: "4444-xq" | "4444" | "hq" | "standard" | "light" | "proxy" | undefined;
18
- verbose?: boolean | undefined;
19
- downloadDir?: string | undefined;
20
- webpackBundle: string | null;
21
- }) => Promise<void>;
10
+ assetsInfo: RenderAssetInfo | null;
11
+ pixelFormat?: PixelFormat;
12
+ codec?: Codec;
13
+ crf?: number | null;
14
+ onProgress?: (progress: number) => void;
15
+ onDownload?: RenderMediaOnDownload;
16
+ proResProfile?: ProResProfile;
17
+ verbose?: boolean;
18
+ parallelEncoding?: boolean;
19
+ preEncodedFileLocation?: string | null;
20
+ ffmpegExecutable?: FfmpegExecutable;
21
+ };
22
+ export declare const spawnFfmpeg: (options: StitcherOptions) => Promise<{
23
+ task: execa.ExecaChildProcess<string>;
24
+ cleanup: (() => void) | undefined;
25
+ }>;
26
+ export declare const stitchFramesToVideo: (options: StitcherOptions) => Promise<void>;
22
27
  //# 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":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACN,KAAK,EACL,gBAAgB,EAEhB,WAAW,EACX,aAAa,EACb,eAAe,EACf,MAAM,UAAU,CAAC;AAIlB,OAAO,EAEN,qBAAqB,EACrB,MAAM,0CAA0C,CAAC;AAclD,oBAAY,eAAe,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,eAAe,GAAG,IAAI,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACpC,CAAC;AA+CF,eAAO,MAAM,WAAW,YAAmB,eAAe;;;EAmIzD,CAAC;AAEF,eAAO,MAAM,mBAAmB,YACtB,eAAe,KACtB,QAAQ,IAAI,CAId,CAAC"}
package/dist/stitcher.js CHANGED
@@ -3,11 +3,8 @@ 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
- const fs_1 = __importDefault(require("fs"));
9
- const os_1 = __importDefault(require("os"));
10
- const path_1 = __importDefault(require("path"));
11
8
  const remotion_1 = require("remotion");
12
9
  const assets_to_ffmpeg_inputs_1 = require("./assets-to-ffmpeg-inputs");
13
10
  const calculate_asset_positions_1 = require("./assets/calculate-asset-positions");
@@ -18,18 +15,50 @@ const calculate_ffmpeg_filters_1 = require("./calculate-ffmpeg-filters");
18
15
  const create_ffmpeg_complex_filter_1 = require("./create-ffmpeg-complex-filter");
19
16
  const get_audio_codec_name_1 = require("./get-audio-codec-name");
20
17
  const get_codec_name_1 = require("./get-codec-name");
21
- const get_frame_number_length_1 = require("./get-frame-number-length");
22
18
  const get_prores_profile_name_1 = require("./get-prores-profile-name");
23
- const image_format_1 = require("./image-format");
24
19
  const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
25
20
  const resolve_asset_src_1 = require("./resolve-asset-src");
21
+ const sample_rate_1 = require("./sample-rate");
26
22
  const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
27
23
  const validate_ffmpeg_1 = require("./validate-ffmpeg");
28
- const makeAssetsDownloadTmpDir = () => {
29
- return fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'remotion-assets-dir'));
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
+ };
30
60
  };
31
- // eslint-disable-next-line complexity
32
- const stitchFramesToVideo = async (options) => {
61
+ const spawnFfmpeg = async (options) => {
33
62
  var _a, _b, _c, _d, _e, _f, _g;
34
63
  remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
35
64
  remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
@@ -41,19 +70,18 @@ const stitchFramesToVideo = async (options) => {
41
70
  codec,
42
71
  });
43
72
  const crf = (_b = options.crf) !== null && _b !== void 0 ? _b : remotion_1.Internals.getDefaultCrfForCodec(codec);
44
- const imageFormat = (_c = options.imageFormat) !== null && _c !== void 0 ? _c : image_format_1.DEFAULT_IMAGE_FORMAT;
45
- const pixelFormat = (_d = options.pixelFormat) !== null && _d !== void 0 ? _d : remotion_1.Internals.DEFAULT_PIXEL_FORMAT;
46
- await (0, validate_ffmpeg_1.validateFfmpeg)();
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);
47
75
  const encoderName = (0, get_codec_name_1.getCodecName)(codec);
48
76
  const audioCodecName = (0, get_audio_codec_name_1.getAudioCodecName)(codec);
49
77
  const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
50
78
  const isAudioOnly = encoderName === null;
51
79
  const supportsCrf = encoderName && codec !== 'prores';
52
80
  if (options.verbose) {
81
+ console.log('[verbose] ffmpeg', (_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : 'ffmpeg in PATH');
53
82
  console.log('[verbose] encoder', encoderName);
54
83
  console.log('[verbose] audioCodec', audioCodecName);
55
84
  console.log('[verbose] pixelFormat', pixelFormat);
56
- console.log('[verbose] imageFormat', imageFormat);
57
85
  if (supportsCrf) {
58
86
  console.log('[verbose] crf', crf);
59
87
  }
@@ -62,69 +90,54 @@ const stitchFramesToVideo = async (options) => {
62
90
  console.log('[verbose] proResProfileName', proResProfileName);
63
91
  }
64
92
  remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
65
- remotion_1.Internals.validateSelectedPixelFormatAndImageFormatCombination(pixelFormat, imageFormat);
66
93
  remotion_1.Internals.validateSelectedPixelFormatAndCodecCombination(pixelFormat, codec);
67
- const [frameInfo, fileUrlAssets] = await Promise.all([
68
- (0, get_frame_number_length_1.getFrameInfo)({
69
- dir: options.dir,
70
- isAudioOnly,
71
- }),
72
- (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
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),
76
- webpackBundle: options.webpackBundle,
77
- }),
78
- ]);
79
- (0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
80
- const assetPositions = (0, calculate_asset_positions_1.calculateAssetPositions)(fileUrlAssets);
81
- const assetPaths = assetPositions.map((asset) => (0, resolve_asset_src_1.resolveAssetSrc)(asset.src));
82
- const assetAudioDetails = await (0, get_asset_audio_details_1.getAssetAudioDetails)({
83
- assetPaths,
84
- parallelism: options.parallelism,
85
- });
86
- const filters = (0, calculate_ffmpeg_filters_1.calculateFfmpegFilters)({
87
- assetAudioDetails,
88
- assetPositions,
89
- fps: options.fps,
90
- videoTrackCount: isAudioOnly ? 0 : 1,
91
- });
92
- if (options.verbose) {
93
- console.log('asset positions', assetPositions);
94
- }
95
- if (options.verbose) {
96
- console.log('filters', filters);
97
- }
98
- 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);
99
95
  const ffmpegArgs = [
100
96
  ['-r', String(options.fps)],
101
- isAudioOnly ? null : ['-f', 'image2'],
102
- isAudioOnly ? null : ['-s', `${options.width}x${options.height}`],
103
- frameInfo ? ['-start_number', String(frameInfo.startNumber)] : null,
104
- frameInfo
105
- ? ['-i', `element-%0${frameInfo.numberLength}d.${imageFormat}`]
106
- : null,
107
- ...(0, assets_to_ffmpeg_inputs_1.assetsToFfmpegInputs)({
108
- assets: assetPaths,
109
- isAudioOnly,
110
- fps: options.fps,
111
- frameCount: options.assetsInfo.assets.length,
112
- }),
113
- encoderName
114
- ? // -c:v is the same as -vcodec as -codec:video
115
- // and specified the video codec.
116
- ['-c:v', encoderName]
117
- : // If only exporting audio, we drop the video explicitly
118
- ['-vn'],
119
- ['-ar', '44100'],
120
- ['-ac', '2'],
121
- proResProfileName ? ['-profile:v', proResProfileName] : null,
122
- supportsCrf ? ['-crf', String(crf)] : null,
123
- isAudioOnly ? null : ['-pix_fmt', pixelFormat],
124
- // Without explicitly disabling auto-alt-ref,
125
- // transparent WebM generation doesn't work
126
- pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
127
- 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),
128
141
  audioCodecName ? ['-c:a', audioCodecName] : null,
129
142
  complexFilterFlag,
130
143
  // Ignore audio from image sequence
@@ -141,7 +154,7 @@ const stitchFramesToVideo = async (options) => {
141
154
  const ffmpegString = ffmpegArgs
142
155
  .reduce((acc, val) => acc.concat(val), [])
143
156
  .filter(Boolean);
144
- const task = (0, execa_1.default)('ffmpeg', ffmpegString, { cwd: options.dir });
157
+ const task = (0, execa_1.default)((_f = options.ffmpegExecutable) !== null && _f !== void 0 ? _f : 'ffmpeg', ffmpegString);
145
158
  (_g = task.stderr) === null || _g === void 0 ? void 0 : _g.on('data', (data) => {
146
159
  if (options.onProgress) {
147
160
  const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(data.toString());
@@ -150,8 +163,13 @@ const stitchFramesToVideo = async (options) => {
150
163
  }
151
164
  }
152
165
  });
166
+ return { task, cleanup };
167
+ };
168
+ exports.spawnFfmpeg = spawnFfmpeg;
169
+ const stitchFramesToVideo = async (options) => {
170
+ const { task, cleanup } = await (0, exports.spawnFfmpeg)(options);
153
171
  await task;
154
- cleanup();
172
+ cleanup === null || cleanup === void 0 ? void 0 : cleanup();
155
173
  };
156
174
  exports.stitchFramesToVideo = stitchFramesToVideo;
157
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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"}
@@ -0,0 +1,2 @@
1
+ export declare const tmpDir: (str: string) => string;
2
+ //# sourceMappingURL=tmp-dir.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tmp-dir.d.ts","sourceRoot":"","sources":["../src/tmp-dir.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,MAAM,QAAS,MAAM,WAUjC,CAAC"}
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.tmpDir = void 0;
7
+ const fs_1 = require("fs");
8
+ const os_1 = __importDefault(require("os"));
9
+ const path_1 = __importDefault(require("path"));
10
+ const remotion_1 = require("remotion");
11
+ const alphabet = 'abcdefghijklmnopqrstuvwxyz0123456789';
12
+ const randomHash = () => {
13
+ return new Array(10)
14
+ .fill(1)
15
+ .map(() => {
16
+ return alphabet[Math.floor(Math.random() * alphabet.length)];
17
+ })
18
+ .join('');
19
+ };
20
+ const tmpDir = (str) => {
21
+ if (remotion_1.Internals.isInLambda()) {
22
+ const dir = '/tmp/' + str + randomHash();
23
+ (0, fs_1.mkdirSync)(dir);
24
+ return dir;
25
+ }
26
+ const newDir = path_1.default.join(os_1.default.tmpdir(), str + randomHash());
27
+ (0, fs_1.mkdirSync)(newDir);
28
+ return newDir;
29
+ };
30
+ exports.tmpDir = tmpDir;
31
+ //# sourceMappingURL=tmp-dir.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tmp-dir.js","sourceRoot":"","sources":["../src/tmp-dir.ts"],"names":[],"mappings":";;;;;;AAAA,2BAA6B;AAC7B,4CAAoB;AACpB,gDAAwB;AACxB,uCAAmC;AAEnC,MAAM,QAAQ,GAAG,sCAAsC,CAAC;AAExD,MAAM,UAAU,GAAG,GAAW,EAAE;IAC/B,OAAO,IAAI,KAAK,CAAC,EAAE,CAAC;SAClB,IAAI,CAAC,CAAC,CAAC;SACP,GAAG,CAAC,GAAG,EAAE;QACT,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAC;AACZ,CAAC,CAAC;AAEK,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE;IACrC,IAAI,oBAAS,CAAC,UAAU,EAAE,EAAE;QAC3B,MAAM,GAAG,GAAG,OAAO,GAAG,GAAG,GAAG,UAAU,EAAE,CAAC;QACzC,IAAA,cAAS,EAAC,GAAG,CAAC,CAAC;QACf,OAAO,GAAG,CAAC;KACX;IAED,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,GAAG,GAAG,UAAU,EAAE,CAAC,CAAC;IAC1D,IAAA,cAAS,EAAC,MAAM,CAAC,CAAC;IAClB,OAAO,MAAM,CAAC;AACf,CAAC,CAAC;AAVW,QAAA,MAAM,UAUjB"}
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,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.203+6e2dfd14e",
4
4
  "description": "Renderer for Remotion",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -16,16 +16,15 @@
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.203+6e2dfd14e",
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.203+6e2dfd14e",
26
26
  "sanitize-filename": "^1.6.3",
27
- "serve-handler": "^6.1.3",
28
- "xns": "^2.0.7"
27
+ "serve-handler": "^6.1.3"
29
28
  },
30
29
  "peerDependencies": {
31
30
  "react": "^17.0.1",
@@ -47,5 +46,5 @@
47
46
  "publishConfig": {
48
47
  "access": "public"
49
48
  },
50
- "gitHead": "a97302554ea1cc85a8682345f2ace2c30e4a9e8b"
49
+ "gitHead": "6e2dfd14e68f5537f527a5fae8b988db0596fac4"
51
50
  }
@@ -1,7 +0,0 @@
1
- export declare const getPcmOutputName: (inputName: string) => string;
2
- export declare const conversionStarted: {
3
- [key: string]: boolean;
4
- };
5
- export declare const convertMp3ToPcm: (source: string) => Promise<string>;
6
- export declare const clearMp3Conversions: () => void;
7
- //# sourceMappingURL=convert-mp3-to-pcm.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"convert-mp3-to-pcm.d.ts","sourceRoot":"","sources":["../src/convert-mp3-to-pcm.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB,cAAe,MAAM,WAMjD,CAAC;AAQF,eAAO,MAAM,iBAAiB,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAM,CAAC;AAE9D,eAAO,MAAM,eAAe,WAAkB,MAAM,oBAcnD,CAAC;AAEF,eAAO,MAAM,mBAAmB,YAI/B,CAAC"}
@@ -1,41 +0,0 @@
1
- "use strict";
2
- // For the h264-mkv format, we need to convert an MP3 file to PCM first
3
- var __importDefault = (this && this.__importDefault) || function (mod) {
4
- return (mod && mod.__esModule) ? mod : { "default": mod };
5
- };
6
- Object.defineProperty(exports, "__esModule", { value: true });
7
- exports.clearMp3Conversions = exports.convertMp3ToPcm = exports.conversionStarted = exports.getPcmOutputName = void 0;
8
- const execa_1 = __importDefault(require("execa"));
9
- const path_1 = __importDefault(require("path"));
10
- const getPcmOutputName = (inputName) => {
11
- const dirname = path_1.default.dirname(inputName);
12
- const extension = path_1.default.extname(inputName);
13
- const filename = path_1.default.basename(inputName, extension);
14
- return path_1.default.join(dirname, `${filename}-converted.wav`);
15
- };
16
- exports.getPcmOutputName = getPcmOutputName;
17
- const isMp3 = async (source) => {
18
- const { stderr } = await (0, execa_1.default)('ffprobe', [source]);
19
- return stderr.includes('Audio: mp3');
20
- };
21
- exports.conversionStarted = {};
22
- const convertMp3ToPcm = async (source) => {
23
- const outname = (0, exports.getPcmOutputName)(source);
24
- if (!(await isMp3(source))) {
25
- return source;
26
- }
27
- if (exports.conversionStarted[source]) {
28
- return outname;
29
- }
30
- exports.conversionStarted[source] = true;
31
- await (0, execa_1.default)('ffmpeg', ['-y', '-i', source, (0, exports.getPcmOutputName)(source)]);
32
- return outname;
33
- };
34
- exports.convertMp3ToPcm = convertMp3ToPcm;
35
- const clearMp3Conversions = () => {
36
- Object.keys(exports.conversionStarted).forEach((key) => {
37
- delete exports.conversionStarted[key];
38
- });
39
- };
40
- exports.clearMp3Conversions = clearMp3Conversions;
41
- //# sourceMappingURL=convert-mp3-to-pcm.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"convert-mp3-to-pcm.js","sourceRoot":"","sources":["../src/convert-mp3-to-pcm.ts"],"names":[],"mappings":";AAAA,uEAAuE;;;;;;AAEvE,kDAA0B;AAC1B,gDAAwB;AAEjB,MAAM,gBAAgB,GAAG,CAAC,SAAiB,EAAE,EAAE;IACrD,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAErD,OAAO,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,QAAQ,gBAAgB,CAAC,CAAC;AACxD,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B;AAEF,MAAM,KAAK,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;IACtC,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,eAAK,EAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAElD,OAAO,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC,CAAC;AAEW,QAAA,iBAAiB,GAA6B,EAAE,CAAC;AAEvD,MAAM,eAAe,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;IACvD,MAAM,OAAO,GAAG,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;IACzC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE;QAC3B,OAAO,MAAM,CAAC;KACd;IAED,IAAI,yBAAiB,CAAC,MAAM,CAAC,EAAE;QAC9B,OAAO,OAAO,CAAC;KACf;IAED,yBAAiB,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAEjC,MAAM,IAAA,eAAK,EAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACtE,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AAdW,QAAA,eAAe,mBAc1B;AAEK,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACvC,MAAM,CAAC,IAAI,CAAC,yBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC9C,OAAO,yBAAiB,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B"}
@@ -1 +0,0 @@
1
- //# sourceMappingURL=handle-null-audio.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"handle-null-audio.d.ts","sourceRoot":"","sources":["../src/handle-null-audio.ts"],"names":[],"mappings":""}
@@ -1,2 +0,0 @@
1
- "use strict";
2
- //# sourceMappingURL=handle-null-audio.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"handle-null-audio.js","sourceRoot":"","sources":["../src/handle-null-audio.ts"],"names":[],"mappings":""}
@@ -1,2 +0,0 @@
1
- export declare const validateFrame: (frame: number, durationInFrames: number) => void;
2
- //# sourceMappingURL=validate-frame.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"validate-frame.d.ts","sourceRoot":"","sources":["../src/validate-frame.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,UAAW,MAAM,oBAAoB,MAAM,SAgCpE,CAAC"}