@remotion/renderer 3.0.0-lambda.57 → 3.0.0-pnpm.8

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 (147) 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 +3 -1
  7. package/dist/assets/calculate-asset-positions.js.map +1 -1
  8. package/dist/assets/convert-assets-to-file-urls.d.ts +2 -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 +5 -6
  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 +72 -16
  15. package/dist/assets/download-and-map-assets-to-file.js.map +1 -1
  16. package/dist/assets/types.d.ts +1 -0
  17. package/dist/assets/types.d.ts.map +1 -1
  18. package/dist/assets/types.js +19 -0
  19. package/dist/assets/types.js.map +1 -1
  20. package/dist/create-ffmpeg-complex-filter.d.ts +4 -1
  21. package/dist/create-ffmpeg-complex-filter.d.ts.map +1 -1
  22. package/dist/delete-directory.d.ts +2 -0
  23. package/dist/delete-directory.d.ts.map +1 -0
  24. package/dist/delete-directory.js +28 -0
  25. package/dist/delete-directory.js.map +1 -0
  26. package/dist/ensure-frames-in-order.d.ts +6 -0
  27. package/dist/ensure-frames-in-order.d.ts.map +1 -0
  28. package/dist/ensure-frames-in-order.js +39 -0
  29. package/dist/ensure-frames-in-order.js.map +1 -0
  30. package/dist/ensure-output-directory.d.ts +2 -0
  31. package/dist/ensure-output-directory.d.ts.map +1 -0
  32. package/dist/ensure-output-directory.js +18 -0
  33. package/dist/ensure-output-directory.js.map +1 -0
  34. package/dist/ffmpeg-flags.d.ts +1 -5
  35. package/dist/ffmpeg-flags.d.ts.map +1 -1
  36. package/dist/ffmpeg-flags.js +1 -5
  37. package/dist/ffmpeg-flags.js.map +1 -1
  38. package/dist/get-audio-codec-name.d.ts.map +1 -1
  39. package/dist/get-audio-codec-name.js +0 -3
  40. package/dist/get-audio-codec-name.js.map +1 -1
  41. package/dist/get-browser-instance.d.ts +10 -0
  42. package/dist/get-browser-instance.d.ts.map +1 -0
  43. package/dist/get-browser-instance.js +35 -0
  44. package/dist/get-browser-instance.js.map +1 -0
  45. package/dist/get-compositions.d.ts +1 -6
  46. package/dist/get-compositions.d.ts.map +1 -1
  47. package/dist/get-compositions.js +12 -32
  48. package/dist/get-compositions.js.map +1 -1
  49. package/dist/get-extension-from-codec.d.ts +3 -0
  50. package/dist/get-extension-from-codec.d.ts.map +1 -0
  51. package/dist/get-extension-from-codec.js +33 -0
  52. package/dist/get-extension-from-codec.js.map +1 -0
  53. package/dist/get-pro-res-profile-name.d.ts +3 -0
  54. package/dist/get-pro-res-profile-name.d.ts.map +1 -0
  55. package/dist/get-pro-res-profile-name.js +26 -0
  56. package/dist/get-pro-res-profile-name.js.map +1 -0
  57. package/dist/index.d.ts +1 -17
  58. package/dist/index.d.ts.map +1 -1
  59. package/dist/index.js +1 -12
  60. package/dist/index.js.map +1 -1
  61. package/dist/is-serve-url.d.ts +2 -0
  62. package/dist/is-serve-url.d.ts.map +1 -0
  63. package/dist/is-serve-url.js +13 -0
  64. package/dist/is-serve-url.js.map +1 -0
  65. package/dist/legacy-webpack-config.d.ts +10 -0
  66. package/dist/legacy-webpack-config.d.ts.map +1 -0
  67. package/dist/legacy-webpack-config.js +14 -0
  68. package/dist/legacy-webpack-config.js.map +1 -0
  69. package/dist/make-assets-download-dir.d.ts +2 -0
  70. package/dist/make-assets-download-dir.d.ts.map +1 -0
  71. package/dist/make-assets-download-dir.js +9 -0
  72. package/dist/make-assets-download-dir.js.map +1 -0
  73. package/dist/open-browser.d.ts.map +1 -1
  74. package/dist/open-browser.js +0 -11
  75. package/dist/open-browser.js.map +1 -1
  76. package/dist/prepare-server.d.ts +5 -0
  77. package/dist/prepare-server.d.ts.map +1 -0
  78. package/dist/prepare-server.js +20 -0
  79. package/dist/prepare-server.js.map +1 -0
  80. package/dist/puppeteer-screenshot.d.ts.map +1 -1
  81. package/dist/puppeteer-screenshot.js.map +1 -1
  82. package/dist/render-media.d.ts +38 -0
  83. package/dist/render-media.d.ts.map +1 -0
  84. package/dist/render-media.js +145 -0
  85. package/dist/render-media.js.map +1 -0
  86. package/dist/render-still.d.ts +4 -4
  87. package/dist/render-still.d.ts.map +1 -1
  88. package/dist/render-still.js +14 -8
  89. package/dist/render-still.js.map +1 -1
  90. package/dist/render-video.d.ts +39 -0
  91. package/dist/render-video.d.ts.map +1 -0
  92. package/dist/render-video.js +138 -0
  93. package/dist/render-video.js.map +1 -0
  94. package/dist/render.d.ts +3 -5
  95. package/dist/render.d.ts.map +1 -1
  96. package/dist/render.js +25 -28
  97. package/dist/render.js.map +1 -1
  98. package/dist/run-ffmpeg-command.d.ts +6 -0
  99. package/dist/run-ffmpeg-command.d.ts.map +1 -0
  100. package/dist/run-ffmpeg-command.js +25 -0
  101. package/dist/run-ffmpeg-command.js.map +1 -0
  102. package/dist/sample-rate.d.ts +2 -0
  103. package/dist/sample-rate.d.ts.map +1 -0
  104. package/dist/sample-rate.js +5 -0
  105. package/dist/sample-rate.js.map +1 -0
  106. package/dist/screenshot-dom-element.d.ts +0 -1
  107. package/dist/screenshot-dom-element.d.ts.map +1 -1
  108. package/dist/screenshot-dom-element.js +5 -0
  109. package/dist/screenshot-dom-element.js.map +1 -1
  110. package/dist/screenshot-task.d.ts +1 -2
  111. package/dist/screenshot-task.d.ts.map +1 -1
  112. package/dist/screenshot-task.js.map +1 -1
  113. package/dist/set-props-and-env.d.ts +2 -2
  114. package/dist/set-props-and-env.d.ts.map +1 -1
  115. package/dist/set-props-and-env.js +2 -3
  116. package/dist/set-props-and-env.js.map +1 -1
  117. package/dist/stitcher.d.ts +1 -3
  118. package/dist/stitcher.d.ts.map +1 -1
  119. package/dist/stitcher.js +7 -18
  120. package/dist/stitcher.js.map +1 -1
  121. package/dist/stringify-ffmpeg-filter.d.ts.map +1 -1
  122. package/dist/stringify-ffmpeg-filter.js +0 -3
  123. package/dist/stringify-ffmpeg-filter.js.map +1 -1
  124. package/dist/tmp-dir.d.ts +2 -0
  125. package/dist/tmp-dir.d.ts.map +1 -0
  126. package/dist/tmp-dir.js +31 -0
  127. package/dist/tmp-dir.js.map +1 -0
  128. package/dist/validate-ffmpeg.d.ts.map +1 -1
  129. package/dist/validate-ffmpeg.js +2 -7
  130. package/dist/validate-ffmpeg.js.map +1 -1
  131. package/package.json +5 -6
  132. package/dist/convert-mp3-to-pcm.d.ts +0 -7
  133. package/dist/convert-mp3-to-pcm.d.ts.map +0 -1
  134. package/dist/convert-mp3-to-pcm.js +0 -41
  135. package/dist/convert-mp3-to-pcm.js.map +0 -1
  136. package/dist/handle-null-audio.d.ts +0 -1
  137. package/dist/handle-null-audio.d.ts.map +0 -1
  138. package/dist/handle-null-audio.js +0 -2
  139. package/dist/handle-null-audio.js.map +0 -1
  140. package/dist/validate-frame.d.ts +0 -2
  141. package/dist/validate-frame.d.ts.map +0 -1
  142. package/dist/validate-frame.js +0 -25
  143. package/dist/validate-frame.js.map +0 -1
  144. package/dist/validate-quality.d.ts +0 -1
  145. package/dist/validate-quality.d.ts.map +0 -1
  146. package/dist/validate-quality.js +0 -2
  147. package/dist/validate-quality.js.map +0 -1
