@remotion/renderer 3.0.0-lambda.295 → 3.0.0-lambda.338

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 (97) hide show
  1. package/dist/add-silent-audio-if-necessary.d.ts +7 -1
  2. package/dist/add-silent-audio-if-necessary.d.ts.map +1 -1
  3. package/dist/add-silent-audio-if-necessary.js +14 -8
  4. package/dist/add-silent-audio-if-necessary.js.map +1 -1
  5. package/dist/assets/download-and-map-assets-to-file.d.ts.map +1 -1
  6. package/dist/assets/download-and-map-assets-to-file.js +4 -15
  7. package/dist/assets/download-and-map-assets-to-file.js.map +1 -1
  8. package/dist/assets/download-file.d.ts +8 -0
  9. package/dist/assets/download-file.d.ts.map +1 -0
  10. package/dist/assets/download-file.js +34 -0
  11. package/dist/assets/download-file.js.map +1 -0
  12. package/dist/assets/read-file.d.ts +3 -0
  13. package/dist/assets/read-file.d.ts.map +1 -0
  14. package/dist/assets/read-file.js +28 -0
  15. package/dist/assets/read-file.js.map +1 -0
  16. package/dist/can-use-parallel-encoding.d.ts +3 -0
  17. package/dist/can-use-parallel-encoding.d.ts.map +1 -0
  18. package/dist/can-use-parallel-encoding.js +12 -0
  19. package/dist/can-use-parallel-encoding.js.map +1 -0
  20. package/dist/combine-videos.js +1 -1
  21. package/dist/combine-videos.js.map +1 -1
  22. package/dist/convert-mp3-to-pcm.d.ts +7 -0
  23. package/dist/convert-mp3-to-pcm.d.ts.map +1 -0
  24. package/dist/convert-mp3-to-pcm.js +41 -0
  25. package/dist/convert-mp3-to-pcm.js.map +1 -0
  26. package/dist/get-audio-codec-name.d.ts.map +1 -1
  27. package/dist/get-audio-codec-name.js +3 -0
  28. package/dist/get-audio-codec-name.js.map +1 -1
  29. package/dist/get-browser-instance.d.ts +3 -1
  30. package/dist/get-browser-instance.d.ts.map +1 -1
  31. package/dist/get-browser-instance.js +2 -1
  32. package/dist/get-browser-instance.js.map +1 -1
  33. package/dist/get-compositions.d.ts +2 -0
  34. package/dist/get-compositions.d.ts.map +1 -1
  35. package/dist/get-compositions.js +2 -1
  36. package/dist/get-compositions.js.map +1 -1
  37. package/dist/handle-null-audio.d.ts +1 -0
  38. package/dist/handle-null-audio.d.ts.map +1 -0
  39. package/dist/handle-null-audio.js +2 -0
  40. package/dist/handle-null-audio.js.map +1 -0
  41. package/dist/index.d.ts +18 -4
  42. package/dist/index.d.ts.map +1 -1
  43. package/dist/index.js +9 -8
  44. package/dist/index.js.map +1 -1
  45. package/dist/is-local-file.d.ts +2 -0
  46. package/dist/is-local-file.d.ts.map +1 -0
  47. package/dist/is-local-file.js +13 -0
  48. package/dist/is-local-file.js.map +1 -0
  49. package/dist/open-browser.d.ts +11 -0
  50. package/dist/open-browser.d.ts.map +1 -1
  51. package/dist/open-browser.js +36 -4
  52. package/dist/open-browser.js.map +1 -1
  53. package/dist/render-media.d.ts +4 -1
  54. package/dist/render-media.d.ts.map +1 -1
  55. package/dist/render-media.js +29 -12
  56. package/dist/render-media.js.map +1 -1
  57. package/dist/render-still.d.ts +3 -0
  58. package/dist/render-still.d.ts.map +1 -1
  59. package/dist/render-still.js +5 -2
  60. package/dist/render-still.js.map +1 -1
  61. package/dist/render-video.d.ts +7 -8
  62. package/dist/render-video.d.ts.map +1 -1
  63. package/dist/render-video.js +55 -24
  64. package/dist/render-video.js.map +1 -1
  65. package/dist/render.d.ts +4 -1
  66. package/dist/render.d.ts.map +1 -1
  67. package/dist/render.js +5 -2
  68. package/dist/render.js.map +1 -1
  69. package/dist/stitcher.d.ts +5 -2
  70. package/dist/stitcher.d.ts.map +1 -1
  71. package/dist/stitcher.js +23 -17
  72. package/dist/stitcher.js.map +1 -1
  73. package/dist/validate-even-dimensions-with-codec.d.ts +2 -1
  74. package/dist/validate-even-dimensions-with-codec.d.ts.map +1 -1
  75. package/dist/validate-even-dimensions-with-codec.js +23 -4
  76. package/dist/validate-even-dimensions-with-codec.js.map +1 -1
  77. package/dist/validate-frame.d.ts +2 -0
  78. package/dist/validate-frame.d.ts.map +1 -0
  79. package/dist/validate-frame.js +25 -0
  80. package/dist/validate-frame.js.map +1 -0
  81. package/dist/validate-quality.d.ts +1 -0
  82. package/dist/validate-quality.d.ts.map +1 -0
  83. package/dist/validate-quality.js +2 -0
  84. package/dist/validate-quality.js.map +1 -0
  85. package/dist/validate-scale.d.ts +2 -0
  86. package/dist/validate-scale.d.ts.map +1 -0
  87. package/dist/validate-scale.js +27 -0
  88. package/dist/validate-scale.js.map +1 -0
  89. package/package.json +6 -7
  90. package/dist/get-pro-res-profile-name.d.ts +0 -3
  91. package/dist/get-pro-res-profile-name.d.ts.map +0 -1
  92. package/dist/get-pro-res-profile-name.js +0 -26
  93. package/dist/get-pro-res-profile-name.js.map +0 -1
  94. package/dist/run-ffmpeg-command.d.ts +0 -6
  95. package/dist/run-ffmpeg-command.d.ts.map +0 -1
  96. package/dist/run-ffmpeg-command.js +0 -25
  97. package/dist/run-ffmpeg-command.js.map +0 -1
