@remotion/renderer 4.0.153 → 4.0.154

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/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.153",
+  "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.153"
+    "remotion": "4.0.154"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -43,13 +43,13 @@
     "@types/ws": "8.5.10"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-x64": "4.0.153",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.153",
-    "@remotion/compositor-linux-arm64-musl": "4.0.153",
-    "@remotion/compositor-win32-x64-msvc": "4.0.153",
-    "@remotion/compositor-linux-x64-musl": "4.0.153",
-    "@remotion/compositor-darwin-arm64": "4.0.153",
-    "@remotion/compositor-linux-x64-gnu": "4.0.153"
+    "@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",