@remotion/renderer 2.5.5-alpha.12 → 3.0.0-alpha.192

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 (98) hide show
  1. package/dist/assets/calculate-asset-positions.d.ts.map +1 -1
  2. package/dist/assets/calculate-asset-positions.js +0 -1
  3. package/dist/assets/calculate-asset-positions.js.map +1 -1
  4. package/dist/assets/convert-assets-to-file-urls.d.ts +4 -3
  5. package/dist/assets/convert-assets-to-file-urls.d.ts.map +1 -1
  6. package/dist/assets/convert-assets-to-file-urls.js +3 -3
  7. package/dist/assets/convert-assets-to-file-urls.js.map +1 -1
  8. package/dist/assets/download-and-map-assets-to-file.d.ts +9 -7
  9. package/dist/assets/download-and-map-assets-to-file.d.ts.map +1 -1
  10. package/dist/assets/download-and-map-assets-to-file.js +17 -21
  11. package/dist/assets/download-and-map-assets-to-file.js.map +1 -1
  12. package/dist/assets/get-asset-audio-details.d.ts +0 -1
  13. package/dist/assets/get-asset-audio-details.d.ts.map +1 -1
  14. package/dist/assets/get-asset-audio-details.js +1 -3
  15. package/dist/assets/get-asset-audio-details.js.map +1 -1
  16. package/dist/create-ffmpeg-complex-filter.d.ts.map +1 -1
  17. package/dist/create-ffmpeg-complex-filter.js +2 -2
  18. package/dist/create-ffmpeg-complex-filter.js.map +1 -1
  19. package/dist/cycle-browser-tabs.d.ts +1 -1
  20. package/dist/cycle-browser-tabs.d.ts.map +1 -1
  21. package/dist/cycle-browser-tabs.js +27 -14
  22. package/dist/cycle-browser-tabs.js.map +1 -1
  23. package/dist/ensure-output-directory.d.ts +2 -0
  24. package/dist/ensure-output-directory.d.ts.map +1 -0
  25. package/dist/ensure-output-directory.js +18 -0
  26. package/dist/ensure-output-directory.js.map +1 -0
  27. package/dist/ffmpeg-flags.d.ts +5 -1
  28. package/dist/ffmpeg-flags.d.ts.map +1 -1
  29. package/dist/ffmpeg-flags.js +5 -1
  30. package/dist/ffmpeg-flags.js.map +1 -1
  31. package/dist/get-audio-codec-name.d.ts.map +1 -1
  32. package/dist/get-audio-codec-name.js +3 -0
  33. package/dist/get-audio-codec-name.js.map +1 -1
  34. package/dist/get-compositions.d.ts +6 -5
  35. package/dist/get-compositions.d.ts.map +1 -1
  36. package/dist/get-compositions.js +55 -47
  37. package/dist/get-compositions.js.map +1 -1
  38. package/dist/get-frame-to-render.d.ts +1 -1
  39. package/dist/get-frame-to-render.d.ts.map +1 -1
  40. package/dist/get-frame-to-render.js +13 -7
  41. package/dist/get-frame-to-render.js.map +1 -1
  42. package/dist/index.d.ts +36 -7
  43. package/dist/index.d.ts.map +1 -1
  44. package/dist/index.js +38 -5
  45. package/dist/index.js.map +1 -1
  46. package/dist/is-serve-url.js +1 -1
  47. package/dist/is-serve-url.js.map +1 -1
  48. package/dist/legacy-webpack-config.d.ts +10 -0
  49. package/dist/legacy-webpack-config.d.ts.map +1 -0
  50. package/dist/legacy-webpack-config.js +14 -0
  51. package/dist/legacy-webpack-config.js.map +1 -0
  52. package/dist/open-browser.d.ts.map +1 -1
  53. package/dist/open-browser.js +13 -0
  54. package/dist/open-browser.js.map +1 -1
  55. package/dist/provide-screenshot.d.ts +2 -2
  56. package/dist/provide-screenshot.d.ts.map +1 -1
  57. package/dist/provide-screenshot.js +1 -1
  58. package/dist/provide-screenshot.js.map +1 -1
  59. package/dist/puppeteer-screenshot.d.ts.map +1 -1
  60. package/dist/puppeteer-screenshot.js.map +1 -1
  61. package/dist/render-media.d.ts +4 -4
  62. package/dist/render-media.d.ts.map +1 -1
  63. package/dist/render-media.js +42 -25
  64. package/dist/render-media.js.map +1 -1
  65. package/dist/render-still.d.ts +18 -17
  66. package/dist/render-still.d.ts.map +1 -1
  67. package/dist/render-still.js +44 -33
  68. package/dist/render-still.js.map +1 -1
  69. package/dist/render.d.ts +35 -17
  70. package/dist/render.d.ts.map +1 -1
  71. package/dist/render.js +150 -69
  72. package/dist/render.js.map +1 -1
  73. package/dist/screenshot-dom-element.d.ts.map +1 -1
  74. package/dist/screenshot-dom-element.js +1 -3
  75. package/dist/screenshot-dom-element.js.map +1 -1
  76. package/dist/screenshot-task.d.ts +2 -1
  77. package/dist/screenshot-task.d.ts.map +1 -1
  78. package/dist/screenshot-task.js.map +1 -1
  79. package/dist/set-props-and-env.d.ts +2 -2
  80. package/dist/set-props-and-env.d.ts.map +1 -1
  81. package/dist/set-props-and-env.js +3 -2
  82. package/dist/set-props-and-env.js.map +1 -1
  83. package/dist/stitcher.d.ts +21 -15
  84. package/dist/stitcher.d.ts.map +1 -1
  85. package/dist/stitcher.js +97 -72
  86. package/dist/stitcher.js.map +1 -1
  87. package/dist/stringify-ffmpeg-filter.d.ts.map +1 -1
  88. package/dist/stringify-ffmpeg-filter.js +3 -0
  89. package/dist/stringify-ffmpeg-filter.js.map +1 -1
  90. package/dist/tmp-dir.d.ts.map +1 -1
  91. package/dist/tmp-dir.js +2 -2
  92. package/dist/tmp-dir.js.map +1 -1
  93. package/dist/types.d.ts +0 -4
  94. package/dist/types.d.ts.map +1 -1
  95. package/dist/validate-ffmpeg.d.ts.map +1 -1
  96. package/dist/validate-ffmpeg.js +7 -2
  97. package/dist/validate-ffmpeg.js.map +1 -1
  98. package/package.json +4 -4