@@ -0,0 +1,145 @@
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.renderMedia = void 0;
7
+ const fs_1 = __importDefault(require("fs"));
8
+ const path_1 = __importDefault(require("path"));
9
+ const remotion_1 = require("remotion");
10
+ const stitcher_1 = require("./stitcher");
11
+ const render_1 = require("./render");
12
+ const tmp_dir_1 = require("./tmp-dir");
13
+ const get_extension_from_codec_1 = require("./get-extension-from-codec");
14
+ const legacy_webpack_config_1 = require("./legacy-webpack-config");
15
+ const ensure_output_directory_1 = require("./ensure-output-directory");
16
+ const ensure_frames_in_order_1 = require("./ensure-frames-in-order");
17
+ 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, ...options }) => {
19
+ var _a, _b;
20
+ remotion_1.Internals.validateQuality(quality);
21
+ if (typeof crf !== 'undefined' && crf !== null) {
22
+ remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
23
+ }
24
+ const serveUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
25
+ let stitchStage = 'encoding';
26
+ let stitcherFfmpeg;
27
+ let preStitcher = null;
28
+ let encodedFrames = 0;
29
+ let renderedFrames = 0;
30
+ let renderedDoneIn = null;
31
+ let encodedDoneIn = null;
32
+ const renderStart = Date.now();
33
+ const tmpdir = (0, tmp_dir_1.tmpDir)('pre-encode');
34
+ const parallelEncoding = !remotion_1.Internals.isAudioCodec(codec);
35
+ const preEncodedFileLocation = parallelEncoding
36
+ ? path_1.default.join(tmpdir, 'pre-encode.' + (0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'chunk'))
37
+ : null;
38
+ try {
39
+ const callUpdate = () => {
40
+ onProgress === null || onProgress === void 0 ? void 0 : onProgress({
41
+ encodedDoneIn,
42
+ encodedFrames,
43
+ renderedDoneIn,
44
+ renderedFrames,
45
+ stitchStage,
46
+ });
47
+ };
48
+ if (preEncodedFileLocation) {
49
+ preStitcher = await (0, stitcher_1.spawnFfmpeg)({
50
+ width: composition.width,
51
+ height: composition.height,
52
+ fps: composition.fps,
53
+ outputLocation: preEncodedFileLocation,
54
+ force: true,
55
+ pixelFormat,
56
+ codec,
57
+ proResProfile,
58
+ crf,
59
+ onProgress: (frame) => {
60
+ encodedFrames = frame;
61
+ callUpdate();
62
+ },
63
+ verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
64
+ parallelEncoding,
65
+ ffmpegExecutable,
66
+ assetsInfo: null,
67
+ });
68
+ stitcherFfmpeg = preStitcher.task;
69
+ }
70
+ const { waitForRightTimeOfFrameToBeInserted, setFrameToStitch, waitForFinish, } = (0, ensure_frames_in_order_1.ensureFramesInOrder)((0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null));
71
+ const { assetsInfo } = await (0, render_1.renderFrames)({
72
+ config: composition,
73
+ onFrameUpdate: (frame) => {
74
+ renderedFrames = frame;
75
+ callUpdate();
76
+ },
77
+ parallelism,
78
+ outputDir: null,
79
+ onStart: (data) => {
80
+ renderedFrames = 0;
81
+ callUpdate();
82
+ onStart === null || onStart === void 0 ? void 0 : onStart(data);
83
+ },
84
+ inputProps,
85
+ envVariables,
86
+ imageFormat: imageFormat !== null && imageFormat !== void 0 ? imageFormat : 'jpeg',
87
+ quality,
88
+ frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
89
+ 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
+ },
96
+ serveUrl,
97
+ dumpBrowserLogs,
98
+ onBrowserLog,
99
+ onDownload,
100
+ });
101
+ if (stitcherFfmpeg) {
102
+ await waitForFinish();
103
+ (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
104
+ await stitcherFfmpeg;
105
+ (_b = preStitcher === null || preStitcher === void 0 ? void 0 : preStitcher.cleanup) === null || _b === void 0 ? void 0 : _b.call(preStitcher);
106
+ }
107
+ renderedDoneIn = Date.now() - renderStart;
108
+ callUpdate();
109
+ (0, ensure_output_directory_1.ensureOutputDirectory)(outputLocation);
110
+ const stitchStart = Date.now();
111
+ await (0, stitcher_1.stitchFramesToVideo)({
112
+ width: composition.width,
113
+ height: composition.height,
114
+ fps: composition.fps,
115
+ outputLocation,
116
+ preEncodedFileLocation,
117
+ force: overwrite !== null && overwrite !== void 0 ? overwrite : remotion_1.Internals.DEFAULT_OVERWRITE,
118
+ pixelFormat,
119
+ codec,
120
+ proResProfile,
121
+ crf,
122
+ assetsInfo,
123
+ ffmpegExecutable,
124
+ onProgress: (frame) => {
125
+ stitchStage = 'muxing';
126
+ encodedFrames = frame;
127
+ callUpdate();
128
+ },
129
+ onDownload,
130
+ verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
131
+ parallelEncoding: false,
132
+ });
133
+ encodedFrames = composition.durationInFrames;
134
+ encodedDoneIn = Date.now() - stitchStart;
135
+ callUpdate();
136
+ }
137
+ finally {
138
+ if (preEncodedFileLocation !== null &&
139
+ fs_1.default.existsSync(preEncodedFileLocation)) {
140
+ fs_1.default.unlinkSync(preEncodedFileLocation);
141
+ }
142
+ }
143
+ };
144
+ exports.renderMedia = renderMedia;
145
+ //# sourceMappingURL=render-media.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"render-media.js","sourceRoot":"","sources":["../src/render-media.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,15 @@
1
1
  import { Browser as PuppeteerBrowser } from 'puppeteer-core';
