@remotion/renderer 3.0.0-wrappedup.220 → 3.0.0

package/dist/serve-static.js

@@ -11,31 +11,40 @@ const get_port_1 = require("./get-port");
 const serveStatic = async (path, options) => {
     var _a, _b;
     const port = await (0, get_port_1.getDesiredPort)((_b = (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : remotion_1.Internals.getServerPort()) !== null && _b !== void 0 ? _b : undefined, 3000, 3100);
-    const server = http_1.default
-        .createServer((request, response) => {
-        (0, serve_handler_1.default)(request, response, {
-            public: path,
-            directoryListing: false,
-            cleanUrls: false,
-        }).catch(() => {
-            response.statusCode = 500;
-            response.end('Error serving file');
-        });
-    })
-        .listen(port);
-    const close = () => {
-        return new Promise((resolve, reject) => {
-            server.close((err) => {
-                if (err) {
-                    reject(err);
-                }
-                else {
-                    resolve();
-                }
+    try {
+        const server = http_1.default
+            .createServer((request, response) => {
+            (0, serve_handler_1.default)(request, response, {
+                public: path,
+                directoryListing: false,
+                cleanUrls: false,
+            }).catch(() => {
+                response.statusCode = 500;
+                response.end('Error serving file');
             });
-        });
-    };
-    return { port, close };
+        })
+            .listen(port);
+        const close = () => {
+            return new Promise((resolve, reject) => {
+                server.close((err) => {
+                    if (err) {
+                        reject(err);
+                    }
+                    else {
+                        resolve();
+                    }
+                });
+            });
+        };
+        return { port, close };
+    }
+    catch (err) {
+        console.log({ err, msg: err.message });
+        if (err.message.includes('EADDRINUSE')) {
+            return (0, exports.serveStatic)(path, options);
+        }
+        throw err;
+    }
 };
 exports.serveStatic = serveStatic;
 //# sourceMappingURL=serve-static.js.map

package/dist/serve-static.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve-static.js","sourceRoot":"","sources":["../src/serve-static.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,uCAAmC;AACnC,kEAAoC;AACpC,yCAA0C;AAEnC,MAAM,WAAW,GAAG,KAAK,EAC/B,IAAY,EACZ,OAEC,EACA,EAAE;;IACH,MAAM,IAAI,GAAG,MAAM,IAAA,yBAAc,EAChC,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,mCAAI,oBAAS,CAAC,aAAa,EAAE,mCAAI,SAAS,EACvD,IAAI,EACJ,IAAI,CACJ,CAAC;IAEF,MAAM,MAAM,GAAG,cAAI;SACjB,YAAY,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;QACnC,IAAA,uBAAO,EAAC,OAAO,EAAE,QAAQ,EAAE;YAC1B,MAAM,EAAE,IAAI;YACZ,gBAAgB,EAAE,KAAK;YACvB,SAAS,EAAE,KAAK;SAChB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACb,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC;YAC1B,QAAQ,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;SACD,MAAM,CAAC,IAAI,CAAC,CAAC;IACf,MAAM,KAAK,GAAG,GAAG,EAAE;QAClB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5C,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACpB,IAAI,GAAG,EAAE;oBACR,MAAM,CAAC,GAAG,CAAC,CAAC;iBACZ;qBAAM;oBACN,OAAO,EAAE,CAAC;iBACV;YACF,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,CAAC;AACtB,CAAC,CAAC;AArCW,QAAA,WAAW,eAqCtB"}
+{"version":3,"file":"serve-static.js","sourceRoot":"","sources":["../src/serve-static.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,uCAAmC;AACnC,kEAAoC;AACpC,yCAA0C;AAEnC,MAAM,WAAW,GAAG,KAAK,EAC/B,IAAY,EACZ,OAEC,EAIC,EAAE;;IACJ,MAAM,IAAI,GAAG,MAAM,IAAA,yBAAc,EAChC,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,mCAAI,oBAAS,CAAC,aAAa,EAAE,mCAAI,SAAS,EACvD,IAAI,EACJ,IAAI,CACJ,CAAC;IAEF,IAAI;QACH,MAAM,MAAM,GAAG,cAAI;aACjB,YAAY,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;YACnC,IAAA,uBAAO,EAAC,OAAO,EAAE,QAAQ,EAAE;gBAC1B,MAAM,EAAE,IAAI;gBACZ,gBAAgB,EAAE,KAAK;gBACvB,SAAS,EAAE,KAAK;aAChB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gBACb,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC;gBAC1B,QAAQ,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;aACD,MAAM,CAAC,IAAI,CAAC,CAAC;QAEf,MAAM,KAAK,GAAG,GAAG,EAAE;YAClB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC5C,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACpB,IAAI,GAAG,EAAE;wBACR,MAAM,CAAC,GAAG,CAAC,CAAC;qBACZ;yBAAM;wBACN,OAAO,EAAE,CAAC;qBACV;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,OAAO,EAAC,IAAI,EAAE,KAAK,EAAC,CAAC;KACrB;IAAC,OAAO,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,CAAC,EAAC,GAAG,EAAE,GAAG,EAAG,GAAa,CAAC,OAAO,EAAC,CAAC,CAAC;QAChD,IAAK,GAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAClD,OAAO,IAAA,mBAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAClC;QAED,MAAM,GAAG,CAAC;KACV;AACF,CAAC,CAAC;AAlDW,QAAA,WAAW,eAkDtB"}

package/dist/set-props-and-env.d.ts

@@ -1,9 +1,10 @@
 import { Page } from 'puppeteer-core';
-export declare const setPropsAndEnv: ({ inputProps, envVariables, page, serveUrl, initialFrame, }: {
+export declare const setPropsAndEnv: ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, }: {
     inputProps: unknown;
     envVariables: Record<string, string> | undefined;
     page: Page;
     serveUrl: string;
     initialFrame: number;
+    timeoutInMilliseconds: number | undefined;
 }) => Promise<void>;
 //# sourceMappingURL=set-props-and-env.d.ts.map

package/dist/set-props-and-env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-props-and-env.d.ts","sourceRoot":"","sources":["../src/set-props-and-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAIpC,eAAO,MAAM,cAAc;gBAOd,OAAO;kBACL,OAAO,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;UAC1C,IAAI;cACA,MAAM;kBACF,MAAM;mBAiCpB,CAAC"}
+{"version":3,"file":"set-props-and-env.d.ts","sourceRoot":"","sources":["../src/set-props-and-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAMpC,eAAO,MAAM,cAAc;gBAQd,OAAO;kBACL,OAAO,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;UAC1C,IAAI;cACA,MAAM;kBACF,MAAM;2BACG,MAAM,GAAG,SAAS;mBAuFzC,CAAC"}

package/dist/set-props-and-env.js

@@ -3,22 +3,60 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setPropsAndEnv = void 0;
 const remotion_1 = require("remotion");
 const normalize_serve_url_1 = require("./normalize-serve-url");
-const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initialFrame, }) => {
-    if (inputProps || envVariables) {
-        await page.goto((0, normalize_serve_url_1.normalizeServeUrl)(serveUrl));
-        if (inputProps) {
-            await page.evaluate((key, input) => {
-                window.localStorage.setItem(key, input);
-            }, remotion_1.Internals.INPUT_PROPS_KEY, JSON.stringify(inputProps));
-        }
-        if (envVariables) {
-            await page.evaluate((key, input) => {
-                window.localStorage.setItem(key, input);
-            }, remotion_1.Internals.ENV_VARIABLES_LOCAL_STORAGE_KEY, JSON.stringify(envVariables));
-        }
-        await page.evaluate((key, value) => {
-            window.localStorage.setItem(key, value);
-        }, remotion_1.Internals.INITIAL_FRAME_LOCAL_STORAGE_KEY, initialFrame);
+const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
+const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
+const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, }) => {
+    (0, validate_puppeteer_timeout_1.validatePuppeteerTimeout)(timeoutInMilliseconds);
+    const actualTimeout = timeoutInMilliseconds !== null && timeoutInMilliseconds !== void 0 ? timeoutInMilliseconds : remotion_1.Internals.DEFAULT_PUPPETEER_TIMEOUT;
+    page.setDefaultTimeout(actualTimeout);
+    page.setDefaultNavigationTimeout(actualTimeout);
+    const urlToVisit = (0, normalize_serve_url_1.normalizeServeUrl)(serveUrl);
+    await page.evaluateOnNewDocument((timeout) => {
+        window.remotion_puppeteerTimeout = timeout;
+    }, [actualTimeout]);
+    if (inputProps) {
+        await page.evaluateOnNewDocument((input) => {
+            window.remotion_inputProps = input;
+        }, [JSON.stringify(inputProps)]);
+    }
+    if (envVariables) {
+        await page.evaluateOnNewDocument((input) => {
+            window.remotion_envVariables = input;
+        }, [JSON.stringify(envVariables)]);
+    }
+    await page.evaluateOnNewDocument((key, value) => {
+        window.localStorage.setItem(key, value);
+    }, [remotion_1.Internals.INITIAL_FRAME_LOCAL_STORAGE_KEY, initialFrame]);
+    const pageRes = await page.goto(urlToVisit);
+    const status = pageRes.status();
+    if (status !== 200 &&
+        status !== 301 &&
+        status !== 302 &&
+        status !== 303 &&
+        status !== 304) {
+        throw new Error(`Error while getting compositions: Tried to go to ${urlToVisit} but the status code was ${status} instead of 200. Does the site you specified exist?`);
+    }
+    const isRemotionFn = await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
+        pageFunction: () => {
+            return window.getStaticCompositions;
+        },
+        args: [],
+        frame: null,
+        page,
+    });
+    if (isRemotionFn === undefined) {
+        throw new Error(`Error while getting compositions: Tried to go to ${urlToVisit} and verify that it is a Remotion project by checking if window.getStaticCompositions is defined. However, the function was undefined, which indicates that this is not a valid Remotion project. Please check the URL you passed.`);
+    }
+    const siteVersion = await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
+        pageFunction: () => {
+            return window.siteVersion;
+        },
+        args: [],
+        frame: null,
+        page,
+    });
+    if (siteVersion !== '2') {
+        throw new Error(`Incompatible site: When visiting ${urlToVisit}, a bundle was found, but one that is not compatible with this version of Remotion. The bundle format changed in versions from March 2022 onwards. To resolve this error, please bundle and deploy again.`);
     }
 };
 exports.setPropsAndEnv = setPropsAndEnv;

