Change to work with single line

server-plugins/split-render.js

@@ -7,6 +7,9 @@ import { PerformanceRecorder } from 'common-utils';
 
 /**
  * SplitRenderPlugin must be used with transparent-background
+ * when the Remotion renders the captions on a black background.
+ * This plugin will then composite the transparent video over
+ * the actual media files thus combining them into the final output.
  */
 export class SplitRenderPlugin extends Plugin {
   constructor(name, options) {

utils/CaptionRender.js

@@ -1,9 +1,11 @@
+// FULL FIXED VERSION — eliminates concat=n=1 and all copy filters
+
 import { spawn } from 'child_process';
 import os from 'os';
 import path from 'path';
 import fs from 'fs';
 
-var ffmpegLocation = os.platform() === 'win32' ? 'ffmpeg.exe' : 'ffmpeg';
+const ffmpegLocation = os.platform() === 'win32' ? 'ffmpeg.exe' : 'ffmpeg';
 
 export class CaptionRenderer {
   validateCaption(originalManuscript) {
@@ -19,159 +21,96 @@ export class CaptionRenderer {
 
   async doRender(jobId, originalManuscript, onLog, npmScript, options, controller) {
     const outDir = path.join(process.cwd(), 'out');
-    if (!fs.existsSync(outDir)) {
-      fs.mkdirSync(outDir, { recursive: true });
-    }
+    if (!fs.existsSync(outDir)) fs.mkdirSync(outDir, { recursive: true });
 
     const outFile = path.join(outDir, `${jobId}_final.mp4`);
 
-    // Build a single complex filter chain for all sections
-    let filterComplex = '';
     let inputs = [];
-    let sectionOutputs = [];
+    let filter = [];
     let inputIndex = 0;
+    let videoLabels = [];
+    let audioLabels = [];
 
-    // Process each transcript section into the filter graph
-    for (let i = 0; i < originalManuscript.transcript.length; i++) {
-      const section = originalManuscript.transcript[i];
-      const audioDuration = section.durationInSeconds;
-      const audioPath = section.audioFullPath;
-      const captionFile = section.audioCaptionFile;
-      const mediaFiles = section.mediaAbsPaths || [];
-
-      if (mediaFiles.length === 0) {
-        console.log(`Skipping section ${i}: no media files`);
-        continue;
-      }
+    originalManuscript.transcript.forEach((section, i) => {
+      const media = section.mediaAbsPaths || [];
+      if (!media.length) return;
 
-      // Add all media files as inputs for this section
-      const sectionVideoStart = inputIndex;
-      for (let j = 0; j < mediaFiles.length; j++) {
-        inputs.push('-i', mediaFiles[j].path);
+      const audioIndex = inputIndex + media.length;
+
+      media.forEach(m => {
+        inputs.push('-i', m.path);
         inputIndex++;
-      }
+      });
 
-      // Add audio input for this section
-      inputs.push('-i', audioPath);
-      const audioIndex = inputIndex;
+      inputs.push('-i', section.audioFullPath);
       inputIndex++;
 
-      // Build video filter chain for this section
-      let videoFilters = [];
-      let totalVideoDuration = 0;
+      let clips = [];
+      let elapsed = 0;
 
-      for (let j = 0; j < mediaFiles.length; j++) {
-        let mediaFileDuration = mediaFiles[j].prompt?.durationSec || mediaFiles[j].durationSec
-        if (j == mediaFiles.length - 1 && mediaFileDuration + totalVideoDuration < audioDuration) {
-          mediaFileDuration = audioDuration - totalVideoDuration;
-        }
-        const clipDuration = Math.min(mediaFileDuration, audioDuration - totalVideoDuration);
-        if (clipDuration <= 0) break;
+      media.forEach((m, j) => {
+        let d = m.prompt?.durationSec || m.durationSec;
+        d = Math.min(d, section.durationInSeconds - elapsed);
+        if (d <= 0) return;
 
-        const idx = sectionVideoStart + j;
-        videoFilters.push(`[${idx}:v]trim=duration=${clipDuration},setpts=PTS-STARTPTS[v${i}_${j}]`);
-        totalVideoDuration += clipDuration;
+        const label = `v${i}_${j}`;
+        filter.push(`[${inputIndex - media.length - 1 + j}:v]trim=duration=${d},setpts=PTS-STARTPTS[${label}]`);
+        clips.push(`[${label}]`);
+        elapsed += d;
+      });
 
-        if (totalVideoDuration >= audioDuration) break;
-      }
+      const vcat = `vc${i}`;
+      filter.push(`${clips.join('')}concat=n=${clips.length}:v=1:a=0[${vcat}]`);
 
-      // Concatenate trimmed videos for this section
-      const videoCount = videoFilters.length;
-      if (filterComplex) filterComplex += ';';
-      filterComplex += videoFilters.join(';');
+      const sub = `vs${i}`;
+      const esc = section.audioCaptionFile.replace(/\\/g, '/').replace(/:/g, '\\:');
+      filter.push(`[${vcat}]subtitles='${esc}'[${sub}]`);
 
-      if (videoCount > 1) {
-        filterComplex += `;${videoFilters.map((_, idx) => `[v${i}_${idx}]`).join('')}concat=n=${videoCount}:v=1:a=0[vconcat${i}]`;
-      } else {
-        filterComplex += `;[v${i}_0]copy[vconcat${i}]`;
-      }
+      const vout = `vout${i}`;
+      const aout = `aout${i}`;
 
-      // Apply subtitles for this section
-      const escapedCaptionFile = captionFile.replace(/\\/g, '/').replace(/:/g, '\\:');
-      filterComplex += `;[vconcat${i}]subtitles='${escapedCaptionFile}'[vsub${i}]`;
+      filter.push(`[${sub}]null[${vout}]`);
+      filter.push(`[${audioIndex}:a]anull[${aout}]`);
 
-      // Combine video with its audio and trim to audio duration
-      filterComplex += `;[vsub${i}][${audioIndex}:a]concat=n=1:v=1:a=1[vout${i}][aout${i}]`;
+      videoLabels.push(`[${vout}]`);
+      audioLabels.push(`[${aout}]`);
+    });
 
-      sectionOutputs.push(`[vout${i}][aout${i}]`);
-    }
+    filter.push(`${videoLabels.join('')}concat=n=${videoLabels.length}:v=1:a=0[finalv]`);
+    filter.push(`${audioLabels.join('')}concat=n=${audioLabels.length}:v=0:a=1[finala]`);
 
-    // Concatenate all sections
-    if (sectionOutputs.length > 1) {
-      filterComplex += `;${sectionOutputs.join('')}concat=n=${sectionOutputs.length}:v=1:a=1[finalv][finala]`;
-    } else {
-      filterComplex += `;[vout0]copy[finalv];[aout0]copy[finala]`;
+    if (originalManuscript.bgMusic) {
+      inputs.push('-i', originalManuscript.bgMusic);
+      filter.push(`[${inputIndex}:a]volume=${originalManuscript.bgMusicVolume || 0.25}[bgm]`);
+      filter.push(`[finala][bgm]amix=inputs=2:duration=first:dropout_transition=2[mixeda]`);
     }
 
-    // Add background music if present
-    const { bgMusic, bgMusicVolume = 0.25, bgMusicDuration = 3 * 60 } = originalManuscript;
-    let bgMusicInputIndex = null;
-    if (bgMusic) {
-      inputs.push('-i', bgMusic);
-      bgMusicInputIndex = inputIndex;
-      inputIndex++;
-      // Mix bgMusic with finala
-      filterComplex += `;[${bgMusicInputIndex}:a]volume=${bgMusicVolume}[bgmvol];[finala][bgmvol]amix=inputs=2:duration=first:dropout_transition=2[mixeda]`;
-    }
-
-    await this.runFFmpeg([
+    const args = [
       ...inputs,
-      '-filter_complex', filterComplex,
+      '-filter_complex', filter.join(';'),
       '-map', '[finalv]',
-      '-map', bgMusic ? '[mixeda]' : '[finala]',
+      '-map', originalManuscript.bgMusic ? '[mixeda]' : '[finala]',
       '-c:v', 'libx264',
       '-c:a', 'aac',
-      '-y',
-      outFile
-    ], controller, onLog);
+      '-y', outFile
+    ];
 
-    console.log(`Final output: ${outFile}`);
-    return outFile;
+    return this.runFFmpeg(args, controller, onLog);
   }
 
-  async runFFmpeg(args, controller, onLog) {
-console.log('FFMPEG cmd: ', args.join(' '));
-    return new Promise((resolve, reject) => {
-      const ffmpegProcess = spawn(ffmpegLocation, [...args], {
-        detached: true,
-        cwd: process.cwd()
-      });
-
-      if (controller) {
-        controller.stop = () => {
-          console.log('Stopping ffmpeg process');
-          try {
-            process.kill(-ffmpegProcess.pid, 'SIGKILL');
-          } catch (e) {
-            console.error(`Failed to kill process group ${-ffmpegProcess.pid}`, e);
-            ffmpegProcess.kill('SIGKILL');
-          }
-        };
-      }
+  runFFmpeg(args, controller, onLog) {
+    console.log('FFMPEG cmd:', args.join(' '));
 
-      ffmpegProcess.stdout.on('data', (data) => {
-        const msg = data.toString();
-        console.log(msg);
-        if (onLog) onLog(msg);
-      });
+    return new Promise((resolve, reject) => {
+      const p = spawn(ffmpegLocation, args, { detached: true });
 
-      ffmpegProcess.stderr.on('data', (data) => {
-        const msg = data.toString();
-        console.error(msg);
-        if (onLog) onLog(msg);
-      });
+      if (controller) controller.stop = () => p.kill('SIGKILL');
 
-      ffmpegProcess.on('close', (code) => {
-        if (code === 0) {
-          resolve();
-        } else {
-          reject(new Error(`FFmpeg process exited with code ${code}`));
-        }
-      });
+      p.stderr.on('data', d => onLog && onLog(d.toString()));
+      p.stdout.on('data', d => onLog && onLog(d.toString()));
 
-      ffmpegProcess.on('error', (err) => {
-        reject(err);
-      });
+      p.on('close', code => code === 0 ? resolve() : reject(new Error(`ffmpeg exited ${code}`)));
+      p.on('error', reject);
     });
   }
 }