@remotion/renderer 3.0.0-lambda.208 → 3.0.0-lambda.242
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.
- package/dist/assets/calculate-asset-positions.d.ts.map +1 -1
- package/dist/assets/calculate-asset-positions.js +3 -1
- package/dist/assets/calculate-asset-positions.js.map +1 -1
- package/dist/assets/download-and-map-assets-to-file.d.ts +1 -0
- package/dist/assets/download-and-map-assets-to-file.d.ts.map +1 -1
- package/dist/assets/download-and-map-assets-to-file.js +69 -4
- package/dist/assets/download-and-map-assets-to-file.js.map +1 -1
- package/dist/assets/types.d.ts +1 -0
- package/dist/assets/types.d.ts.map +1 -1
- package/dist/assets/types.js +19 -0
- package/dist/assets/types.js.map +1 -1
- package/dist/create-ffmpeg-complex-filter.d.ts +1 -4
- package/dist/create-ffmpeg-complex-filter.d.ts.map +1 -1
- package/dist/ensure-frames-in-order.d.ts +6 -0
- package/dist/ensure-frames-in-order.d.ts.map +1 -0
- package/dist/ensure-frames-in-order.js +39 -0
- package/dist/ensure-frames-in-order.js.map +1 -0
- package/dist/get-pro-res-profile-name.d.ts +3 -0
- package/dist/get-pro-res-profile-name.d.ts.map +1 -0
- package/dist/get-pro-res-profile-name.js +26 -0
- package/dist/get-pro-res-profile-name.js.map +1 -0
- package/dist/provide-screenshot.d.ts +1 -0
- package/dist/provide-screenshot.d.ts.map +1 -1
- package/dist/puppeteer-screenshot.d.ts +1 -0
- package/dist/puppeteer-screenshot.d.ts.map +1 -1
- package/dist/render-media.d.ts.map +1 -1
- package/dist/render-media.js +6 -24
- package/dist/render-media.js.map +1 -1
- package/dist/render-video.d.ts +8 -7
- package/dist/render-video.d.ts.map +1 -1
- package/dist/render-video.js +24 -55
- package/dist/render-video.js.map +1 -1
- package/dist/render.d.ts +2 -2
- package/dist/render.d.ts.map +1 -1
- package/dist/render.js +12 -7
- package/dist/render.js.map +1 -1
- package/dist/run-ffmpeg-command.d.ts +6 -0
- package/dist/run-ffmpeg-command.d.ts.map +1 -0
- package/dist/run-ffmpeg-command.js +25 -0
- package/dist/run-ffmpeg-command.js.map +1 -0
- package/dist/screenshot-dom-element.d.ts +1 -0
- package/dist/screenshot-dom-element.d.ts.map +1 -1
- package/dist/screenshot-task.d.ts +1 -0
- package/dist/screenshot-task.d.ts.map +1 -1
- package/dist/stitcher.d.ts.map +1 -1
- package/dist/stitcher.js +6 -7
- package/dist/stitcher.js.map +1 -1
- package/dist/stringify-ffmpeg-filter.d.ts.map +1 -1
- package/dist/stringify-ffmpeg-filter.js +0 -2
- package/dist/stringify-ffmpeg-filter.js.map +1 -1
- package/package.json +4 -4
- package/dist/convert-mp3-to-pcm.d.ts +0 -7
- package/dist/convert-mp3-to-pcm.d.ts.map +0 -1
- package/dist/convert-mp3-to-pcm.js +0 -41
- package/dist/convert-mp3-to-pcm.js.map +0 -1
- package/dist/handle-null-audio.d.ts +0 -1
- package/dist/handle-null-audio.d.ts.map +0 -1
- package/dist/handle-null-audio.js +0 -2
- package/dist/handle-null-audio.js.map +0 -1
- package/dist/is-local-file.d.ts +0 -2
- package/dist/is-local-file.d.ts.map +0 -1
- package/dist/is-local-file.js +0 -13
- package/dist/is-local-file.js.map +0 -1
- package/dist/validate-frame.d.ts +0 -2
- package/dist/validate-frame.d.ts.map +0 -1
- package/dist/validate-frame.js +0 -25
- package/dist/validate-frame.js.map +0 -1
- package/dist/validate-quality.d.ts +0 -1
- package/dist/validate-quality.d.ts.map +0 -1
- package/dist/validate-quality.js +0 -2
- package/dist/validate-quality.js.map +0 -1
package/dist/render-video.js
CHANGED
|
@@ -3,14 +3,15 @@ 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.
|
|
6
|
+
exports.renderMedia = 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
|
|
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
13
|
var _a, _b;
|
|
14
|
+
let stitchStage = 'encoding';
|
|
14
15
|
let stitcherFfmpeg;
|
|
15
16
|
let preStitcher;
|
|
16
17
|
let encodedFrames = 0;
|
|
@@ -19,6 +20,15 @@ const renderVideo = async ({ parallelism, proResProfile, parallelEncoding, crf,
|
|
|
19
20
|
let renderedDoneIn = null;
|
|
20
21
|
let encodedDoneIn = null;
|
|
21
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
|
+
};
|
|
22
32
|
if (parallelEncoding) {
|
|
23
33
|
if (typeof crf !== 'number') {
|
|
24
34
|
throw new TypeError('CRF is unexpectedly not a number');
|
|
@@ -39,13 +49,7 @@ const renderVideo = async ({ parallelism, proResProfile, parallelEncoding, crf,
|
|
|
39
49
|
parallelism,
|
|
40
50
|
onProgress: (frame) => {
|
|
41
51
|
encodedFrames = frame;
|
|
42
|
-
|
|
43
|
-
encodedFrames,
|
|
44
|
-
renderedFrames,
|
|
45
|
-
encodedDoneIn: null,
|
|
46
|
-
renderedDoneIn: null,
|
|
47
|
-
stitchStage: 'encoding',
|
|
48
|
-
});
|
|
52
|
+
callUpdate();
|
|
49
53
|
},
|
|
50
54
|
verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
|
|
51
55
|
parallelEncoding,
|
|
@@ -55,31 +59,17 @@ const renderVideo = async ({ parallelism, proResProfile, parallelEncoding, crf,
|
|
|
55
59
|
});
|
|
56
60
|
stitcherFfmpeg = preStitcher.task;
|
|
57
61
|
}
|
|
58
|
-
const
|
|
62
|
+
const { assetsInfo } = await (0, render_1.renderFrames)({
|
|
59
63
|
config,
|
|
60
64
|
onFrameUpdate: (frame) => {
|
|
61
65
|
renderedFrames = frame;
|
|
62
|
-
|
|
63
|
-
encodedFrames,
|
|
64
|
-
renderedFrames,
|
|
65
|
-
encodedDoneIn,
|
|
66
|
-
renderedDoneIn,
|
|
67
|
-
stitchStage: 'encoding',
|
|
68
|
-
});
|
|
66
|
+
callUpdate();
|
|
69
67
|
},
|
|
70
68
|
parallelism,
|
|
71
|
-
parallelEncoding,
|
|
72
69
|
outputDir,
|
|
73
70
|
onStart: () => {
|
|
74
71
|
renderedFrames = 0;
|
|
75
|
-
|
|
76
|
-
encodedDoneIn,
|
|
77
|
-
encodedFrames,
|
|
78
|
-
renderedDoneIn,
|
|
79
|
-
renderedFrames,
|
|
80
|
-
// TODO: Keep a state
|
|
81
|
-
stitchStage: 'encoding',
|
|
82
|
-
});
|
|
72
|
+
callUpdate();
|
|
83
73
|
},
|
|
84
74
|
inputProps,
|
|
85
75
|
envVariables,
|
|
@@ -93,8 +83,8 @@ const renderVideo = async ({ parallelism, proResProfile, parallelEncoding, crf,
|
|
|
93
83
|
(_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
|
|
94
84
|
},
|
|
95
85
|
serveUrl,
|
|
86
|
+
dumpBrowserLogs,
|
|
96
87
|
});
|
|
97
|
-
const { assetsInfo } = await renderer;
|
|
98
88
|
if (stitcherFfmpeg) {
|
|
99
89
|
(_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
|
|
100
90
|
await stitcherFfmpeg;
|
|
@@ -102,19 +92,7 @@ const renderVideo = async ({ parallelism, proResProfile, parallelEncoding, crf,
|
|
|
102
92
|
}
|
|
103
93
|
const closeBrowserPromise = openedBrowser.close();
|
|
104
94
|
renderedDoneIn = Date.now() - renderStart;
|
|
105
|
-
|
|
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
|
-
}
|
|
95
|
+
callUpdate();
|
|
118
96
|
if (typeof crf !== 'number') {
|
|
119
97
|
throw new TypeError('CRF is unexpectedly not a number');
|
|
120
98
|
}
|
|
@@ -142,28 +120,19 @@ const renderVideo = async ({ parallelism, proResProfile, parallelEncoding, crf,
|
|
|
142
120
|
parallelism,
|
|
143
121
|
ffmpegExecutable,
|
|
144
122
|
onProgress: (frame) => {
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
renderedDoneIn,
|
|
149
|
-
encodedDoneIn,
|
|
150
|
-
stitchStage: 'muxing',
|
|
151
|
-
});
|
|
123
|
+
stitchStage = 'muxing';
|
|
124
|
+
encodedFrames = frame;
|
|
125
|
+
callUpdate();
|
|
152
126
|
},
|
|
153
127
|
// TODO: Optimization, Now can download before!
|
|
154
128
|
onDownload,
|
|
155
129
|
webpackBundle: bundled,
|
|
156
130
|
verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
|
|
157
131
|
});
|
|
132
|
+
encodedFrames = config.durationInFrames;
|
|
158
133
|
encodedDoneIn = Date.now() - stitchStart;
|
|
159
|
-
|
|
160
|
-
encodedDoneIn,
|
|
161
|
-
encodedFrames,
|
|
162
|
-
renderedDoneIn,
|
|
163
|
-
renderedFrames,
|
|
164
|
-
stitchStage: 'muxing',
|
|
165
|
-
});
|
|
134
|
+
callUpdate();
|
|
166
135
|
await closeBrowserPromise;
|
|
167
136
|
};
|
|
168
|
-
exports.
|
|
137
|
+
exports.renderMedia = renderMedia;
|
|
169
138
|
//# sourceMappingURL=render-video.js.map
|
package/dist/render-video.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-video.js","sourceRoot":"","sources":["../src/render-video.ts"],"names":[],"mappings":";;;;;;AACA,4CAAoB;AACpB,gDAAwB;AAExB,uCASkB;AAClB,yCAA4D;AAC5D,qCAAsC;
|
|
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
|
@@ -27,10 +27,10 @@ declare type RenderFramesOptions = {
|
|
|
27
27
|
puppeteerInstance?: PuppeteerBrowser;
|
|
28
28
|
browserExecutable?: BrowserExecutable;
|
|
29
29
|
onBrowserLog?: (log: BrowserLog) => void;
|
|
30
|
-
|
|
30
|
+
onFrameBuffer?: (buffer: Buffer, frame: number) => void;
|
|
31
31
|
onDownload?: RenderMediaOnDownload;
|
|
32
32
|
} & ConfigOrComposition & ServeUrlOrWebpackBundle;
|
|
33
|
-
export declare const innerRenderFrames: ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog,
|
|
33
|
+
export declare const innerRenderFrames: ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, }: Omit<RenderFramesOptions, "url"> & {
|
|
34
34
|
onError: (err: Error) => void;
|
|
35
35
|
pagesArray: Page[];
|
|
36
36
|
serveUrl: string;
|
package/dist/render.d.ts.map
CHANGED
|
@@ -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,
|
|
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,EAGX,WAAW,EACX,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,WAAW,CAAC;CACnB,GACD;IACA,WAAW,EAAE,WAAW,CAAC;CACxB,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;CACnC,GAAG,mBAAmB,GACtB,uBAAuB,CAAC;AAczB,eAAO,MAAM,iBAAiB;mBAmBd,KAAK,KAAK,IAAI;gBACjB,IAAI,EAAE;cACR,MAAM;iBACH,WAAW;MACrB,QAAQ,kBAAkB,CAmM7B,CAAC;AAEF,eAAO,MAAM,YAAY,YACf,mBAAmB,KAC1B,QAAQ,kBAAkB,CAgF5B,CAAC"}
|
package/dist/render.js
CHANGED
|
@@ -30,7 +30,7 @@ const getComposition = (others) => {
|
|
|
30
30
|
}
|
|
31
31
|
return undefined;
|
|
32
32
|
};
|
|
33
|
-
const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog,
|
|
33
|
+
const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, }) => {
|
|
34
34
|
if (!puppeteerInstance) {
|
|
35
35
|
throw new Error('weird');
|
|
36
36
|
}
|
|
@@ -90,7 +90,8 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
90
90
|
frameCount,
|
|
91
91
|
});
|
|
92
92
|
const downloadDir = (0, make_assets_download_dir_1.makeAssetsDownloadTmpDir)();
|
|
93
|
-
const assets =
|
|
93
|
+
const assets = new Array(frameCount).fill(undefined);
|
|
94
|
+
await Promise.all(new Array(frameCount)
|
|
94
95
|
.fill(Boolean)
|
|
95
96
|
.map((x, i) => i)
|
|
96
97
|
.map(async (index) => {
|
|
@@ -117,7 +118,7 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
117
118
|
throw error;
|
|
118
119
|
}
|
|
119
120
|
if (imageFormat !== 'none') {
|
|
120
|
-
if (
|
|
121
|
+
if (onFrameBuffer) {
|
|
121
122
|
const buffer = await (0, provide_screenshot_1.provideScreenshot)({
|
|
122
123
|
page: freePage,
|
|
123
124
|
imageFormat,
|
|
@@ -127,11 +128,11 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
127
128
|
output: undefined,
|
|
128
129
|
},
|
|
129
130
|
});
|
|
130
|
-
|
|
131
|
+
onFrameBuffer(buffer, frame);
|
|
131
132
|
}
|
|
132
133
|
else {
|
|
133
134
|
if (!outputDir) {
|
|
134
|
-
throw new Error('Called renderFrames() without specifying either `outputDir` or `
|
|
135
|
+
throw new Error('Called renderFrames() without specifying either `outputDir` or `onFrameBuffer`');
|
|
135
136
|
}
|
|
136
137
|
const output = path_1.default.join(outputDir, `element-${paddedIndex}.${imageFormat}`);
|
|
137
138
|
await (0, provide_screenshot_1.provideScreenshot)({
|
|
@@ -148,11 +149,15 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
148
149
|
const collectedAssets = await freePage.evaluate(() => {
|
|
149
150
|
return window.remotion_collectAssets();
|
|
150
151
|
});
|
|
151
|
-
collectedAssets.
|
|
152
|
+
const compressedAssets = collectedAssets.map((asset) => remotion_1.Internals.AssetCompression.compressAsset(assets.filter(remotion_1.Internals.truthy).flat(1), asset));
|
|
153
|
+
assets[index] = compressedAssets;
|
|
154
|
+
compressedAssets.forEach((asset) => {
|
|
152
155
|
(0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
|
|
153
156
|
asset,
|
|
154
157
|
downloadDir,
|
|
155
158
|
onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : (() => () => undefined),
|
|
159
|
+
}).catch((err) => {
|
|
160
|
+
onError(new Error(`Error while downloading asset: ${err.stack}`));
|
|
156
161
|
});
|
|
157
162
|
});
|
|
158
163
|
pool.release(freePage);
|
|
@@ -160,7 +165,7 @@ const innerRenderFrames = async ({ parallelism, onFrameUpdate, outputDir, onStar
|
|
|
160
165
|
onFrameUpdate(framesRendered, frame);
|
|
161
166
|
freePage.off('pageerror', errorCallbackOnFrame);
|
|
162
167
|
freePage.off('error', errorCallbackOnFrame);
|
|
163
|
-
return
|
|
168
|
+
return compressedAssets;
|
|
164
169
|
}));
|
|
165
170
|
const returnValue = {
|
|
166
171
|
assetsInfo: {
|
package/dist/render.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AAMxB,
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import execa from 'execa';
|
|
2
|
+
export declare const ENABLE_WASM_FFMPEG = true;
|
|
3
|
+
export declare const wasmFfmpeg: import("@ffmpeg/ffmpeg").FFmpeg;
|
|
4
|
+
export declare const load: Promise<void>;
|
|
5
|
+
export declare const runFfmpegCommand: (args: string[], isRenderBad: boolean, options?: execa.Options<string> | undefined) => Promise<execa.ExecaReturnValue<string>>;
|
|
6
|
+
//# sourceMappingURL=run-ffmpeg-command.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-ffmpeg-command.d.ts","sourceRoot":"","sources":["../src/run-ffmpeg-command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,eAAO,MAAM,kBAAkB,OAAO,CAAC;AAEvC,eAAO,MAAM,UAAU,iCAA4B,CAAC;AACpD,eAAO,MAAM,IAAI,eAAoB,CAAC;AAEtC,eAAO,MAAM,gBAAgB,SACtB,MAAM,EAAE,eACD,OAAO,yFAgBpB,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
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.runFfmpegCommand = exports.load = exports.wasmFfmpeg = exports.ENABLE_WASM_FFMPEG = void 0;
|
|
7
|
+
const ffmpeg_1 = require("@ffmpeg/ffmpeg");
|
|
8
|
+
const execa_1 = __importDefault(require("execa"));
|
|
9
|
+
const fs_1 = __importDefault(require("fs"));
|
|
10
|
+
exports.ENABLE_WASM_FFMPEG = true;
|
|
11
|
+
exports.wasmFfmpeg = ffmpeg_1.createFFmpeg({ log: true });
|
|
12
|
+
exports.load = exports.wasmFfmpeg.load();
|
|
13
|
+
const runFfmpegCommand = async (args, isRenderBad, options) => {
|
|
14
|
+
await exports.load;
|
|
15
|
+
await exports.wasmFfmpeg.run(...args);
|
|
16
|
+
if (isRenderBad) {
|
|
17
|
+
await fs_1.default.promises.writeFile('./hi.mp4',
|
|
18
|
+
// eslint-disable-next-line new-cap
|
|
19
|
+
exports.wasmFfmpeg.FS('readFile', 'hi.mp4'));
|
|
20
|
+
}
|
|
21
|
+
console.log('wasm done');
|
|
22
|
+
return execa_1.default('ffmpeg', args, options);
|
|
23
|
+
};
|
|
24
|
+
exports.runFfmpegCommand = runFfmpegCommand;
|
|
25
|
+
//# sourceMappingURL=run-ffmpeg-command.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-ffmpeg-command.js","sourceRoot":"","sources":["../src/run-ffmpeg-command.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA4C;AAC5C,kDAA0B;AAC1B,4CAAoB;AAEP,QAAA,kBAAkB,GAAG,IAAI,CAAC;AAE1B,QAAA,UAAU,GAAG,qBAAY,CAAC,EAAC,GAAG,EAAE,IAAI,EAAC,CAAC,CAAC;AACvC,QAAA,IAAI,GAAG,kBAAU,CAAC,IAAI,EAAE,CAAC;AAE/B,MAAM,gBAAgB,GAAG,KAAK,EACpC,IAAc,EACd,WAAoB,EACpB,OAAuB,EACtB,EAAE;IACH,MAAM,YAAI,CAAC;IAEX,MAAM,kBAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAC9B,IAAI,WAAW,EAAE;QAChB,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAC1B,UAAU;QACV,mCAAmC;QACnC,kBAAU,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CACnC,CAAC;KACF;IAED,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACzB,OAAO,eAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AACvC,CAAC,CAAC;AAlBW,QAAA,gBAAgB,oBAkB3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"screenshot-dom-element.d.ts","sourceRoot":"","sources":["../src/screenshot-dom-element.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAGrC,eAAO,MAAM,oBAAoB;UAM1B,UAAU,IAAI;iBACP,WAAW;aACf,MAAM,GAAG,SAAS;;;;;MAKxB,QAAQ,MAAM,CA0BjB,CAAC"}
|
|
1
|
+
{"version":3,"file":"screenshot-dom-element.d.ts","sourceRoot":"","sources":["../src/screenshot-dom-element.ts"],"names":[],"mappings":";AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAGrC,eAAO,MAAM,oBAAoB;UAM1B,UAAU,IAAI;iBACP,WAAW;aACf,MAAM,GAAG,SAAS;;;;;MAKxB,QAAQ,MAAM,CA0BjB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"screenshot-task.d.ts","sourceRoot":"","sources":["../src/screenshot-task.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,IAAI,EAAE,iBAAiB,EAAS,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAY,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAErD,eAAO,MAAM,eAAe,SACrB,IAAI,UACF,gBAAgB,WACf,iBAAiB,KACxB,QAAQ,MAAM,GAAG,MAAM,CAqCzB,CAAC"}
|
|
1
|
+
{"version":3,"file":"screenshot-task.d.ts","sourceRoot":"","sources":["../src/screenshot-task.ts"],"names":[],"mappings":";AACA,OAAO,EAAa,IAAI,EAAE,iBAAiB,EAAS,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAY,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAErD,eAAO,MAAM,eAAe,SACrB,IAAI,UACF,gBAAgB,WACf,iBAAiB,KACxB,QAAQ,MAAM,GAAG,MAAM,CAqCzB,CAAC"}
|
package/dist/stitcher.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stitcher.d.ts","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACN,KAAK,EACL,gBAAgB,EAEhB,WAAW,EACX,aAAa,EACb,eAAe,EACf,MAAM,UAAU,CAAC;AAIlB,OAAO,EAEN,qBAAqB,EACrB,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"stitcher.d.ts","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACN,KAAK,EACL,gBAAgB,EAEhB,WAAW,EACX,aAAa,EACb,eAAe,EACf,MAAM,UAAU,CAAC;AAIlB,OAAO,EAEN,qBAAqB,EACrB,MAAM,0CAA0C,CAAC;AAalD,oBAAY,eAAe,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,eAAe,GAAG,IAAI,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,UAAU,CAAC,EAAE,qBAAqB,CAAC;IACnC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACpC,CAAC;AA+CF,eAAO,MAAM,WAAW,YAAmB,eAAe;;;EAmIzD,CAAC;AAEF,eAAO,MAAM,mBAAmB,YACtB,eAAe,KACtB,QAAQ,IAAI,CAId,CAAC"}
|
package/dist/stitcher.js
CHANGED
|
@@ -17,7 +17,6 @@ const get_audio_codec_name_1 = require("./get-audio-codec-name");
|
|
|
17
17
|
const get_codec_name_1 = require("./get-codec-name");
|
|
18
18
|
const get_prores_profile_name_1 = require("./get-prores-profile-name");
|
|
19
19
|
const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
|
|
20
|
-
const resolve_asset_src_1 = require("./resolve-asset-src");
|
|
21
20
|
const sample_rate_1 = require("./sample-rate");
|
|
22
21
|
const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
|
|
23
22
|
const validate_ffmpeg_1 = require("./validate-ffmpeg");
|
|
@@ -35,9 +34,9 @@ const getAssetsData = async (options) => {
|
|
|
35
34
|
: null);
|
|
36
35
|
(0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
|
|
37
36
|
const assetPositions = fileUrlAssets === null ? [] : (0, calculate_asset_positions_1.calculateAssetPositions)(fileUrlAssets);
|
|
38
|
-
|
|
37
|
+
(0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
|
|
39
38
|
const assetAudioDetails = await (0, get_asset_audio_details_1.getAssetAudioDetails)({
|
|
40
|
-
assetPaths,
|
|
39
|
+
assetPaths: assetPositions.map((a) => a.src),
|
|
41
40
|
});
|
|
42
41
|
const filters = (0, calculate_ffmpeg_filters_1.calculateFfmpegFilters)({
|
|
43
42
|
assetAudioDetails,
|
|
@@ -55,7 +54,7 @@ const getAssetsData = async (options) => {
|
|
|
55
54
|
return {
|
|
56
55
|
complexFilterFlag,
|
|
57
56
|
cleanup,
|
|
58
|
-
|
|
57
|
+
assetPositions,
|
|
59
58
|
};
|
|
60
59
|
};
|
|
61
60
|
const spawnFfmpeg = async (options) => {
|
|
@@ -91,7 +90,7 @@ const spawnFfmpeg = async (options) => {
|
|
|
91
90
|
}
|
|
92
91
|
remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
|
|
93
92
|
remotion_1.Internals.validateSelectedPixelFormatAndCodecCombination(pixelFormat, codec);
|
|
94
|
-
const { complexFilterFlag = undefined, cleanup = undefined,
|
|
93
|
+
const { complexFilterFlag = undefined, cleanup = undefined, assetPositions = undefined, } = options.parallelEncoding ? {} : await getAssetsData(options);
|
|
95
94
|
const ffmpegArgs = [
|
|
96
95
|
['-r', String(options.fps)],
|
|
97
96
|
...(options.preEncodedFileLocation
|
|
@@ -109,9 +108,9 @@ const spawnFfmpeg = async (options) => {
|
|
|
109
108
|
: null,
|
|
110
109
|
options.parallelEncoding ? ['-i', '-'] : null,
|
|
111
110
|
]),
|
|
112
|
-
...(options.assetsInfo &&
|
|
111
|
+
...(options.assetsInfo && assetPositions
|
|
113
112
|
? (0, assets_to_ffmpeg_inputs_1.assetsToFfmpegInputs)({
|
|
114
|
-
assets:
|
|
113
|
+
assets: assetPositions.map((a) => a.src),
|
|
115
114
|
isAudioOnly,
|
|
116
115
|
fps: options.fps,
|
|
117
116
|
frameCount: options.assetsInfo.assets.length,
|
package/dist/stitcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stitcher.js","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,uCAOkB;AAClB,uEAA+D;AAC/D,kFAA2E;AAC3E,sFAA6E;AAC7E,8FAGkD;AAClD,8EAAsE;AAEtE,yEAAkE;AAClE,iFAAyE;AACzE,iEAAyD;AACzD,qDAA8C;AAC9C,uEAA+D;AAC/D,mEAA4D;AAC5D
|
|
1
|
+
{"version":3,"file":"stitcher.js","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stringify-ffmpeg-filter.d.ts","sourceRoot":"","sources":["../src/stringify-ffmpeg-filter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C,eAAO,MAAM,qBAAqB;iBAWpB,MAAM;cACT,MAAM;eACL,MAAM;cACP,MAAM;kBACF,MAAM;wBACA,MAAM;YAClB,WAAW;SACd,MAAM;kBACG,MAAM;
|
|
1
|
+
{"version":3,"file":"stringify-ffmpeg-filter.d.ts","sourceRoot":"","sources":["../src/stringify-ffmpeg-filter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C,eAAO,MAAM,qBAAqB;iBAWpB,MAAM;cACT,MAAM;eACL,MAAM;cACP,MAAM;kBACF,MAAM;wBACA,MAAM;YAClB,WAAW;SACd,MAAM;kBACG,MAAM;YA6BpB,CAAC"}
|
|
@@ -14,8 +14,6 @@ const stringifyFfmpegFilter = ({ streamIndex, trimLeft, trimRight, channels, sta
|
|
|
14
14
|
});
|
|
15
15
|
return (`[${streamIndex}:a]` +
|
|
16
16
|
[
|
|
17
|
-
// TODO: This will solve the issue of stitching videos together reported by Olli
|
|
18
|
-
// on Discord. But will it introduce other problems where the audio is not right? Pending investigation
|
|
19
17
|
'apad',
|
|
20
18
|
`atrim=${trimLeft}:${trimRight}`,
|
|
21
19
|
// For n channels, we delay n + 1 channels.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stringify-ffmpeg-filter.js","sourceRoot":"","sources":["../src/stringify-ffmpeg-filter.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AACnC,gEAA0D;AAC1D,gFAAyE;AAGlE,MAAM,qBAAqB,GAAG,CAAC,EACrC,WAAW,EACX,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,kBAAkB,EAClB,MAAM,EACN,GAAG,EACH,YAAY,GAWZ,EAAE,EAAE;IACJ,MAAM,mBAAmB,GAAG,CAAC,CAAC,YAAY,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,kBAAkB;IAEvF,MAAM,YAAY,GAAG,IAAA,iDAAsB,EAAC;QAC3C,MAAM;QACN,UAAU,EAAE,kBAAkB;QAC9B,YAAY;QACZ,GAAG;KACH,CAAC,CAAC;IACH,OAAO,CACN,IAAI,WAAW,KAAK;QACpB;YACC,
|
|
1
|
+
{"version":3,"file":"stringify-ffmpeg-filter.js","sourceRoot":"","sources":["../src/stringify-ffmpeg-filter.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AACnC,gEAA0D;AAC1D,gFAAyE;AAGlE,MAAM,qBAAqB,GAAG,CAAC,EACrC,WAAW,EACX,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,kBAAkB,EAClB,MAAM,EACN,GAAG,EACH,YAAY,GAWZ,EAAE,EAAE;IACJ,MAAM,mBAAmB,GAAG,CAAC,CAAC,YAAY,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,kBAAkB;IAEvF,MAAM,YAAY,GAAG,IAAA,iDAAsB,EAAC;QAC3C,MAAM;QACN,UAAU,EAAE,kBAAkB;QAC9B,YAAY;QACZ,GAAG;KACH,CAAC,CAAC;IACH,OAAO,CACN,IAAI,WAAW,KAAK;QACpB;YACC,MAAM;YACN,SAAS,QAAQ,IAAI,SAAS,EAAE;YAChC,2CAA2C;YAC3C,0EAA0E;YAC1E,eAAe;YACf,2DAA2D;YAC3D,4CAA4C;YAC5C,gDAAgD;YAChD,UAAU,IAAI,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACvE,IAAA,kCAAe,EAAC,YAAY,CAAC;YAC7B,UAAU,YAAY,CAAC,KAAK,SAAS,YAAY,CAAC,IAAI,EAAE;SACxD;aACC,MAAM,CAAC,oBAAS,CAAC,MAAM,CAAC;aACxB,IAAI,CAAC,GAAG,CAAC;QACX,KAAK,WAAW,GAAG,CACnB,CAAC;AACH,CAAC,CAAC;AAhDW,QAAA,qBAAqB,yBAgDhC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@remotion/renderer",
|
|
3
|
-
"version": "3.0.0-lambda.
|
|
3
|
+
"version": "3.0.0-lambda.242+47ecdf33b",
|
|
4
4
|
"description": "Renderer for Remotion",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -16,13 +16,13 @@
|
|
|
16
16
|
"url": "https://github.com/remotion-dev/remotion"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@remotion/bundler": "3.0.0-lambda.
|
|
19
|
+
"@remotion/bundler": "3.0.0-lambda.242+47ecdf33b",
|
|
20
20
|
"@testing-library/dom": "^8.7.2",
|
|
21
21
|
"execa": "^4.0.2",
|
|
22
22
|
"got": "11.8.2",
|
|
23
23
|
"p-limit": "^3.1.0",
|
|
24
24
|
"puppeteer-core": "^10.2.0",
|
|
25
|
-
"remotion": "3.0.0-lambda.
|
|
25
|
+
"remotion": "3.0.0-lambda.242+47ecdf33b",
|
|
26
26
|
"sanitize-filename": "^1.6.3",
|
|
27
27
|
"serve-handler": "^6.1.3"
|
|
28
28
|
},
|
|
@@ -46,5 +46,5 @@
|
|
|
46
46
|
"publishConfig": {
|
|
47
47
|
"access": "public"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "47ecdf33b56a86cac40df2a95a1801d40dfc47a6"
|
|
50
50
|
}
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
export declare const getPcmOutputName: (inputName: string) => string;
|
|
2
|
-
export declare const conversionStarted: {
|
|
3
|
-
[key: string]: boolean;
|
|
4
|
-
};
|
|
5
|
-
export declare const convertMp3ToPcm: (source: string) => Promise<string>;
|
|
6
|
-
export declare const clearMp3Conversions: () => void;
|
|
7
|
-
//# sourceMappingURL=convert-mp3-to-pcm.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"convert-mp3-to-pcm.d.ts","sourceRoot":"","sources":["../src/convert-mp3-to-pcm.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB,cAAe,MAAM,WAMjD,CAAC;AAQF,eAAO,MAAM,iBAAiB,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAM,CAAC;AAE9D,eAAO,MAAM,eAAe,WAAkB,MAAM,oBAcnD,CAAC;AAEF,eAAO,MAAM,mBAAmB,YAI/B,CAAC"}
|
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// For the h264-mkv format, we need to convert an MP3 file to PCM first
|
|
3
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
|
-
};
|
|
6
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.clearMp3Conversions = exports.convertMp3ToPcm = exports.conversionStarted = exports.getPcmOutputName = void 0;
|
|
8
|
-
const execa_1 = __importDefault(require("execa"));
|
|
9
|
-
const path_1 = __importDefault(require("path"));
|
|
10
|
-
const getPcmOutputName = (inputName) => {
|
|
11
|
-
const dirname = path_1.default.dirname(inputName);
|
|
12
|
-
const extension = path_1.default.extname(inputName);
|
|
13
|
-
const filename = path_1.default.basename(inputName, extension);
|
|
14
|
-
return path_1.default.join(dirname, `${filename}-converted.wav`);
|
|
15
|
-
};
|
|
16
|
-
exports.getPcmOutputName = getPcmOutputName;
|
|
17
|
-
const isMp3 = async (source) => {
|
|
18
|
-
const { stderr } = await (0, execa_1.default)('ffprobe', [source]);
|
|
19
|
-
return stderr.includes('Audio: mp3');
|
|
20
|
-
};
|
|
21
|
-
exports.conversionStarted = {};
|
|
22
|
-
const convertMp3ToPcm = async (source) => {
|
|
23
|
-
const outname = (0, exports.getPcmOutputName)(source);
|
|
24
|
-
if (!(await isMp3(source))) {
|
|
25
|
-
return source;
|
|
26
|
-
}
|
|
27
|
-
if (exports.conversionStarted[source]) {
|
|
28
|
-
return outname;
|
|
29
|
-
}
|
|
30
|
-
exports.conversionStarted[source] = true;
|
|
31
|
-
await (0, execa_1.default)('ffmpeg', ['-y', '-i', source, (0, exports.getPcmOutputName)(source)]);
|
|
32
|
-
return outname;
|
|
33
|
-
};
|
|
34
|
-
exports.convertMp3ToPcm = convertMp3ToPcm;
|
|
35
|
-
const clearMp3Conversions = () => {
|
|
36
|
-
Object.keys(exports.conversionStarted).forEach((key) => {
|
|
37
|
-
delete exports.conversionStarted[key];
|
|
38
|
-
});
|
|
39
|
-
};
|
|
40
|
-
exports.clearMp3Conversions = clearMp3Conversions;
|
|
41
|
-
//# sourceMappingURL=convert-mp3-to-pcm.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"convert-mp3-to-pcm.js","sourceRoot":"","sources":["../src/convert-mp3-to-pcm.ts"],"names":[],"mappings":";AAAA,uEAAuE;;;;;;AAEvE,kDAA0B;AAC1B,gDAAwB;AAEjB,MAAM,gBAAgB,GAAG,CAAC,SAAiB,EAAE,EAAE;IACrD,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAErD,OAAO,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,QAAQ,gBAAgB,CAAC,CAAC;AACxD,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B;AAEF,MAAM,KAAK,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;IACtC,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,IAAA,eAAK,EAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAElD,OAAO,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC,CAAC;AAEW,QAAA,iBAAiB,GAA6B,EAAE,CAAC;AAEvD,MAAM,eAAe,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;IACvD,MAAM,OAAO,GAAG,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;IACzC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE;QAC3B,OAAO,MAAM,CAAC;KACd;IAED,IAAI,yBAAiB,CAAC,MAAM,CAAC,EAAE;QAC9B,OAAO,OAAO,CAAC;KACf;IAED,yBAAiB,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAEjC,MAAM,IAAA,eAAK,EAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACtE,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AAdW,QAAA,eAAe,mBAc1B;AAEK,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACvC,MAAM,CAAC,IAAI,CAAC,yBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC9C,OAAO,yBAAiB,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
//# sourceMappingURL=handle-null-audio.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"handle-null-audio.d.ts","sourceRoot":"","sources":["../src/handle-null-audio.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"handle-null-audio.js","sourceRoot":"","sources":["../src/handle-null-audio.ts"],"names":[],"mappings":""}
|
package/dist/is-local-file.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
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"}
|
package/dist/is-local-file.js
DELETED
|
@@ -1,13 +0,0 @@
|
|
|
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
|
|
@@ -1 +0,0 @@
|
|
|
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"}
|
package/dist/validate-frame.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"validate-frame.d.ts","sourceRoot":"","sources":["../src/validate-frame.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,UAAW,MAAM,oBAAoB,MAAM,SAgCpE,CAAC"}
|