2
- import { Browser, BrowserExecutable, StillImageFormat, TCompMetadata } from 'remotion';
2
+ import { Browser, BrowserExecutable, TCompMetadata } from 'remotion';
3
3
  /**
4
4
  * @description Render a still frame from a composition and returns an image path
5
5
  */
6
- export declare const renderStill: ({ composition, quality, imageFormat, serveUrl, browser, puppeteerInstance, dumpBrowserLogs, onError, inputProps, envVariables, output, frame, overwrite, browserExecutable, }: {
6
+ export declare const renderStill: ({ composition, quality, imageFormat, webpackBundle, browser, puppeteerInstance, dumpBrowserLogs, onError, inputProps, envVariables, output, frame, overwrite, browserExecutable, }: {
7
7
  composition: TCompMetadata;
8
8
  output: string;
9
- serveUrl: string;
9
+ webpackBundle: string;
10
10
  frame?: number | undefined;
11
11
  inputProps?: unknown;
12
- imageFormat?: StillImageFormat | undefined;
12
+ imageFormat?: "png" | "jpeg" | undefined;
13
13
  quality?: number | undefined;
14
14
  browser?: Browser | undefined;
15
15
  puppeteerInstance?: PuppeteerBrowser | undefined;
@@ -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,OAAO,EACP,iBAAiB,EAEjB,gBAAgB,EAChB,aAAa,EACb,MAAM,UAAU,CAAC;AAOlB;;GAEG;AACH,eAAO,MAAM,WAAW;iBAgBV,aAAa;YAClB,MAAM;cACJ,MAAM;;iBAEH,OAAO;;;;;;qBAMJ,KAAK,KAAK,IAAI;;;;mBA8H9B,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,EAAC,OAAO,EAAE,iBAAiB,EAAa,aAAa,EAAC,MAAM,UAAU,CAAC;AAO9E;;GAEG;AACH,eAAO,MAAM,WAAW;iBAgBV,aAAa;YAClB,MAAM;mBACC,MAAM;;iBAER,OAAO;;;;;;qBAMJ,KAAK,KAAK,IAAI;;;;mBAoI9B,CAAC"}
@@ -26,15 +26,15 @@ exports.renderStill = void 0;
26
26
  const fs_1 = __importStar(require("fs"));
27
27
  const path_1 = __importDefault(require("path"));
28
28
  const remotion_1 = require("remotion");
29
- const normalize_serve_url_1 = require("./normalize-serve-url");
30
29
  const open_browser_1 = require("./open-browser");
31
30
  const provide_screenshot_1 = require("./provide-screenshot");
32
31
  const seek_to_frame_1 = require("./seek-to-frame");
32
+ const serve_static_1 = require("./serve-static");
33
33
  const set_props_and_env_1 = require("./set-props-and-env");
34
34
  /**
35
35
  * @description Render a still frame from a composition and returns an image path
36
36
  */
37
- const renderStill = async ({ composition, quality, imageFormat = 'png', serveUrl, browser = remotion_1.Internals.DEFAULT_BROWSER, puppeteerInstance, dumpBrowserLogs = false, onError, inputProps, envVariables, output, frame = 0, overwrite = true, browserExecutable, }) => {
37
+ const renderStill = async ({ composition, quality, imageFormat = 'png', webpackBundle, browser = remotion_1.Internals.DEFAULT_BROWSER, puppeteerInstance, dumpBrowserLogs = false, onError, inputProps, envVariables, output, frame = 0, overwrite = true, browserExecutable, }) => {
38
38
  remotion_1.Internals.validateDimension(composition.height, 'height', 'in the `config` object passed to `renderStill()`');
39
39
  remotion_1.Internals.validateDimension(composition.width, 'width', 'in the `config` object passed to `renderStill()`');
40
40
  remotion_1.Internals.validateFps(composition.fps, 'in the `config` object of `renderStill()`');
@@ -61,10 +61,13 @@ const renderStill = async ({ composition, quality, imageFormat = 'png', serveUrl
61
61
  (0, fs_1.mkdirSync)(path_1.default.resolve(output, '..'), {
62
62
  recursive: true,
63
63
  });
64
- const browserInstance = puppeteerInstance !== null && puppeteerInstance !== void 0 ? puppeteerInstance : (await (0, open_browser_1.openBrowser)(browser, {
65
- browserExecutable,
66
- shouldDumpIo: dumpBrowserLogs,
67
- }));
64
+ const [{ port, close }, browserInstance] = await Promise.all([
65
+ (0, serve_static_1.serveStatic)(webpackBundle),
66
+ puppeteerInstance !== null && puppeteerInstance !== void 0 ? puppeteerInstance : (0, open_browser_1.openBrowser)(browser, {
67
+ browserExecutable,
68
+ shouldDumpIo: dumpBrowserLogs,
69
+ }),
70
+ ]);
68
71
  const page = await browserInstance.newPage();
69
72
  page.setViewport({
70
73
  width: composition.width,
@@ -75,14 +78,14 @@ const renderStill = async ({ composition, quality, imageFormat = 'png', serveUrl
75
78
  onError === null || onError === void 0 ? void 0 : onError(err);
76
79
  };
77
80
  page.on('pageerror', errorCallback);
78
- const site = `${(0, normalize_serve_url_1.normalizeServeUrl)(serveUrl)}?composition=${composition.id}`;
79
81
  await (0, set_props_and_env_1.setPropsAndEnv)({
80
82
  inputProps,
81
83
  envVariables,
82
84
  page,
83
- serveUrl,
85
+ port,
84
86
  initialFrame: frame,
85
87
  });
88
+ const site = `http://localhost:${port}/index.html?composition=${composition.id}`;
86
89
  await page.goto(site);
87
90
  try {
88
91
  await (0, seek_to_frame_1.seekToFrame)({ frame, page });
@@ -108,6 +111,9 @@ const renderStill = async ({ composition, quality, imageFormat = 'png', serveUrl
108
111
  },
109
112
  });
110
113
  page.off('pageerror', errorCallback);
114
+ close().catch((err) => {
115
+ console.log('Unable to close web server', err);
116
+ });
111
117
  if (puppeteerInstance) {
112
118
  await page.close();
113
119
  }
@@ -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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"}
@@ -0,0 +1,39 @@
1
+ import type { Browser as PuppeteerBrowser } from 'puppeteer-core';
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: {
6
+ renderedFrames: number;
7
+ encodedFrames: number;
8
+ encodedDoneIn: number | null;
9
+ renderedDoneIn: number | null;
10
+ stitchStage: StitchingState;
11
+ }) => void;
12
+ export declare type RenderMediaOptions = {
13
+ proResProfile: ProResProfile | undefined;
14
+ parallelism: number | null;
15
+ parallelEncoding: boolean;
16
+ crf: number | null;
17
+ outputDir: string;
18
+ config: TCompMetadata;
19
+ imageFormat: 'png' | 'jpeg' | 'none';
20
+ ffmpegExecutable: FfmpegExecutable;
21
+ inputProps: object;
22
+ pixelFormat: PixelFormat;
23
+ codec: Codec;
24
+ envVariables: Record<string, string>;
25
+ quality: number | undefined;
26
+ frameRange: FrameRange | null;
27
+ browser: Browser;
28
+ serveUrl: string;
29
+ openedBrowser: PuppeteerBrowser;
30
+ overwrite: boolean;
31
+ absoluteOutputFile: string;
32
+ onProgress?: RenderMediaOnProgress;
33
+ fileExtension: string | null;
34
+ bundled: string;
35
+ onDownload: (src: string) => void;
36
+ dumpBrowserLogs: boolean;
37
+ };
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>;
39
+ //# sourceMappingURL=render-video.d.ts.map
@@ -0,0 +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"}
@@ -0,0 +1,138 @@
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.renderMedia = void 0;
7
+ const fs_1 = __importDefault(require("fs"));
8
+ const path_1 = __importDefault(require("path"));
9
+ const remotion_1 = require("remotion");
10
+ const stitcher_1 = require("./stitcher");
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, }) => {
13
+ var _a, _b;
14
+ let stitchStage = 'encoding';
15
+ let stitcherFfmpeg;
16
+ let preStitcher;
17
+ let encodedFrames = 0;
18
+ let renderedFrames = 0;
19
+ let preEncodedFileLocation;
20
+ let renderedDoneIn = null;
21
+ let encodedDoneIn = null;
22
+ 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
+ if (parallelEncoding) {
33
+ if (typeof crf !== 'number') {
34
+ throw new TypeError('CRF is unexpectedly not a number');
35
+ }
36
+ preEncodedFileLocation = path_1.default.join(outputDir, 'pre-encode.' + fileExtension);
37
+ preStitcher = await (0, stitcher_1.spawnFfmpeg)({
38
+ dir: outputDir,
39
+ width: config.width,
40
+ height: config.height,
41
+ fps: config.fps,
42
+ outputLocation: preEncodedFileLocation,
43
+ force: true,
44
+ imageFormat,
45
+ pixelFormat,
46
+ codec,
47
+ proResProfile,
48
+ crf,
49
+ parallelism,
50
+ onProgress: (frame) => {
51
+ encodedFrames = frame;
52
+ callUpdate();
53
+ },
54
+ verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
55
+ parallelEncoding,
56
+ webpackBundle: bundled,
57
+ ffmpegExecutable,
58
+ assetsInfo: { assets: [] },
59
+ });
60
+ stitcherFfmpeg = preStitcher.task;
61
+ }
62
+ const { assetsInfo } = await (0, render_1.renderFrames)({
63
+ config,
64
+ onFrameUpdate: (frame) => {
65
+ renderedFrames = frame;
66
+ callUpdate();
67
+ },
68
+ parallelism,
69
+ outputDir,
70
+ onStart: () => {
71
+ renderedFrames = 0;
72
+ callUpdate();
73
+ },
74
+ inputProps,
75
+ envVariables,
76
+ imageFormat,
77
+ quality,
78
+ browser,
79
+ frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
80
+ puppeteerInstance: openedBrowser,
81
+ writeFrame: async (buffer) => {
82
+ var _a;
83
+ (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
84
+ },
85
+ serveUrl,
86
+ dumpBrowserLogs,
87
+ });
88
+ if (stitcherFfmpeg) {
89
+ (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
90
+ await stitcherFfmpeg;
91
+ (_b = preStitcher === null || preStitcher === void 0 ? void 0 : preStitcher.cleanup) === null || _b === void 0 ? void 0 : _b.call(preStitcher);
92
+ }
93
+ const closeBrowserPromise = openedBrowser.close();
94
+ renderedDoneIn = Date.now() - renderStart;
95
+ callUpdate();
96
+ if (typeof crf !== 'number') {
97
+ throw new TypeError('CRF is unexpectedly not a number');
98
+ }
99
+ const dirName = path_1.default.dirname(absoluteOutputFile);
100
+ if (!fs_1.default.existsSync(dirName)) {
101
+ fs_1.default.mkdirSync(dirName, {
102
+ recursive: true,
103
+ });
104
+ }
105
+ const stitchStart = Date.now();
106
+ await (0, stitcher_1.stitchFramesToVideo)({
107
+ dir: outputDir,
108
+ width: config.width,
109
+ height: config.height,
110
+ fps: config.fps,
111
+ outputLocation: absoluteOutputFile,
112
+ preEncodedFileLocation,
113
+ force: overwrite,
114
+ imageFormat,
115
+ pixelFormat,
116
+ codec,
117
+ proResProfile,
118
+ crf,
119
+ assetsInfo,
120
+ parallelism,
121
+ ffmpegExecutable,
122
+ onProgress: (frame) => {
123
+ stitchStage = 'muxing';
124
+ encodedFrames = frame;
125
+ callUpdate();
126
+ },
127
+ // TODO: Optimization, Now can download before!
128
+ onDownload,
129
+ webpackBundle: bundled,
130
+ verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
131
+ });
132
+ encodedFrames = config.durationInFrames;
133
+ encodedDoneIn = Date.now() - stitchStart;
134
+ callUpdate();
135
+ await closeBrowserPromise;
136
+ };
137
+ exports.renderMedia = renderMedia;
138
+ //# sourceMappingURL=render-video.js.map
@@ -0,0 +1 @@
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
@@ -1,25 +1,23 @@
1
1
  import { Browser as PuppeteerBrowser } from 'puppeteer-core';
2
2
  import { Browser, BrowserExecutable, FrameRange, ImageFormat, VideoConfig } from 'remotion';
3
- import { BrowserLog } from './browser-log';
4
3
  import { OnErrorInfo, OnStartData, RenderFramesOutput } from './types';
5
- export declare const renderFrames: ({ config, parallelism, onFrameUpdate, compositionId, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, serveUrl, onError, envVariables, browserExecutable, dumpBrowserLogs, browser, onBrowserLog, }: {
4
+ export declare const renderFrames: ({ config, parallelism, onFrameUpdate, compositionId, outputDir, onStart, inputProps, envVariables, webpackBundle, quality, imageFormat, browser, frameRange, dumpBrowserLogs, puppeteerInstance, onError, browserExecutable, }: {
6
5
  config: VideoConfig;
7
6
  compositionId: string;
8
7
  onStart: (data: OnStartData) => void;
9
- onFrameUpdate: (framesRendered: number, src: string, frameIndex: number) => void;
8
+ onFrameUpdate: (f: number) => void;
10
9
  outputDir: string;
11
10
  inputProps: unknown;
12
11
  envVariables?: Record<string, string> | undefined;
12
+ webpackBundle: string;
13
13
  imageFormat: ImageFormat;
14
14
  parallelism?: number | null | undefined;
15
15
  quality?: number | undefined;
16
16
  browser?: Browser | undefined;
17
17
  frameRange?: FrameRange | null | undefined;
18
- serveUrl: string;
19
18
  dumpBrowserLogs?: boolean | undefined;
20
19
  puppeteerInstance?: PuppeteerBrowser | undefined;
21
20
  browserExecutable?: BrowserExecutable | undefined;
22
21
  onError?: ((info: OnErrorInfo) => void) | undefined;
23
- onBrowserLog?: ((log: BrowserLog) => void) | undefined;
24
22
  }) => Promise<RenderFramesOutput>;
25
23
  //# sourceMappingURL=render.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAiB,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EACN,OAAO,EACP,iBAAiB,EACjB,UAAU,EACV,WAAW,EAEX,WAAW,EACX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAYzC,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAErE,eAAO,MAAM,YAAY;YAoBhB,WAAW;mBACJ,MAAM;oBACL,WAAW,KAAK,IAAI;oCAEnB,MAAM,OACjB,MAAM,cACC,MAAM,KACd,IAAI;eACE,MAAM;gBACL,OAAO;;iBAEN,WAAW;;;;;cAKd,MAAM;;;;sBAIC,WAAW,KAAK,IAAI;0BAChB,UAAU,KAAK,IAAI;MACrC,QAAQ,kBAAkB,CAqL7B,CAAC"}
1
+ {"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACN,OAAO,EACP,iBAAiB,EACjB,UAAU,EACV,WAAW,EAGX,WAAW,EACX,MAAM,UAAU,CAAC;AAYlB,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AAErE,eAAO,MAAM,YAAY;YAmBhB,WAAW;mBACJ,MAAM;oBACL,WAAW,KAAK,IAAI;uBACjB,MAAM,KAAK,IAAI;eACvB,MAAM;gBACL,OAAO;;mBAEJ,MAAM;iBACR,WAAW;;;;;;;;sBAQP,WAAW,KAAK,IAAI;MAClC,QAAQ,kBAAkB,CAmL7B,CAAC"}
package/dist/render.js CHANGED
@@ -11,13 +11,13 @@ const get_concurrency_1 = require("./get-concurrency");
11
11
  const get_frame_range_1 = require("./get-frame-range");
12
12
  const get_frame_to_render_1 = require("./get-frame-to-render");
13
13
  const image_format_1 = require("./image-format");
14
- const normalize_serve_url_1 = require("./normalize-serve-url");
15
14
  const open_browser_1 = require("./open-browser");
16
15
  const pool_1 = require("./pool");
17
16
  const provide_screenshot_1 = require("./provide-screenshot");
18
17
  const seek_to_frame_1 = require("./seek-to-frame");
18
+ const serve_static_1 = require("./serve-static");
19
19
  const set_props_and_env_1 = require("./set-props-and-env");
20
- const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, serveUrl, onError, envVariables, browserExecutable, dumpBrowserLogs, browser, onBrowserLog, }) => {
20
+ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId, outputDir, onStart, inputProps, envVariables = {}, webpackBundle, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, browser = remotion_1.Internals.DEFAULT_BROWSER, frameRange, dumpBrowserLogs = false, puppeteerInstance, onError, browserExecutable, }) => {
21
21
  remotion_1.Internals.validateDimension(config.height, 'height', 'in the `config` object passed to `renderFrames()`');
22
22
  remotion_1.Internals.validateDimension(config.width, 'width', 'in the `config` object passed to `renderFrames()`');
23
23
  remotion_1.Internals.validateFps(config.fps, 'in the `config` object of `renderFrames()`');
@@ -27,10 +27,13 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
27
27
  }
28
28
  remotion_1.Internals.validateQuality(quality);
29
29
  const actualParallelism = (0, get_concurrency_1.getActualConcurrency)(parallelism !== null && parallelism !== void 0 ? parallelism : null);
30
- const browserInstance = puppeteerInstance !== null && puppeteerInstance !== void 0 ? puppeteerInstance : (await (0, open_browser_1.openBrowser)(browser !== null && browser !== void 0 ? browser : remotion_1.Internals.DEFAULT_BROWSER, {
31
- shouldDumpIo: dumpBrowserLogs,
32
- browserExecutable,
33
- }));
30
+ const [{ port, close }, browserInstance] = await Promise.all([
31
+ (0, serve_static_1.serveStatic)(webpackBundle),
32
+ puppeteerInstance !== null && puppeteerInstance !== void 0 ? puppeteerInstance : (0, open_browser_1.openBrowser)(browser, {
33
+ shouldDumpIo: dumpBrowserLogs,
34
+ browserExecutable,
35
+ }),
36
+ ]);
34
37
  const pages = new Array(actualParallelism).fill(true).map(async () => {
35
38
  const page = await browserInstance.newPage();
36
39
  page.setViewport({
@@ -41,17 +44,6 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
41
44
  const errorCallback = (err) => {
42
45
  onError === null || onError === void 0 ? void 0 : onError({ error: err, frame: null });
43
46
  };
44
- const logCallback = (log) => {
45
- onBrowserLog === null || onBrowserLog === void 0 ? void 0 : onBrowserLog({
46
- stackTrace: log.stackTrace(),
47
- text: log.text(),
48
- type: log.type(),
49
- });
50
- };
51
- if (onBrowserLog) {
52
- page.on('console', logCallback);
53
- }
54
- page.on('error', errorCallback);
55
47
  page.on('pageerror', errorCallback);
56
48
  const initialFrame = typeof frameRange === 'number'
57
49
  ? frameRange
@@ -62,29 +54,30 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
62
54
  inputProps,
63
55
  envVariables,
64
56
  page,
65
- serveUrl,
57
+ port,
66
58
  initialFrame,
67
59
  });
68
- const site = `${(0, normalize_serve_url_1.normalizeServeUrl)(serveUrl)}?composition=${compositionId}`;
60
+ const site = `http://localhost:${port}/index.html?composition=${compositionId}`;
69
61
  await page.goto(site);
70
- page.off('error', errorCallback);
71
62
  page.off('pageerror', errorCallback);
72
- page.off('console', logCallback);
73
63
  return page;
74
64
  });
75
65
  const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserInstance);
76
66
  const puppeteerPages = await Promise.all(pages);
77
67
  const pool = new pool_1.Pool(puppeteerPages);
78
68
  const frameCount = (0, get_frame_range_1.getFrameCount)(config.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null);
79
- const lastFrameIndex = (0, get_frame_to_render_1.getFrameToRender)(frameRange !== null && frameRange !== void 0 ? frameRange : null, frameCount - 1);
80
69
  // Substract one because 100 frames will be 00-99
81
70
  // --> 2 digits
82
- const filePadLength = String(lastFrameIndex).length;
71
+ let filePadLength = 0;
72
+ if (frameCount) {
73
+ filePadLength = String(frameCount - 1).length;
74
+ }
83
75
  let framesRendered = 0;
84
76
  onStart({
85
77
  frameCount,
86
78
  });
87
- const assets = await Promise.all(new Array(frameCount)
79
+ const assets = new Array(frameCount).fill(undefined);
80
+ await Promise.all(new Array(frameCount)
88
81
  .fill(Boolean)
89
82
  .map((x, i) => i)
90
83
  .map(async (index) => {
@@ -94,7 +87,6 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
94
87
  const errorCallback = (err) => {
95
88
  onError === null || onError === void 0 ? void 0 : onError({ error: err, frame });
96
89
  };
97
- const output = path_1.default.join(outputDir, `element-${paddedIndex}.${imageFormat}`);
98
90
  freePage.on('pageerror', errorCallback);
99
91
  try {
100
92
  await (0, seek_to_frame_1.seekToFrame)({ frame, page: freePage });
@@ -117,19 +109,23 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
117
109
  quality,
118
110
  options: {
119
111
  frame,
120
- output,
112
+ output: path_1.default.join(outputDir, `element-${paddedIndex}.${imageFormat}`),
121
113
  },
122
114
  });
123
115
  }
124
116
  const collectedAssets = await freePage.evaluate(() => {
125
117
  return window.remotion_collectAssets();
126
118
  });
119
+ const compressedAssets = collectedAssets.map((asset) => remotion_1.Internals.AssetCompression.compressAsset(assets.filter(remotion_1.Internals.truthy).flat(1), asset));
120
+ assets[index] = compressedAssets;
127
121
  pool.release(freePage);
128
122
  framesRendered++;
129
- onFrameUpdate(framesRendered, output, frame);
123
+ onFrameUpdate(framesRendered);
130
124
  freePage.off('pageerror', errorCallback);
131
- return collectedAssets;
132
125
  }));
126
+ close().catch((err) => {
127
+ console.log('Unable to close web server', err);
128
+ });
133
129
  stopCycling();
134
130
  // If browser instance was passed in, we close all the pages
135
131
  // we opened.
@@ -147,6 +143,7 @@ const renderFrames = async ({ config, parallelism, onFrameUpdate, compositionId,
147
143
  return {
148
144
  assetsInfo: {
149
145
  assets,
146
+ bundleDir: webpackBundle,
150
147
  },
151
148
  frameCount,
152
149
  };