package/dist/set-props-and-env.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-props-and-env.js","sourceRoot":"","sources":["../src/set-props-and-env.ts"],"names":[],"mappings":";;;AACA,uCAAmC;AACnC,+DAAwD;AAEjD,MAAM,cAAc,GAAG,KAAK,EAAE,EACpC,UAAU,EACV,YAAY,EACZ,IAAI,EACJ,QAAQ,EACR,YAAY,GAOZ,EAAE,EAAE;IACJ,IAAI,UAAU,IAAI,YAAY,EAAE;QAC/B,MAAM,IAAI,CAAC,IAAI,CAAC,IAAA,uCAAiB,EAAC,QAAQ,CAAC,CAAC,CAAC;QAE7C,IAAI,UAAU,EAAE;YACf,MAAM,IAAI,CAAC,QAAQ,CAClB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACd,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACzC,CAAC,EACD,oBAAS,CAAC,eAAe,EACzB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAC1B,CAAC;SACF;QAED,IAAI,YAAY,EAAE;YACjB,MAAM,IAAI,CAAC,QAAQ,CAClB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACd,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACzC,CAAC,EACD,oBAAS,CAAC,+BAA+B,EACzC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAC5B,CAAC;SACF;QAED,MAAM,IAAI,CAAC,QAAQ,CAClB,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YACd,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC,EACD,oBAAS,CAAC,+BAA+B,EACzC,YAAY,CACZ,CAAC;KACF;AACF,CAAC,CAAC;AA5CW,QAAA,cAAc,kBA4CzB"}
+{"version":3,"file":"set-props-and-env.js","sourceRoot":"","sources":["../src/set-props-and-env.ts"],"names":[],"mappings":";;;AACA,uCAAmC;AACnC,+DAAwD;AACxD,6DAAgE;AAChE,6EAAsE;AAE/D,MAAM,cAAc,GAAG,KAAK,EAAE,EACpC,UAAU,EACV,YAAY,EACZ,IAAI,EACJ,QAAQ,EACR,YAAY,EACZ,qBAAqB,GAQrB,EAAE,EAAE;IACJ,IAAA,qDAAwB,EAAC,qBAAqB,CAAC,CAAC;IAChD,MAAM,aAAa,GAClB,qBAAqB,aAArB,qBAAqB,cAArB,qBAAqB,GAAI,oBAAS,CAAC,yBAAyB,CAAC;IAC9D,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACtC,IAAI,CAAC,2BAA2B,CAAC,aAAa,CAAC,CAAC;IAEhD,MAAM,UAAU,GAAG,IAAA,uCAAiB,EAAC,QAAQ,CAAC,CAAC;IAE/C,MAAM,IAAI,CAAC,qBAAqB,CAC/B,CAAC,OAAe,EAAE,EAAE;QACnB,MAAM,CAAC,yBAAyB,GAAG,OAAO,CAAC;IAC5C,CAAC,EACD,CAAC,aAAa,CAAC,CACf,CAAC;IAEF,IAAI,UAAU,EAAE;QACf,MAAM,IAAI,CAAC,qBAAqB,CAC/B,CAAC,KAAa,EAAE,EAAE;YACjB,MAAM,CAAC,mBAAmB,GAAG,KAAK,CAAC;QACpC,CAAC,EACD,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAC5B,CAAC;KACF;IAED,IAAI,YAAY,EAAE;QACjB,MAAM,IAAI,CAAC,qBAAqB,CAC/B,CAAC,KAAa,EAAE,EAAE;YACjB,MAAM,CAAC,qBAAqB,GAAG,KAAK,CAAC;QACtC,CAAC,EACD,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAC9B,CAAC;KACF;IAED,MAAM,IAAI,CAAC,qBAAqB,CAC/B,CAAC,GAAW,EAAE,KAAa,EAAE,EAAE;QAC9B,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC,EACD,CAAC,oBAAS,CAAC,+BAA+B,EAAE,YAAY,CAAC,CACzD,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAE5C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAChC,IACC,MAAM,KAAK,GAAG;QACd,MAAM,KAAK,GAAG;QACd,MAAM,KAAK,GAAG;QACd,MAAM,KAAK,GAAG;QACd,MAAM,KAAK,GAAG,EACb;QACD,MAAM,IAAI,KAAK,CACd,oDAAoD,UAAU,4BAA4B,MAAM,qDAAqD,CACrJ,CAAC;KACF;IAED,MAAM,YAAY,GAAG,MAAM,IAAA,+CAA0B,EAEnD;QACD,YAAY,EAAE,GAAG,EAAE;YAClB,OAAO,MAAM,CAAC,qBAAqB,CAAC;QACrC,CAAC;QACD,IAAI,EAAE,EAAE;QACR,KAAK,EAAE,IAAI;QACX,IAAI;KACJ,CAAC,CAAC;IACH,IAAI,YAAY,KAAK,SAAS,EAAE;QAC/B,MAAM,IAAI,KAAK,CACd,oDAAoD,UAAU,oOAAoO,CAClS,CAAC;KACF;IAED,MAAM,WAAW,GAAG,MAAM,IAAA,+CAA0B,EAAM;QACzD,YAAY,EAAE,GAAG,EAAE;YAClB,OAAO,MAAM,CAAC,WAAW,CAAC;QAC3B,CAAC;QACD,IAAI,EAAE,EAAE;QACR,KAAK,EAAE,IAAI;QACX,IAAI;KACJ,CAAC,CAAC;IAEH,IAAI,WAAW,KAAK,GAAG,EAAE;QACxB,MAAM,IAAI,KAAK,CACd,oCAAoC,UAAU,2MAA2M,CACzP,CAAC;KACF;AACF,CAAC,CAAC;AApGW,QAAA,cAAc,kBAoGzB"}

