@remotion/renderer 4.0.0-fastlambda.8 → 4.0.0-july8th.12

package/dist/add-silent-audio-if-necessary.d.ts

@@ -0,0 +1,2 @@
+export declare const addSilentAudioIfNecessary: (videoFile: string) => Promise<void>;
+//# sourceMappingURL=add-silent-audio-if-necessary.d.ts.map

package/dist/add-silent-audio-if-necessary.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-silent-audio-if-necessary.d.ts","sourceRoot":"","sources":["../src/add-silent-audio-if-necessary.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,yBAAyB,cAC1B,MAAM,KACf,QAAQ,IAAI,CA+Bd,CAAC"}

package/dist/add-silent-audio-if-necessary.js

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addSilentAudioIfNecessary = void 0;
+const execa_1 = __importDefault(require("execa"));
+const fs_1 = require("fs");
+const get_audio_channels_1 = require("./assets/get-audio-channels");
+const addSilentAudioIfNecessary = async (videoFile) => {
+    const audioChannels = await (0, get_audio_channels_1.getAudioChannels)(videoFile);
+    if (audioChannels > 0) {
+        return;
+    }
+    const out = videoFile + '-n';
+    await (0, execa_1.default)('ffmpeg', [
+        '-f',
+        'lavfi',
+        '-i',
+        'anullsrc',
+        '-i',
+        videoFile,
+        '-map',
+        '0:a:0',
+        '-map',
+        '1:v:0',
+        '-c:a',
+        'pcm_s16le',
+        '-c:v',
+        'copy',
+        '-y',
+        '-shortest',
+        '-f',
+        'matroska',
+        out,
+    ]);
+    (0, fs_1.unlinkSync)(videoFile);
+    (0, fs_1.renameSync)(out, videoFile);
+};
+exports.addSilentAudioIfNecessary = addSilentAudioIfNecessary;
+//# sourceMappingURL=add-silent-audio-if-necessary.js.map

package/dist/add-silent-audio-if-necessary.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-silent-audio-if-necessary.js","sourceRoot":"","sources":["../src/add-silent-audio-if-necessary.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,2BAA0C;AAC1C,oEAA6D;AAEtD,MAAM,yBAAyB,GAAG,KAAK,EAC7C,SAAiB,EACD,EAAE;IAClB,MAAM,aAAa,GAAG,MAAM,IAAA,qCAAgB,EAAC,SAAS,CAAC,CAAC;IACxD,IAAI,aAAa,GAAG,CAAC,EAAE;QACtB,OAAO;KACP;IAED,MAAM,GAAG,GAAG,SAAS,GAAG,IAAI,CAAC;IAE7B,MAAM,IAAA,eAAK,EAAC,QAAQ,EAAE;QACrB,IAAI;QACJ,OAAO;QACP,IAAI;QACJ,UAAU;QACV,IAAI;QACJ,SAAS;QACT,MAAM;QACN,OAAO;QACP,MAAM;QACN,OAAO;QACP,MAAM;QACN,WAAW;QACX,MAAM;QACN,MAAM;QACN,IAAI;QACJ,WAAW;QACX,IAAI;QACJ,UAAU;QACV,GAAG;KACH,CAAC,CAAC;IACH,IAAA,eAAU,EAAC,SAAS,CAAC,CAAC;IACtB,IAAA,eAAU,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;AAC5B,CAAC,CAAC;AAjCW,QAAA,yBAAyB,6BAiCpC"}

package/dist/assets/asset-is-used-at-time.d.ts

@@ -0,0 +1,3 @@
+import { MediaAsset } from './types';
+export declare const assetIsUsedAtTime: (asset: MediaAsset, frame: number) => boolean;
+//# sourceMappingURL=asset-is-used-at-time.d.ts.map

package/dist/assets/asset-is-used-at-time.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"asset-is-used-at-time.d.ts","sourceRoot":"","sources":["../../src/assets/asset-is-used-at-time.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AAEnC,eAAO,MAAM,iBAAiB,UAAW,UAAU,SAAS,MAAM,YAIjE,CAAC"}

package/dist/assets/asset-is-used-at-time.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assetIsUsedAtTime = void 0;
+const assetIsUsedAtTime = (asset, frame) => {
+    return (frame >= asset.startInVideo && frame < asset.startInVideo + asset.duration);
+};
+exports.assetIsUsedAtTime = assetIsUsedAtTime;
+//# sourceMappingURL=asset-is-used-at-time.js.map

package/dist/assets/asset-is-used-at-time.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"asset-is-used-at-time.js","sourceRoot":"","sources":["../../src/assets/asset-is-used-at-time.ts"],"names":[],"mappings":";;;AAEO,MAAM,iBAAiB,GAAG,CAAC,KAAiB,EAAE,KAAa,EAAE,EAAE;IACrE,OAAO,CACN,KAAK,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,GAAG,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC,QAAQ,CAC1E,CAAC;AACH,CAAC,CAAC;AAJW,QAAA,iBAAiB,qBAI5B"}

