Fix overly

common-utils

@@ -1 +1 @@
-Subproject commit 017243cdd3557fe8e78c195b79bdce52b17f5b92
+Subproject commit 48ca73211bd3385143512d8bdc5aba48ea72c0ab

server-plugins/overlay.js

@@ -19,7 +19,7 @@ export class OverlayPlugin extends Plugin {
 
     let overlayPath = null;
     // if option looks like a file path
-    if (/\.(mp4|webm)$/i.test(overlayOpt)) {
+    if (/\.(mp4|webm|png)$/i.test(overlayOpt)) {
       const flattened = this.mediaPathFlatten(overlayOpt);
       if (fs.existsSync(flattened)) overlayPath = flattened;
       else if (fs.existsSync(overlayOpt)) overlayPath = overlayOpt;
@@ -28,12 +28,14 @@ export class OverlayPlugin extends Plugin {
         return;
       }
     } else {
-      // look inside public/assets/effects for mp4 or webm
+      // look inside public/assets/effects for mp4, webm, or png
       const effectsDir = path.join('public', 'assets', 'effects');
       const mp4Path = path.join(effectsDir, `${overlayOpt}.mp4`);
       const webmPath = path.join(effectsDir, `${overlayOpt}.webm`);
+      const pngPath = path.join(effectsDir, `${overlayOpt}.png`);
       if (fs.existsSync(mp4Path)) overlayPath = mp4Path;
       else if (fs.existsSync(webmPath)) overlayPath = webmPath;
+      else if (fs.existsSync(pngPath)) overlayPath = pngPath;
       else {
         this.log(`No overlay found for '${overlayOpt}' in ${effectsDir}`);
         return;
@@ -68,6 +70,8 @@ export class OverlayPlugin extends Plugin {
 
           const srcW = parseInt(meta.video.width);
           const srcH = parseInt(meta.video.height);
+          const srcDuration = parseFloat(meta.duration || meta.format?.duration || 0);
+          const durationArg = srcDuration > 0 ? `-t ${srcDuration}` : '';
 
           const ext = path.extname(mediaPath);
           const base = path.basename(mediaPath, ext);
@@ -78,10 +82,16 @@ export class OverlayPlugin extends Plugin {
           if (overlayExt === '.mp4') {
             // mp4 uses green-screen (chroma key) -> remove green then overlay
             // chromakey params: color (green), similarity, blend
-            cmd = `ffmpeg -i "${mediaPath}" -i "${overlayPath}" -filter_complex "[1:v]scale=${srcW}:${srcH},chromakey=0x00FF00:0.3:0.1[ovr];[0:v][ovr]overlay=0:0:format=auto,format=yuv420p" -c:v libx264 -preset veryfast -crf 23 -c:a copy -shortest "${outPath}" -y`;
+            cmd = `ffmpeg -i "${mediaPath}" -stream_loop -1 -i "${overlayPath}" -filter_complex "[1:v]scale=${srcW}:${srcH},chromakey=0x00FF00:0.3:0.1[ovr];[0:v][ovr]overlay=0:0:format=auto,format=yuv420p" -c:v libx264 -preset veryfast -crf 23 -c:a copy ${durationArg} "${outPath}" -y`;
+          } else if (overlayExt === '.webm') {
+            // webm assumed to have alpha (transparent video) and should loop to match source duration
+            cmd = `ffmpeg -i "${mediaPath}" -stream_loop -1 -i "${overlayPath}" -filter_complex "[1:v]scale=${srcW}:${srcH}[ovr];[0:v][ovr]overlay=0:0:format=auto,format=yuv420p" -c:v libx264 -preset veryfast -crf 23 -c:a copy ${durationArg} "${outPath}" -y`;
+          } else if (overlayExt === '.png') {
+            // png is static image overlay, loop to cover full video duration
+            cmd = `ffmpeg -i "${mediaPath}" -loop 1 -i "${overlayPath}" -filter_complex "[1:v]scale=${srcW}:${srcH}[ovr];[0:v][ovr]overlay=0:0:format=auto,format=yuv420p" -c:v libx264 -preset veryfast -crf 23 -c:a copy ${durationArg} "${outPath}" -y`;
           } else {
-            // webm assumed to have alpha (transparent video)
-            cmd = `ffmpeg -i "${mediaPath}" -i "${overlayPath}" -filter_complex "[1:v]scale=${srcW}:${srcH}[ovr];[0:v][ovr]overlay=0:0:format=auto,format=yuv420p" -c:v libx264 -preset veryfast -crf 23 -c:a copy -shortest "${outPath}" -y`;
+            this.log(`Unsupported overlay extension: ${overlayExt}`);
+            continue;
           }
 
           this.log(`Applying overlay ${overlayPath} -> ${outPath} on ${mediaPath}`);