@@ -1 +1 @@
1
- {"version":3,"file":"get-compositions.js","sourceRoot":"","sources":["../src/get-compositions.ts"],"names":[],"mappings":";;;AACA,uCAA8E;AAC9E,iDAA2C;AAC3C,iDAA2C;AAC3C,2DAAmD;AAUnD,MAAM,mBAAmB,GAAG,KAAK,EAAE,EAClC,gBAAgB,EAChB,OAAO,EACP,iBAAiB,GAKjB,EAGE,EAAE;IACJ,IAAI,gBAAgB,EAAE;QACrB,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC9C,OAAO;YACN,IAAI;YACJ,OAAO,EAAE,GAAG,EAAE;gBACb,wDAAwD;gBACxD,qBAAqB;gBACrB,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC1B,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC;gBAC5D,CAAC,CAAC,CAAC;YACJ,CAAC;SACD,CAAC;KACF;IAED,MAAM,eAAe,GAAG,MAAM,IAAA,0BAAW,EACxC,OAAO,IAAI,oBAAS,CAAC,eAAe,EACpC;QACC,iBAAiB;KACjB,CACD,CAAC;IACF,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,CAAC;IAEpD,OAAO;QACN,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,GAAG,EAAE;YACb,6EAA6E;YAC7E,eAAe,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACrC,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;QACJ,CAAC;KACD,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,EACnC,aAAqB,EACrB,MAA8B,EACH,EAAE;;IAC7B,MAAM,EAAC,IAAI,EAAE,OAAO,EAAC,GAAG,MAAM,mBAAmB,CAAC;QACjD,gBAAgB,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,eAAe;QACzC,OAAO,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,mCAAI,oBAAS,CAAC,eAAe;QACrD,iBAAiB,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,iBAAiB,mCAAI,IAAI;KACpD,CAAC,CAAC;IAEH,MAAM,EAAC,IAAI,EAAE,KAAK,EAAC,GAAG,MAAM,IAAA,0BAAW,EAAC,aAAa,CAAC,CAAC;IACvD,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAEpC,MAAM,IAAA,kCAAc,EAAC;QACpB,UAAU,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU;QAC9B,YAAY,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY;QAClC,IAAI;QACJ,IAAI;QACJ,YAAY,EAAE,CAAC;KACf,CAAC,CAAC;IAEH,MAAM,IAAI,CAAC,IAAI,CAAC,oBAAoB,IAAI,6BAA6B,CAAC,CAAC;IACvE,MAAM,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,gCAAgC,CAAC,CAAC;IAErE,oDAAoD;IACpD,cAAc;IACd,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACrB,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,GAAG,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,CAAC;IAEV,OAAO,MAAyB,CAAC;AAClC,CAAC,CAAC;AAlCW,QAAA,eAAe,mBAkC1B"}
1
+ {"version":3,"file":"get-compositions.js","sourceRoot":"","sources":["../src/get-compositions.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
1
  import { FrameRange } from 'remotion';
2
- export declare const getFrameToRender: (frameRange: FrameRange | null, index: number) => number;
2
+ export declare const getRealFrameRange: (durationInFrames: number, frameRange: FrameRange | null) => [number, number];
3
3
  //# sourceMappingURL=get-frame-to-render.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"get-frame-to-render.d.ts","sourceRoot":"","sources":["../src/get-frame-to-render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,eAAO,MAAM,gBAAgB,eAChB,UAAU,GAAG,IAAI,SACtB,MAAM,WAWb,CAAC"}
1
+ {"version":3,"file":"get-frame-to-render.d.ts","sourceRoot":"","sources":["../src/get-frame-to-render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,eAAO,MAAM,iBAAiB,qBACX,MAAM,cACZ,UAAU,GAAG,IAAI,KAC3B,CAAC,MAAM,EAAE,MAAM,CA0BjB,CAAC"}
@@ -1,14 +1,20 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getFrameToRender = void 0;
4
- const getFrameToRender = (frameRange, index) => {
5
- if (typeof frameRange === 'object' && frameRange !== null) {
6
- return index + frameRange[0];
3
+ exports.getRealFrameRange = void 0;
4
+ const getRealFrameRange = (durationInFrames, frameRange) => {
5
+ if (frameRange === null) {
6
+ return [0, durationInFrames - 1];
7
7
  }
8
8
  if (typeof frameRange === 'number') {
9
- return frameRange;
9
+ if (frameRange < 0 || frameRange >= durationInFrames) {
10
+ throw new Error(`Frame number is out of range, must be between 0 and ${durationInFrames - 1} but got ${frameRange}`);
11
+ }
12
+ return [frameRange, frameRange];
10
13
  }
11
- return index;
14
+ if (frameRange[1] >= durationInFrames || frameRange[0] < 0) {
15
+ throw new Error(`Frame range ${frameRange.join('-')} is not in between 0-${durationInFrames - 1}`);
16
+ }
17
+ return frameRange;
12
18
  };
13
- exports.getFrameToRender = getFrameToRender;
19
+ exports.getRealFrameRange = getRealFrameRange;
14
20
  //# sourceMappingURL=get-frame-to-render.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"get-frame-to-render.js","sourceRoot":"","sources":["../src/get-frame-to-render.ts"],"names":[],"mappings":";;;AAEO,MAAM,gBAAgB,GAAG,CAC/B,UAA6B,EAC7B,KAAa,EACZ,EAAE;IACH,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,IAAI,EAAE;QAC1D,OAAO,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;KAC7B;IAED,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QACnC,OAAO,UAAU,CAAC;KAClB;IAED,OAAO,KAAK,CAAC;AACd,CAAC,CAAC;AAbW,QAAA,gBAAgB,oBAa3B"}
1
+ {"version":3,"file":"get-frame-to-render.js","sourceRoot":"","sources":["../src/get-frame-to-render.ts"],"names":[],"mappings":";;;AAEO,MAAM,iBAAiB,GAAG,CAChC,gBAAwB,EACxB,UAA6B,EACV,EAAE;IACrB,IAAI,UAAU,KAAK,IAAI,EAAE;QACxB,OAAO,CAAC,CAAC,EAAE,gBAAgB,GAAG,CAAC,CAAC,CAAC;KACjC;IAED,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QACnC,IAAI,UAAU,GAAG,CAAC,IAAI,UAAU,IAAI,gBAAgB,EAAE;YACrD,MAAM,IAAI,KAAK,CACd,uDACC,gBAAgB,GAAG,CACpB,YAAY,UAAU,EAAE,CACxB,CAAC;SACF;QAED,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;KAChC;IAED,IAAI,UAAU,CAAC,CAAC,CAAC,IAAI,gBAAgB,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;QAC3D,MAAM,IAAI,KAAK,CACd,eAAe,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,wBAClC,gBAAgB,GAAG,CACpB,EAAE,CACF,CAAC;KACF;IAED,OAAO,UAAU,CAAC;AACnB,CAAC,CAAC;AA7BW,QAAA,iBAAiB,qBA6B5B"}
package/dist/index.d.ts CHANGED
@@ -7,32 +7,61 @@ declare global {
7
7
  remotion_collectAssets: () => TAsset[];
8
8
  }
9
9
  }
10
+ export { renderMedia, RenderMediaOnProgress, StitchingState, RenderMediaOptions, } from './render-media';
11
+ export type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
12
+ export { combineVideos } from './combine-videos';
10
13
  export { FfmpegVersion } from './ffmpeg-flags';
11
14
  export { getCompositions } from './get-compositions';
12
15
  export { renderFrames } from './render';
13
16
  export { renderStill } from './render-still';
14
- export { stitchFramesToVideo } from './stitcher';
15
- export { OnErrorInfo, OnStartData, RenderFramesOutput } from './types';
17
+ export { stitchFramesToVideo, StitcherOptions } from './stitcher';
18
+ export { OnStartData, RenderFramesOutput } from './types';
19
+ export { BrowserLog } from './browser-log';
20
+ export { openBrowser } from './open-browser';
16
21
  export declare const RenderInternals: {
17
22
  ensureLocalBrowser: (browser: import("remotion").Browser, preferredBrowserExecutable: import("remotion").BrowserExecutable) => Promise<void>;
18
- ffmpegHasFeature: (ffmpegExecutable: string | null, feature: "enable-gpl" | "enable-libx265" | "enable-libvpx") => Promise<boolean>;
23
+ ffmpegHasFeature: ({ ffmpegExecutable, feature, isLambda, }: {
24
+ ffmpegExecutable: string | null;
25
+ feature: "enable-gpl" | "enable-libx265" | "enable-libvpx";
26
+ isLambda: boolean;
27
+ }) => Promise<boolean>;
19
28
  getActualConcurrency: (userPreference: number | null) => number;
20
29
  getFfmpegVersion: (options: {
21
30
  ffmpegExecutable: string | null;
22
31
  }) => Promise<import("./ffmpeg-flags").FfmpegVersion>;
23
- openBrowser: (browser: import("remotion").Browser, options?: {
24
- shouldDumpIo?: boolean | undefined;
25
- browserExecutable?: string | null | undefined;
26
- } | undefined) => Promise<import("puppeteer-core").Browser>;
27
32
  validateFfmpeg: (customFfmpegBinary: string | null) => Promise<void>;
28
33
  binaryExists: (name: "ffmpeg" | "brew", localFFmpeg: string | null) => Promise<boolean>;
29
34
  getFfmpegBuildInfo: (options: {
30
35
  ffmpegExecutable: string | null;
31
36
  }) => Promise<string>;
37
+ serveStatic: (path: string, options?: {
38
+ port?: number | undefined;
39
+ } | undefined) => Promise<{
40
+ port: number;
41
+ close: () => Promise<void>;
42
+ }>;
43
+ addSilentAudioIfNecessary: (videoFile: string, durationInFrames: number, fps: number) => Promise<void>;
32
44
  validateEvenDimensionsWithCodec: ({ width, height, codec, }: {
33
45
  width: number;
34
46
  height: number;
35
47
  codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv";
36
48
  }) => void;
49
+ normalizeServeUrl: (unnormalized: string) => string;
50
+ spawnFfmpeg: (options: import("./stitcher").StitcherOptions) => Promise<{
51
+ task: import("execa").ExecaChildProcess<string>;
52
+ cleanup: (() => void) | undefined;
53
+ }>;
54
+ getFileExtensionFromCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv", type: "chunk" | "final") => "mp3" | "aac" | "wav" | "mp4" | "mkv" | "mov" | "webm";
55
+ makeAssetsDownloadTmpDir: () => string;
56
+ tmpDir: (str: string) => string;
57
+ deleteDirectory: (directory: string) => Promise<void>;
58
+ prepareServer: (webpackConfigOrServeUrl: string) => Promise<{
59
+ serveUrl: string;
60
+ closeServer: () => Promise<void>;
61
+ }>;
62
+ isServeUrl: (potentialUrl: string) => boolean;
63
+ ensureOutputDirectory: (outputLocation: string) => void;
64
+ gotStream: import("got/dist/source").GotStream;
65
+ getRealFrameRange: (durationInFrames: number, frameRange: import("remotion").FrameRange | null) => [number, number];
37
66
  };
38
67
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AAY/C,OAAO,CAAC,MAAM,CAAC;IACd,UAAU,MAAM;QACf,KAAK,EAAE,OAAO,CAAC;QACf,qBAAqB,EAAE,MAAM,aAAa,EAAE,CAAC;QAC7C,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;QAC3C,sBAAsB,EAAE,MAAM,MAAM,EAAE,CAAC;KACvC;CACD;AAED,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AACrE,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;CAU3B,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AAwB/C,OAAO,CAAC,MAAM,CAAC;IACd,UAAU,MAAM;QACf,KAAK,EAAE,OAAO,CAAC;QACf,qBAAqB,EAAE,MAAM,aAAa,EAAE,CAAC;QAC7C,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;QAC3C,sBAAsB,EAAE,MAAM,MAAM,EAAE,CAAC;KACvC;CACD;AAED,OAAO,EACN,WAAW,EACX,qBAAqB,EACrB,cAAc,EACd,kBAAkB,GAClB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,mBAAmB,EAAE,eAAe,EAAC,MAAM,YAAY,CAAC;AAChE,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAC;AACxD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsB3B,CAAC"}
package/dist/index.js CHANGED
@@ -1,29 +1,62 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.RenderInternals = exports.stitchFramesToVideo = exports.renderStill = exports.renderFrames = exports.getCompositions = void 0;
6
+ exports.RenderInternals = exports.openBrowser = exports.stitchFramesToVideo = exports.renderStill = exports.renderFrames = exports.getCompositions = exports.combineVideos = exports.renderMedia = void 0;
7
+ const add_silent_audio_if_necessary_1 = require("./add-silent-audio-if-necessary");
4
8
  const ffmpeg_flags_1 = require("./ffmpeg-flags");
5
9
  const get_concurrency_1 = require("./get-concurrency");
10
+ const get_extension_from_codec_1 = require("./get-extension-from-codec");
6
11
  const get_local_browser_executable_1 = require("./get-local-browser-executable");
7
- const open_browser_1 = require("./open-browser");
12
+ const make_assets_download_dir_1 = require("./make-assets-download-dir");
13
+ const normalize_serve_url_1 = require("./normalize-serve-url");
14
+ const serve_static_1 = require("./serve-static");
15
+ const stitcher_1 = require("./stitcher");
8
16
  const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
9
17
  const validate_ffmpeg_1 = require("./validate-ffmpeg");
18
+ const tmp_dir_1 = require("./tmp-dir");
19
+ const delete_directory_1 = require("./delete-directory");
20
+ const prepare_server_1 = require("./prepare-server");
21
+ const is_serve_url_1 = require("./is-serve-url");
22
+ const ensure_output_directory_1 = require("./ensure-output-directory");
23
+ const got_1 = __importDefault(require("got"));
24
+ const get_frame_to_render_1 = require("./get-frame-to-render");
25
+ var render_media_1 = require("./render-media");
26
+ Object.defineProperty(exports, "renderMedia", { enumerable: true, get: function () { return render_media_1.renderMedia; } });
27
+ var combine_videos_1 = require("./combine-videos");
28
+ Object.defineProperty(exports, "combineVideos", { enumerable: true, get: function () { return combine_videos_1.combineVideos; } });
10
29
  var get_compositions_1 = require("./get-compositions");
11
30
  Object.defineProperty(exports, "getCompositions", { enumerable: true, get: function () { return get_compositions_1.getCompositions; } });
12
31
  var render_1 = require("./render");
13
32
  Object.defineProperty(exports, "renderFrames", { enumerable: true, get: function () { return render_1.renderFrames; } });
14
33
  var render_still_1 = require("./render-still");
15
34
  Object.defineProperty(exports, "renderStill", { enumerable: true, get: function () { return render_still_1.renderStill; } });
16
- var stitcher_1 = require("./stitcher");
17
- Object.defineProperty(exports, "stitchFramesToVideo", { enumerable: true, get: function () { return stitcher_1.stitchFramesToVideo; } });
35
+ var stitcher_2 = require("./stitcher");
36
+ Object.defineProperty(exports, "stitchFramesToVideo", { enumerable: true, get: function () { return stitcher_2.stitchFramesToVideo; } });
37
+ var open_browser_1 = require("./open-browser");
38
+ Object.defineProperty(exports, "openBrowser", { enumerable: true, get: function () { return open_browser_1.openBrowser; } });
18
39
  exports.RenderInternals = {
19
40
  ensureLocalBrowser: get_local_browser_executable_1.ensureLocalBrowser,
20
41
  ffmpegHasFeature: ffmpeg_flags_1.ffmpegHasFeature,
21
42
  getActualConcurrency: get_concurrency_1.getActualConcurrency,
22
43
  getFfmpegVersion: ffmpeg_flags_1.getFfmpegVersion,
23
- openBrowser: open_browser_1.openBrowser,
24
44
  validateFfmpeg: validate_ffmpeg_1.validateFfmpeg,
25
45
  binaryExists: validate_ffmpeg_1.binaryExists,
26
46
  getFfmpegBuildInfo: ffmpeg_flags_1.getFfmpegBuildInfo,
47
+ serveStatic: serve_static_1.serveStatic,
48
+ addSilentAudioIfNecessary: add_silent_audio_if_necessary_1.addSilentAudioIfNecessary,
27
49
  validateEvenDimensionsWithCodec: validate_even_dimensions_with_codec_1.validateEvenDimensionsWithCodec,
50
+ normalizeServeUrl: normalize_serve_url_1.normalizeServeUrl,
51
+ spawnFfmpeg: stitcher_1.spawnFfmpeg,
52
+ getFileExtensionFromCodec: get_extension_from_codec_1.getFileExtensionFromCodec,
53
+ makeAssetsDownloadTmpDir: make_assets_download_dir_1.makeAssetsDownloadTmpDir,
54
+ tmpDir: tmp_dir_1.tmpDir,
55
+ deleteDirectory: delete_directory_1.deleteDirectory,
56
+ prepareServer: prepare_server_1.prepareServer,
57
+ isServeUrl: is_serve_url_1.isServeUrl,
58
+ ensureOutputDirectory: ensure_output_directory_1.ensureOutputDirectory,
59
+ gotStream: got_1.default.stream,
60
+ getRealFrameRange: get_frame_to_render_1.getRealFrameRange,
28
61
  };
29
62
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,iDAIwB;AACxB,uDAAuD;AACvD,iFAAkE;AAClE,iDAA2C;AAC3C,+FAAsF;AACtF,uDAA+D;AAY/D,uDAAmD;AAA3C,mHAAA,eAAe,OAAA;AACvB,mCAAsC;AAA9B,sGAAA,YAAY,OAAA;AACpB,+CAA2C;AAAnC,2GAAA,WAAW,OAAA;AACnB,uCAA+C;AAAvC,+GAAA,mBAAmB,OAAA;AAEd,QAAA,eAAe,GAAG;IAC9B,kBAAkB,EAAlB,iDAAkB;IAClB,gBAAgB,EAAhB,+BAAgB;IAChB,oBAAoB,EAApB,sCAAoB;IACpB,gBAAgB,EAAhB,+BAAgB;IAChB,WAAW,EAAX,0BAAW;IACX,cAAc,EAAd,gCAAc;IACd,YAAY,EAAZ,8BAAY;IACZ,kBAAkB,EAAlB,iCAAkB;IAClB,+BAA+B,EAA/B,qEAA+B;CAC/B,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AACA,mFAA0E;AAC1E,iDAIwB;AACxB,uDAAuD;AACvD,yEAAqE;AACrE,iFAAkE;AAClE,yEAAoE;AACpE,+DAAwD;AACxD,iDAA2C;AAC3C,yCAAuC;AACvC,+FAAsF;AACtF,uDAA+D;AAC/D,uCAAiC;AACjC,yDAAmD;AACnD,qDAA+C;AAC/C,iDAA0C;AAC1C,uEAAgE;AAChE,8CAAsB;AACtB,+DAAwD;AAWxD,+CAKwB;AAJvB,2GAAA,WAAW,OAAA;AAMZ,mDAA+C;AAAvC,+GAAA,aAAa,OAAA;AAErB,uDAAmD;AAA3C,mHAAA,eAAe,OAAA;AACvB,mCAAsC;AAA9B,sGAAA,YAAY,OAAA;AACpB,+CAA2C;AAAnC,2GAAA,WAAW,OAAA;AACnB,uCAAgE;AAAxD,+GAAA,mBAAmB,OAAA;AAG3B,+CAA2C;AAAnC,2GAAA,WAAW,OAAA;AAEN,QAAA,eAAe,GAAG;IAC9B,kBAAkB,EAAlB,iDAAkB;IAClB,gBAAgB,EAAhB,+BAAgB;IAChB,oBAAoB,EAApB,sCAAoB;IACpB,gBAAgB,EAAhB,+BAAgB;IAChB,cAAc,EAAd,gCAAc;IACd,YAAY,EAAZ,8BAAY;IACZ,kBAAkB,EAAlB,iCAAkB;IAClB,WAAW,EAAX,0BAAW;IACX,yBAAyB,EAAzB,yDAAyB;IACzB,+BAA+B,EAA/B,qEAA+B;IAC/B,iBAAiB,EAAjB,uCAAiB;IACjB,WAAW,EAAX,sBAAW;IACX,yBAAyB,EAAzB,oDAAyB;IACzB,wBAAwB,EAAxB,mDAAwB;IACxB,MAAM,EAAN,gBAAM;IACN,eAAe,EAAf,kCAAe;IACf,aAAa,EAAb,8BAAa;IACb,UAAU,EAAV,yBAAU;IACV,qBAAqB,EAArB,+CAAqB;IACrB,SAAS,EAAE,aAAG,CAAC,MAAM;IACrB,iBAAiB,EAAjB,uCAAiB;CACjB,CAAC"}
@@ -7,7 +7,7 @@ const isServeUrl = (potentialUrl) => {
7
7
  potentialUrl.includes('amazonaws.com')) {
8
8
  return true;
9
9
  }
10
- return (potentialUrl.startsWith('https://') || !potentialUrl.startsWith('http://'));
10
+ return (potentialUrl.startsWith('https://') || potentialUrl.startsWith('http://'));
11
11
  };
12
12
  exports.isServeUrl = isServeUrl;
13
13
  //# sourceMappingURL=is-serve-url.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"is-serve-url.js","sourceRoot":"","sources":["../src/is-serve-url.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
+ {"version":3,"file":"is-serve-url.js","sourceRoot":"","sources":["../src/is-serve-url.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,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,CACzE,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,UAAU,cAYrB"}
@@ -0,0 +1,10 @@
1
+ export declare type ServeUrlOrWebpackBundle = {
2
+ serveUrl: string;
3
+ } | {
4
+ /**
5
+ * @deprecated Renamed to `serveUrl instead`
6
+ */
7
+ webpackBundle: string;
8
+ };
9
+ export declare const getServeUrlWithFallback: (serve: ServeUrlOrWebpackBundle) => string;
10
+ //# sourceMappingURL=legacy-webpack-config.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"legacy-webpack-config.d.ts","sourceRoot":"","sources":["../src/legacy-webpack-config.ts"],"names":[],"mappings":"AAAA,oBAAY,uBAAuB,GAChC;IACA,QAAQ,EAAE,MAAM,CAAC;CAChB,GACD;IACA;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;CACrB,CAAC;AAEL,eAAO,MAAM,uBAAuB,UAAW,uBAAuB,WAUrE,CAAC"}
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getServeUrlWithFallback = void 0;
4
+ const getServeUrlWithFallback = (serve) => {
5
+ if ('webpackBundle' in serve) {
6
+ return serve.webpackBundle;
7
+ }
8
+ if ('serveUrl' in serve) {
9
+ return serve.serveUrl;
10
+ }
11
+ throw new Error('You must pass the `serveUrl` parameter');
12
+ };
13
+ exports.getServeUrlWithFallback = getServeUrlWithFallback;
14
+ //# sourceMappingURL=legacy-webpack-config.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"legacy-webpack-config.js","sourceRoot":"","sources":["../src/legacy-webpack-config.ts"],"names":[],"mappings":";;;AAWO,MAAM,uBAAuB,GAAG,CAAC,KAA8B,EAAE,EAAE;IACzE,IAAI,eAAe,IAAI,KAAK,EAAE;QAC7B,OAAO,KAAK,CAAC,aAAa,CAAC;KAC3B;IAED,IAAI,UAAU,IAAI,KAAK,EAAE;QACxB,OAAO,KAAK,CAAC,QAAQ,CAAC;KACtB;IAED,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;AAC3D,CAAC,CAAC;AAVW,QAAA,uBAAuB,2BAUlC"}
@@ -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,CA2B3B,CAAC"}
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"}
@@ -25,8 +25,21 @@ const openBrowser = async (browser, options) => {
25
25
  '--use-gl=angle',
26
26
  '--disable-background-media-suspend',
27
27
  process.platform === 'linux' ? '--single-process' : null,
28
+ '--allow-running-insecure-content',
29
+ '--disable-component-update',
30
+ '--disable-domain-reliability',
31
+ '--disable-features=AudioServiceOutOfProcess,IsolateOrigins,site-per-process',
32
+ '--disable-print-preview',
33
+ '--disable-site-isolation-trials',
34
+ '--disk-cache-size=33554432',
35
+ '--hide-scrollbars',
36
+ '--no-default-browser-check',
37
+ '--no-pings',
38
+ '--no-zygote', // https://source.chromium.org/search?q=lang:cpp+symbol:kNoZygote&ss=chromium
28
39
  ].filter(Boolean),
29
40
  });
41
+ const pages = await browserInstance.pages();
42
+ pages.forEach((p) => p.close());
30
43
  return browserInstance;
31
44
  };
32
45
  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,gBAAgB;YAChB,oCAAoC;YACpC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI;SACxD,CAAC,MAAM,CAAC,OAAO,CAAa;KAC7B,CAAC,CAAC;IACH,OAAO,eAAe,CAAC;AACxB,CAAC,CAAC;AAjCW,QAAA,WAAW,eAiCtB"}
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,gBAAgB;YAChB,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,6EAA6E;SAC5F,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"}
@@ -6,7 +6,7 @@ export declare const provideScreenshot: ({ page, imageFormat, options, quality,
6
6
  quality: number | undefined;
7
7
  options: {
8
8
  frame: number;
9
- output: string;
9
+ output?: string;
10
10
  };
11
- }) => Promise<void>;
11
+ }) => Promise<Buffer>;
12
12
  //# sourceMappingURL=provide-screenshot.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"provide-screenshot.d.ts","sourceRoot":"","sources":["../src/provide-screenshot.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAGrC,eAAO,MAAM,iBAAiB;UAMvB,UAAU,IAAI;iBACP,WAAW;aACf,MAAM,GAAG,SAAS;aAClB;QACR,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KACf;MACE,QAAQ,IAAI,CAUf,CAAC"}
