Bubble feature done and dusted

utils/AvatarRender.js

@@ -60,40 +60,38 @@ export class AvatarRenderer {
         tempFiles.push(sectionVideo);
       }
 
-      // Burn captions for this section
+      // First apply bubbles (so they are below caption layer)
+      let sourceAfterBubbles = sectionVideo;
+      if (section.bubbles && Array.isArray(section.bubbles) && section.bubbles.length) {
+        const bubbledFile = path.join(outDir, `${jobId}_section${i}_bubbled.mp4`);
+        try {
+          onLog && onLog(`Applying ${section.bubbles.length} bubble(s) to section ${i}...\n`);
+          await Bubble.makeBubble(sectionVideo, section.bubbles, bubbledFile, onLog);
+          tempFiles.push(bubbledFile);
+          sourceAfterBubbles = bubbledFile;
+        } catch (e) {
+          onLog && onLog(`Bubble application failed for section ${i}, using original: ${e}\n`);
+          sourceAfterBubbles = sectionVideo;
+        }
+      }
+
+      // Then burn captions on top of bubbled video (so captions stay visible)
       const captionFile = section.audioCaptionFile;
-      let sourceForBubbles;
       if (captionFile && captionFile.endsWith('.ass')) {
         const subbedFile = path.join(outDir, `${jobId}_section${i}_subbed.mp4`);
         const esc = captionFile.replace(/\\/g, '/').replace(/:/g, '\\:');
         const subArgs = [
-          '-i', sectionVideo,
+          '-i', sourceAfterBubbles,
           '-vf', `subtitles='${esc}'`,
           '-c:a', 'copy',
           '-y', subbedFile
         ];
-        onLog && onLog(`Burning captions for section ${i}...\n`);
+        onLog && onLog(`Burning captions for section ${i} after bubbles...\n`);
         await this.runFFmpeg(subArgs, controller, onLog);
         tempFiles.push(subbedFile);
-        sourceForBubbles = subbedFile;
-      } else {
-        sourceForBubbles = sectionVideo;
-      }
-
-      // Apply bubbles if present on this section
-      if (section.bubbles && Array.isArray(section.bubbles) && section.bubbles.length) {
-        const bubbledFile = path.join(outDir, `${jobId}_section${i}_bubbled.mp4`);
-        try {
-          onLog && onLog(`Applying ${section.bubbles.length} bubble(s) to section ${i}...\n`);
-          await Bubble.makeBubble(sourceForBubbles, section.bubbles, bubbledFile, onLog);
-          tempFiles.push(bubbledFile);
-          sectionCaptionedVideos.push(bubbledFile);
-        } catch (e) {
-          onLog && onLog(`Bubble application failed for section ${i}, using original: ${e}\n`);
-          sectionCaptionedVideos.push(sourceForBubbles);
-        }
+        sectionCaptionedVideos.push(subbedFile);
       } else {
-        sectionCaptionedVideos.push(sourceForBubbles);
+        sectionCaptionedVideos.push(sourceAfterBubbles);
       }
     }