package/dist/stitcher.d.ts

@@ -1,5 +1,5 @@
 import execa from 'execa';
-import { Codec, FfmpegExecutable, PixelFormat, ProResProfile, RenderAssetInfo } from 'remotion';
+import { Codec, FfmpegExecutable, ImageFormat, PixelFormat, ProResProfile, RenderAssetInfo } from 'remotion';
 import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 export declare type StitcherOptions = {
     fps: number;
@@ -15,13 +15,18 @@ export declare type StitcherOptions = {
     onDownload?: RenderMediaOnDownload;
     proResProfile?: ProResProfile;
     verbose?: boolean;
-    parallelEncoding?: boolean;
-    preEncodedFileLocation?: string | null;
     ffmpegExecutable?: FfmpegExecutable;
+    dir?: string;
+    internalOptions?: {
+        preEncodedFileLocation: string | null;
+        parallelEncoding: boolean;
+        imageFormat: ImageFormat;
+    };
 };
 export declare const spawnFfmpeg: (options: StitcherOptions) => Promise<{
     task: execa.ExecaChildProcess<string>;
     cleanup: (() => void) | undefined;
+    getLogs: () => string;
 }>;
 export declare const stitchFramesToVideo: (options: StitcherOptions) => Promise<void>;
 //# sourceMappingURL=stitcher.d.ts.map

package/dist/stitcher.d.ts.map

@@ -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;AAclD,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"}
+{"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,EAChB,WAAW,EAEX,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,gBAAgB,CAAC;IACpC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE;QACjB,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;QACtC,gBAAgB,EAAE,OAAO,CAAC;QAC1B,WAAW,EAAE,WAAW,CAAC;KACzB,CAAC;CACF,CAAC;AA+CF,eAAO,MAAM,WAAW,YAAmB,eAAe;;;;EA0JzD,CAAC;AAEF,eAAO,MAAM,mBAAmB,YACtB,eAAe,KACtB,QAAQ,IAAI,CASd,CAAC"}

package/dist/stitcher.js

@@ -17,7 +17,6 @@ const get_audio_codec_name_1 = require("./get-audio-codec-name");
 const get_codec_name_1 = require("./get-codec-name");
 const get_prores_profile_name_1 = require("./get-prores-profile-name");
 const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
-const resolve_asset_src_1 = require("./resolve-asset-src");
 const sample_rate_1 = require("./sample-rate");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
 const validate_ffmpeg_1 = require("./validate-ffmpeg");
@@ -35,9 +34,9 @@ const getAssetsData = async (options) => {
         : null);
     (0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
     const assetPositions = fileUrlAssets === null ? [] : (0, calculate_asset_positions_1.calculateAssetPositions)(fileUrlAssets);
-    const assetPaths = assetPositions.map((asset) => (0, resolve_asset_src_1.resolveAssetSrc)(asset.src));
+    (0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
     const assetAudioDetails = await (0, get_asset_audio_details_1.getAssetAudioDetails)({
-        assetPaths,
+        assetPaths: assetPositions.map((a) => a.src),
     });
     const filters = (0, calculate_ffmpeg_filters_1.calculateFfmpegFilters)({
         assetAudioDetails,
@@ -55,11 +54,11 @@ const getAssetsData = async (options) => {
     return {
         complexFilterFlag,
         cleanup,
-        assetPaths,
+        assetPositions,
     };
 };
 const spawnFfmpeg = async (options) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateFps(options.fps, 'passed to `stitchFramesToVideo()`');
@@ -68,6 +67,7 @@ const spawnFfmpeg = async (options) => {
         width: options.width,
         height: options.height,
         codec,
+        scale: 1,
     });
     const crf = (_b = options.crf) !== null && _b !== void 0 ? _b : remotion_1.Internals.getDefaultCrfForCodec(codec);
     const pixelFormat = (_c = options.pixelFormat) !== null && _c !== void 0 ? _c : remotion_1.Internals.DEFAULT_PIXEL_FORMAT;
@@ -91,15 +91,22 @@ const spawnFfmpeg = async (options) => {
     }
     remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
     remotion_1.Internals.validateSelectedPixelFormatAndCodecCombination(pixelFormat, codec);
-    const { complexFilterFlag = undefined, cleanup = undefined, assetPaths = undefined, } = options.parallelEncoding ? {} : await getAssetsData(options);
+    const { complexFilterFlag = undefined, cleanup = undefined, assetPositions = undefined, } = ((_f = options.internalOptions) === null || _f === void 0 ? void 0 : _f.parallelEncoding)
+        ? {}
+        : await getAssetsData(options);
     const ffmpegArgs = [
         ['-r', String(options.fps)],
-        ...(options.preEncodedFileLocation
-            ? [['-i', options.preEncodedFileLocation]]
+        ...(((_g = options.internalOptions) === null || _g === void 0 ? void 0 : _g.preEncodedFileLocation)
+            ? [['-i', (_h = options.internalOptions) === null || _h === void 0 ? void 0 : _h.preEncodedFileLocation]]
             : isAudioOnly
                 ? []
                 : [
-                    ['-f', options.parallelEncoding ? 'image2pipe' : 'image2'],
+                    [
+                        '-f',
+                        ((_j = options.internalOptions) === null || _j === void 0 ? void 0 : _j.parallelEncoding)
+                            ? ['image2pipe']
+                            : 'image2',
+                    ],
                     ['-s', `${options.width}x${options.height}`],
                     options.assetsInfo
                         ? ['-start_number', String(options.assetsInfo.firstFrameIndex)]
@@ -107,25 +114,33 @@ const spawnFfmpeg = async (options) => {
                     options.assetsInfo
                         ? ['-i', options.assetsInfo.imageSequenceName]
                         : null,
-                    options.parallelEncoding ? ['-i', '-'] : null,
+                    // If scale is very small (like 0.1), FFMPEG cannot figure out the image
+                    // format on it's own and we need to hint the format
+                    ((_k = options.internalOptions) === null || _k === void 0 ? void 0 : _k.parallelEncoding)
+                        ? [
+                            '-vcodec',
+                            options.internalOptions.imageFormat === 'jpeg'
+                                ? 'mjpeg'
+                                : 'png',
+                        ]
+                        : null,
+                    ((_l = options.internalOptions) === null || _l === void 0 ? void 0 : _l.parallelEncoding) ? ['-i', '-'] : null,
                 ]),
-        ...(options.assetsInfo && assetPaths
+        ...(options.assetsInfo && assetPositions
             ? (0, assets_to_ffmpeg_inputs_1.assetsToFfmpegInputs)({
-                assets: assetPaths,
+                assets: assetPositions.map((a) => a.src),
                 isAudioOnly,
                 fps: options.fps,
                 frameCount: options.assetsInfo.assets.length,
             })
             : []),
-        options.preEncodedFileLocation
-            ? ['-c:v', 'copy']
-            : encoderName
-                ? // -c:v is the same as -vcodec as -codec:video
-                    // and specified the video codec.
-                    ['-c:v', encoderName]
-                : // If only exporting audio, we drop the video explicitly
-                    ['-vn'],
-        ...(options.preEncodedFileLocation
+        encoderName
+            ? // -c:v is the same as -vcodec as -codec:video
+                // and specified the video codec.
+                ['-c:v', encoderName]
+            : // If only exporting audio, we drop the video explicitly
+                ['-vn'],
+        ...(((_m = options.internalOptions) === null || _m === void 0 ? void 0 : _m.preEncodedFileLocation)
             ? []
             : [
                 proResProfileName ? ['-profile:v', proResProfileName] : null,
@@ -138,6 +153,10 @@ const spawnFfmpeg = async (options) => {
             ]),
         '-ar',
         String(sample_rate_1.DEFAULT_SAMPLE_RATE),
+        // Stereo sound, even force mono to be stereo
+        // Otherwise mixing mono + stereo ends up speeding up the audio
+        '-ac',
+        '2',
         audioCodecName ? ['-c:a', audioCodecName] : null,
         complexFilterFlag,
         // Ignore audio from image sequence
@@ -151,25 +170,35 @@ const spawnFfmpeg = async (options) => {
         console.log('Generated FFMPEG command:');
         console.log(ffmpegArgs);
     }
-    const ffmpegString = ffmpegArgs
-        .reduce((acc, val) => acc.concat(val), [])
-        .filter(Boolean);
-    const task = (0, execa_1.default)((_f = options.ffmpegExecutable) !== null && _f !== void 0 ? _f : 'ffmpeg', ffmpegString);
-    (_g = task.stderr) === null || _g === void 0 ? void 0 : _g.on('data', (data) => {
+    const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
+    const task = (0, execa_1.default)((_o = options.ffmpegExecutable) !== null && _o !== void 0 ? _o : 'ffmpeg', ffmpegString, {
+        cwd: ((_p = options.internalOptions) === null || _p === void 0 ? void 0 : _p.parallelEncoding) ? undefined : options.dir,
+    });
+    let ffmpegOutput = '';
+    (_q = task.stderr) === null || _q === void 0 ? void 0 : _q.on('data', (data) => {
+        const str = data.toString();
+        ffmpegOutput += str;
         if (options.onProgress) {
-            const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(data.toString());
+            const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(str);
             if (parsed !== undefined) {
                 options.onProgress(parsed);
             }
         }
     });
-    return { task, cleanup };
+    return { task, cleanup, getLogs: () => ffmpegOutput };
 };
 exports.spawnFfmpeg = spawnFfmpeg;
 const stitchFramesToVideo = async (options) => {
-    const { task, cleanup } = await (0, exports.spawnFfmpeg)(options);
-    await task;
-    cleanup === null || cleanup === void 0 ? void 0 : cleanup();
+    const { task, cleanup, getLogs } = await (0, exports.spawnFfmpeg)(options);
+    try {
+        await task;
+    }
+    catch (err) {
+        throw new Error(getLogs());
+    }
+    finally {
+        cleanup === null || cleanup === void 0 ? void 0 : cleanup();
+    }
 };
 exports.stitchFramesToVideo = stitchFramesToVideo;
 //# sourceMappingURL=stitcher.js.map

package/dist/stitcher.js.map

@@ -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,2DAAoD;AACpD,+CAAkD;AAClD,+FAAsF;AACtF,uDAAiD;AAqBjD,MAAM,aAAa,GAAG,KAAK,EAAE,OAAwB,EAAE,EAAE;;IACxD,MAAM,KAAK,GAAG,MAAA,OAAO,CAAC,KAAK,mCAAI,oBAAS,CAAC,aAAa,CAAC;IACvD,MAAM,WAAW,GAAG,IAAA,6BAAY,EAAC,KAAK,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,WAAW,KAAK,IAAI,CAAC;IACzC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU;QAC9C,CAAC,CAAC,IAAA,qDAAuB,EAAC;YACxB,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM;YACjC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,WAAW;YAC3C,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;SACxD,CAAC;QACJ,CAAC,CAAC,IAAI,CAAC,CAAC;IAET,IAAA,2DAAyB,GAAE,CAAC;IAC5B,MAAM,cAAc,GACnB,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAA,mDAAuB,EAAC,aAAa,CAAC,CAAC;IAEtE,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,mCAAe,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAE7E,MAAM,iBAAiB,GAAG,MAAM,IAAA,8CAAoB,EAAC;QACpD,UAAU;KACV,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAA,iDAAsB,EAAC;QACtC,iBAAiB;QACjB,cAAc;QACd,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACpC,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC;KAC/C;IAED,IAAI,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;KAChC;IAED,MAAM,EAAC,iBAAiB,EAAE,OAAO,EAAC,GAAG,MAAM,IAAA,wDAAyB,EAAC,OAAO,CAAC,CAAC;IAE9E,OAAO;QACN,iBAAiB;QACjB,OAAO;QACP,UAAU;KACV,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,WAAW,GAAG,KAAK,EAAE,OAAwB,EAAE,EAAE;;IAC7D,oBAAS,CAAC,iBAAiB,CAC1B,OAAO,CAAC,MAAM,EACd,QAAQ,EACR,mCAAmC,CACnC,CAAC;IACF,oBAAS,CAAC,iBAAiB,CAC1B,OAAO,CAAC,KAAK,EACb,OAAO,EACP,mCAAmC,CACnC,CAAC;IACF,oBAAS,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,mCAAmC,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,MAAA,OAAO,CAAC,KAAK,mCAAI,oBAAS,CAAC,aAAa,CAAC;IACvD,IAAA,qEAA+B,EAAC;QAC/B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK;KACL,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,MAAA,OAAO,CAAC,GAAG,mCAAI,oBAAS,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,MAAA,OAAO,CAAC,WAAW,mCAAI,oBAAS,CAAC,oBAAoB,CAAC;IAC1E,MAAM,IAAA,gCAAc,EAAC,MAAA,OAAO,CAAC,gBAAgB,mCAAI,IAAI,CAAC,CAAC;IAEvD,MAAM,WAAW,GAAG,IAAA,6BAAY,EAAC,KAAK,CAAC,CAAC;IACxC,MAAM,cAAc,GAAG,IAAA,wCAAiB,EAAC,KAAK,CAAC,CAAC;IAChD,MAAM,iBAAiB,GAAG,IAAA,8CAAoB,EAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAE7E,MAAM,WAAW,GAAG,WAAW,KAAK,IAAI,CAAC;IACzC,MAAM,WAAW,GAAG,WAAW,IAAI,KAAK,KAAK,QAAQ,CAAC;IAEtD,IAAI,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,GAAG,CACV,kBAAkB,EAClB,MAAA,OAAO,CAAC,gBAAgB,mCAAI,gBAAgB,CAC5C,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,CAAC,CAAC;QACpD,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;QAClD,IAAI,WAAW,EAAE;YAChB,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;SAClC;QAED,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,iBAAiB,CAAC,CAAC;KAC9D;IAED,oBAAS,CAAC,sCAAsC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC7D,oBAAS,CAAC,8CAA8C,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAE7E,MAAM,EACL,iBAAiB,GAAG,SAAS,EAC7B,OAAO,GAAG,SAAS,EACnB,UAAU,GAAG,SAAS,GACtB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;IAEjE,MAAM,UAAU,GAAG;QAClB,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,GAAG,CAAC,OAAO,CAAC,sBAAsB;YACjC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;YAC1C,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC;oBACA,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC;oBAC1D,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;oBAC5C,OAAO,CAAC,UAAU;wBACjB,CAAC,CAAC,CAAC,eAAe,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;wBAC/D,CAAC,CAAC,IAAI;oBACP,OAAO,CAAC,UAAU;wBACjB,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC;wBAC9C,CAAC,CAAC,IAAI;oBACP,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;iBAC5C,CAAC;QACL,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,UAAU;YACnC,CAAC,CAAC,IAAA,8CAAoB,EAAC;gBACrB,MAAM,EAAE,UAAU;gBAClB,WAAW;gBACX,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM;aAC3C,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC;QACN,OAAO,CAAC,sBAAsB;YAC7B,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC;YAClB,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,8CAA8C;oBAC9C,iCAAiC;oBACjC,CAAC,MAAM,EAAE,WAAW,CAAC;gBACvB,CAAC,CAAC,wDAAwD;oBACxD,CAAC,KAAK,CAAC;QACV,GAAG,CAAC,OAAO,CAAC,sBAAsB;YACjC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACA,iBAAiB,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI;gBAC5D,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;gBAC1C,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,WAAW,CAAC;gBAE9C,6CAA6C;gBAC7C,2CAA2C;gBAC3C,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;gBAC1D,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC;aAClC,CAAC;QACL,KAAK;QACL,MAAM,CAAC,iCAAmB,CAAC;QAC3B,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI;QAChD,iBAAiB;QACjB,mCAAmC;QACnC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC;QACpC,kDAAkD;QAClD,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,IAAI,CAAC;QAC5C,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;QAC3B,OAAO,CAAC,cAAc;KACtB,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KACxB;IAED,MAAM,YAAY,GAAG,UAAU;SAC7B,MAAM,CAAgC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;SACxE,MAAM,CAAC,OAAO,CAAa,CAAC;IAE9B,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,MAAA,OAAO,CAAC,gBAAgB,mCAAI,QAAQ,EAAE,YAAY,CAAC,CAAC;IACvE,MAAA,IAAI,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;QACxC,IAAI,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,MAAM,GAAG,IAAA,2CAAmB,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpD,IAAI,MAAM,KAAK,SAAS,EAAE;gBACzB,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aAC3B;SACD;IACF,CAAC,CAAC,CAAC;IACH,OAAO,EAAC,IAAI,EAAE,OAAO,EAAC,CAAC;AACxB,CAAC,CAAC;AAnIW,QAAA,WAAW,eAmItB;AAEK,MAAM,mBAAmB,GAAG,KAAK,EACvC,OAAwB,EACR,EAAE;IAClB,MAAM,EAAC,IAAI,EAAE,OAAO,EAAC,GAAG,MAAM,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;IACnD,MAAM,IAAI,CAAC;IACX,OAAO,aAAP,OAAO,uBAAP,OAAO,EAAI,CAAC;AACb,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B"}
+{"version":3,"file":"stitcher.js","sourceRoot":"","sources":["../src/stitcher.ts"],"names":[],"mappings":"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"}

package/dist/stringify-ffmpeg-filter.d.ts.map

@@ -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;YA+BpB,CAAC"}
+{"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"}

package/dist/stringify-ffmpeg-filter.js

@@ -14,8 +14,6 @@ const stringifyFfmpegFilter = ({ streamIndex, trimLeft, trimRight, channels, sta
     });
     return (`[${streamIndex}:a]` +
         [
-            // TODO: This will solve the issue of stitching videos together reported by Olli
-            // on Discord. But will it introduce other problems where the audio is not right? Pending investigation
             'apad',
             `atrim=${trimLeft}:${trimRight}`,
             // For n channels, we delay n + 1 channels.

package/dist/stringify-ffmpeg-filter.js.map

@@ -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,gFAAgF;YAChF,uGAAuG;YACvG,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;AAlDW,QAAA,qBAAqB,yBAkDhC"}
+{"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/dist/symbolicate-stacktrace.d.ts

@@ -0,0 +1,17 @@
+import { SourceMapConsumer } from 'source-map';
+import { UnsymbolicatedStackFrame } from './parse-browser-error-stack';
+export declare function getSourceMap(fileUri: string, fileContents: string): Promise<SourceMapConsumer>;
+export declare type ScriptLine = {
+    lineNumber: number;
+    content: string;
+    highlight: boolean;
+};
+export declare type SymbolicatedStackFrame = {
+    originalFunctionName: string | null;
+    originalFileName: string | null;
+    originalLineNumber: number | null;
+    originalColumnNumber: number | null;
+    originalScriptCode: ScriptLine[] | null;
+};
+export declare const symbolicateStackTrace: (frames: UnsymbolicatedStackFrame[]) => Promise<SymbolicatedStackFrame[]>;
+//# sourceMappingURL=symbolicate-stacktrace.d.ts.map

package/dist/symbolicate-stacktrace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"symbolicate-stacktrace.d.ts","sourceRoot":"","sources":["../src/symbolicate-stacktrace.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAC,wBAAwB,EAAC,MAAM,6BAA6B,CAAC;AA0BrE,wBAAsB,YAAY,CACjC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,GAClB,OAAO,CAAC,iBAAiB,CAAC,CAmB5B;AAiBD,oBAAY,UAAU,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,oBAAY,sBAAsB,GAAG;IACpC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,kBAAkB,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;CACxC,CAAC;AAmCF,eAAO,MAAM,qBAAqB,WACzB,wBAAwB,EAAE,KAChC,QAAQ,sBAAsB,EAAE,CAmDlC,CAAC"}

package/dist/symbolicate-stacktrace.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.symbolicateStackTrace = exports.getSourceMap = void 0;
+const remotion_1 = require("remotion");
+const read_file_1 = require("./assets/read-file");
+const source_map_1 = require("source-map");
+function extractSourceMapUrl(fileUri, fileContents) {
+    const regex = /\/\/[#@] ?sourceMappingURL=([^\s'"]+)\s*$/gm;
+    let match = null;
+    for (;;) {
+        const next = regex.exec(fileContents);
+        if (next === null || next === undefined) {
+            break;
+        }
+        match = next;
+    }
+    if (!(match === null || match === void 0 ? void 0 : match[1])) {
+        return Promise.reject(new Error(`Cannot find a source map directive for ${fileUri}.`));
+    }
+    return Promise.resolve(match[1].toString());
+}
+async function getSourceMap(fileUri, fileContents) {
+    const sm = await extractSourceMapUrl(fileUri, fileContents);
+    if (sm.indexOf('data:') === 0) {
+        const base64 = /^data:application\/json;([\w=:"-]+;)*base64,/;
+        const match2 = sm.match(base64);
+        if (!match2) {
+            throw new Error('Sorry, non-base64 inline source-map encoding is not supported.');
+        }
+        const converted = window.atob(sm.substring(match2[0].length));
+        return new source_map_1.SourceMapConsumer(JSON.parse(converted));
+    }
+    const index = fileUri.lastIndexOf('/');
+    const url = fileUri.substring(0, index + 1) + sm;
+    const obj = await fetchUrl(url);
+    return new source_map_1.SourceMapConsumer(obj);
+}
+exports.getSourceMap = getSourceMap;
+const fetchUrl = async (url) => {
+    const res = await (0, read_file_1.readFile)(url);
+    return new Promise((resolve, reject) => {
+        let downloaded = '';
+        res.on('data', (d) => {
+            downloaded += d;
+        });
+        res.on('end', () => {
+            resolve(downloaded);
+        });
+        res.on('error', (err) => reject(err));
+    });
+};
+function getLinesAround(line, count, lines) {
+    const result = [];
+    for (let index = Math.max(0, line - 1 - count) + 1; index <= Math.min(lines.length - 1, line - 1 + count); ++index) {
+        result.push({
+            lineNumber: index + 1,
+            content: lines[index],
+            highlight: index + 1 === line,
+        });
+    }
+    return result;
+}
+const getOriginalPosition = (source_map, line, column) => {
+    const result = source_map.originalPositionFor({
+        line,
+        column,
+    });
+    return { line: result.line, column: result.column, source: result.source };
+};
+const symbolicateStackTrace = async (frames) => {
+    const uniqueFileNames = [
+        ...new Set(frames
+            .map((f) => f.fileName)
+            .filter((f) => f.startsWith('http://') || f.startsWith('https://'))
+            .filter(remotion_1.Internals.truthy)),
+    ];
+    const maps = await Promise.all(uniqueFileNames.map(async (fileName) => {
+        const fileContents = await fetchUrl(fileName);
+        return getSourceMap(fileName, fileContents);
+    }));
+    const mapValues = {};
+    for (let i = 0; i < uniqueFileNames.length; i++) {
+        mapValues[uniqueFileNames[i]] = maps[i];
+    }
+    return frames
+        .map((frame) => {
+        const map = mapValues[frame.fileName];
+        if (!map) {
+            return null;
+        }
+        const pos = getOriginalPosition(map, frame.lineNumber, frame.columnNumber);
+        const { functionName } = frame;
+        let hasSource = null;
+        hasSource = pos.source ? map.sourceContentFor(pos.source, false) : null;
+        const scriptCode = hasSource && pos.line
+            ? getLinesAround(pos.line, 3, hasSource.split('\n'))
+            : null;
+        return {
+            originalColumnNumber: pos.column,
+            originalFileName: pos.source,
+            originalFunctionName: functionName,
+            originalLineNumber: pos.line ? pos.line : null,
+            originalScriptCode: scriptCode,
+        };
+    })
+        .filter(remotion_1.Internals.truthy);
+};
+exports.symbolicateStackTrace = symbolicateStackTrace;
+//# sourceMappingURL=symbolicate-stacktrace.js.map

package/dist/symbolicate-stacktrace.js.map

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

package/dist/tmp-dir.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tmp-dir.d.ts","sourceRoot":"","sources":["../src/tmp-dir.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,MAAM,QAAS,MAAM,WAUjC,CAAC"}
+{"version":3,"file":"tmp-dir.d.ts","sourceRoot":"","sources":["../src/tmp-dir.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,MAAM,QAAS,MAAM,WAYjC,CAAC"}