@@ -0,0 +1 @@
1
+ {"version":3,"file":"is-local-file.d.ts","sourceRoot":"","sources":["../src/is-local-file.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,iBAAkB,MAAM,YAY9C,CAAC"}
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.isServeUrl = void 0;
4
+ const isServeUrl = (potentialUrl) => {
5
+ // Theoretically not a valid URL but handle the most basic cases of forgetting protocol in front
6
+ if (potentialUrl.startsWith('www.') ||
7
+ potentialUrl.includes('amazonaws.com')) {
8
+ return true;
9
+ }
10
+ return (potentialUrl.startsWith('https://') || !potentialUrl.startsWith('http://'));
11
+ };
12
+ exports.isServeUrl = isServeUrl;
13
+ //# sourceMappingURL=is-local-file.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"is-local-file.js","sourceRoot":"","sources":["../src/is-local-file.ts"],"names":[],"mappings":";;;AAAO,MAAM,UAAU,GAAG,CAAC,YAAoB,EAAE,EAAE;IAClD,gGAAgG;IAChG,IACC,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC;QAC/B,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC,EACrC;QACD,OAAO,IAAI,CAAC;KACZ;IAED,OAAO,CACN,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,CAC1E,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,UAAU,cAYrB"}
@@ -1,7 +1,18 @@
1
1
  import puppeteer from 'puppeteer-core';
2
2
  import { Browser } from 'remotion';
3
+ declare const validRenderers: readonly ["angle", "egl", "swiftshader"];
4
+ declare type OpenGlRenderer = typeof validRenderers[number];
5
+ export declare type ChromiumOptions = {
6
+ ignoreCertificateErrors?: boolean;
7
+ disableWebSecurity?: boolean;
8
+ gl?: OpenGlRenderer;
9
+ headless?: boolean;
10
+ };
11
+ export declare const killAllBrowsers: () => Promise<void>;
3
12
  export declare const openBrowser: (browser: Browser, options?: {
4
13
  shouldDumpIo?: boolean | undefined;
5
14
  browserExecutable?: string | null | undefined;
15
+ chromiumOptions?: ChromiumOptions | undefined;
6
16
  } | undefined) => Promise<puppeteer.Browser>;
17
+ export {};
7
18
  //# sourceMappingURL=open-browser.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"open-browser.d.ts","sourceRoot":"","sources":["../src/open-browser.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,OAAO,EAAY,MAAM,UAAU,CAAC;AAM5C,eAAO,MAAM,WAAW,YACd,OAAO;;;kBAKd,QAAQ,iBAAiB,CAwC3B,CAAC"}
1
+ {"version":3,"file":"open-browser.d.ts","sourceRoot":"","sources":["../src/open-browser.ts"],"names":[],"mappings":"AAGA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,OAAO,EAAY,MAAM,UAAU,CAAC;AAM5C,QAAA,MAAM,cAAc,0CAA2C,CAAC;AAEhE,aAAK,cAAc,GAAG,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;AAEpD,oBAAY,eAAe,GAAG;IAC7B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,EAAE,CAAC,EAAE,cAAc,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAUF,eAAO,MAAM,eAAe,qBAM3B,CAAC;AAEF,eAAO,MAAM,WAAW,YACd,OAAO;;;;kBAMd,QAAQ,iBAAiB,CAuD3B,CAAC"}
@@ -3,12 +3,31 @@ 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.openBrowser = void 0;
6
+ exports.openBrowser = exports.killAllBrowsers = void 0;
7
+ const os_1 = __importDefault(require("os"));
8
+ const path_1 = __importDefault(require("path"));
9
+ const fs_1 = __importDefault(require("fs"));
7
10
  const puppeteer_core_1 = __importDefault(require("puppeteer-core"));
8
11
  const remotion_1 = require("remotion");
9
12
  const get_local_browser_executable_1 = require("./get-local-browser-executable");
13
+ const validRenderers = ['angle', 'egl', 'swiftshader'];
14
+ const getOpenGlRenderer = (option) => {
15
+ const renderer = option !== null && option !== void 0 ? option : remotion_1.Internals.DEFAULT_OPENGL_RENDERER;
16
+ remotion_1.Internals.validateOpenGlRenderer(renderer);
17
+ return renderer;
18
+ };
19
+ const browserInstances = [];
20
+ const killAllBrowsers = async () => {
21
+ for (const browser of browserInstances) {
22
+ try {
23
+ await browser.close();
24
+ }
25
+ catch (err) { }
26
+ }
27
+ };
28
+ exports.killAllBrowsers = killAllBrowsers;
10
29
  const openBrowser = async (browser, options) => {
11
- var _a, _b, _c;
30
+ var _a, _b, _c, _d, _e, _f, _g, _h;
12
31
  if (browser === 'firefox' && !remotion_1.Internals.FEATURE_FLAG_FIREFOX_SUPPORT) {
13
32
  throw new TypeError('Firefox supported is not yet turned on. Stay tuned for the future.');
14
33
  }
@@ -18,11 +37,11 @@ const openBrowser = async (browser, options) => {
18
37
  executablePath,
19
38
  product: browser,
20
39
  dumpio: (_c = options === null || options === void 0 ? void 0 : options.shouldDumpIo) !== null && _c !== void 0 ? _c : false,
40
+ headless: (_e = (_d = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _d === void 0 ? void 0 : _d.headless) !== null && _e !== void 0 ? _e : true,
21
41
  args: [
22
42
  '--no-sandbox',
23
43
  '--disable-setuid-sandbox',
24
44
  '--disable-dev-shm-usage',
25
- remotion_1.Internals.isInLambda() ? '--use-gl=swiftshader' : '--use-gl=angle',
26
45
  '--disable-background-media-suspend',
27
46
  process.platform === 'linux' ? '--single-process' : null,
28
47
  '--allow-running-insecure-content',
@@ -35,11 +54,24 @@ const openBrowser = async (browser, options) => {
35
54
  '--hide-scrollbars',
36
55
  '--no-default-browser-check',
37
56
  '--no-pings',
38
- '--no-zygote', // https://source.chromium.org/search?q=lang:cpp+symbol:kNoZygote&ss=chromium,
57
+ '--no-zygote',
58
+ `--use-gl=${getOpenGlRenderer((_f = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _f === void 0 ? void 0 : _f.gl)}`,
59
+ '--disable-background-media-suspend',
60
+ ((_g = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _g === void 0 ? void 0 : _g.ignoreCertificateErrors)
61
+ ? '--ignore-certificate-errors'
62
+ : null,
63
+ ...(((_h = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _h === void 0 ? void 0 : _h.disableWebSecurity)
64
+ ? [
65
+ '--disable-web-security',
66
+ '--user-data-dir=' +
67
+ (await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'chrome-user-dir'))),
68
+ ]
69
+ : []),
39
70
  ].filter(Boolean),
40
71
  });
41
72
  const pages = await browserInstance.pages();
42
73
  pages.forEach((p) => p.close());
74
+ browserInstances.push(browserInstance);
43
75
  return browserInstance;
44
76
  };
45
77
  exports.openBrowser = openBrowser;
@@ -1 +1 @@
1
- {"version":3,"file":"open-browser.js","sourceRoot":"","sources":["../src/open-browser.ts"],"names":[],"mappings":";;;;;;AAAA,oEAAuC;AACvC,uCAA4C;AAC5C,iFAGwC;AAEjC,MAAM,WAAW,GAAG,KAAK,EAC/B,OAAgB,EAChB,OAGC,EAC4B,EAAE;;IAC/B,IAAI,OAAO,KAAK,SAAS,IAAI,CAAC,oBAAS,CAAC,4BAA4B,EAAE;QACrE,MAAM,IAAI,SAAS,CAClB,oEAAoE,CACpE,CAAC;KACF;IAED,MAAM,IAAA,iDAAkB,EAAC,OAAO,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,mCAAI,IAAI,CAAC,CAAC;IAEtE,MAAM,cAAc,GAAG,MAAM,IAAA,wDAAyB,EACrD,OAAO,EACP,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,mCAAI,IAAI,CAClC,CAAC;IACF,MAAM,eAAe,GAAG,MAAM,wBAAS,CAAC,MAAM,CAAC;QAC9C,cAAc;QACd,OAAO,EAAE,OAAO;QAChB,MAAM,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,mCAAI,KAAK;QACtC,IAAI,EAAE;YACL,cAAc;YACd,0BAA0B;YAC1B,yBAAyB;YACzB,oBAAS,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,gBAAgB;YAClE,oCAAoC;YACpC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI;YACxD,kCAAkC;YAClC,4BAA4B;YAC5B,8BAA8B;YAC9B,6EAA6E;YAC7E,yBAAyB;YACzB,iCAAiC;YACjC,4BAA4B;YAC5B,mBAAmB;YACnB,4BAA4B;YAC5B,YAAY;YACZ,aAAa,EAAE,8EAA8E;SAC7F,CAAC,MAAM,CAAC,OAAO,CAAa;KAC7B,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,KAAK,EAAE,CAAC;IAC5C,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAChC,OAAO,eAAe,CAAC;AACxB,CAAC,CAAC;AA9CW,QAAA,WAAW,eA8CtB"}
1
+ {"version":3,"file":"open-browser.js","sourceRoot":"","sources":["../src/open-browser.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ import { BrowserLog } from './browser-log';
4
4
  import { OnStartData } from './types';
5
5
  import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
6
6
  import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
7
+ import { ChromiumOptions } from './open-browser';
7
8
  export declare type StitchingState = 'encoding' | 'muxing';
8
9
  export declare type RenderMediaOnProgress = (progress: {
9
10
  renderedFrames: number;
@@ -34,6 +35,8 @@ export declare type RenderMediaOptions = {
34
35
  onBrowserLog?: ((log: BrowserLog) => void) | undefined;
35
36
  onStart?: (data: OnStartData) => void;
36
37
  timeoutInMilliseconds?: number;
38
+ chromiumOptions?: ChromiumOptions;
39
+ scale?: number;
37
40
  } & ServeUrlOrWebpackBundle;
38
- export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, ...options }: RenderMediaOptions) => Promise<void>;
41
+ export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, ...options }: RenderMediaOptions) => Promise<void>;
39
42
  //# sourceMappingURL=render-media.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"render-media.d.ts","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACN,KAAK,EACL,gBAAgB,EAChB,UAAU,EAEV,WAAW,EACX,aAAa,EACb,kBAAkB,EAClB,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAG/E,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AAKjC,oBAAY,cAAc,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEnD,oBAAY,qBAAqB,GAAG,CAAC,QAAQ,EAAE;IAC9C,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,cAAc,CAAC;CAC5B,KAAK,IAAI,CAAC;AAEX,oBAAY,kBAAkB,GAAG;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,kBAAkB,CAAC;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/B,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACvD,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACtC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAC/B,GAAG,uBAAuB,CAAC;AAI5B,eAAO,MAAM,WAAW,wSAuBrB,kBAAkB,kBAsJpB,CAAC"}
1
+ {"version":3,"file":"render-media.d.ts","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACN,KAAK,EACL,gBAAgB,EAChB,UAAU,EAEV,WAAW,EACX,aAAa,EACb,kBAAkB,EAClB,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAG/E,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAI/C,oBAAY,cAAc,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEnD,oBAAY,qBAAqB,GAAG,CAAC,QAAQ,EAAE;IAC9C,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,cAAc,CAAC;CAC5B,KAAK,IAAI,CAAC;AAEX,oBAAY,kBAAkB,GAAG;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,kBAAkB,CAAC;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACtC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/B,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACvD,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACtC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,uBAAuB,CAAC;AAI5B,eAAO,MAAM,WAAW,gUAyBrB,kBAAkB,kBAwKpB,CAAC"}
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.renderMedia = void 0;
7
+ const os_1 = __importDefault(require("os"));
7
8
  const fs_1 = __importDefault(require("fs"));
8
9
  const path_1 = __importDefault(require("path"));
9
10
  const remotion_1 = require("remotion");
@@ -15,12 +16,15 @@ const legacy_webpack_config_1 = require("./legacy-webpack-config");
15
16
  const ensure_output_directory_1 = require("./ensure-output-directory");
16
17
  const ensure_frames_in_order_1 = require("./ensure-frames-in-order");
17
18
  const get_frame_to_render_1 = require("./get-frame-to-render");
18
- const renderMedia = async ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, ...options }) => {
19
+ const validate_scale_1 = require("./validate-scale");
20
+ const can_use_parallel_encoding_1 = require("./can-use-parallel-encoding");
21
+ const renderMedia = async ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, ...options }) => {
19
22
  var _a, _b;
20
23
  remotion_1.Internals.validateQuality(quality);
21
24
  if (typeof crf !== 'undefined' && crf !== null) {
22
25
  remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
23
26
  }
27
+ (0, validate_scale_1.validateScale)(scale);
24
28
  const serveUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
25
29
  let stitchStage = 'encoding';
26
30
  let stitcherFfmpeg;
@@ -31,10 +35,13 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
31
35
  let encodedDoneIn = null;
32
36
  const renderStart = Date.now();
33
37
  const tmpdir = (0, tmp_dir_1.tmpDir)('pre-encode');
34
- const parallelEncoding = !remotion_1.Internals.isAudioCodec(codec);
38
+ const parallelEncoding = (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec);
35
39
  const preEncodedFileLocation = parallelEncoding
36
40
  ? path_1.default.join(tmpdir, 'pre-encode.' + (0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'chunk'))
37
41
  : null;
42
+ const outputDir = parallelEncoding
43
+ ? null
44
+ : await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-render'));
38
45
  try {
39
46
  const callUpdate = () => {
40
47
  onProgress === null || onProgress === void 0 ? void 0 : onProgress({
@@ -61,8 +68,11 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
61
68
  callUpdate();
62
69
  },
63
70
  verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
64
- parallelEncoding,
65
71
  ffmpegExecutable,
72
+ internalOptions: {
73
+ parallelEncoding,
74
+ preEncodedFileLocation: null,
75
+ },
66
76
  assetsInfo: null,
67
77
  });
68
78
  stitcherFfmpeg = preStitcher.task;
@@ -75,7 +85,7 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
75
85
  callUpdate();
76
86
  },
77
87
  parallelism,
78
- outputDir: null,
88
+ outputDir,
79
89
  onStart: (data) => {
80
90
  renderedFrames = 0;
81
91
  callUpdate();
@@ -87,17 +97,21 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
87
97
  quality,
88
98
  frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
89
99
  puppeteerInstance,
90
- onFrameBuffer: async (buffer, frame) => {
91
- var _a;
92
- await waitForRightTimeOfFrameToBeInserted(frame);
93
- (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
94
- setFrameToStitch(frame + 1);
95
- },
100
+ onFrameBuffer: parallelEncoding
101
+ ? async (buffer, frame) => {
102
+ var _a;
103
+ await waitForRightTimeOfFrameToBeInserted(frame);
104
+ (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
105
+ setFrameToStitch(frame + 1);
106
+ }
107
+ : undefined,
96
108
  serveUrl,
97
109
  dumpBrowserLogs,
98
110
  onBrowserLog,
99
111
  onDownload,
100
112
  timeoutInMilliseconds,
113
+ chromiumOptions,
114
+ scale,
101
115
  });
102
116
  if (stitcherFfmpeg) {
103
117
  await waitForFinish();
@@ -114,7 +128,10 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
114
128
  height: composition.height,
115
129
  fps: composition.fps,
116
130
  outputLocation,
117
- preEncodedFileLocation,
131
+ internalOptions: {
132
+ parallelEncoding,
133
+ preEncodedFileLocation,
134
+ },
118
135
  force: overwrite !== null && overwrite !== void 0 ? overwrite : remotion_1.Internals.DEFAULT_OVERWRITE,
119
136
  pixelFormat,
120
137
  codec,
@@ -129,7 +146,7 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
129
146
  },
130
147
  onDownload,
131
148
  verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
132
- parallelEncoding: false,
149
+ dir: outputDir !== null && outputDir !== void 0 ? outputDir : undefined,
133
150
  });
