@remotion/renderer 4.0.0-alpha.4 → 4.0.0-alpha4

package/LICENSE.md

@@ -1,34 +1,34 @@
 # Remotion License
 
-Depending on the type of your legal entity, you are granted permission to use Remotion for your project. Individuals and small companies are allowed to use Remotion create videos for free (even commercial), while a company license is required for for-profit organisations of a certain size. This two-tier system was designed to ensure funding for this project while still allowing the source code to be available and the program to be free for most. Read below for the exact terms of use.
+Depending on the type of your legal entity, you are granted permission to use Remotion for your project. Individuals and small companies are allowed to use Remotion to create videos for free (even commercial), while a company license is required for for-profit organizations of a certain size. This two-tier system was designed to ensure funding for this project while still allowing the source code to be available and the program to be free for most. Read below for the exact terms of use.
 
 - [Free license](#free-license)
 - [Company license](#company-license)
 
 ## Free license
 
-Copyright © 2022 [Jonny Burger](https://jonny.io)
+Copyright © 2023 [Remotion](https://www.remotion.dev/)
 
 ### Eligibility
 
 You are eligible to use Remotion for free if you are:
 
 - an individual
-- a for-profit organisation with up to 3 employees
-- a non-profit or not-for-profit organisation
+- a for-profit organization with up to 3 employees
+- a non-profit or not-for-profit organization
 - evaluating whether Remotion is a good fit, and are not yet using it in a commercial way
 
 ### Allowed use cases
 
-Permission is hereby granted, free of charge, to any person eligible for the "Free license", to use the software non-commercially or commercially for the purpose of creating videos and images and to modify and the software to their own liking, for the purpose of fulfilling their custom use case or to contribute bug fixes or improvements back to Remotion.
+Permission is hereby granted, free of charge, to any person eligible for the "Free license", to use the software non-commercially or commercially for the purpose of creating videos and images and to modify the software to their own liking, for the purpose of fulfilling their custom use case or to contribute bug fixes or improvements back to Remotion.
 
 ### Disallowed use cases
 
-It is not allowed to copy or modify Remotion code for the purpose of selling, renting, licensing, relicensing, sublicensing your own derivate of Remotion.
+It is not allowed to copy or modify Remotion code for the purpose of selling, renting, licensing, relicensing, or sublicensing your own derivate of Remotion.
 
 ### Warranty notice
 
-The software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the author or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software.
+The software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and non-infringement. In no event shall the author or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software.
 
 ### Support
 
@@ -36,6 +36,6 @@ Support is provided on a best-we-can-do basis via GitHub Issues and Discord.
 
 ## Company license
 
-You are required to obtain a company license to use Remotion if you are not within the group of entities eligible for a free license. This license will enable you to use Remotion for the allowed use cases specified in the free license, and give you access to prioritized support.
+You are required to obtain a company license to use Remotion if you are not within the group of entities eligible for a free license. This license will enable you to use Remotion for the allowed use cases specified in the free license, and give you access to prioritized support (read the [Support Policy](/docs/support)).
 
 Visit [companies.remotion.dev](https://companies.remotion.dev) for pricing and to buy a license.

package/README.md

@@ -0,0 +1,47 @@
+# Rust development
+
+To participate in the development of the Rust parts of Remotion, you need to do additional steps. If you don't want to change the Rust code, you don't have to set anything up.
+
+## Setup
+
+These are instructions for macOS. Contributions for other platforms are appreciated.
+
+First, install Cargo, if you don't have it, or upgrade to a version that supports `edition-2021`:
+
+```
+curl https://sh.rustup.rs -sSf | sh
+```
+
+Second, install components that allow for cross-compilation:
+
+```sh
+sh install_platforms.sh
+```
+
+Third, install linkers for cross compilation:
+
+```sh
+brew install MaterializeInc/crosstools/x86_64-unknown-linux-gnu
+brew install MaterializeInc/crosstools/aarch64-unknown-linux-gnu
+brew install messense/macos-cross-toolchains/x86_64-unknown-linux-musl
+brew install messense/macos-cross-toolchains/aarch64-unknown-linux-musl
+brew install mingw-w64
+```
+
+> This will take a few minutes.
+
+## Building
+
+To build the Rust parts for your operating system, run:
+
+```
+node build.mjs
+```
+
+To build the Rust binaries for all supported platforms, run:
+
+```
+node build.mjs --all
+```
+
+The resulting artifacts should be checked into Git.

package/client.d.ts

@@ -0,0 +1 @@
+export * from './dist/client';

package/client.js

@@ -0,0 +1 @@
+module.exports = require('./dist/client');

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

@@ -42,6 +42,7 @@ const calculateAssetPositions = (frames) => {
                     trimLeft: asset.mediaFrame,
                     volume: [],
                     playbackRate: asset.playbackRate,
+                    allowAmplificationDuringRender: asset.allowAmplificationDuringRender,
                 });
             }
             const found = assets.find((a) => a.duration === null && areEqual(a, asset));

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

@@ -11,10 +11,11 @@ export declare const downloadAsset: ({ src, onDownload, downloadMap, }: {
     downloadMap: DownloadMap;
 }) => Promise<string>;
 export declare const markAllAssetsAsDownloaded: (downloadMap: DownloadMap) => void;
-export declare const getSanitizedFilenameForAssetUrl: ({ src, downloadDir, contentDisposition, }: {
+export declare const getSanitizedFilenameForAssetUrl: ({ src, downloadDir, contentDisposition, contentType, }: {
     src: string;
     downloadDir: string;
     contentDisposition: string | null;
+    contentType: string | null;
 }) => string;
 export declare const downloadAndMapAssetsToFileUrl: ({ asset, onDownload, downloadMap, }: {
     asset: TAsset;

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

@@ -1,18 +1,45 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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 = exports.downloadAsset = void 0;
 const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const path_1 = __importStar(require("path"));
 const remotion_1 = require("remotion");
 const compress_assets_1 = require("../compress-assets");
 const ensure_output_directory_1 = require("../ensure-output-directory");
+const mime_types_1 = require("../mime-types");
 const download_file_1 = require("./download-file");
 const sanitize_filepath_1 = require("./sanitize-filepath");
 const waitForAssetToBeDownloaded = ({ src, downloadDir, downloadMap, }) => {
     var _a, _b;
+    if (process.env.NODE_ENV === 'test') {
+        console.log('waiting for asset to be downloaded', src);
+    }
     if ((_a = downloadMap.hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]) {
         return Promise.resolve((_b = downloadMap.hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir]);
     }
@@ -115,14 +142,11 @@ const downloadAsset = async ({ src, onDownload, downloadMap, }) => {
         downloadMap.isDownloadingMap[src] = {};
     }
     downloadMap.isDownloadingMap[src][downloadDir] = true;
+    if (process.env.NODE_ENV === 'test') {
+        console.log('Actually downloading asset', src);
+    }
     const onProgress = onDownload(src);
     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 = [
@@ -136,6 +160,13 @@ const downloadAsset = async ({ src, onDownload, downloadMap, }) => {
         const [mimeType, encoding] = assetDetails.split(';');
         validateMimeType(mimeType, src);
         validateBufferEncoding(encoding, src);
+        const output = (0, exports.getSanitizedFilenameForAssetUrl)({
+            contentDisposition: null,
+            downloadDir,
+            src,
+            contentType: mimeType,
+        });
+        (0, ensure_output_directory_1.ensureOutputDirectory)(output);
         const buff = Buffer.from(assetData, encoding);
         await fs_1.default.promises.writeFile(output, buff);
         notifyAssetIsDownloaded({ src, downloadMap, downloadDir, to: output });
@@ -146,7 +177,12 @@ const downloadAsset = async ({ src, onDownload, downloadMap, }) => {
         onProgress: (progress) => {
             onProgress === null || onProgress === void 0 ? void 0 : onProgress(progress);
         },
-        to: (contentDisposition) => (0, exports.getSanitizedFilenameForAssetUrl)({ contentDisposition, downloadDir, src }),
+        to: (contentDisposition, contentType) => (0, exports.getSanitizedFilenameForAssetUrl)({
+            contentDisposition,
+            downloadDir,
+            src,
+            contentType,
+        }),
     });
     notifyAssetIsDownloaded({ src, downloadMap, downloadDir, to });
     return to;
@@ -161,7 +197,7 @@ const markAllAssetsAsDownloaded = (downloadMap) => {
     });
 };
 exports.markAllAssetsAsDownloaded = markAllAssetsAsDownloaded;
-const getFilename = ({ contentDisposition, src, }) => {
+const getFilename = ({ contentDisposition, src, contentType, }) => {
     const filenameProbe = 'filename=';
     if (contentDisposition === null || contentDisposition === void 0 ? void 0 : contentDisposition.includes(filenameProbe)) {
         const start = contentDisposition.indexOf(filenameProbe);
@@ -176,13 +212,26 @@ const getFilename = ({ contentDisposition, src, }) => {
         };
     }
     const { pathname, search } = new URL(src);
+    const ext = (0, path_1.extname)(pathname);
+    // Has no file extension, check if we can derive it from contentType
+    if (!ext && contentType) {
+        const matchedExt = (0, mime_types_1.getExt)(contentType);
+        return {
+            pathname: `${pathname}.${matchedExt}`,
+            search,
+        };
+    }
     return { pathname, search };
 };
-const getSanitizedFilenameForAssetUrl = ({ src, downloadDir, contentDisposition, }) => {
+const getSanitizedFilenameForAssetUrl = ({ src, downloadDir, contentDisposition, contentType, }) => {
     if ((0, compress_assets_1.isAssetCompressed)(src)) {
         return src;
     }
-    const { pathname, search } = getFilename({ contentDisposition, src });
+    const { pathname, search } = getFilename({
+        contentDisposition,
+        contentType,
+        src,
+    });
     const split = pathname.split('.');
     const fileExtension = split.length > 1 && split[split.length - 1]
         ? `.${split[split.length - 1]}`

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

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

package/dist/assets/download-file.js

@@ -6,11 +6,41 @@ const ensure_output_directory_1 = require("../ensure-output-directory");
 const read_file_1 = require("./read-file");
 const downloadFile = ({ onProgress, url, to: toFn, }) => {
     return new Promise((resolve, reject) => {
+        let rejected = false;
+        let resolved = false;
+        let timeout;
+        const resolveAndFlag = (val) => {
+            resolved = true;
+            resolve(val);
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+        };
+        const rejectAndFlag = (err) => {
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+            reject(err);
+            rejected = true;
+        };
+        const refreshTimeout = () => {
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+            timeout = setTimeout(() => {
+                if (resolved) {
+                    return;
+                }
+                rejectAndFlag(new Error(`Tried to download file ${url}, but the server sent no data for 20 seconds`));
+            }, 20000);
+        };
+        refreshTimeout();
         (0, read_file_1.readFile)(url)
             .then((res) => {
-            var _a;
+            var _a, _b;
             const contentDisposition = (_a = res.headers['content-disposition']) !== null && _a !== void 0 ? _a : null;
-            const to = toFn(contentDisposition);
+            const contentType = (_b = res.headers['content-type']) !== null && _b !== void 0 ? _b : null;
+            const to = toFn(contentDisposition, contentType);
             (0, ensure_output_directory_1.ensureOutputDirectory)(to);
             const sizeHeader = res.headers['content-length'];
             const totalSize = typeof sizeHeader === 'undefined' ? null : Number(sizeHeader);
@@ -20,26 +50,39 @@ const downloadFile = ({ onProgress, url, to: toFn, }) => {
             // concise method to avoid this problem
             // https://github.com/remotion-dev/remotion/issues/384#issuecomment-844398183
             writeStream.on('close', () => {
+                if (rejected) {
+                    return;
+                }
                 onProgress === null || onProgress === void 0 ? void 0 : onProgress({
                     downloaded,
                     percent: 1,
                     totalSize: downloaded,
                 });
-                return resolve({ sizeInBytes: downloaded, to });
+                refreshTimeout();
+                return resolveAndFlag({ sizeInBytes: downloaded, to });
             });
-            writeStream.on('error', (err) => reject(err));
-            res.pipe(writeStream).on('error', (err) => reject(err));
+            writeStream.on('error', (err) => rejectAndFlag(err));
+            res.on('error', (err) => rejectAndFlag(err));
+            res.pipe(writeStream).on('error', (err) => rejectAndFlag(err));
             res.on('data', (d) => {
+                refreshTimeout();
                 downloaded += d.length;
+                refreshTimeout();
                 onProgress === null || onProgress === void 0 ? void 0 : onProgress({
                     downloaded,
                     percent: totalSize === null ? null : downloaded / totalSize,
                     totalSize,
                 });
             });
+            res.on('close', () => {
+                if (totalSize !== null && downloaded !== totalSize) {
+                    rejectAndFlag(new Error(`Download finished with ${downloaded} bytes, but expected ${totalSize} bytes from 'Content-Length'.`));
+                }
+                writeStream.close();
+            });
         })
             .catch((err) => {
-            reject(err);
+            rejectAndFlag(err);
         });
     });
 };

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

@@ -7,9 +7,10 @@ declare type EncodingStatus = {
     src: string;
 } | undefined;
 export declare type SpecialVCodecForTransparency = 'vp9' | 'vp8' | 'none';
+export declare type NeedsResize = [number, number] | null;
 export declare type Vp9Result = {
-    specialVcodec: SpecialVCodecForTransparency;
-    needsResize: [number, number] | null;
+    specialVcodecForTransparency: SpecialVCodecForTransparency;
+    needsResize: NeedsResize;
 };
 export declare type VideoDurationResult = {
     duration: number | null;
@@ -52,6 +53,10 @@ export declare type DownloadMap = {
     audioPreprocessing: string;
     stitchFrames: string;
     assetDir: string;
+    compositingDir: string;
+    compositorCache: {
+        [key: string]: string;
+    };
 };
 export declare type RenderAssetInfo = {
     assets: TAsset[][];
@@ -60,5 +65,5 @@ export declare type RenderAssetInfo = {
     downloadMap: DownloadMap;
 };
 export declare const makeDownloadMap: () => DownloadMap;
-export declare const cleanDownloadMap: (downloadMap: DownloadMap) => Promise<void>;
+export declare const cleanDownloadMap: (downloadMap: DownloadMap) => void;
 export {};

package/dist/assets/download-map.js

@@ -62,12 +62,16 @@ const makeDownloadMap = () => {
         audioMixing: makeAndReturn(dir, 'remotion-audio-mixing'),
         audioPreprocessing: makeAndReturn(dir, 'remotion-audio-preprocessing'),
         stitchFrames: makeAndReturn(dir, 'remotion-stitch-temp-dir'),
+        compositingDir: makeAndReturn(dir, 'remotion-compositing-temp-dir'),
+        compositorCache: {},
     };
 };
 exports.makeDownloadMap = makeDownloadMap;
-const cleanDownloadMap = async (downloadMap) => {
-    await (0, delete_directory_1.deleteDirectory)(downloadMap.downloadDir);
-    await (0, delete_directory_1.deleteDirectory)(downloadMap.complexFilter);
-    await (0, delete_directory_1.deleteDirectory)(downloadMap.assetDir);
+const cleanDownloadMap = (downloadMap) => {
+    (0, delete_directory_1.deleteDirectory)(downloadMap.downloadDir);
+    (0, delete_directory_1.deleteDirectory)(downloadMap.complexFilter);
+    (0, delete_directory_1.deleteDirectory)(downloadMap.compositingDir);
+    // Assets dir must be last since the others are contained
+    (0, delete_directory_1.deleteDirectory)(downloadMap.assetDir);
 };
 exports.cleanDownloadMap = cleanDownloadMap;

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

@@ -4,9 +4,10 @@ declare type FfmpegVolumeExpression = {
     eval: FfmpegEval;
     value: string;
 };
-export declare const ffmpegVolumeExpression: ({ volume, fps, trimLeft, }: {
+export declare const ffmpegVolumeExpression: ({ volume, fps, trimLeft, allowAmplificationDuringRender, }: {
     volume: AssetVolume;
     trimLeft: number;
     fps: number;
+    allowAmplificationDuringRender: boolean;
 }) => FfmpegVolumeExpression;
 export {};

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

@@ -43,13 +43,14 @@ const ffmpegBuildVolumeExpression = (arr, delay, fps) => {
     const [volume, frames] = first;
     return ffmpegIfOrElse(ffmpegIsOneOfFrames({ frames, trimLeft: delay, fps }), String(volume), ffmpegBuildVolumeExpression(rest, delay, fps));
 };
-const ffmpegVolumeExpression = ({ volume, fps, trimLeft, }) => {
+const ffmpegVolumeExpression = ({ volume, fps, trimLeft, allowAmplificationDuringRender, }) => {
+    const maxVolume = allowAmplificationDuringRender ? Infinity : 1;
     // If it's a static volume, we return it and tell
     // FFMPEG it only has to evaluate it once
     if (typeof volume === 'number') {
         return {
             eval: 'once',
-            value: String(Math.min(1, volume)),
+            value: String(Math.min(maxVolume, volume)),
         };
     }
     if ([...new Set(volume)].length === 1) {
@@ -57,6 +58,7 @@ const ffmpegVolumeExpression = ({ volume, fps, trimLeft, }) => {
             volume: volume[0],
             fps,
             trimLeft,
+            allowAmplificationDuringRender,
         });
     }
     // A 1 sec video with frames 0-29 would mean that
@@ -71,7 +73,7 @@ const ffmpegVolumeExpression = ({ volume, fps, trimLeft, }) => {
     const volumeMap = {};
     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));
+        const actualVolume = (0, round_volume_to_avoid_stack_overflow_1.roundVolumeToAvoidStackOverflow)(Math.min(maxVolume, baseVolume));
         if (!volumeMap[actualVolume]) {
             volumeMap[actualVolume] = [];
         }

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

@@ -1,3 +1,3 @@
 import type { FfmpegExecutable } from '../ffmpeg-executable';
 import type { AudioChannelsAndDurationResultCache, DownloadMap } from './download-map';
-export declare const getAudioChannelsAndDuration: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable) => Promise<AudioChannelsAndDurationResultCache>;
+export declare const getAudioChannelsAndDuration: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable, remotionRoot: string) => Promise<AudioChannelsAndDurationResultCache>;

package/dist/assets/get-audio-channels.js

@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAudioChannelsAndDuration = void 0;
 const execa_1 = __importDefault(require("execa"));
+const ffmpeg_flags_1 = require("../ffmpeg-flags");
 const p_limit_1 = require("../p-limit");
 const limit = (0, p_limit_1.pLimit)(1);
-async function getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExecutable) {
+async function getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot) {
     if (downloadMap.durationOfAssetCache[src]) {
         return downloadMap.durationOfAssetCache[src];
     }
@@ -19,7 +20,7 @@ async function getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExe
     ]
         .reduce((acc, val) => acc.concat(val), [])
         .filter(Boolean);
-    const task = await (0, execa_1.default)(ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : 'ffprobe', args);
+    const task = await (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffprobeExecutable, remotionRoot, 'ffprobe'), args);
     const channels = task.stdout.match(/channels=([0-9]+)/);
     const duration = task.stdout.match(/duration=([0-9.]+)/);
     const result = {
@@ -29,7 +30,7 @@ async function getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExe
     downloadMap.durationOfAssetCache[src] = result;
     return result;
 }
-const getAudioChannelsAndDuration = (downloadMap, src, ffprobeExecutable) => {
-    return limit(() => getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExecutable));
+const getAudioChannelsAndDuration = (downloadMap, src, ffprobeExecutable, remotionRoot) => {
+    return limit(() => getAudioChannelsAndDurationUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot));
 };
 exports.getAudioChannelsAndDuration = getAudioChannelsAndDuration;

package/dist/assets/get-video-stream-duration.d.ts

@@ -1,3 +1,9 @@
 import type { FfmpegExecutable } from '../ffmpeg-executable';
 import type { DownloadMap, VideoDurationResult } from './download-map';
-export declare const getVideoStreamDuration: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable) => Promise<VideoDurationResult>;
+export declare const parseVideoStreamDuration: (stdout: string) => VideoDurationResult;
+export declare function getVideoStreamDurationwithoutCache({ src, ffprobeExecutable, remotionRoot, }: {
+    src: string;
+    ffprobeExecutable: FfmpegExecutable;
+    remotionRoot: string;
+}): Promise<VideoDurationResult>;
+export declare const getVideoStreamDuration: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable, remotionRoot: string) => Promise<VideoDurationResult>;

package/dist/assets/get-video-stream-duration.js

@@ -3,33 +3,69 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVideoStreamDuration = void 0;
+exports.getVideoStreamDuration = exports.getVideoStreamDurationwithoutCache = exports.parseVideoStreamDuration = void 0;
 const execa_1 = __importDefault(require("execa"));
+const ffmpeg_flags_1 = require("../ffmpeg-flags");
 const p_limit_1 = require("../p-limit");
 const limit = (0, p_limit_1.pLimit)(1);
-async function getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutable) {
-    if (downloadMap.videoDurationResultCache[src]) {
-        return downloadMap.videoDurationResultCache[src];
+const parseAlternativeDuration = (stdout) => {
+    const webmDuration = stdout.match(/TAG:DURATION=([0-9.]+):([0-9.]+):([0-9.]+)/);
+    if (!webmDuration) {
+        return null;
+    }
+    const [, hours, minutes, seconds] = webmDuration;
+    const hoursAsNumber = Number(hours);
+    if (Number.isNaN(hoursAsNumber)) {
+        return null;
+    }
+    const minutesAsNumber = Number(minutes);
+    if (Number.isNaN(minutesAsNumber)) {
+        return null;
+    }
+    const secondsAsNumber = Number(seconds);
+    if (Number.isNaN(secondsAsNumber)) {
+        return null;
     }
+    return secondsAsNumber + minutesAsNumber * 60 + hoursAsNumber * 3600;
+};
+const parseVideoStreamDuration = (stdout) => {
+    const duration = stdout.match(/duration=([0-9.]+)/);
+    const alternativeDuration = parseAlternativeDuration(stdout);
+    const fps = stdout.match(/r_frame_rate=([0-9.]+)\/([0-9.]+)/);
+    const result = {
+        duration: duration ? parseFloat(duration[1]) : alternativeDuration,
+        fps: fps ? parseInt(fps[1], 10) / parseInt(fps[2], 10) : null,
+    };
+    return result;
+};
+exports.parseVideoStreamDuration = parseVideoStreamDuration;
+async function getVideoStreamDurationwithoutCache({ src, ffprobeExecutable, remotionRoot, }) {
     const args = [
         ['-v', 'error'],
         ['-select_streams', 'v:0'],
-        ['-show_entries', 'stream=duration,r_frame_rate'],
+        ['-show_entries', 'stream'],
         [src],
     ]
         .reduce((acc, val) => acc.concat(val), [])
         .filter(Boolean);
-    const task = await (0, execa_1.default)(ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : 'ffprobe', args);
-    const duration = task.stdout.match(/duration=([0-9.]+)/);
-    const fps = task.stdout.match(/r_frame_rate=([0-9.]+)\/([0-9.]+)/);
-    const result = {
-        duration: duration ? parseFloat(duration[1]) : null,
-        fps: fps ? parseInt(fps[1], 10) / parseInt(fps[2], 10) : null,
-    };
+    const task = await (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffprobeExecutable, remotionRoot, 'ffprobe'), args);
+    const result = (0, exports.parseVideoStreamDuration)(task.stdout);
+    return result;
+}
+exports.getVideoStreamDurationwithoutCache = getVideoStreamDurationwithoutCache;
+async function getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot) {
+    if (downloadMap.videoDurationResultCache[src]) {
+        return downloadMap.videoDurationResultCache[src];
+    }
+    const result = await getVideoStreamDurationwithoutCache({
+        src,
+        ffprobeExecutable,
+        remotionRoot,
+    });
     downloadMap.videoDurationResultCache[src] = result;
     return result;
 }
-const getVideoStreamDuration = (downloadMap, src, ffprobeExecutable) => {
-    return limit(() => getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutable));
+const getVideoStreamDuration = (downloadMap, src, ffprobeExecutable, remotionRoot) => {
+    return limit(() => getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot));
 };
 exports.getVideoStreamDuration = getVideoStreamDuration;

package/dist/assets/read-file.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readFile = void 0;
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
+const redirect_status_codes_1 = require("../redirect-status-codes");
 const getClient = (url) => {
     if (url.startsWith('https://')) {
         return https_1.default.get;
@@ -29,10 +30,7 @@ const readFile = async (url, redirectsSoFar = 0) => {
         throw new Error(`Too many redirects while downloading ${url}`);
     }
     const file = await readFileWithoutRedirect(url);
-    if (file.statusCode === 302 ||
-        file.statusCode === 301 ||
-        file.statusCode === 307 ||
-        file.statusCode === 308) {
+    if (redirect_status_codes_1.redirectStatusCodes.includes(file.statusCode)) {
         if (!file.headers.location) {
             throw new Error(`Received a status code ${file.statusCode} but no "Location" header while calling ${file.headers.location}`);
         }