@bendyline/squisq-video 2.2.5 → 2.2.7

package/dist/index.d.ts

@@ -168,8 +168,9 @@ declare function resolveFfmpegWasmLoad(config: FfmpegWasmLoadConfig | undefined,
  *    concatenates the segment files in order.
  *  - Timed media clips (`block.media` + `doc.documentMedia`) are placed at
  *    their **absolute** doc-timeline positions via the shared
- *    `resolveMediaSchedule()` helper (the same one the CLI calls), honouring
- *    each clip's trim window (`sourceIn` / `absoluteEnd - absoluteStart`).
+ *    `resolveMediaSchedule()` helper, honouring each clip's trim window
+ *    (`sourceIn` / `absoluteEnd - absoluteStart`). This includes the audio
+ *    stream carried by scheduled video clips unless explicitly disabled.
  *  - Every start time is shifted by `coverPreRoll` so a cover pre-roll padding
  *    (silent leading frames) keeps audio in sync.
  */
@@ -184,6 +185,20 @@ interface AudioTimelineClip {
     sourceInSec: number;
     /** Played length in seconds (the trimmed window of the source). */
     durationSec: number;
+    /**
+     * Video sources may legitimately contain no audio stream. The browser mixer
+     * probes them independently and skips only the silent ones. Omitted means an
+     * authored audio/narration source, whose decode failure remains an error.
+     */
+    sourceKind?: 'video';
+}
+interface ComputeAudioTimelineOptions {
+    /**
+     * Include the audio stream carried by scheduled video clips. Defaults to
+     * true for composed MP4 export. Consumers that cannot demux video audio may
+     * explicitly retain the legacy audio-only behavior.
+     */
+    includeVideoAudio?: boolean;
 }
 /**
  * Flatten a doc's narration + timed-media audio into absolute-timed clips.
@@ -196,7 +211,7 @@ interface AudioTimelineClip {
  * @param coverPreRoll - Leading silent padding (seconds) added ahead of every
  *   clip, matching the cover-slide pre-roll frames. Default 0.
  */
-declare function computeAudioTimeline(doc: Doc, coverPreRoll?: number): AudioTimelineClip[];
+declare function computeAudioTimeline(doc: Doc, coverPreRoll?: number, options?: ComputeAudioTimelineOptions): AudioTimelineClip[];
 
 /**
  * Render HTML Generation for Video Frame Capture
@@ -343,4 +358,4 @@ declare function ffmpegGifOutputArgs(options: GifOutputOptions): string[];
  */
 declare function framesToMp4Wasm(frames: Uint8Array[], audio: Uint8Array | null, options?: VideoExportOptions): Promise<EncoderResult>;
 
-export { type AudioTimelineClip, type EncoderResult, FFMPEG_WASM_SETUP_HINT, type FfmpegWasmLoadConfig, type GifDither, type GifFilterOptions, type GifOutputOptions, ORIENTATION_DIMENSIONS, QUALITY_PRESETS, type QualityPreset, type RenderHtmlOptions, type VideoExportOptions, type VideoOrientation, type VideoQuality, audioBitrateArg, bitrateForQuality, computeAudioTimeline, ffmpegAudioMuxArgs, ffmpegGifFilterGraph, ffmpegGifOutputArgs, ffmpegGifPaletteApplicationArgs, ffmpegGifPaletteApplicationGraph, ffmpegGifPaletteGenerationFilter, ffmpegVideoQualityArgs, framesToMp4Wasm, generateRenderHtml, resolveDimensions, resolveFfmpegWasmLoad, validateVideoExportOptions };
+export { type AudioTimelineClip, type ComputeAudioTimelineOptions, type EncoderResult, FFMPEG_WASM_SETUP_HINT, type FfmpegWasmLoadConfig, type GifDither, type GifFilterOptions, type GifOutputOptions, ORIENTATION_DIMENSIONS, QUALITY_PRESETS, type QualityPreset, type RenderHtmlOptions, type VideoExportOptions, type VideoOrientation, type VideoQuality, audioBitrateArg, bitrateForQuality, computeAudioTimeline, ffmpegAudioMuxArgs, ffmpegGifFilterGraph, ffmpegGifOutputArgs, ffmpegGifPaletteApplicationArgs, ffmpegGifPaletteApplicationGraph, ffmpegGifPaletteGenerationFilter, ffmpegVideoQualityArgs, framesToMp4Wasm, generateRenderHtml, resolveDimensions, resolveFfmpegWasmLoad, validateVideoExportOptions };

package/dist/index.js

@@ -65,8 +65,10 @@ function resolveFfmpegWasmLoad(config, context, defaults) {
 
 // src/audioTimeline.ts
 import { resolveMediaSchedule } from "@bendyline/squisq/schemas";
-function computeAudioTimeline(doc, coverPreRoll = 0) {
+import { flattenRenderableBlocks, materializeBlockLayers } from "@bendyline/squisq/doc";
+function computeAudioTimeline(doc, coverPreRoll = 0, options = {}) {
   const preRoll = safeSeconds(coverPreRoll);
+  const includeVideoAudio = options.includeVideoAudio ?? true;
   const clips = [];
   let cursor = 0;
   for (const seg of doc.audio?.segments ?? []) {
@@ -77,7 +79,7 @@ function computeAudioTimeline(doc, coverPreRoll = 0) {
     cursor += durationSec;
   }
   for (const clip of resolveMediaSchedule(doc)) {
-    if (clip.kind !== "audio") continue;
+    if (clip.kind !== "audio" && !includeVideoAudio) continue;
     if (!Number.isFinite(clip.absoluteStart) || !Number.isFinite(clip.absoluteEnd)) continue;
     const durationSec = Math.max(0, clip.absoluteEnd - clip.absoluteStart);
     if (durationSec <= 0 || !clip.src) continue;
@@ -85,11 +87,47 @@ function computeAudioTimeline(doc, coverPreRoll = 0) {
       src: clip.src,
       startSec: safeSeconds(clip.absoluteStart) + preRoll,
       sourceInSec: safeSeconds(clip.sourceIn),
-      durationSec
+      durationSec,
+      ...clip.kind === "video" ? { sourceKind: "video" } : {}
+    });
+  }
+  if (includeVideoAudio) {
+    const blocks = flattenRenderableBlocks(doc.blocks);
+    const existing = new Set(clips.map(timelineKey));
+    blocks.forEach((block, blockIndex) => {
+      const materialized = materializeBlockLayers(block, {
+        blockIndex,
+        totalBlocks: blocks.length,
+        customTemplates: doc.customTemplates,
+        persistentLayers: false
+      });
+      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 blockRemainder = Math.max(0, safeSeconds(block.duration) - startAt);
+        const durationSec = layer.content.spillover ? clipDuration : Math.min(clipDuration, blockRemainder);
+        if (durationSec <= 0) continue;
+        const candidate = {
+          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);
+      }
     });
   }
   return clips;
 }
+function timelineKey(clip) {
+  return `${clip.src}\0${clip.startSec}\0${clip.sourceInSec}\0${clip.durationSec}`;
+}
 function safeSeconds(value) {
   return Number.isFinite(value) && value > 0 ? value : 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bendyline/squisq-video",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "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.4.1",
+    "@bendyline/squisq": "2.4.3",
     "@ffmpeg/ffmpeg": "0.12.15",
     "@ffmpeg/util": "0.12.2"
   },