134
151
  encodedFrames = composition.durationInFrames;
135
152
  encodedDoneIn = Date.now() - stitchStart;
@@ -1 +1 @@
1
- {"version":3,"file":"render-media.js","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-media.js","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import { Browser as PuppeteerBrowser } from 'puppeteer-core';
2
2
  import { BrowserExecutable, StillImageFormat, TCompMetadata } from 'remotion';
3
3
  import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
4
+ import { ChromiumOptions } from './open-browser';
4
5
  declare type InnerStillOptions = {
5
6
  composition: TCompMetadata;
6
7
  output: string;
@@ -14,6 +15,8 @@ declare type InnerStillOptions = {
14
15
  overwrite?: boolean;
15
16
  browserExecutable?: BrowserExecutable;
16
17
  timeoutInMilliseconds?: number;
18
+ chromiumOptions?: ChromiumOptions;
19
+ scale?: number;
17
20
  };
18
21
  export declare type RenderStillOptions = InnerStillOptions & ServeUrlOrWebpackBundle;
19
22
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"render-still.d.ts","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACN,iBAAiB,EAEjB,gBAAgB,EAChB,aAAa,EACb,MAAM,UAAU,CAAC;AAElB,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AASjC,aAAK,iBAAiB,GAAG;IACxB,WAAW,EAAE,aAAa,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAEF,oBAAY,kBAAkB,GAAG,iBAAiB,GAAG,uBAAuB,CAAC;AAkJ7E;;GAEG;AAEH,eAAO,MAAM,WAAW,YACd,kBAAkB,KACzB,QAAQ,IAAI,CAgBd,CAAC"}
1
+ {"version":3,"file":"render-still.d.ts","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACN,iBAAiB,EAEjB,gBAAgB,EAChB,aAAa,EACb,MAAM,UAAU,CAAC;AAElB,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAC,eAAe,EAAc,MAAM,gBAAgB,CAAC;AAQ5D,aAAK,iBAAiB,GAAG;IACxB,WAAW,EAAE,aAAa,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,oBAAY,kBAAkB,GAAG,iBAAiB,GAAG,uBAAuB,CAAC;AAsJ7E;;GAEG;AAEH,eAAO,MAAM,WAAW,YACd,kBAAkB,KACzB,QAAQ,IAAI,CAgBd,CAAC"}
@@ -35,7 +35,8 @@ const provide_screenshot_1 = require("./provide-screenshot");
35
35
  const seek_to_frame_1 = require("./seek-to-frame");
36
36
  const set_props_and_env_1 = require("./set-props-and-env");
37
37
  const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
38
- const innerRenderStill = async ({ composition, quality, imageFormat = 'png', serveUrl, puppeteerInstance, dumpBrowserLogs = false, onError, inputProps, envVariables, output, frame = 0, overwrite = true, browserExecutable, timeoutInMilliseconds, }) => {
38
+ const validate_scale_1 = require("./validate-scale");
39
+ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', serveUrl, puppeteerInstance, dumpBrowserLogs = false, onError, inputProps, envVariables, output, frame = 0, overwrite = true, browserExecutable, timeoutInMilliseconds, chromiumOptions, scale, }) => {
39
40
  remotion_1.Internals.validateDimension(composition.height, 'height', 'in the `config` object passed to `renderStill()`');
40
41
  remotion_1.Internals.validateDimension(composition.width, 'width', 'in the `config` object passed to `renderStill()`');
41
42
  remotion_1.Internals.validateFps(composition.fps, 'in the `config` object of `renderStill()`');
@@ -43,6 +44,7 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
43
44
  remotion_1.Internals.validateNonNullImageFormat(imageFormat);
44
45
  remotion_1.Internals.validateFrame(frame, composition.durationInFrames);
45
46
  (0, validate_puppeteer_timeout_1.validatePuppeteerTimeout)(timeoutInMilliseconds);
47
+ (0, validate_scale_1.validateScale)(scale);
46
48
  if (typeof output !== 'string') {
47
49
  throw new TypeError('`output` parameter was not passed or is not a string');
48
50
  }
@@ -64,12 +66,13 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
64
66
  const browserInstance = puppeteerInstance !== null && puppeteerInstance !== void 0 ? puppeteerInstance : (await (0, open_browser_1.openBrowser)(remotion_1.Internals.DEFAULT_BROWSER, {
65
67
  browserExecutable,
66
68
  shouldDumpIo: dumpBrowserLogs,
69
+ chromiumOptions,
67
70
  }));
68
71
  const page = await browserInstance.newPage();
69
72
  page.setViewport({
70
73
  width: composition.width,
71
74
  height: composition.height,
72
- deviceScaleFactor: 1,
75
+ deviceScaleFactor: scale !== null && scale !== void 0 ? scale : 1,
73
76
  });
74
77
  const cleanup = async () => {
75
78
  page.off('pageerror', errorCallback);
@@ -1 +1 @@
1
- {"version":3,"file":"render-still.js","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-still.js","sourceRoot":"","sources":["../src/render-still.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,14 @@
1
1
  import type { Browser as PuppeteerBrowser } from 'puppeteer-core';
2
2
  import { Browser, Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, TCompMetadata } from 'remotion';
3
- export declare type RenderMediaOnDownload = (src: string) => void;
4
- export declare type StitchingState = 'encoding' | 'muxing';
5
- export declare type RenderMediaOnProgress = (progress: {
3
+ export declare type RenderVideoOnDownload = (src: string) => void;
4
+ export declare type RenderVideoOnProgress = (progress: {
6
5
  renderedFrames: number;
7
6
  encodedFrames: number;
8
7
  encodedDoneIn: number | null;
9
8
  renderedDoneIn: number | null;
10
- stitchStage: StitchingState;
9
+ stitchStage: 'encoding' | 'muxing';
11
10
  }) => void;
12
- export declare type RenderMediaOptions = {
11
+ export declare type RenderVideoOptions = {
13
12
  proResProfile: ProResProfile | undefined;
14
13
  parallelism: number | null;
15
14
  parallelEncoding: boolean;
@@ -29,11 +28,11 @@ export declare type RenderMediaOptions = {
29
28
  openedBrowser: PuppeteerBrowser;
30
29
  overwrite: boolean;
31
30
  absoluteOutputFile: string;
32
- onProgress?: RenderMediaOnProgress;
31
+ onProgress: RenderVideoOnProgress;
32
+ shouldOutputImageSequence: boolean;
33
33
  fileExtension: string | null;
34
34
  bundled: string;
35
35
  onDownload: (src: string) => void;
36
- dumpBrowserLogs: boolean;
37
36
  };
38
- export declare const renderMedia: ({ parallelism, proResProfile, parallelEncoding, crf, outputDir, config, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, browser, serveUrl, openedBrowser, absoluteOutputFile, onProgress, overwrite, fileExtension, bundled, onDownload, dumpBrowserLogs, }: RenderMediaOptions) => Promise<void>;
37
+ export declare const renderVideo: ({ parallelism, proResProfile, parallelEncoding, crf, outputDir, config, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, browser, serveUrl, openedBrowser, absoluteOutputFile, onProgress, overwrite, shouldOutputImageSequence, fileExtension, bundled, onDownload, }: RenderVideoOptions) => Promise<void>;
39
38
  //# sourceMappingURL=render-video.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"render-video.d.ts","sourceRoot":"","sources":["../src/render-video.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACN,OAAO,EACP,KAAK,EACL,gBAAgB,EAChB,UAAU,EAEV,WAAW,EACX,aAAa,EACb,aAAa,EACb,MAAM,UAAU,CAAC;AAIlB,oBAAY,qBAAqB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;AAE1D,oBAAY,cAAc,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEnD,oBAAY,qBAAqB,GAAG,CAAC,QAAQ,EAAE;IAC9C,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,cAAc,CAAC;CAC5B,KAAK,IAAI,CAAC;AAEX,oBAAY,kBAAkB,GAAG;IAChC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IACzC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,aAAa,CAAC;IACtB,WAAW,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACrC,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,gBAAgB,CAAC;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,eAAe,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,WAAW,kTAyBrB,kBAAkB,kBAuIpB,CAAC"}
1
+ {"version":3,"file":"render-video.d.ts","sourceRoot":"","sources":["../src/render-video.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAChE,OAAO,EACN,OAAO,EACP,KAAK,EACL,gBAAgB,EAChB,UAAU,EAEV,WAAW,EACX,aAAa,EACb,aAAa,EACb,MAAM,UAAU,CAAC;AAIlB,oBAAY,qBAAqB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;AAE1D,oBAAY,qBAAqB,GAAG,CAAC,QAAQ,EAAE;IAC9C,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,UAAU,GAAG,QAAQ,CAAC;CACnC,KAAK,IAAI,CAAC;AAEX,oBAAY,kBAAkB,GAAG;IAChC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IACzC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,aAAa,CAAC;IACtB,WAAW,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAAC;IACrC,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,gBAAgB,CAAC;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,qBAAqB,CAAC;IAClC,yBAAyB,EAAE,OAAO,CAAC;IACnC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,WAAW,4TAyBrB,kBAAkB,kBAuKpB,CAAC"}
@@ -3,15 +3,14 @@ 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.renderMedia = void 0;
6
+ exports.renderVideo = void 0;
7
7
  const fs_1 = __importDefault(require("fs"));
8
8
  const path_1 = __importDefault(require("path"));
9
9
  const remotion_1 = require("remotion");
10
10
  const stitcher_1 = require("./stitcher");
11
11
  const render_1 = require("./render");
12
- const renderMedia = async ({ parallelism, proResProfile, parallelEncoding, crf, outputDir, config, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, browser, serveUrl, openedBrowser, absoluteOutputFile, onProgress, overwrite, fileExtension, bundled, onDownload, dumpBrowserLogs, }) => {
12
+ const renderVideo = async ({ parallelism, proResProfile, parallelEncoding, crf, outputDir, config, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, browser, serveUrl, openedBrowser, absoluteOutputFile, onProgress, overwrite, shouldOutputImageSequence, fileExtension, bundled, onDownload, }) => {
13
13
  var _a, _b;
14
- let stitchStage = 'encoding';
15
14
  let stitcherFfmpeg;
16
15
  let preStitcher;
17
16
  let encodedFrames = 0;
@@ -20,15 +19,6 @@ const renderMedia = async ({ parallelism, proResProfile, parallelEncoding, crf,
20
19
  let renderedDoneIn = null;
21
20
  let encodedDoneIn = null;
22
21
  const renderStart = Date.now();
23
- const callUpdate = () => {
24
- onProgress === null || onProgress === void 0 ? void 0 : onProgress({
25
- encodedDoneIn,
26
- encodedFrames,
27
- renderedDoneIn,
28
- renderedFrames,
29
- stitchStage,
30
- });
31
- };
32
22
  if (parallelEncoding) {
33
23
  if (typeof crf !== 'number') {
34
24
  throw new TypeError('CRF is unexpectedly not a number');
@@ -49,7 +39,13 @@ const renderMedia = async ({ parallelism, proResProfile, parallelEncoding, crf,
49
39
  parallelism,
50
40
  onProgress: (frame) => {
51
41
  encodedFrames = frame;
52
- callUpdate();
42
+ onProgress({
43
+ encodedFrames,
44
+ renderedFrames,
45
+ encodedDoneIn: null,
46
+ renderedDoneIn: null,
47
+ stitchStage: 'encoding',
48
+ });
53
49
  },
54
50
  verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
55
51
  parallelEncoding,
@@ -59,17 +55,31 @@ const renderMedia = async ({ parallelism, proResProfile, parallelEncoding, crf,
59
55
  });
60
56
  stitcherFfmpeg = preStitcher.task;
61
57
  }
62
- const { assetsInfo } = await (0, render_1.renderFrames)({
58
+ const renderer = (0, render_1.renderFrames)({
63
59
  config,
64
60
  onFrameUpdate: (frame) => {
65
61
  renderedFrames = frame;
66
- callUpdate();
62
+ onProgress({
63
+ encodedFrames,
64
+ renderedFrames,
65
+ encodedDoneIn,
66
+ renderedDoneIn,
67
+ stitchStage: 'encoding',
68
+ });
67
69
  },
68
70
  parallelism,
71
+ parallelEncoding,
69
72
  outputDir,
70
73
  onStart: () => {
71
74
  renderedFrames = 0;
72
- callUpdate();
75
+ onProgress({
76
+ encodedDoneIn,
77
+ encodedFrames,
78
+ renderedDoneIn,
79
+ renderedFrames,
80
+ // TODO: Keep a state
81
+ stitchStage: 'encoding',
82
+ });
73
83
  },
74
84
  inputProps,
75
85
  envVariables,
@@ -83,8 +93,8 @@ const renderMedia = async ({ parallelism, proResProfile, parallelEncoding, crf,
83
93
  (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
84
94
  },
85
95
  serveUrl,
86
- dumpBrowserLogs,
87
96
  });
97
+ const { assetsInfo } = await renderer;
88
98
  if (stitcherFfmpeg) {
89
99
  (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
90
100
  await stitcherFfmpeg;
@@ -92,7 +102,19 @@ const renderMedia = async ({ parallelism, proResProfile, parallelEncoding, crf,
92
102
  }
93
103
  const closeBrowserPromise = openedBrowser.close();
94
104
  renderedDoneIn = Date.now() - renderStart;
95
- callUpdate();
105
+ onProgress({
106
+ encodedFrames,
107
+ renderedFrames,
108
+ renderedDoneIn,
109
+ encodedDoneIn,
110
+ stitchStage: 'encoding',
111
+ });
112
+ if (process.env.DEBUG) {
113
+ remotion_1.Internals.perf.logPerf();
114
+ }
115
+ if (shouldOutputImageSequence) {
116
+ return;
117
+ }
96
118
  if (typeof crf !== 'number') {
97
119
  throw new TypeError('CRF is unexpectedly not a number');
98
120
  }
@@ -120,19 +142,28 @@ const renderMedia = async ({ parallelism, proResProfile, parallelEncoding, crf,
120
142
  parallelism,
121
143
  ffmpegExecutable,
122
144
  onProgress: (frame) => {
123
- stitchStage = 'muxing';
124
- encodedFrames = frame;
125
- callUpdate();
145
+ onProgress({
146
+ encodedFrames: frame,
147
+ renderedFrames,
148
+ renderedDoneIn,
149
+ encodedDoneIn,
150
+ stitchStage: 'muxing',
151
+ });
126
152
  },
127
153
  // TODO: Optimization, Now can download before!
128
154
  onDownload,
129
155
  webpackBundle: bundled,
130
156
  verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
131
157
  });
132
- encodedFrames = config.durationInFrames;
133
158
  encodedDoneIn = Date.now() - stitchStart;
134
- callUpdate();
159
+ onProgress({
160
+ encodedDoneIn,
161
+ encodedFrames,
162
+ renderedDoneIn,
163
+ renderedFrames,
164
+ stitchStage: 'muxing',
165
+ });
135
166
  await closeBrowserPromise;
136
167
  };
137
- exports.renderMedia = renderMedia;
168
+ exports.renderVideo = renderVideo;
138
169
  //# sourceMappingURL=render-video.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"render-video.js","sourceRoot":"","sources":["../src/render-video.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render-video.js","sourceRoot":"","sources":["../src/render-video.ts"],"names":[],"mappings":"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"}
package/dist/render.d.ts CHANGED
@@ -4,6 +4,7 @@ import { BrowserExecutable, FrameRange, ImageFormat, SmallTCompMetadata } from '
4
4
  import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
5
5
  import { BrowserLog } from './browser-log';
6
6
  import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
7
+ import { ChromiumOptions } from './open-browser';
7
8
  import { OnStartData, RenderFramesOutput } from './types';
8
9
  declare type ConfigOrComposition = {
9
10
  /**
@@ -30,8 +31,10 @@ declare type RenderFramesOptions = {
30
31
  onFrameBuffer?: (buffer: Buffer, frame: number) => void;
31
32
  onDownload?: RenderMediaOnDownload;
32
33
  timeoutInMilliseconds?: number;
34
+ chromiumOptions?: ChromiumOptions;
35
+ scale?: number;
33
36
  } & ConfigOrComposition & ServeUrlOrWebpackBundle;
34
- export declare const innerRenderFrames: ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, }: Omit<RenderFramesOptions, "url"> & {
37
+ export declare const innerRenderFrames: ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, }: Omit<RenderFramesOptions, "url"> & {
35
38
  onError: (err: Error) => void;
36
39
  pagesArray: Page[];
37
40
  serveUrl: string;
@@ -1 +1 @@
1
- {"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";AAEA,OAAO,EACN,OAAO,IAAI,gBAAgB,EAE3B,IAAI,EACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,iBAAiB,EACjB,UAAU,EACV,WAAW,EAEX,kBAAkB,EAElB,MAAM,UAAU,CAAC;AAClB,OAAO,EAEN,qBAAqB,EACrB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAKzC,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AASjC,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAExD,aAAK,mBAAmB,GACrB;IACA;;OAEG;IACH,MAAM,EAAE,kBAAkB,CAAC;CAC1B,GACD;IACA,WAAW,EAAE,kBAAkB,CAAC;CAC/B,CAAC;AAEL,aAAK,mBAAmB,GAAG;IAC1B,OAAO,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACrC,aAAa,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IACpE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC;IACzC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAC/B,GAAG,mBAAmB,GACtB,uBAAuB,CAAC;AAczB,eAAO,MAAM,iBAAiB;mBAoBd,KAAK,KAAK,IAAI;gBACjB,IAAI,EAAE;cACR,MAAM;iBACH,kBAAkB;MAC5B,QAAQ,kBAAkB,CAoM7B,CAAC;AAEF,eAAO,MAAM,YAAY,YACf,mBAAmB,KAC1B,QAAQ,kBAAkB,CAgF5B,CAAC"}
1
+ {"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";AAEA,OAAO,EACN,OAAO,IAAI,gBAAgB,EAE3B,IAAI,EACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACN,iBAAiB,EACjB,UAAU,EACV,WAAW,EAEX,kBAAkB,EAElB,MAAM,UAAU,CAAC;AAClB,OAAO,EAEN,qBAAqB,EACrB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAKzC,OAAO,EAEN,uBAAuB,EACvB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAC,eAAe,EAAc,MAAM,gBAAgB,CAAC;AAM5D,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAGxD,aAAK,mBAAmB,GACrB;IACA;;OAEG;IACH,MAAM,EAAE,kBAAkB,CAAC;CAC1B,GACD;IACA,WAAW,EAAE,kBAAkB,CAAC;CAC/B,CAAC;AAEL,aAAK,mBAAmB,GAAG;IAC1B,OAAO,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAC;IACrC,aAAa,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IACpE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC;IACzC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,mBAAmB,GACtB,uBAAuB,CAAC;AAczB,eAAO,MAAM,iBAAiB;mBAqBd,KAAK,KAAK,IAAI;gBACjB,IAAI,EAAE;cACR,MAAM;iBACH,kBAAkB;MAC5B,QAAQ,kBAAkB,CAoM7B,CAAC;AAEF,eAAO,MAAM,YAAY,YACf,mBAAmB,KAC1B,QAAQ,kBAAkB,CAkF5B,CAAC"}