package/dist/assets/calculate-asset-positions.d.ts

@@ -1,3 +1,3 @@
-import { TAsset } from 'remotion';
-import { Assets } from './types';
+import type { TAsset } from 'remotion';
+import type { Assets } from './types';
 export declare const calculateAssetPositions: (frames: TAsset[][]) => Assets;

package/dist/assets/calculate-asset-positions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculate-asset-positions.d.ts","sourceRoot":"","sources":["../../src/assets/calculate-asset-positions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAGhC,OAAO,EAAC,MAAM,EAAgD,MAAM,SAAS,CAAC;AA2B9E,eAAO,MAAM,uBAAuB,WAAY,MAAM,EAAE,EAAE,WA4CzD,CAAC"}
+{"version":3,"file":"calculate-asset-positions.d.ts","sourceRoot":"","sources":["../../src/assets/calculate-asset-positions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAC,MAAM,EAA0B,MAAM,SAAS,CAAC;AA2BxD,eAAO,MAAM,uBAAuB,WAAY,MAAM,EAAE,EAAE,WA+CzD,CAAC"}

package/dist/assets/calculate-asset-positions.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculate-asset-positions.js","sourceRoot":"","sources":["../../src/assets/calculate-asset-positions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"calculate-asset-positions.js","sourceRoot":"","sources":["../../src/assets/calculate-asset-positions.ts"],"names":[],"mappings":"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"}

