@remotion/renderer 4.0.128 → 4.0.131

package/dist/assets/download-file.js

@@ -96,6 +96,7 @@ const downloadFile = async (options, retries = 2, attempt = 1) => {
     catch (err) {
         const { message } = err;
         if (message === 'aborted' ||
+            message === 'ECONNRESET' ||
             message.includes(incorrectContentLengthToken) ||
             // Try again if hitting internal errors
             message.includes('503') ||

package/dist/calculate-ffmpeg-filters.js

@@ -4,19 +4,10 @@ exports.calculateFfmpegFilter = void 0;
 const flatten_volume_array_1 = require("./assets/flatten-volume-array");
 const stringify_ffmpeg_filter_1 = require("./stringify-ffmpeg-filter");
 const calculateFfmpegFilter = ({ asset, fps, channels, assetDuration, trimLeftOffset, trimRightOffset, chunkLengthInSeconds, forSeamlessAacConcatenation, }) => {
-    if (channels === 0) {
-        return null;
-    }
-    const trimLeft = (asset.trimLeft * asset.playbackRate) / fps +
-        trimLeftOffset * asset.playbackRate;
-    const trimRight = trimLeft +
-        (asset.duration * asset.playbackRate) / fps +
-        trimRightOffset * asset.playbackRate;
+    // TODO: Don't need this wrapper function anymore
     return (0, stringify_ffmpeg_filter_1.stringifyFfmpegFilter)({
         channels,
         startInVideo: asset.startInVideo,
-        trimLeft,
-        trimRight,
         volume: (0, flatten_volume_array_1.flattenVolumeArray)(asset.volume),
         fps,
         playbackRate: asset.playbackRate,
@@ -25,6 +16,9 @@ const calculateFfmpegFilter = ({ asset, fps, channels, assetDuration, trimLeftOf
         toneFrequency: asset.toneFrequency,
         chunkLengthInSeconds,
         forSeamlessAacConcatenation,
+        trimLeftOffset,
+        trimRightOffset,
+        asset,
     });
 };
 exports.calculateFfmpegFilter = calculateFfmpegFilter;

package/dist/client.d.ts

@@ -464,19 +464,19 @@ export declare const BrowserSafeApis: {
             cliFlag: "gl";
             docLink: string;
             name: string;
-            type: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
+            type: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
             ssrName: string;
             description: () => import("react/jsx-runtime").JSX.Element;
             getValue: ({ commandLine }: {
                 commandLine: Record<string, unknown>;
             }) => {
-                value: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
+                value: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
                 source: string;
             } | {
                 value: null;
                 source: string;
             };
-            setConfig: (value: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null) => void;
+            setConfig: (value: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null) => void;
         };
         enableLambdaInsights: {
             name: string;

package/dist/compositor/make-file-executable.js

@@ -3,11 +3,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeFileExecutableIfItIsNot = void 0;
 /* eslint-disable no-bitwise */
 const node_fs_1 = require("node:fs");
-const makeFileExecutableIfItIsNot = (path) => {
-    try {
-        (0, node_fs_1.accessSync)(path, node_fs_1.constants.X_OK);
+const hasPermissions = (p) => {
+    if (process.platform !== 'linux') {
+        try {
+            (0, node_fs_1.accessSync)(p, node_fs_1.constants.X_OK);
+            return true;
+        }
+        catch (_a) {
+            return false;
+        }
+    }
+    // On Linux, checking file permissions, because Node.js
+    // seems buggy: https://github.com/remotion-dev/remotion/issues/3587
+    const stats = (0, node_fs_1.statSync)(p);
+    const { mode } = stats;
+    const othersHaveExecutePermission = Boolean(mode & 0o001);
+    if (othersHaveExecutePermission) {
+        return true;
+    }
+    if (!process.getuid || !process.getgid) {
+        throw new Error('Cannot check permissions on Linux without process.getuid and process.getgid');
     }
-    catch (err) {
+    const uid = process.getuid();
+    const gid = process.getgid();
+    const isOwner = uid === stats.uid;
+    const isGroup = gid === stats.gid;
+    const ownerHasExecutePermission = Boolean(mode & 0o100);
+    const groupHasExecutePermission = Boolean(mode & 0o010);
+    const canExecute = (isOwner && ownerHasExecutePermission) ||
+        (isGroup && groupHasExecutePermission);
+    return canExecute;
+};
+const makeFileExecutableIfItIsNot = (path) => {
+    const hasPermissionsResult = hasPermissions(path);
+    if (!hasPermissionsResult) {
         (0, node_fs_1.chmodSync)(path, 0o755);
     }
 };

package/dist/index.d.ts

@@ -142,8 +142,8 @@ export declare const RenderInternals: {
     validPixelFormats: readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"];
     DEFAULT_BROWSER: "chrome";
     validateFrameRange: (frameRange: import("./frame-range").FrameRange | null) => void;
-    DEFAULT_OPENGL_RENDERER: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
-    validateOpenGlRenderer: (option: unknown) => "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
+    DEFAULT_OPENGL_RENDERER: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
+    validateOpenGlRenderer: (option: unknown) => "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
     validCodecs: readonly ["h264", "h265", "vp8", "vp9", "mp3", "aac", "wav", "prores", "h264-mkv", "h264-ts", "gif"];
     DEFAULT_PIXEL_FORMAT: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le";
     validateJpegQuality: (q: unknown) => void;
@@ -353,8 +353,8 @@ export declare const RenderInternals: {
     }) => execa.ExecaChildProcess<string>;
     validStillImageFormats: readonly ["png", "jpeg", "pdf", "webp"];
     validVideoImageFormats: readonly ["png", "jpeg", "none"];
-    DEFAULT_STILL_IMAGE_FORMAT: "png" | "jpeg" | "pdf" | "webp";
-    DEFAULT_VIDEO_IMAGE_FORMAT: "png" | "jpeg" | "none";
+    DEFAULT_STILL_IMAGE_FORMAT: "jpeg" | "png" | "webp" | "pdf";
+    DEFAULT_VIDEO_IMAGE_FORMAT: "jpeg" | "png" | "none";
     DEFAULT_JPEG_QUALITY: number;
     chalk: {
         enabled: () => boolean;
@@ -453,7 +453,7 @@ export declare const RenderInternals: {
         frame: number;
         serializedInputPropsWithCustomSchema: string;
         serializedResolvedPropsWithCustomSchema: string;
-        imageFormat: "png" | "jpeg" | "pdf" | "webp";
+        imageFormat: "jpeg" | "png" | "webp" | "pdf";
         jpegQuality: number;
         puppeteerInstance: HeadlessBrowser | null;
         envVariables: Record<string, string>;

package/dist/offthread-video-server.js

@@ -155,7 +155,6 @@ const startOffthreadVideoServer = ({ downloadMap, concurrency, logLevel, indent,
                 if (err.message !== REQUEST_CLOSED_TOKEN &&
                     !err.message.includes('EPIPE')) {
                     downloadMap.emitter.dispatchError(err);
-                    console.log('Error occurred', err);
                 }
             });
         },

package/dist/options/gl.d.ts

@@ -1,19 +1,19 @@
 export declare const validOpenGlRenderers: readonly ["swangle", "angle", "egl", "swiftshader", "vulkan", "angle-egl"];
 export type OpenGlRenderer = (typeof validOpenGlRenderers)[number];
 export declare const DEFAULT_OPENGL_RENDERER: OpenGlRenderer | null;
-export declare const getChromiumOpenGlRenderer: () => "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
+export declare const getChromiumOpenGlRenderer: () => "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
 export declare const setChromiumOpenGlRenderer: (renderer: OpenGlRenderer) => void;
 export declare const glOption: {
     cliFlag: "gl";
     docLink: string;
     name: string;
-    type: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
+    type: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
     ssrName: string;
     description: () => import("react/jsx-runtime").JSX.Element;
     getValue: ({ commandLine }: {
         commandLine: Record<string, unknown>;
     }) => {
-        value: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
+        value: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
         source: string;
     } | {
         value: null;

package/dist/options/index.d.ts

@@ -245,19 +245,19 @@ export declare const allOptions: {
         cliFlag: "gl";
         docLink: string;
         name: string;
-        type: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
+        type: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
         ssrName: string;
         description: () => import("react/jsx-runtime").JSX.Element;
         getValue: ({ commandLine }: {
             commandLine: Record<string, unknown>;
         }) => {
-            value: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
+            value: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
             source: string;
         } | {
             value: null;
             source: string;
         };
-        setConfig: (value: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null) => void;
+        setConfig: (value: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null) => void;
     };
     enableLambdaInsights: {
         name: string;

package/dist/preprocess-audio-track.js

@@ -43,7 +43,7 @@ const preprocessAudioTrackUnlimited = async ({ outName, asset, fps, downloadMap,
         ['-ar', String(sample_rate_1.DEFAULT_SAMPLE_RATE)],
         ['-y', outName],
     ].flat(2);
-    logger_1.Log.verbose({ indent, logLevel }, 'Preprocessing audio track', args, 'Filter:', filter.filter);
+    logger_1.Log.verbose({ indent, logLevel }, 'Preprocessing audio track:', JSON.stringify(args.join(' ')), 'Filter:', filter.filter);
     const startTime = Date.now();
     const task = (0, call_ffmpeg_1.callFf)({
         bin: 'ffmpeg',

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

@@ -1,4 +1,4 @@
-import type { AssetVolume } from './assets/types';
+import type { AssetVolume, MediaAsset } from './assets/types';
 export type FilterWithoutPaddingApplied = ProcessedTrack & {
     filter: string;
 };
@@ -6,9 +6,7 @@ export type ProcessedTrack = {
     pad_start: string | null;
     pad_end: string | null;
 };
-export declare const stringifyFfmpegFilter: ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, assetDuration, allowAmplificationDuringRender, toneFrequency, chunkLengthInSeconds, forSeamlessAacConcatenation, }: {
-    trimLeft: number;
-    trimRight: number;
+export declare const stringifyFfmpegFilter: ({ channels, startInVideo, volume, fps, playbackRate, assetDuration, allowAmplificationDuringRender, toneFrequency, chunkLengthInSeconds, forSeamlessAacConcatenation, trimLeftOffset, trimRightOffset, asset, }: {
     channels: number;
     startInVideo: number;
     volume: AssetVolume;
@@ -19,4 +17,7 @@ export declare const stringifyFfmpegFilter: ({ trimLeft, trimRight, channels, st
     toneFrequency: number | null;
     chunkLengthInSeconds: number;
     forSeamlessAacConcatenation: boolean;
+    trimLeftOffset: number;
+    trimRightOffset: number;
+    asset: MediaAsset;
 }) => FilterWithoutPaddingApplied | null;

package/dist/stringify-ffmpeg-filter.js

@@ -14,15 +14,20 @@ const stringifyTrim = (trim) => {
     }
     return asString;
 };
-const trimAndSetTempo = ({ playbackRate, trimLeft, trimRight, forSeamlessAacConcatenation, assetDuration, }) => {
-    const trimRightOrAssetDuration = assetDuration
-        ? Math.min(trimRight, assetDuration)
-        : trimRight;
+const trimAndSetTempo = ({ playbackRate, forSeamlessAacConcatenation, assetDuration, asset, trimLeftOffset, trimRightOffset, fps, }) => {
     // If we need seamless AAC stitching, we need to apply the tempo filter first
     // because the atempo filter is not frame-perfect. It creates a small offset
     // and the offset needs to be the same for all audio tracks, before processing it further.
     // This also affects the trimLeft and trimRight values, as they need to be adjusted.
     if (forSeamlessAacConcatenation) {
+        const trimLeft = (asset.trimLeft * asset.playbackRate) / fps +
+            trimLeftOffset * asset.playbackRate;
+        const trimRight = trimLeft +
+            (asset.duration * asset.playbackRate) / fps +
+            trimRightOffset * asset.playbackRate;
+        const trimRightOrAssetDuration = assetDuration
+            ? Math.min(trimRight, assetDuration * asset.playbackRate)
+            : trimRight;
         const actualTrimLeft = trimLeft / playbackRate;
         const actualTrimRight = trimRightOrAssetDuration / playbackRate;
         return {
@@ -37,6 +42,11 @@ const trimAndSetTempo = ({ playbackRate, trimLeft, trimRight, forSeamlessAacConc
     // Otherwise, we first trim and then apply playback rate, as then the atempo
     // filter needs to do less work.
     if (!forSeamlessAacConcatenation) {
+        const trimLeft = asset.trimLeft / fps + trimLeftOffset * asset.playbackRate;
+        const trimRight = trimLeft + asset.duration / fps + trimRightOffset * asset.playbackRate;
+        const trimRightOrAssetDuration = assetDuration
+            ? Math.min(trimRight, assetDuration)
+            : trimRight;
         return {
             filter: [
                 `atrim=${stringifyTrim(trimLeft)}:${stringifyTrim(trimRightOrAssetDuration)}`,
@@ -48,9 +58,12 @@ const trimAndSetTempo = ({ playbackRate, trimLeft, trimRight, forSeamlessAacConc
     }
     throw new Error('This should never happen');
 };
-const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, assetDuration, allowAmplificationDuringRender, toneFrequency, chunkLengthInSeconds, forSeamlessAacConcatenation, }) => {
+const stringifyFfmpegFilter = ({ channels, startInVideo, volume, fps, playbackRate, assetDuration, allowAmplificationDuringRender, toneFrequency, chunkLengthInSeconds, forSeamlessAacConcatenation, trimLeftOffset, trimRightOffset, asset, }) => {
+    if (channels === 0) {
+        return null;
+    }
     const startInVideoSeconds = startInVideo / fps;
-    if (assetDuration && trimLeft >= assetDuration) {
+    if (assetDuration && asset.trimLeft / fps >= assetDuration) {
         return null;
     }
     if (toneFrequency !== null && (toneFrequency <= 0 || toneFrequency > 2)) {
@@ -60,8 +73,10 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
         playbackRate,
         forSeamlessAacConcatenation,
         assetDuration,
-        trimLeft,
-        trimRight,
+        trimLeftOffset,
+        trimRightOffset,
+        asset,
+        fps,
     });
     const volumeFilter = (0, ffmpeg_volume_expression_1.ffmpegVolumeExpression)({
         volume,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.0.128",
+  "version": "4.0.131",
   "description": "Renderer for Remotion",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "extract-zip": "2.0.1",
     "source-map": "^0.8.0-beta.0",
     "ws": "8.7.0",
-    "remotion": "4.0.128"
+    "remotion": "4.0.131"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -40,13 +40,13 @@
     "vitest": "0.31.1"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-x64": "4.0.128",
-    "@remotion/compositor-darwin-arm64": "4.0.128",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.128",
-    "@remotion/compositor-linux-x64-gnu": "4.0.128",
-    "@remotion/compositor-linux-arm64-musl": "4.0.128",
-    "@remotion/compositor-linux-x64-musl": "4.0.128",
-    "@remotion/compositor-win32-x64-msvc": "4.0.128"
+    "@remotion/compositor-darwin-x64": "4.0.131",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.131",
+    "@remotion/compositor-darwin-arm64": "4.0.131",
+    "@remotion/compositor-linux-arm64-musl": "4.0.131",
+    "@remotion/compositor-linux-x64-musl": "4.0.131",
+    "@remotion/compositor-win32-x64-msvc": "4.0.131",
+    "@remotion/compositor-linux-x64-gnu": "4.0.131"
   },
   "keywords": [
     "remotion",