1
+ {"version":3,"file":"provide-screenshot.d.ts","sourceRoot":"","sources":["../src/provide-screenshot.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAGrC,eAAO,MAAM,iBAAiB;UAMvB,UAAU,IAAI;iBACP,WAAW;aACf,MAAM,GAAG,SAAS;aAClB;QACR,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;KAChB;MACE,QAAQ,MAAM,CAUjB,CAAC"}
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.provideScreenshot = void 0;
4
4
  const screenshot_dom_element_1 = require("./screenshot-dom-element");
5
5
  const provideScreenshot = async ({ page, imageFormat, options, quality, }) => {
6
- await (0, screenshot_dom_element_1.screenshotDOMElement)({
6
+ return (0, screenshot_dom_element_1.screenshotDOMElement)({
7
7
  page,
8
8
  opts: {
9
9
  path: options.output,
@@ -1 +1 @@
1
- {"version":3,"file":"provide-screenshot.js","sourceRoot":"","sources":["../src/provide-screenshot.ts"],"names":[],"mappings":";;;AAEA,qEAA8D;AAEvD,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACvC,IAAI,EACJ,WAAW,EACX,OAAO,EACP,OAAO,GASP,EAAiB,EAAE;IACnB,MAAM,IAAA,6CAAoB,EAAC;QAC1B,IAAI;QACJ,IAAI,EAAE;YACL,IAAI,EAAE,OAAO,CAAC,MAAM;YACpB,QAAQ,EAAE,kBAAkB;SAC5B;QACD,WAAW;QACX,OAAO;KACP,CAAC,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,iBAAiB,qBAuB5B"}
1
+ {"version":3,"file":"provide-screenshot.js","sourceRoot":"","sources":["../src/provide-screenshot.ts"],"names":[],"mappings":";;;AAEA,qEAA8D;AAEvD,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACvC,IAAI,EACJ,WAAW,EACX,OAAO,EACP,OAAO,GASP,EAAmB,EAAE;IACrB,OAAO,IAAA,6CAAoB,EAAC;QAC3B,IAAI;QACJ,IAAI,EAAE;YACL,IAAI,EAAE,OAAO,CAAC,MAAM;YACpB,QAAQ,EAAE,kBAAkB;SAC5B;QACD,WAAW;QACX,OAAO;KACP,CAAC,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,iBAAiB,qBAuB5B"}
@@ -1 +1 @@
1
- {"version":3,"file":"puppeteer-screenshot.d.ts","sourceRoot":"","sources":["../src/puppeteer-screenshot.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAGvD,eAAO,MAAM,UAAU,SAChB,IAAI,YACD,iBAAiB,KACxB,QAAQ,MAAM,GAAG,MAAM,GAAG,IAAI,CAyFhC,CAAC"}
1
+ {"version":3,"file":"puppeteer-screenshot.d.ts","sourceRoot":"","sources":["../src/puppeteer-screenshot.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAIvD,eAAO,MAAM,UAAU,SAChB,IAAI,YACD,iBAAiB,KACxB,QAAQ,MAAM,GAAG,MAAM,GAAG,IAAI,CAyFhC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"puppeteer-screenshot.js","sourceRoot":"","sources":["../src/puppeteer-screenshot.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AAEjC,uDAAkD;AAE3C,MAAM,UAAU,GAAG,KAAK,EAC9B,IAAU,EACV,UAA6B,EAAE,EACG,EAAE;IACpC,IAAI,cAAc,GAA0B,IAAI,CAAC;IACjD,0EAA0E;IAC1E,yEAAyE;IACzE,yBAAyB;IACzB,IAAI,OAAO,CAAC,IAAI,EAAE;QACjB,MAAM,CAAC,EAAE,CACR,OAAO,CAAC,IAAI,KAAK,KAAK,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EACjD,8BAA8B,GAAG,OAAO,CAAC,IAAI,CAC7C,CAAC;QACF,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;KAC9B;SAAM,IAAI,OAAO,CAAC,IAAI,EAAE;QACxB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;QAC9B,MAAM,SAAS,GAAG,QAAQ;aACxB,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aACpC,WAAW,EAAE,CAAC;QAChB,IAAI,SAAS,KAAK,KAAK;YAAE,cAAc,GAAG,KAAK,CAAC;aAC3C,IAAI,SAAS,KAAK,KAAK,IAAI,SAAS,KAAK,MAAM;YACnD,cAAc,GAAG,MAAM,CAAC;QACzB,MAAM,CAAC,EAAE,CACR,cAAc,EACd,gDAAgD,SAAS,IAAI,CAC7D,CAAC;KACF;IAED,IAAI,CAAC,cAAc;QAAE,cAAc,GAAG,KAAK,CAAC;IAE5C,IAAI,OAAO,CAAC,OAAO,EAAE;QACpB,MAAM,CAAC,EAAE,CACR,cAAc,KAAK,MAAM,EACzB,yCAAyC;YACxC,cAAc;YACd,cAAc,CACf,CAAC;QACF,MAAM,CAAC,EAAE,CACR,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,EACnC,oDAAoD;YACnD,OAAO,OAAO,CAAC,OAAO,CACvB,CAAC;QACF,MAAM,CAAC,EAAE,CACR,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EACjC,2CAA2C,CAC3C,CAAC;QACF,MAAM,CAAC,EAAE,CACR,OAAO,CAAC,OAAO,IAAI,CAAC,IAAI,OAAO,CAAC,OAAO,IAAI,GAAG,EAC9C,oEAAoE;YACnE,OAAO,CAAC,OAAO,CAChB,CAAC;KACF;IAED,MAAM,CAAC,EAAE,CACR,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAClC,iDAAiD,CACjD,CAAC;IACF,IAAI,OAAO,CAAC,IAAI,EAAE;QACjB,MAAM,CAAC,EAAE,CACR,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,QAAQ,EAClC,mDAAmD;YAClD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CACtB,CAAC;QACF,MAAM,CAAC,EAAE,CACR,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,QAAQ,EAClC,mDAAmD;YAClD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CACtB,CAAC;QACF,MAAM,CAAC,EAAE,CACR,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,QAAQ,EACtC,uDAAuD;YACtD,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAC1B,CAAC;QACF,MAAM,CAAC,EAAE,CACR,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,EACvC,wDAAwD;YACvD,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAC3B,CAAC;QACF,MAAM,CAAC,EAAE,CACR,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,EACxB,0CAA0C,CAC1C,CAAC;QACF,MAAM,CAAC,EAAE,CACR,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EACzB,2CAA2C,CAC3C,CAAC;KACF;IAED,mBAAmB;IACnB,OAAQ,IAAa,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,EAAE,CACxD,IAAA,iCAAe,EAAC,IAAI,EAAE,cAAgC,EAAE,OAAO,CAAC,CAChE,CAAC;AACH,CAAC,CAAC;AA5FW,QAAA,UAAU,cA4FrB"}
1
+ {"version":3,"file":"puppeteer-screenshot.js","sourceRoot":"","sources":["../src/puppeteer-screenshot.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ import { Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, TCompM
3
3
  import { BrowserLog } from './browser-log';
4
4
  import { OnStartData } from './types';
5
5
  import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
6
+ import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
6
7
  export declare type StitchingState = 'encoding' | 'muxing';
7
8
  export declare type RenderMediaOnProgress = (progress: {
8
9
  renderedFrames: number;
@@ -12,10 +13,9 @@ export declare type RenderMediaOnProgress = (progress: {
12
13
  stitchStage: StitchingState;
13
14
  }) => void;
14
15
  export declare type RenderMediaOptions = {
15
- serveUrl: string;
16
16
  outputLocation: string;
17
17
  codec: Codec;
18
- config: TCompMetadata;
18
+ composition: TCompMetadata;
19
19
  inputProps?: unknown;
20
20
  parallelism?: number | null;
21
21
  crf?: number | null;
@@ -33,6 +33,6 @@ export declare type RenderMediaOptions = {
33
33
  dumpBrowserLogs?: boolean;
34
34
  onBrowserLog?: ((log: BrowserLog) => void) | undefined;
35
35
  onStart?: (data: OnStartData) => void;
36
- };
37
- export declare const renderMedia: ({ parallelism, proResProfile, crf, config, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, serveUrl, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, }: RenderMediaOptions) => Promise<void>;
36
+ } & ServeUrlOrWebpackBundle;
37
+ export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, ...options }: RenderMediaOptions) => Promise<void>;
38
38
  //# 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,aAAa,EACb,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;AAK/E,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,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,aAAa,CAAC;IACtB,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;CACtC,CAAC;AAIF,eAAO,MAAM,WAAW,2QAsBrB,kBAAkB,kBA4IpB,CAAC"}
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,aAAa,EACb,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;AAGjC,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,aAAa,CAAC;IAC3B,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;CACtC,GAAG,uBAAuB,CAAC;AAI5B,eAAO,MAAM,WAAW,iRAsBrB,kBAAkB,kBAsKpB,CAAC"}
@@ -11,13 +11,15 @@ const stitcher_1 = require("./stitcher");
11
11
  const render_1 = require("./render");
12
12
  const tmp_dir_1 = require("./tmp-dir");
13
13
  const get_extension_from_codec_1 = require("./get-extension-from-codec");
14
- const delete_directory_1 = require("./delete-directory");
15
- const renderMedia = async ({ parallelism, proResProfile, crf, config, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, serveUrl, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, }) => {
14
+ const legacy_webpack_config_1 = require("./legacy-webpack-config");
15
+ const ensure_output_directory_1 = require("./ensure-output-directory");
16
+ const renderMedia = async ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, ...options }) => {
16
17
  var _a, _b;
17
18
  remotion_1.Internals.validateQuality(quality);
18
- if (typeof crf !== 'undefined') {
19
+ if (typeof crf !== 'undefined' && crf !== null) {
19
20
  remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
20
21
  }
22
+ const serveUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
21
23
  let stitchStage = 'encoding';
22
24
  let stitcherFfmpeg;
23
25
  let preStitcher = null;
@@ -27,7 +29,6 @@ const renderMedia = async ({ parallelism, proResProfile, crf, config, imageForma
27
29
  let encodedDoneIn = null;
28
30
  const renderStart = Date.now();
29
31
  const tmpdir = (0, tmp_dir_1.tmpDir)('pre-encode');
30
- const outputDir = (0, tmp_dir_1.tmpDir)('frames ' + Math.random());
31
32
  const parallelEncoding = !remotion_1.Internals.isAudioCodec(codec);
32
33
  const preEncodedFileLocation = parallelEncoding
33
34
  ? path_1.default.join(tmpdir, 'pre-encode.' + (0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'chunk'))
@@ -44,10 +45,9 @@ const renderMedia = async ({ parallelism, proResProfile, crf, config, imageForma
44
45
  };
45
46
  if (preEncodedFileLocation) {
46
47
  preStitcher = await (0, stitcher_1.spawnFfmpeg)({
47
- dir: outputDir,
48
- width: config.width,
49
- height: config.height,
50
- fps: config.fps,
48
+ width: composition.width,
49
+ height: composition.height,
50
+ fps: composition.fps,
51
51
  outputLocation: preEncodedFileLocation,
52
52
  force: true,
53
53
  pixelFormat,
@@ -58,21 +58,41 @@ const renderMedia = async ({ parallelism, proResProfile, crf, config, imageForma
58
58
  encodedFrames = frame;
59
59
  callUpdate();
60
60
  },
61
- verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
61
+ verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
62
62
  parallelEncoding,
63
63
  ffmpegExecutable,
64
64
  assetsInfo: null,
65
65
  });
66
66
  stitcherFfmpeg = preStitcher.task;
67
67
  }
68
+ let frameToStitch = typeof frameRange === 'number'
69
+ ? frameRange
70
+ : frameRange === null || frameRange === undefined
71
+ ? 0
72
+ : frameRange[0];
73
+ let lastFrame = 0;
74
+ const waitForRightTimeOfFrameToBeInserted = async (frameToBe) => {
75
+ return new Promise((resolve) => {
76
+ if (frameToStitch === frameToBe) {
77
+ resolve();
78
+ return;
79
+ }
80
+ const interval = setInterval(() => {
81
+ if (frameToStitch === frameToBe) {
82
+ resolve();
83
+ clearInterval(interval);
84
+ }
85
+ }, 10);
86
+ });
87
+ };
68
88
  const { assetsInfo } = await (0, render_1.renderFrames)({
69
- config,
89
+ config: composition,
70
90
  onFrameUpdate: (frame) => {
71
91
  renderedFrames = frame;
72
92
  callUpdate();
73
93
  },
74
94
  parallelism,
75
- outputDir,
95
+ outputDir: null,
76
96
  onStart: (data) => {
77
97
  renderedFrames = 0;
78
98
  callUpdate();
@@ -84,9 +104,12 @@ const renderMedia = async ({ parallelism, proResProfile, crf, config, imageForma
84
104
  quality,
85
105
  frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
86
106
  puppeteerInstance,
87
- writeFrame: async (buffer) => {
107
+ writeFrame: async (buffer, frame) => {
88
108
  var _a;
109
+ lastFrame = Math.max(lastFrame, frame);
110
+ await waitForRightTimeOfFrameToBeInserted(frame);
89
111
  (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
112
+ frameToStitch = frame + 1;
90
113
  },
91
114
  serveUrl,
92
115
  dumpBrowserLogs,
@@ -94,24 +117,19 @@ const renderMedia = async ({ parallelism, proResProfile, crf, config, imageForma
94
117
  onDownload,
95
118
  });
96
119
  if (stitcherFfmpeg) {
120
+ await waitForRightTimeOfFrameToBeInserted(lastFrame + 1);
97
121
  (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
98
122
  await stitcherFfmpeg;
99
123
  (_b = preStitcher === null || preStitcher === void 0 ? void 0 : preStitcher.cleanup) === null || _b === void 0 ? void 0 : _b.call(preStitcher);
100
124
  }
101
125
  renderedDoneIn = Date.now() - renderStart;
102
126
  callUpdate();
103
- const dirName = path_1.default.dirname(outputLocation);
104
- if (!fs_1.default.existsSync(dirName)) {
105
- fs_1.default.mkdirSync(dirName, {
106
- recursive: true,
107
- });
108
- }
127
+ (0, ensure_output_directory_1.ensureOutputDirectory)(outputLocation);
109
128
  const stitchStart = Date.now();
110
129
  await (0, stitcher_1.stitchFramesToVideo)({
111
- dir: outputDir,
112
- width: config.width,
113
- height: config.height,
114
- fps: config.fps,
130
+ width: composition.width,
131
+ height: composition.height,
132
+ fps: composition.fps,
115
133
  outputLocation,
116
134
  preEncodedFileLocation,
117
135
  force: overwrite !== null && overwrite !== void 0 ? overwrite : remotion_1.Internals.DEFAULT_OVERWRITE,
@@ -127,10 +145,10 @@ const renderMedia = async ({ parallelism, proResProfile, crf, config, imageForma
127
145
  callUpdate();
128
146
  },
129
147
  onDownload,
130
- verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
148
+ verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
131
149
  parallelEncoding: false,
132
150
  });
133
- encodedFrames = config.durationInFrames;
151
+ encodedFrames = composition.durationInFrames;
134
152
  encodedDoneIn = Date.now() - stitchStart;
135
153
  callUpdate();
136
154
  }
@@ -139,7 +157,6 @@ const renderMedia = async ({ parallelism, proResProfile, crf, config, imageForma
139
157
  fs_1.default.existsSync(preEncodedFileLocation)) {
140
158
  fs_1.default.unlinkSync(preEncodedFileLocation);
141
159
  }
142
- await (0, delete_directory_1.deleteDirectory)(outputDir);
143
160
  }
144
161
  };
145
162
  exports.renderMedia = renderMedia;
@@ -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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"}