@remotion/renderer 4.0.0-audio.0 → 4.0.0-audio.13

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

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

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

@@ -12,7 +12,7 @@ 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];
@@ -28,11 +28,11 @@ 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');
     }
@@ -40,13 +40,13 @@ const ffmpegBuildVolumeExpression = (arr, fps) => {
         // 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 ffmpegIfOrElse(ffmpegIsOneOfFrames({ frames: arr[0][1], trimLeft: delay, fps }), String(arr[0][0]), String(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, startInVideo, 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') {
@@ -60,6 +60,7 @@ const ffmpegVolumeExpression = ({ volume, startInVideo, fps, }) => {
             volume: volume[0],
             startInVideo,
             fps,
+            trimLeft,
         });
     }
     // Otherwise, we construct an FFMPEG expression. First step:
@@ -81,7 +82,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/offthread/index.js

@@ -0,0 +1 @@
+"use strict";

package/dist/open-browser.d.ts

@@ -1,6 +1,6 @@
 import puppeteer from 'puppeteer-core';
 import { Browser } from 'remotion';
-declare const validRenderers: readonly ["angle", "egl", "swiftshader"];
+declare const validRenderers: readonly ["swangle", "angle", "egl", "swiftshader"];
 declare type OpenGlRenderer = typeof validRenderers[number];
 export declare type ChromiumOptions = {
     ignoreCertificateErrors?: boolean;
@@ -13,5 +13,6 @@ export declare const openBrowser: (browser: Browser, options?: {
     shouldDumpIo?: boolean | undefined;
     browserExecutable?: string | null | undefined;
     chromiumOptions?: ChromiumOptions | undefined;
+    forceDeviceScaleFactor?: number | undefined;
 } | undefined) => Promise<puppeteer.Browser>;
 export {};

package/dist/open-browser.js

@@ -10,11 +10,17 @@ const path_1 = __importDefault(require("path"));
 const puppeteer_core_1 = __importDefault(require("puppeteer-core"));
 const remotion_1 = require("remotion");
 const get_local_browser_executable_1 = require("./get-local-browser-executable");
-const validRenderers = ['angle', 'egl', 'swiftshader'];
+const validRenderers = ['swangle', 'angle', 'egl', 'swiftshader'];
 const getOpenGlRenderer = (option) => {
     const renderer = option !== null && option !== void 0 ? option : remotion_1.Internals.DEFAULT_OPENGL_RENDERER;
     remotion_1.Internals.validateOpenGlRenderer(renderer);
-    return renderer;
+    if (renderer === 'swangle') {
+        return [`--use-gl=angle`, `--use-angle=swiftshader`];
+    }
+    if (renderer === null) {
+        return [];
+    }
+    return [`--use-gl=${renderer}`];
 };
 const browserInstances = [];
 const killAllBrowsers = async () => {
@@ -38,12 +44,48 @@ const openBrowser = async (browser, options) => {
         executablePath,
         product: browser,
         dumpio: (_e = options === null || options === void 0 ? void 0 : options.shouldDumpIo) !== null && _e !== void 0 ? _e : false,
-        headless: (_g = (_f = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _f === void 0 ? void 0 : _f.headless) !== null && _g !== void 0 ? _g : true,
+        ignoreDefaultArgs: true,
         args: [
+            'about:blank',
+            '--allow-pre-commit-input',
+            '--disable-background-networking',
+            '--enable-features=NetworkService,NetworkServiceInProcess',
+            '--disable-background-timer-throttling',
+            '--disable-backgrounding-occluded-windows',
+            '--disable-breakpad',
+            '--disable-client-side-phishing-detection',
+            '--disable-component-extensions-with-background-pages',
+            '--disable-default-apps',
+            '--disable-dev-shm-usage',
+            '--disable-extensions',
+            '--no-proxy-server',
+            "--proxy-server='direct://'",
+            '--proxy-bypass-list=*',
+            // TODO: remove AvoidUnnecessaryBeforeUnloadCheckSync below
+            // once crbug.com/1324138 is fixed and released.
+            '--disable-features=Translate,BackForwardCache,AvoidUnnecessaryBeforeUnloadCheckSync',
+            '--disable-hang-monitor',
+            '--disable-ipc-flooding-protection',
+            '--disable-popup-blocking',
+            '--disable-prompt-on-repost',
+            '--disable-renderer-backgrounding',
+            '--disable-sync',
+            '--force-color-profile=srgb',
+            '--metrics-recording-only',
+            '--no-first-run',
+            '--video-threads=16',
+            '--enable-automation',
+            '--password-store=basic',
+            '--use-mock-keychain',
+            // TODO(sadym): remove '--enable-blink-features=IdleDetection'
+            // once IdleDetection is turned on by default.
+            '--enable-blink-features=IdleDetection',
+            '--export-tagged-pdf',
+            '--intensive-wake-up-throttling-policy=0',
+            ((_g = (_f = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _f === void 0 ? void 0 : _f.headless) !== null && _g !== void 0 ? _g : true) ? '--headless' : null,
             '--no-sandbox',
             '--disable-setuid-sandbox',
-            '--disable-dev-shm-usage',
-            customGlRenderer ? `--use-gl=${customGlRenderer}` : null,
+            ...customGlRenderer,
             '--disable-background-media-suspend',
             process.platform === 'linux' ? '--single-process' : null,
             '--allow-running-insecure-content',
@@ -52,12 +94,14 @@ const openBrowser = async (browser, options) => {
             '--disable-features=AudioServiceOutOfProcess,IsolateOrigins,site-per-process',
             '--disable-print-preview',
             '--disable-site-isolation-trials',
-            '--disk-cache-size=33554432',
+            '--disk-cache-size=268435456',
             '--hide-scrollbars',
             '--no-default-browser-check',
             '--no-pings',
             '--no-zygote',
-            '--disable-background-media-suspend',
+            (options === null || options === void 0 ? void 0 : options.forceDeviceScaleFactor)
+                ? `--force-device-scale-factor=${options.forceDeviceScaleFactor}`
+                : null,
             ((_h = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _h === void 0 ? void 0 : _h.ignoreCertificateErrors)
                 ? '--ignore-certificate-errors'
                 : null,

package/dist/render-frames.js

@@ -187,7 +187,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
     return returnValue;
 };
 const renderFrames = async (options) => {
-    var _a, _b;
+    var _a, _b, _c;
     const composition = getComposition(options);
     if (!composition) {
         throw new Error('No `composition` option has been specified for renderFrames()');
@@ -207,8 +207,9 @@ const renderFrames = async (options) => {
         shouldDumpIo: options.dumpBrowserLogs,
         browserExecutable: options.browserExecutable,
         chromiumOptions: options.chromiumOptions,
+        forceDeviceScaleFactor: (_b = options.scale) !== null && _b !== void 0 ? _b : 1,
     }));
-    const actualParallelism = (0, get_concurrency_1.getActualConcurrency)((_b = options.parallelism) !== null && _b !== void 0 ? _b : null);
+    const actualParallelism = (0, get_concurrency_1.getActualConcurrency)((_c = options.parallelism) !== null && _c !== void 0 ? _c : null);
     const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserInstance, actualParallelism);
     const openedPages = [];
     return new Promise((resolve, reject) => {

package/dist/render-still.js

@@ -68,6 +68,7 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
         browserExecutable,
         shouldDumpIo: dumpBrowserLogs,
         chromiumOptions,
+        forceDeviceScaleFactor: scale !== null && scale !== void 0 ? scale : 1,
     }));
     const page = await browserInstance.newPage();
     page.setViewport({

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

@@ -24,9 +24,9 @@ const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initia
             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]);
+    await page.evaluateOnNewDocument((key) => {
+        window.remotion_initialFrame = key;
+    }, [initialFrame]);
     const pageRes = await page.goto(urlToVisit);
     const status = pageRes.status();
     if (status !== 200 &&

package/dist/stringify-ffmpeg-filter.js

@@ -11,6 +11,7 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
         volume,
         startInVideo,
         fps,
+        trimLeft,
     });
     // Avoid setting filters if possible, as combining them can create noise
     const chunkLength = durationInFrames / fps;
@@ -37,6 +38,8 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
                     .fill((startInVideoSeconds * 1000).toFixed(0))
                     .join('|')}`,
             // set the volume if needed
+            // The timings for volume must include whatever is in atrim, unless the volume
+            // filter gets applied before atrim
             volumeFilter.value === '1'
                 ? null
                 : `volume=${volumeFilter.value}:eval=${volumeFilter.eval}`,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "4.0.0-audio.0+9876e2ce3",
+	"version": "4.0.0-audio.13+0b79d452c",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -20,10 +20,10 @@
 		"url": "https://github.com/remotion-dev/remotion/issues"
 	},
 	"dependencies": {
-		"@remotion/bundler": "4.0.0-audio.0+9876e2ce3",
+		"@remotion/bundler": "4.0.0-audio.13+0b79d452c",
 		"execa": "5.1.1",
 		"puppeteer-core": "13.5.1",
-		"remotion": "4.0.0-audio.0+9876e2ce3",
+		"remotion": "4.0.0-audio.13+0b79d452c",
 		"serve-handler": "6.1.3",
 		"source-map": "^0.8.0-beta.0"
 	},
@@ -60,5 +60,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "9876e2ce3f5e81e926ee08211ba093fbdf234b53"
+	"gitHead": "0b79d452c04f18dd6745a6fddf21fb4c73617c61"
 }