@bendyline/squisq-video 2.4.20 → 2.4.22

package/dist/index.js

@@ -66,6 +66,7 @@ function resolveFfmpegWasmLoad(config, context, defaults) {
 // src/audioTimeline.ts
 import { resolveMediaSchedule } from "@bendyline/squisq/schemas";
 import { flattenRenderableBlocks, materializeBlockLayers } from "@bendyline/squisq/doc";
+import { createMediaTimeMap } from "@bendyline/squisq/mediaEdit";
 var CUT_EDGE_FADE_SEC = 0.01;
 function clipDynamics(clip) {
   const out = {};
@@ -124,22 +125,47 @@ function computeAudioTimeline(doc, coverPreRoll = 0, options = {}) {
       for (const layer of materialized.layers) {
         if (layer.type !== "video" || !layer.content.src) continue;
         const startAt = safeSeconds(layer.content.startAt ?? 0);
-        const sourceInSec = safeSeconds(layer.content.clipStart);
-        const clipDuration = Math.max(0, layer.content.clipEnd - sourceInSec);
+        const clipStart = safeSeconds(layer.content.clipStart);
         const blockRemainder = Math.max(0, safeSeconds(block.duration) - startAt);
-        const durationSec = layer.content.spillover ? clipDuration : Math.min(clipDuration, blockRemainder);
-        if (durationSec <= 0) continue;
-        const candidate = {
+        const kept = createMediaTimeMap({
+          clipStart,
+          clipEnd: Math.max(clipStart, layer.content.clipEnd),
+          cuts: layer.content.cuts
+        }).keptRanges();
+        const edits = layer.content.edits;
+        const processed = edits?.fx && options.processedAudio ? options.processedAudio({
+          id: layer.id,
           src: layer.content.src,
-          startSec: safeSeconds(block.startTime) + startAt + preRoll,
-          sourceInSec,
-          durationSec,
-          sourceKind: "video"
-        };
-        const key = timelineKey(candidate);
-        if (existing.has(key)) continue;
-        existing.add(key);
-        clips.push(candidate);
+          kind: "video",
+          startAt: 0,
+          anchor: "block",
+          edits
+        }) : void 0;
+        let played = 0;
+        kept.forEach((range, index) => {
+          const length = range.end - range.start;
+          const room = layer.content.spillover ? length : Math.min(length, blockRemainder - played);
+          const offset = played;
+          played += length;
+          if (!(room > 0)) return;
+          const fadeIn = index > 0 ? CUT_EDGE_FADE_SEC : edits?.fadeIn ?? 0;
+          const fadeOut = index < kept.length - 1 ? CUT_EDGE_FADE_SEC : edits?.fadeOut ?? 0;
+          const candidate = {
+            src: processed ?? layer.content.src,
+            startSec: safeSeconds(block.startTime) + startAt + offset + preRoll,
+            sourceInSec: range.start,
+            durationSec: room,
+            // A render is an audio file; only the video itself may be silent.
+            ...processed ? {} : { sourceKind: "video" },
+            ...edits?.gain ? { gainDb: edits.gain } : {},
+            ...fadeIn > 0 ? { fadeInSec: fadeIn } : {},
+            ...fadeOut > 0 ? { fadeOutSec: fadeOut } : {}
+          };
+          const key = timelineKey(candidate);
+          if (existing.has(key)) return;
+          existing.add(key);
+          clips.push(candidate);
+        });
       }
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bendyline/squisq-video",
-  "version": "2.4.20",
+  "version": "2.4.22",
   "description": "Cross-runtime video and animated-GIF helpers with browser-based ffmpeg.wasm encoding for Squisq documents",
   "license": "MIT",
   "author": "Bendyline",
@@ -48,7 +48,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@bendyline/squisq": "2.13.14",
+    "@bendyline/squisq": "2.13.16",
     "@ffmpeg/ffmpeg": "0.12.15",
     "@ffmpeg/util": "0.12.2"
   },