simple-ffmpegjs 0.4.2 → 0.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-ffmpegjs",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Declarative video composition for Node.js — define clips, transitions, text, and audio as simple objects, and let FFmpeg handle the rest.",
   "author": "Brayden Blackwell <braydenblackwell21@gmail.com> (https://github.com/Fats403)",
   "license": "MIT",

package/src/ffmpeg/bgm_builder.js

@@ -12,19 +12,23 @@ function buildBackgroundMusicMix(
     };
   }
 
+  // Prefer the caller-supplied visualEnd which accounts for transition
+  // compression, falling back to clip end values for audio-only projects.
   const projectDuration =
-    project.videoOrAudioClips.filter(
-      (c) => c.type === "video" || c.type === "image"
-    ).length > 0
-      ? Math.max(
-          ...project.videoOrAudioClips
-            .filter((c) => c.type === "video" || c.type === "image")
-            .map((c) => c.end)
-        )
-      : Math.max(
-          0,
-          ...backgroundClips.map((c) => (typeof c.end === "number" ? c.end : 0))
-        );
+    typeof visualEnd === "number" && visualEnd > 0
+      ? visualEnd
+      : project.videoOrAudioClips.filter(
+          (c) => c.type === "video" || c.type === "image"
+        ).length > 0
+        ? Math.max(
+            ...project.videoOrAudioClips
+              .filter((c) => c.type === "video" || c.type === "image")
+              .map((c) => c.end)
+          )
+        : Math.max(
+            0,
+            ...backgroundClips.map((c) => (typeof c.end === "number" ? c.end : 0))
+          );
 
   let filter = "";
   const bgLabels = [];

package/src/simpleffmpeg.js

@@ -469,17 +469,11 @@ class SIMPLEFFMPEG {
       finalVideoLabel = vres.finalVideoLabel;
       hasVideo = vres.hasVideo;
 
-      // Use the actual video output length for finalVisualEnd so that
-      // audio trim and BGM duration match the real video stream length,
-      // rather than an original-timeline position that may differ due to
-      // transition compression.
+      // Use the actual video output length so that audio trim and BGM
+      // duration match the real video stream length, which may be shorter
+      // than the original-timeline positions due to transition compression.
       if (typeof vres.videoDuration === "number" && vres.videoDuration > 0) {
         totalVideoDuration = vres.videoDuration;
-      }
-      if (
-        typeof vres.videoDuration === "number" &&
-        vres.videoDuration > finalVisualEnd
-      ) {
         finalVisualEnd = vres.videoDuration;
       }
     }
@@ -800,9 +794,12 @@ class SIMPLEFFMPEG {
 
       const wmConfig = exportOptions.watermark;
 
-      // For image watermarks, we need to add an input
+      // For image watermarks, we need to add an input.
+      // Use the actual file input count (from _inputIndexMap) rather than
+      // videoOrAudioClips.length, because flat color clips use the color=
+      // filter source and don't produce file inputs.
       if (wmConfig.type === "image" && wmConfig.url) {
-        watermarkInputIndex = this.videoOrAudioClips.length;
+        watermarkInputIndex = this._inputIndexMap.size;
         watermarkInputString = ` -i "${escapeFilePath(wmConfig.url)}"`;
       }