@remotion/renderer 4.0.489 → 4.0.490

package/dist/assets/calculate-asset-positions.js

@@ -5,39 +5,68 @@ const filter_asset_types_1 = require("../filter-asset-types");
 const resolve_asset_src_1 = require("../resolve-asset-src");
 const flatten_volume_array_1 = require("./flatten-volume-array");
 const types_1 = require("./types");
-const areEqual = (a, b) => {
-    return a.id === b.id;
-};
-const findFrom = (target, renderAsset) => {
-    const index = target.findIndex((a) => areEqual(a, renderAsset));
-    if (index === -1) {
-        return false;
-    }
-    target.splice(index, 1);
-    return true;
-};
-const copyAndDeduplicateAssets = (renderAssets) => {
+const deduplicateAssets = (renderAssets) => {
     const onlyAudioAndVideo = (0, filter_asset_types_1.onlyAudioAndVideoAssets)(renderAssets);
+    const seenIds = new Set();
     const deduplicated = [];
     for (const renderAsset of onlyAudioAndVideo) {
-        if (!deduplicated.find((d) => d.id === renderAsset.id)) {
+        if (!seenIds.has(renderAsset.id)) {
+            seenIds.add(renderAsset.id);
             deduplicated.push(renderAsset);
         }
     }
     return deduplicated;
 };
+const indexUncompressedAssets = (renderAssets) => {
+    const referencedAssets = new Set();
+    for (const renderAsset of renderAssets) {
+        if (renderAsset.src.startsWith('same-as')) {
+            referencedAssets.add(renderAsset.src);
+        }
+    }
+    const assetsByReference = new Map();
+    for (const renderAsset of renderAssets) {
+        if (referencedAssets.size === 0) {
+            break;
+        }
+        if (renderAsset.src.startsWith('same-as')) {
+            continue;
+        }
+        const reference = `same-as-${renderAsset.id}-${renderAsset.frame}`;
+        if (referencedAssets.has(reference)) {
+            assetsByReference.set(reference, renderAsset);
+            referencedAssets.delete(reference);
+        }
+    }
+    return assetsByReference;
+};
 const calculateAssetPositions = (frames) => {
-    var _a, _b;
     const assets = [];
+    // Assets that have started but not yet ended, keyed by asset id.
+    // Since assets are deduplicated by id within a frame, at most one
+    // asset per id is open at a time.
+    const openAssets = new Map();
     const flattened = frames.flat(1);
+    const uncompressedAssets = indexUncompressedAssets(flattened);
     for (let frame = 0; frame < frames.length; frame++) {
-        const prev = copyAndDeduplicateAssets((_a = frames[frame - 1]) !== null && _a !== void 0 ? _a : []);
-        const current = copyAndDeduplicateAssets(frames[frame]);
-        const next = copyAndDeduplicateAssets((_b = frames[frame + 1]) !== null && _b !== void 0 ? _b : []);
+        const current = deduplicateAssets(frames[frame]);
+        const currentIds = new Set(current.map((a) => a.id));
+        for (const [id, openAsset] of openAssets) {
+            if (!currentIds.has(id)) {
+                // The asset was last present on the previous frame.
+                // Duration calculation:
+                // start 0, present for frames 0-59, gone at frame 60:
+                // 60 - 0 ==> 60 frames duration
+                openAsset.duration = frame - openAsset.startInVideo;
+                openAssets.delete(id);
+            }
+        }
         for (const asset of current) {
-            if (!findFrom(prev, asset)) {
-                assets.push({
-                    src: (0, resolve_asset_src_1.resolveAssetSrc)((0, types_1.uncompressMediaAsset)(flattened, asset).src),
+            let openAsset = openAssets.get(asset.id);
+            if (openAsset === undefined) {
+                const uncompressedAsset = uncompressedAssets.get(asset.src);
+                openAsset = {
+                    src: (0, resolve_asset_src_1.resolveAssetSrc)((0, types_1.uncompressMediaAsset)(uncompressedAsset ? [uncompressedAsset] : flattened, asset).src),
                     type: asset.type,
                     duration: null,
                     id: asset.id,
@@ -48,20 +77,17 @@ const calculateAssetPositions = (frames) => {
                     toneFrequency: asset.toneFrequency,
                     audioStartFrame: asset.audioStartFrame,
                     audioStreamIndex: asset.audioStreamIndex,
-                });
-            }
-            const found = assets.find((a) => a.duration === null && areEqual(a, asset));
-            if (!found)
-                throw new Error('something wrong');
-            if (!findFrom(next, asset)) {
-                // Duration calculation:
-                // start 0, range 0-59:
-                // 59 - 0 + 1 ==> 60 frames duration
-                found.duration = frame - found.startInVideo + 1;
+                };
+                assets.push(openAsset);
+                openAssets.set(asset.id, openAsset);
             }
-            found.volume.push(asset.volume);
+            openAsset.volume.push(asset.volume);
         }
     }
+    // Assets that lasted until the end of the video.
+    for (const openAsset of openAssets.values()) {
+        openAsset.duration = frames.length - openAsset.startInVideo;
+    }
     for (const asset of assets) {
         if (asset.duration === null) {
             throw new Error('duration is unexpectedly null');

package/dist/esm/index.mjs

@@ -22102,38 +22102,61 @@ var uncompressMediaAsset = (allRenderAssets, assetToUncompress) => {
 };
 
 // src/assets/calculate-asset-positions.ts
-var areEqual = (a, b) => {
-  return a.id === b.id;
-};
-var findFrom = (target, renderAsset) => {
-  const index = target.findIndex((a) => areEqual(a, renderAsset));
-  if (index === -1) {
-    return false;
-  }
-  target.splice(index, 1);
-  return true;
-};
-var copyAndDeduplicateAssets = (renderAssets) => {
+var deduplicateAssets = (renderAssets) => {
   const onlyAudioAndVideo = onlyAudioAndVideoAssets(renderAssets);
+  const seenIds = new Set;
   const deduplicated = [];
   for (const renderAsset of onlyAudioAndVideo) {
-    if (!deduplicated.find((d) => d.id === renderAsset.id)) {
+    if (!seenIds.has(renderAsset.id)) {
+      seenIds.add(renderAsset.id);
       deduplicated.push(renderAsset);
     }
   }
   return deduplicated;
 };
+var indexUncompressedAssets = (renderAssets) => {
+  const referencedAssets = new Set;
+  for (const renderAsset of renderAssets) {
+    if (renderAsset.src.startsWith("same-as")) {
+      referencedAssets.add(renderAsset.src);
+    }
+  }
+  const assetsByReference = new Map;
+  for (const renderAsset of renderAssets) {
+    if (referencedAssets.size === 0) {
+      break;
+    }
+    if (renderAsset.src.startsWith("same-as")) {
+      continue;
+    }
+    const reference = `same-as-${renderAsset.id}-${renderAsset.frame}`;
+    if (referencedAssets.has(reference)) {
+      assetsByReference.set(reference, renderAsset);
+      referencedAssets.delete(reference);
+    }
+  }
+  return assetsByReference;
+};
 var calculateAssetPositions = (frames) => {
   const assets = [];
+  const openAssets = new Map;
   const flattened = frames.flat(1);
+  const uncompressedAssets = indexUncompressedAssets(flattened);
   for (let frame = 0;frame < frames.length; frame++) {
-    const prev = copyAndDeduplicateAssets(frames[frame - 1] ?? []);
-    const current = copyAndDeduplicateAssets(frames[frame]);
-    const next = copyAndDeduplicateAssets(frames[frame + 1] ?? []);
+    const current = deduplicateAssets(frames[frame]);
+    const currentIds = new Set(current.map((a) => a.id));
+    for (const [id, openAsset] of openAssets) {
+      if (!currentIds.has(id)) {
+        openAsset.duration = frame - openAsset.startInVideo;
+        openAssets.delete(id);
+      }
+    }
     for (const asset of current) {
-      if (!findFrom(prev, asset)) {
-        assets.push({
-          src: resolveAssetSrc(uncompressMediaAsset(flattened, asset).src),
+      let openAsset = openAssets.get(asset.id);
+      if (openAsset === undefined) {
+        const uncompressedAsset = uncompressedAssets.get(asset.src);
+        openAsset = {
+          src: resolveAssetSrc(uncompressMediaAsset(uncompressedAsset ? [uncompressedAsset] : flattened, asset).src),
           type: asset.type,
           duration: null,
           id: asset.id,
@@ -22144,17 +22167,16 @@ var calculateAssetPositions = (frames) => {
           toneFrequency: asset.toneFrequency,
           audioStartFrame: asset.audioStartFrame,
           audioStreamIndex: asset.audioStreamIndex
-        });
-      }
-      const found = assets.find((a) => a.duration === null && areEqual(a, asset));
-      if (!found)
-        throw new Error("something wrong");
-      if (!findFrom(next, asset)) {
-        found.duration = frame - found.startInVideo + 1;
+        };
+        assets.push(openAsset);
+        openAssets.set(asset.id, openAsset);
       }
-      found.volume.push(asset.volume);
+      openAsset.volume.push(asset.volume);
     }
   }
+  for (const openAsset of openAssets.values()) {
+    openAsset.duration = frames.length - openAsset.startInVideo;
+  }
   for (const asset of assets) {
     if (asset.duration === null) {
       throw new Error("duration is unexpectedly null");

package/package.json

@@ -3,7 +3,7 @@
 		"url": "https://github.com/remotion-dev/remotion/tree/main/packages/renderer"
 	},
 	"name": "@remotion/renderer",
-	"version": "4.0.489",
+	"version": "4.0.490",
 	"description": "Render Remotion videos using Node.js or Bun",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -22,11 +22,11 @@
 	},
 	"dependencies": {
 		"execa": "5.1.1",
-		"remotion": "4.0.489",
-		"@remotion/streaming": "4.0.489",
+		"remotion": "4.0.490",
+		"@remotion/streaming": "4.0.490",
 		"source-map": "0.8.0-beta.0",
 		"ws": "8.21.0",
-		"@remotion/licensing": "4.0.489"
+		"@remotion/licensing": "4.0.490"
 	},
 	"peerDependencies": {
 		"react": ">=16.8.0",
@@ -40,19 +40,19 @@
 		"react-dom": "19.2.3",
 		"@typescript/native-preview": "7.0.0-dev.20260217.1",
 		"@types/ws": "8.5.10",
-		"@remotion/example-videos": "4.0.489",
-		"@remotion/eslint-config-internal": "4.0.489",
+		"@remotion/example-videos": "4.0.490",
+		"@remotion/eslint-config-internal": "4.0.490",
 		"eslint": "9.19.0",
 		"@types/node": "20.12.14"
 	},
 	"optionalDependencies": {
-		"@remotion/compositor-darwin-arm64": "4.0.489",
-		"@remotion/compositor-darwin-x64": "4.0.489",
-		"@remotion/compositor-linux-arm64-gnu": "4.0.489",
-		"@remotion/compositor-linux-arm64-musl": "4.0.489",
-		"@remotion/compositor-linux-x64-gnu": "4.0.489",
-		"@remotion/compositor-linux-x64-musl": "4.0.489",
-		"@remotion/compositor-win32-x64-msvc": "4.0.489"
+		"@remotion/compositor-darwin-arm64": "4.0.490",
+		"@remotion/compositor-darwin-x64": "4.0.490",
+		"@remotion/compositor-linux-arm64-gnu": "4.0.490",
+		"@remotion/compositor-linux-arm64-musl": "4.0.490",
+		"@remotion/compositor-linux-x64-gnu": "4.0.490",
+		"@remotion/compositor-linux-x64-musl": "4.0.490",
+		"@remotion/compositor-win32-x64-msvc": "4.0.490"
 	},
 	"keywords": [
 		"remotion",