package/dist/assets/calculate-atempo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculate-atempo.d.ts","sourceRoot":"","sources":["../../src/assets/calculate-atempo.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,iBAAkB,MAAM,KAAG,MAAM,GAAG,IAY/D,CAAC"}
+{"version":3,"file":"calculate-atempo.d.ts","sourceRoot":"","sources":["../../src/assets/calculate-atempo.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,iBAAkB,MAAM,KAAG,MAQtD,CAAC"}

package/dist/assets/calculate-atempo.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculate-atempo.js","sourceRoot":"","sources":["../../src/assets/calculate-atempo.ts"],"names":[],"mappings":";AAAA,kCAAkC;AAClC,mFAAmF;AACnF,sUAAsU;;;AAE/T,MAAM,eAAe,GAAG,CAAC,YAAoB,EAAiB,EAAE;IACtE,IAAI,YAAY,KAAK,CAAC,EAAE;QACvB,OAAO,IAAI,CAAC;KACZ;IAED,IAAI,YAAY,IAAI,GAAG,IAAI,YAAY,IAAI,CAAC,EAAE;QAC7C,OAAO,UAAU,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3C;IAED,OAAO,GAAG,IAAA,uBAAe,EAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,IAAA,uBAAe,EACpE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CACvB,EAAE,CAAC;AACL,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B"}
+{"version":3,"file":"calculate-atempo.js","sourceRoot":"","sources":["../../src/assets/calculate-atempo.ts"],"names":[],"mappings":";AAAA,kCAAkC;AAClC,mFAAmF;AACnF,sUAAsU;;;AAE/T,MAAM,eAAe,GAAG,CAAC,YAAoB,EAAU,EAAE;IAC/D,IAAI,YAAY,IAAI,GAAG,IAAI,YAAY,IAAI,CAAC,EAAE;QAC7C,OAAO,UAAU,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3C;IAED,OAAO,GAAG,IAAA,uBAAe,EAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,IAAA,uBAAe,EACpE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CACvB,EAAE,CAAC;AACL,CAAC,CAAC;AARW,QAAA,eAAe,mBAQ1B"}

package/dist/assets/convert-assets-to-file-urls.d.ts

@@ -1,5 +1,5 @@
-import { TAsset } from 'remotion';
-import { RenderMediaOnDownload } from './download-and-map-assets-to-file';
+import type { TAsset } from 'remotion';
+import type { RenderMediaOnDownload } from './download-and-map-assets-to-file';
 export declare const convertAssetsToFileUrls: ({ assets, downloadDir, onDownload, }: {
     assets: TAsset[][];
     downloadDir: string;

package/dist/assets/convert-assets-to-file-urls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-assets-to-file-urls.d.ts","sourceRoot":"","sources":["../../src/assets/convert-assets-to-file-urls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAEN,qBAAqB,EACrB,MAAM,mCAAmC,CAAC;AAU3C,eAAO,MAAM,uBAAuB;YAK3B,MAAM,EAAE,EAAE;iBACL,MAAM;gBACP,qBAAqB;MAC9B,QAAQ,MAAM,EAAE,EAAE,CAsBrB,CAAC"}
+{"version":3,"file":"convert-assets-to-file-urls.d.ts","sourceRoot":"","sources":["../../src/assets/convert-assets-to-file-urls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAEN,UAAU,EACV,MAAM,mCAAmC,CAAC;AAU3C,eAAO,MAAM,uBAAuB;YAK3B,MAAM,EAAE,EAAE;iBACL,MAAM;gBACP,UAAU;MACnB,QAAQ,MAAM,EAAE,EAAE,CAsBrB,CAAC"}

package/dist/assets/download-and-map-assets-to-file.d.ts

@@ -1,11 +1,19 @@
-import { TAsset } from 'remotion';
+import type { TAsset } from 'remotion';
 export declare type RenderMediaOnDownload = (src: string) => ((progress: {
-    percent: number;
+    percent: number | null;
+    downloaded: number;
+    totalSize: number | null;
 }) => void) | undefined | void;
+export declare const downloadAsset: ({ src, onDownload, downloadDir, }: {
+    src: string;
+    onDownload: RenderMediaOnDownload;
+    downloadDir: string;
+}) => Promise<string>;
 export declare const markAllAssetsAsDownloaded: () => void;
-export declare const getSanitizedFilenameForAssetUrl: ({ src, downloadDir, }: {
+export declare const getSanitizedFilenameForAssetUrl: ({ src, downloadDir, contentDisposition, }: {
     src: string;
     downloadDir: string;
+    contentDisposition: string | null;
 }) => string;
 export declare const downloadAndMapAssetsToFileUrl: ({ asset, downloadDir, onDownload, }: {
     asset: TAsset;

package/dist/assets/download-and-map-assets-to-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"download-and-map-assets-to-file.d.ts","sourceRoot":"","sources":["../../src/assets/download-and-map-assets-to-file.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,MAAM,EAAC,MAAM,UAAU,CAAC;AAKnD,oBAAY,qBAAqB,GAAG,CACnC,GAAG,EAAE,MAAM,KACP,CAAC,CAAC,QAAQ,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,KAAK,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAuHhE,eAAO,MAAM,yBAAyB,YAQrC,CAAC;AAEF,eAAO,MAAM,+BAA+B;SAItC,MAAM;iBACE,MAAM;YAqBnB,CAAC;AAEF,eAAO,MAAM,6BAA6B;WAKlC,MAAM;iBACA,MAAM;gBACP,qBAAqB;MAC9B,QAAQ,MAAM,CAcjB,CAAC"}
+{"version":3,"file":"download-and-map-assets-to-file.d.ts","sourceRoot":"","sources":["../../src/assets/download-and-map-assets-to-file.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,MAAM,EAAC,MAAM,UAAU,CAAC;AAGxC,oBAAY,UAAU,GAAG,CACxB,GAAG,EAAE,MAAM,KACP,CAAC,CAAC,QAAQ,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,KAAK,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAkEhE,eAAO,MAAM,yBAAyB,YAQrC,CAAC;AAEF,eAAO,MAAM,+BAA+B;SAItC,MAAM;iBACE,MAAM;YAiBnB,CAAC;AAEF,eAAO,MAAM,6BAA6B;WAKlC,MAAM;iBACA,MAAM;gBACP,UAAU;MACnB,QAAQ,MAAM,CAYjB,CAAC"}

package/dist/assets/download-and-map-assets-to-file.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadAndMapAssetsToFileUrl = exports.getSanitizedFilenameForAssetUrl = exports.markAllAssetsAsDownloaded = void 0;
+exports.downloadAndMapAssetsToFileUrl = exports.getSanitizedFilenameForAssetUrl = exports.markAllAssetsAsDownloaded = exports.downloadAsset = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const remotion_1 = require("remotion");
@@ -13,21 +13,40 @@ const sanitize_filepath_1 = require("./sanitize-filepath");
 const isDownloadingMap = {};
 const hasBeenDownloadedMap = {};
 const listeners = {};
-const waitForAssetToBeDownloaded = (src) => {
+const waitForAssetToBeDownloaded = ({ src, downloadDir, }) => {
+    var _a, _b;
+    if ((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]) {
+        return Promise.resolve((_b = hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir]);
+    }
     if (!listeners[src]) {
-        listeners[src] = [];
+        listeners[src] = {};
+    }
+    if (!listeners[src][downloadDir]) {
+        listeners[src][downloadDir] = [];
     }
     return new Promise((resolve) => {
-        listeners[src].push(() => resolve());
+        listeners[src][downloadDir].push(() => {
+            var _a;
+            resolve((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]);
+        });
     });
 };
-const notifyAssetIsDownloaded = (src) => {
+const notifyAssetIsDownloaded = ({ src, downloadDir, to, }) => {
     if (!listeners[src]) {
-        listeners[src] = [];
+        listeners[src] = {};
+    }
+    if (!listeners[src][downloadDir]) {
+        listeners[src][downloadDir] = [];
+    }
+    listeners[src][downloadDir].forEach((fn) => fn());
+    if (!isDownloadingMap[src]) {
+        isDownloadingMap[src] = {};
     }
-    listeners[src].forEach((fn) => fn());
-    isDownloadingMap[src] = false;
-    hasBeenDownloadedMap[src] = true;
+    isDownloadingMap[src][downloadDir] = true;
+    if (!hasBeenDownloadedMap[src]) {
+        hasBeenDownloadedMap[src] = {};
+    }
+    hasBeenDownloadedMap[src][downloadDir] = to;
 };
 const validateMimeType = (mimeType, src) => {
     if (!mimeType.includes('/')) {
@@ -68,17 +87,29 @@ function validateBufferEncoding(potentialEncoding, dataUrl) {
         throw new TypeError(errMessage);
     }
 }
-const downloadAsset = async (src, to, onDownload) => {
-    if (hasBeenDownloadedMap[src]) {
-        return;
+const downloadAsset = async ({ src, onDownload, downloadDir, }) => {
+    var _a, _b, _c;
+    if (remotion_1.Internals.AssetCompression.isAssetCompressed(src)) {
+        return src;
+    }
+    if ((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]) {
+        return (_b = hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir];
     }
-    if (isDownloadingMap[src]) {
-        return waitForAssetToBeDownloaded(src);
+    if ((_c = isDownloadingMap[src]) === null || _c === void 0 ? void 0 : _c[downloadDir]) {
+        return waitForAssetToBeDownloaded({ src, downloadDir });
     }
-    isDownloadingMap[src] = true;
+    if (!isDownloadingMap[src]) {
+        isDownloadingMap[src] = {};
+    }
+    isDownloadingMap[src][downloadDir] = true;
     const onProgress = onDownload(src);
-    (0, ensure_output_directory_1.ensureOutputDirectory)(to);
     if (src.startsWith('data:')) {
+        const output = (0, exports.getSanitizedFilenameForAssetUrl)({
+            contentDisposition: null,
+            downloadDir,
+            src,
+        });
+        (0, ensure_output_directory_1.ensureOutputDirectory)(output);
         const [assetDetails, assetData] = src.substring('data:'.length).split(',');
         if (!assetDetails.includes(';')) {
             const errMessage = [
@@ -93,17 +124,21 @@ const downloadAsset = async (src, to, onDownload) => {
         validateMimeType(mimeType, src);
         validateBufferEncoding(encoding, src);
         const buff = Buffer.from(assetData, encoding);
-        await fs_1.default.promises.writeFile(to, buff);
-        notifyAssetIsDownloaded(src);
-        return;
+        await fs_1.default.promises.writeFile(output, buff);
+        notifyAssetIsDownloaded({ src, downloadDir, to: output });
+        return output;
     }
-    await (0, download_file_1.downloadFile)(src, to, ({ progress }) => {
-        onProgress === null || onProgress === void 0 ? void 0 : onProgress({
-            percent: progress,
-        });
+    const { to } = await (0, download_file_1.downloadFile)({
+        url: src,
+        onProgress: (progress) => {
+            onProgress === null || onProgress === void 0 ? void 0 : onProgress(progress);
+        },
+        to: (contentDisposition) => (0, exports.getSanitizedFilenameForAssetUrl)({ contentDisposition, downloadDir, src }),
     });
-    notifyAssetIsDownloaded(src);
+    notifyAssetIsDownloaded({ src, downloadDir, to });
+    return to;
 };
+exports.downloadAsset = downloadAsset;
 const markAllAssetsAsDownloaded = () => {
     Object.keys(hasBeenDownloadedMap).forEach((key) => {
         delete hasBeenDownloadedMap[key];
@@ -113,27 +148,43 @@ const markAllAssetsAsDownloaded = () => {
     });
 };
 exports.markAllAssetsAsDownloaded = markAllAssetsAsDownloaded;
-const getSanitizedFilenameForAssetUrl = ({ src, downloadDir, }) => {
+const getFilename = ({ contentDisposition, src, }) => {
+    const filenameProbe = 'filename=';
+    if (contentDisposition === null || contentDisposition === void 0 ? void 0 : contentDisposition.includes(filenameProbe)) {
+        const start = contentDisposition.indexOf(filenameProbe);
+        const onlyFromFileName = contentDisposition.substring(start + filenameProbe.length);
+        const hasSemi = onlyFromFileName.indexOf(';');
+        if (hasSemi === -1) {
+            return { pathname: onlyFromFileName.trim(), search: '' };
+        }
+        return {
+            search: '',
+            pathname: onlyFromFileName.substring(0, hasSemi).trim(),
+        };
+    }
+    const { pathname, search } = new URL(src);
+    return { pathname, search };
+};
+const getSanitizedFilenameForAssetUrl = ({ src, downloadDir, contentDisposition, }) => {
     if (remotion_1.Internals.AssetCompression.isAssetCompressed(src)) {
         return src;
     }
-    const { pathname, search } = new URL(src);
+    const { pathname, search } = getFilename({ contentDisposition, src });
     const split = pathname.split('.');
     const fileExtension = split.length > 1 && split[split.length - 1]
         ? `.${split[split.length - 1]}`
         : '';
     const hashedFileName = String((0, remotion_1.random)(`${pathname}${search}`)).replace('0.', '');
-    return path_1.default.join(downloadDir, (0, sanitize_filepath_1.sanitizeFilePath)(hashedFileName + fileExtension));
+    const filename = hashedFileName + fileExtension;
+    return path_1.default.join(downloadDir, (0, sanitize_filepath_1.sanitizeFilePath)(filename));
 };
 exports.getSanitizedFilenameForAssetUrl = getSanitizedFilenameForAssetUrl;
 const downloadAndMapAssetsToFileUrl = async ({ asset, downloadDir, onDownload, }) => {
-    const newSrc = (0, exports.getSanitizedFilenameForAssetUrl)({
+    const newSrc = await (0, exports.downloadAsset)({
         src: asset.src,
         downloadDir,
+        onDownload,
     });
-    if (!remotion_1.Internals.AssetCompression.isAssetCompressed(newSrc)) {
-        await downloadAsset(asset.src, newSrc, onDownload);
-    }
     return {
         ...asset,
         src: newSrc,

package/dist/assets/download-and-map-assets-to-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"download-and-map-assets-to-file.js","sourceRoot":"","sources":["../../src/assets/download-and-map-assets-to-file.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,uCAAmD;AACnD,wEAAiE;AACjE,mDAA6C;AAC7C,2DAAqD;AAMrD,MAAM,gBAAgB,GAA6B,EAAE,CAAC;AACtD,MAAM,oBAAoB,GAA6B,EAAE,CAAC;AAC1D,MAAM,SAAS,GAAoC,EAAE,CAAC;AAEtD,MAAM,0BAA0B,GAAG,CAAC,GAAW,EAAE,EAAE;IAClD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;QACpB,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;KACpB;IAED,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QACpC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,GAAW,EAAE,EAAE;IAC/C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;QACpB,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;KACpB;IAED,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACrC,gBAAgB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IAC9B,oBAAoB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,QAAgB,EAAE,GAAW,EAAE,EAAE;IAC1D,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC5B,MAAM,UAAU,GAAG;YAClB,2HAA2H;YAC3H,0EAA0E;YAC1E,sDAAsD;YACtD,8DAA8D;YAC9D,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC;SAClB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACZ,MAAM,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC;KAChC;AACF,CAAC,CAAC;AAEF,SAAS,sBAAsB,CAC9B,iBAAyB,EACzB,OAAe;IAEf,MAAM,QAAQ,GAAG,iBAAmC,CAAC;IACrD,MAAM,cAAc,GAAqB;QACxC,OAAO;QACP,QAAQ;QACR,WAAW;QACX,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,OAAO;QACP,MAAM;QACN,OAAO;QACP,SAAS;QACT,MAAM;KACN,CAAC;IACF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC,EAAE;QAClD,MAAM,UAAU,GAAG;YAClB,2HAA2H;YAC3H,0EAA0E;YAC1E,wDAAwD;YACxD,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;YAC9B,8DAA8D;YAC9D,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC;SACtB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACZ,MAAM,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC;KAChC;AACF,CAAC;AAED,MAAM,aAAa,GAAG,KAAK,EAC1B,GAAW,EACX,EAAU,EACV,UAAiC,EAChC,EAAE;IACH,IAAI,oBAAoB,CAAC,GAAG,CAAC,EAAE;QAC9B,OAAO;KACP;IAED,IAAI,gBAAgB,CAAC,GAAG,CAAC,EAAE;QAC1B,OAAO,0BAA0B,CAAC,GAAG,CAAC,CAAC;KACvC;IAED,gBAAgB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAE7B,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IACnC,IAAA,+CAAqB,EAAC,EAAE,CAAC,CAAC;IAE1B,IAAI,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC5B,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3E,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAChC,MAAM,UAAU,GAAG;gBAClB,2HAA2H;gBAC3H,0EAA0E;gBAC1E,8DAA8D;gBAC9D,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC;aACrB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC;SAChC;QAED,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAErD,gBAAgB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAChC,sBAAsB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAEtC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC9C,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACtC,uBAAuB,CAAC,GAAG,CAAC,CAAC;QAC7B,OAAO;KACP;IAED,MAAM,IAAA,4BAAY,EAAC,GAAG,EAAE,EAAE,EAAE,CAAC,EAAC,QAAQ,EAAC,EAAE,EAAE;QAC1C,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG;YACZ,OAAO,EAAE,QAAQ;SACjB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,uBAAuB,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEK,MAAM,yBAAyB,GAAG,GAAG,EAAE;IAC7C,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACjD,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC7C,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,yBAAyB,6BAQpC;AAEK,MAAM,+BAA+B,GAAG,CAAC,EAC/C,GAAG,EACH,WAAW,GAIX,EAAE,EAAE;IACJ,IAAI,oBAAS,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE;QACtD,OAAO,GAAG,CAAC;KACX;IAED,MAAM,EAAC,QAAQ,EAAE,MAAM,EAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IAExC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,aAAa,GAClB,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QAC1C,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE;QAC/B,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,cAAc,GAAG,MAAM,CAAC,IAAA,iBAAM,EAAC,GAAG,QAAQ,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,CACpE,IAAI,EACJ,EAAE,CACF,CAAC;IACF,OAAO,cAAI,CAAC,IAAI,CACf,WAAW,EACX,IAAA,oCAAgB,EAAC,cAAc,GAAG,aAAa,CAAC,CAChD,CAAC;AACH,CAAC,CAAC;AA1BW,QAAA,+BAA+B,mCA0B1C;AAEK,MAAM,6BAA6B,GAAG,KAAK,EAAE,EACnD,KAAK,EACL,WAAW,EACX,UAAU,GAKV,EAAmB,EAAE;IACrB,MAAM,MAAM,GAAG,IAAA,uCAA+B,EAAC;QAC9C,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,WAAW;KACX,CAAC,CAAC;IAEH,IAAI,CAAC,oBAAS,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE;QAC1D,MAAM,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;KACnD;IAED,OAAO;QACN,GAAG,KAAK;QACR,GAAG,EAAE,MAAM;KACX,CAAC;AACH,CAAC,CAAC;AAtBW,QAAA,6BAA6B,iCAsBxC"}
+{"version":3,"file":"download-and-map-assets-to-file.js","sourceRoot":"","sources":["../../src/assets/download-and-map-assets-to-file.ts"],"names":[],"mappings":"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"}

package/dist/assets/download-file.d.ts

@@ -1,7 +1,12 @@
-export declare const downloadFile: (url: string, to: string, onProgress: ((progress: {
-    progress: number;
-    downloaded: number;
-    totalSize: number;
-}) => void) | undefined) => Promise<{
+export declare const downloadFile: ({ onProgress, url, to: toFn, }: {
+    url: string;
+    to: (contentDisposition: string | null) => string;
+    onProgress: ((progress: {
+        percent: number | null;
+        downloaded: number;
+        totalSize: number | null;
+    }) => void) | undefined;
+}) => Promise<{
     sizeInBytes: number;
+    to: string;
 }>;

package/dist/assets/download-file.js

@@ -2,25 +2,38 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadFile = void 0;
 const fs_1 = require("fs");
+const ensure_output_directory_1 = require("../ensure-output-directory");
 const read_file_1 = require("./read-file");
-const downloadFile = (url, to, onProgress) => {
+const downloadFile = ({ onProgress, url, to: toFn, }) => {
     return new Promise((resolve, reject) => {
         (0, read_file_1.readFile)(url)
             .then((res) => {
-            const totalSize = Number(res.headers['content-length']);
+            var _a;
+            const contentDisposition = (_a = res.headers['content-disposition']) !== null && _a !== void 0 ? _a : null;
+            const to = toFn(contentDisposition);
+            (0, ensure_output_directory_1.ensureOutputDirectory)(to);
+            const sizeHeader = res.headers['content-length'];
+            const totalSize = typeof sizeHeader === 'undefined' ? null : Number(sizeHeader);
             const writeStream = (0, fs_1.createWriteStream)(to);
+            let downloaded = 0;
             // Listen to 'close' event instead of more
             // concise method to avoid this problem
             // https://github.com/remotion-dev/remotion/issues/384#issuecomment-844398183
-            writeStream.on('close', () => resolve({ sizeInBytes: totalSize }));
+            writeStream.on('close', () => {
+                onProgress === null || onProgress === void 0 ? void 0 : onProgress({
+                    downloaded,
+                    percent: 1,
+                    totalSize: downloaded,
+                });
+                return resolve({ sizeInBytes: downloaded, to });
+            });
             writeStream.on('error', (err) => reject(err));
-            let downloaded = 0;
             res.pipe(writeStream).on('error', (err) => reject(err));
             res.on('data', (d) => {
                 downloaded += d.length;
                 onProgress === null || onProgress === void 0 ? void 0 : onProgress({
                     downloaded,
-                    progress: downloaded / totalSize,
+                    percent: totalSize === null ? null : downloaded / totalSize,
                     totalSize,
                 });
             });

package/dist/assets/ffmpeg-volume-expression.d.ts

@@ -1,12 +1,12 @@
-import { AssetVolume } from './types';
+import type { AssetVolume } from './types';
 declare type FfmpegEval = 'once' | 'frame';
 declare type FfmpegVolumeExpression = {
     eval: FfmpegEval;
     value: string;
 };
-export declare const ffmpegVolumeExpression: ({ volume, startInVideo, fps, }: {
+export declare const ffmpegVolumeExpression: ({ volume, fps, trimLeft, }: {
     volume: AssetVolume;
-    startInVideo: number;
+    trimLeft: number;
     fps: number;
 }) => FfmpegVolumeExpression;
 export {};

package/dist/assets/ffmpeg-volume-expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ffmpeg-volume-expression.d.ts","sourceRoot":"","sources":["../../src/assets/ffmpeg-volume-expression.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,aAAK,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC;AA8DnC,aAAK,sBAAsB,GAAG;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,sBAAsB;YAK1B,WAAW;kBACL,MAAM;SACf,MAAM;MACR,sBA+CH,CAAC"}
+{"version":3,"file":"ffmpeg-volume-expression.d.ts","sourceRoot":"","sources":["../../src/assets/ffmpeg-volume-expression.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,aAAK,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC;AA8DnC,aAAK,sBAAsB,GAAG;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACd,CAAC;AAGF,eAAO,MAAM,sBAAsB;YAM1B,WAAW;gBACP,MAAM;kBACJ,MAAM;SACf,MAAM;MACR,sBA+CH,CAAC"}

package/dist/assets/ffmpeg-volume-expression.js

@@ -12,12 +12,12 @@ const FFMPEG_TIME_VARIABLE = 't';
 const ffmpegIfOrElse = (condition, then, elseDo) => {
     return `if(${condition},${then},${elseDo})`;
 };
-const ffmpegIsOneOfFrames = (frames, fps) => {
+const ffmpegIsOneOfFrames = ({ frames, trimLeft, fps, }) => {
     const consecutiveArrays = [];
     for (let i = 0; i < frames.length; i++) {
         const previousFrame = frames[i - 1];
         const frame = frames[i];
-        if (!previousFrame || frame !== previousFrame + 1) {
+        if (previousFrame === undefined || frame !== previousFrame + 1) {
             consecutiveArrays.push([]);
         }
         consecutiveArrays[consecutiveArrays.length - 1].push(frame);
@@ -28,25 +28,22 @@ const ffmpegIsOneOfFrames = (frames, fps) => {
         const lastFrame = f[f.length - 1];
         const before = (firstFrame - 0.5) / fps;
         const after = (lastFrame + 0.5) / fps;
-        return `between(${FFMPEG_TIME_VARIABLE},${before.toFixed(4)},${after.toFixed(4)})`;
+        return `between(${FFMPEG_TIME_VARIABLE},${(before + trimLeft).toFixed(4)},${(after + trimLeft).toFixed(4)})`;
     })
         .join('+');
 };
-const ffmpegBuildVolumeExpression = (arr, fps) => {
+const ffmpegBuildVolumeExpression = (arr, delay, fps) => {
     if (arr.length === 0) {
         throw new Error('Volume array expression should never have length 0');
     }
     if (arr.length === 1) {
-        // FFMpeg tends to request volume for frames outside the range
-        // where the audio actually plays.
-        // If this is the case, we just return volume 0 to clip it.
-        return ffmpegIfOrElse(ffmpegIsOneOfFrames(arr[0][1], fps), String(arr[0][0]), String(0));
+        return String(arr[0][0]);
     }
     const [first, ...rest] = arr;
     const [volume, frames] = first;
-    return ffmpegIfOrElse(ffmpegIsOneOfFrames(frames, fps), String(volume), ffmpegBuildVolumeExpression(rest, fps));
+    return ffmpegIfOrElse(ffmpegIsOneOfFrames({ frames, trimLeft: delay, fps }), String(volume), ffmpegBuildVolumeExpression(rest, delay, fps));
 };
-const ffmpegVolumeExpression = ({ volume, startInVideo, fps, }) => {
+const ffmpegVolumeExpression = ({ volume, fps, trimLeft, }) => {
     // If it's a static volume, we return it and tell
     // FFMPEG it only has to evaluate it once
     if (typeof volume === 'number') {
@@ -58,22 +55,27 @@ const ffmpegVolumeExpression = ({ volume, startInVideo, fps, }) => {
     if ([...new Set(volume)].length === 1) {
         return (0, exports.ffmpegVolumeExpression)({
             volume: volume[0],
-            startInVideo,
             fps,
+            trimLeft,
         });
     }
+    // A 1 sec video with frames 0-29 would mean that
+    // frame 29 corresponds to timestamp 0.966666...
+    // but the audio is actually 1 sec long. For that reason we pad the last
+    // timestamp.
+    const paddedVolume = [...volume, volume[volume.length - 1]];
     // Otherwise, we construct an FFMPEG expression. First step:
     // Make a map of all possible volumes
     // {possibleVolume1} => [frame1, frame2]
     // {possibleVolume2} => [frame3, frame4]
     const volumeMap = {};
-    volume.forEach((baseVolume, frame) => {
+    paddedVolume.forEach((baseVolume, frame) => {
         // Adjust volume based on how many other tracks have not yet finished
         const actualVolume = (0, round_volume_to_avoid_stack_overflow_1.roundVolumeToAvoidStackOverflow)(Math.min(1, baseVolume));
         if (!volumeMap[actualVolume]) {
             volumeMap[actualVolume] = [];
         }
-        volumeMap[actualVolume].push(frame + startInVideo);
+        volumeMap[actualVolume].push(frame);
     });
     // Sort the map so that the most common volume is last
     // this is going to be the else statement so the expression is short
@@ -81,7 +83,7 @@ const ffmpegVolumeExpression = ({ volume, startInVideo, fps, }) => {
         .map((key) => [Number(key), volumeMap[key]])
         .sort((a, b) => a[1].length - b[1].length);
     // Construct and tell FFMPEG it has to evaluate expression on each frame
-    const expression = ffmpegBuildVolumeExpression(volumeArray, fps);
+    const expression = ffmpegBuildVolumeExpression(volumeArray, trimLeft, fps);
     return {
         eval: 'frame',
         value: `'${expression}'`,

package/dist/assets/ffmpeg-volume-expression.js.map

@@ -1 +1 @@
-{"version":3,"file":"ffmpeg-volume-expression.js","sourceRoot":"","sources":["../../src/assets/ffmpeg-volume-expression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ffmpeg-volume-expression.js","sourceRoot":"","sources":["../../src/assets/ffmpeg-volume-expression.ts"],"names":[],"mappings":"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"}

package/dist/assets/flatten-volume-array.d.ts

@@ -1,3 +1,3 @@
-import { AssetVolume, MediaAsset } from './types';
+import type { AssetVolume, MediaAsset } from './types';
 export declare const flattenVolumeArray: (volume: AssetVolume) => AssetVolume;
 export declare const convertAssetToFlattenedVolume: (asset: MediaAsset) => MediaAsset;

package/dist/assets/get-asset-audio-details.d.ts

@@ -0,0 +1,5 @@
+import { AssetAudioDetails } from './types';
+export declare function getAssetAudioDetails(options: {
+    assetPaths: string[];
+}): Promise<Map<string, AssetAudioDetails>>;
+//# sourceMappingURL=get-asset-audio-details.d.ts.map

package/dist/assets/get-asset-audio-details.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-asset-audio-details.d.ts","sourceRoot":"","sources":["../../src/assets/get-asset-audio-details.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,iBAAiB,EAAC,MAAM,SAAS,CAAC;AAE1C,wBAAsB,oBAAoB,CAAC,OAAO,EAAE;IACnD,UAAU,EAAE,MAAM,EAAE,CAAC;CACrB,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAgB1C"}

package/dist/assets/get-asset-audio-details.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAssetAudioDetails = void 0;
+const p_limit_1 = __importDefault(require("p-limit"));
+const get_audio_channels_1 = require("./get-audio-channels");
+async function getAssetAudioDetails(options) {
+    const uniqueAssets = [...new Set(options.assetPaths)];
+    const actualParallelism = 2;
+    const parallelLimit = (0, p_limit_1.default)(actualParallelism);
+    const audioChannelTasks = uniqueAssets.map((path) => parallelLimit(() => (0, get_audio_channels_1.getAudioChannels)(path)));
+    const result = await Promise.all(audioChannelTasks);
+    const mappedResults = result.map((channels, index) => {
+        return [uniqueAssets[index], { channels }];
+    });
+    return new Map(mappedResults);
+}
+exports.getAssetAudioDetails = getAssetAudioDetails;
+//# sourceMappingURL=get-asset-audio-details.js.map

package/dist/assets/get-asset-audio-details.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-asset-audio-details.js","sourceRoot":"","sources":["../../src/assets/get-asset-audio-details.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAC7B,6DAAsD;AAG/C,KAAK,UAAU,oBAAoB,CAAC,OAE1C;IACA,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IACtD,MAAM,iBAAiB,GAAG,CAAC,CAAC;IAC5B,MAAM,aAAa,GAAG,IAAA,iBAAM,EAAC,iBAAiB,CAAC,CAAC;IAChD,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACnD,aAAa,CAAC,GAAG,EAAE,CAAC,IAAA,qCAAgB,EAAC,IAAI,CAAC,CAAC,CAC3C,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAkC,MAAM,CAAC,GAAG,CAC9D,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;QACnB,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAC,QAAQ,EAAC,CAAC,CAAC;IAC1C,CAAC,CACD,CAAC;IAEF,OAAO,IAAI,GAAG,CAA4B,aAAa,CAAC,CAAC;AAC1D,CAAC;AAlBD,oDAkBC"}

package/dist/assets/get-audio-channels.d.ts

@@ -1,4 +1,7 @@
-export declare function getAudioChannelsAndDuration(path: string): Promise<{
+import type { FfmpegExecutable } from 'remotion';
+declare type Result = {
     channels: number;
     duration: number | null;
-}>;
+};
+export declare const getAudioChannelsAndDuration: (src: string, ffprobeExecutable: FfmpegExecutable) => Promise<Result>;
+export {};

package/dist/assets/get-audio-channels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-audio-channels.d.ts","sourceRoot":"","sources":["../../src/assets/get-audio-channels.ts"],"names":[],"mappings":"AAEA,wBAAsB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACxE,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,CAAC,CAmBD"}
+{"version":3,"file":"get-audio-channels.d.ts","sourceRoot":"","sources":["../../src/assets/get-audio-channels.ts"],"names":[],"mappings":"AAEA,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,mBAqBlD"}