@remotion/renderer 4.0.152 → 4.0.154

package/dist/client.d.ts

@@ -467,19 +467,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/index.d.ts

@@ -140,8 +140,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;
@@ -337,7 +337,7 @@ export declare const RenderInternals: {
     makeFileExtensionMap: () => Record<string, ("h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "h264-ts" | "gif")[]>;
     defaultCodecsForFileExtension: Record<import("./file-extensions").FileExtension, "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "h264-ts" | "gif">;
     getExecutablePath: ({ indent, logLevel, type, binariesDirectory, }: {
-        type: "compositor" | "ffmpeg" | "ffprobe";
+        type: "ffmpeg" | "ffprobe" | "compositor";
         indent: boolean;
         logLevel: "verbose" | "info" | "warn" | "error";
         binariesDirectory: string | null;
@@ -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>;
@@ -820,24 +820,4 @@ export declare const RenderInternals: {
             setConfig: () => never;
         };
     }>) => Promise<import("./ensure-browser").BrowserStatus>;
-    exampleVideos: {
-        bigBuckBunny: string;
-        transparentWebm: string;
-        framerWithoutFileExtension: string;
-        corrupted: string;
-        customDar: string;
-        screenrecording: string;
-        nofps: string;
-        variablefps: string;
-        zerotimestamp: string;
-        webcam: string;
-        iphonevideo: string;
-        av1: string;
-        framer24fps: string;
-        music: string;
-        notavideo: string;
-        notafile: string;
-        transparentwithdar: string;
-        iphonehevc: string;
-    };
 };

package/dist/index.js

@@ -115,7 +115,6 @@ const make_file_executable_1 = require("./compositor/make-file-executable");
 const ensure_browser_2 = require("./ensure-browser");
 const audio_codec_1 = require("./options/audio-codec");
 const render_has_audio_1 = require("./render-has-audio");
-const example_videos_1 = require("./test/example-videos");
 const to_megabytes_1 = require("./to-megabytes");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
 const validate_videobitrate_1 = require("./validate-videobitrate");
@@ -206,7 +205,6 @@ exports.RenderInternals = {
     codecSupportsMedia: codec_supports_media_1.codecSupportsMedia,
     toMegabytes: to_megabytes_1.toMegabytes,
     internalEnsureBrowser: ensure_browser_2.internalEnsureBrowser,
-    exampleVideos: example_videos_1.exampleVideos,
 };
 // Warn of potential performance issues with Apple Silicon (M1 chip under Rosetta)
 (0, check_version_requirements_1.checkRuntimeVersion)('info', false);

package/dist/offthread-video-server.js

@@ -74,12 +74,6 @@ const startOffthreadVideoServer = ({ downloadMap, concurrency, logLevel, indent,
             }
             const { src, time, transparent, toneMapped } = (0, exports.extractUrlAndSourceFromUrl)(req.url);
             response.setHeader('access-control-allow-origin', '*');
-            if (transparent) {
-                response.setHeader('content-type', `image/png`);
-            }
-            else {
-                response.setHeader('content-type', `image/bmp`);
-            }
             // Prevent caching of the response and excessive disk writes
             // https://github.com/remotion-dev/remotion/issues/2760
             response.setHeader('cache-control', 'no-cache, no-store, must-revalidate');
@@ -134,6 +128,21 @@ const startOffthreadVideoServer = ({ downloadMap, concurrency, logLevel, indent,
                     if (timeToExtract > 1000) {
                         logger_1.Log.verbose({ indent, logLevel }, `Took ${timeToExtract}ms to extract frame from ${src} at ${time}`);
                     }
+                    const firstByte = readable.at(0);
+                    const secondByte = readable.at(1);
+                    const thirdByte = readable.at(2);
+                    const isPng = firstByte === 0x89 && secondByte === 0x50 && thirdByte === 0x4e;
+                    const isBmp = firstByte === 0x42 && secondByte === 0x4d;
+                    if (isPng) {
+                        response.setHeader('content-type', `image/png`);
+                    }
+                    else if (isBmp) {
+                        response.setHeader('content-type', `image/bmp`);
+                    }
+                    else {
+                        reject(new Error(`Unknown file type: ${firstByte} ${secondByte} ${thirdByte}`));
+                        return;
+                    }
                     response.writeHead(200);
                     response.write(readable, (err) => {
                         response.end();

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/stringify-ffmpeg-filter.d.ts

@@ -7,12 +7,16 @@ export type ProcessedTrack = {
     pad_start: string | null;
     pad_end: string | null;
 };
-export declare const getActualTrimLeft: ({ asset, fps, trimLeftOffset, seamless, }: {
+export declare const getActualTrimLeft: ({ asset, fps, trimLeftOffset, seamless, assetDuration, }: {
     asset: MediaAsset;
     fps: number;
     trimLeftOffset: number;
     seamless: boolean;
-}) => number;
+    assetDuration: number | null;
+}) => {
+    trimLeft: number;
+    maxTrim: number | null;
+};
 export declare const stringifyFfmpegFilter: ({ channels, volume, fps, assetDuration, chunkLengthInSeconds, forSeamlessAacConcatenation, trimLeftOffset, trimRightOffset, asset, indent, logLevel, }: {
     channels: number;
     volume: AssetVolume;

package/dist/stringify-ffmpeg-filter.js

@@ -15,17 +15,23 @@ const stringifyTrim = (trim) => {
     }
     return asString;
 };
-const getActualTrimLeft = ({ asset, fps, trimLeftOffset, seamless, }) => {
+const getActualTrimLeft = ({ asset, fps, trimLeftOffset, seamless, assetDuration, }) => {
     const sinceStart = asset.trimLeft - asset.audioStartFrame;
     if (!seamless) {
-        return (asset.audioStartFrame / fps +
-            (sinceStart / fps) * asset.playbackRate +
-            trimLeftOffset);
+        return {
+            trimLeft: asset.audioStartFrame / fps +
+                (sinceStart / fps) * asset.playbackRate +
+                trimLeftOffset,
+            maxTrim: assetDuration,
+        };
     }
     if (seamless) {
-        return (asset.audioStartFrame / fps / asset.playbackRate +
-            sinceStart / fps +
-            trimLeftOffset);
+        return {
+            trimLeft: asset.audioStartFrame / fps / asset.playbackRate +
+                sinceStart / fps +
+                trimLeftOffset,
+            maxTrim: assetDuration ? assetDuration / asset.playbackRate : null,
+        };
     }
     throw new Error('This should never happen');
 };
@@ -36,15 +42,16 @@ const trimAndSetTempo = ({ forSeamlessAacConcatenation, assetDuration, asset, tr
     // 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 = (0, exports.getActualTrimLeft)({
+        const { trimLeft, maxTrim } = (0, exports.getActualTrimLeft)({
             asset,
             fps,
             trimLeftOffset,
             seamless: true,
+            assetDuration,
         });
         const trimRight = trimLeft + asset.duration / fps - trimLeftOffset + trimRightOffset;
-        let trimRightOrAssetDuration = assetDuration
-            ? Math.min(trimRight, assetDuration / asset.playbackRate)
+        let trimRightOrAssetDuration = maxTrim
+            ? Math.min(trimRight, maxTrim)
             : trimRight;
         if (trimRightOrAssetDuration < trimLeft) {
             logger_1.Log.warn({ indent, logLevel }, 'trimRightOrAssetDuration < trimLeft: ' +
@@ -68,15 +75,16 @@ const trimAndSetTempo = ({ forSeamlessAacConcatenation, assetDuration, asset, tr
     // Otherwise, we first trim and then apply playback rate, as then the atempo
     // filter needs to do less work.
     if (!forSeamlessAacConcatenation) {
-        const actualTrimLeft = (0, exports.getActualTrimLeft)({
+        const { trimLeft: actualTrimLeft, maxTrim } = (0, exports.getActualTrimLeft)({
             asset,
             fps,
             trimLeftOffset,
             seamless: false,
+            assetDuration,
         });
         const trimRight = actualTrimLeft + (asset.duration / fps) * asset.playbackRate;
-        const trimRightOrAssetDuration = assetDuration
-            ? Math.min(trimRight, assetDuration)
+        const trimRightOrAssetDuration = maxTrim
+            ? Math.min(trimRight, maxTrim)
             : trimRight;
         return {
             filter: [
@@ -93,16 +101,16 @@ const stringifyFfmpegFilter = ({ channels, volume, fps, assetDuration, chunkLeng
     if (channels === 0) {
         return null;
     }
-    const { toneFrequency, startInVideo, playbackRate } = asset;
+    const { toneFrequency, startInVideo } = asset;
     const startInVideoSeconds = startInVideo / fps;
-    if (assetDuration &&
-        (0, exports.getActualTrimLeft)({
-            asset,
-            fps,
-            trimLeftOffset,
-            seamless: forSeamlessAacConcatenation,
-        }) >=
-            assetDuration / playbackRate) {
+    const { trimLeft, maxTrim } = (0, exports.getActualTrimLeft)({
+        asset,
+        fps,
+        trimLeftOffset,
+        seamless: forSeamlessAacConcatenation,
+        assetDuration,
+    });
+    if (maxTrim && trimLeft >= maxTrim) {
         return null;
     }
     if (toneFrequency !== null && (toneFrequency <= 0 || toneFrequency > 2)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.0.152",
+  "version": "4.0.154",
   "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.152"
+    "remotion": "4.0.154"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -43,13 +43,13 @@
     "@types/ws": "8.5.10"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-arm64": "4.0.152",
-    "@remotion/compositor-linux-x64-gnu": "4.0.152",
-    "@remotion/compositor-darwin-x64": "4.0.152",
-    "@remotion/compositor-win32-x64-msvc": "4.0.152",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.152",
-    "@remotion/compositor-linux-x64-musl": "4.0.152",
-    "@remotion/compositor-linux-arm64-musl": "4.0.152"
+    "@remotion/compositor-linux-arm64-gnu": "4.0.154",
+    "@remotion/compositor-linux-arm64-musl": "4.0.154",
+    "@remotion/compositor-darwin-arm64": "4.0.154",
+    "@remotion/compositor-darwin-x64": "4.0.154",
+    "@remotion/compositor-linux-x64-gnu": "4.0.154",
+    "@remotion/compositor-linux-x64-musl": "4.0.154",
+    "@remotion/compositor-win32-x64-msvc": "4.0.154"
   },
   "keywords": [
     "remotion",