Update rust_combiner/src/lib.rs

rust_combiner/src/lib.rs

@@ -1,97 +1,29 @@
-use pyo3::prelude::*;
-use std::process::Command;
-use std::path::Path;
-
-#[pyfunction]
-fn render_video(
-    id: usize,
-    image_path: String,
-    audio_path: String,
-    duration: f64,
-    words: Vec<(String, (u32, u32, u32, u32))>,
-    output_dir: String,
-) -> PyResult<String> {
-    // Validate paths
-    if !Path::new(&image_path).exists() {
-        return Err(pyo3::exceptions::PyFileNotFoundError::new_err(format!(
-            "Image not found: {}",
-            image_path
-        )));
-    }
-    if !Path::new(&audio_path).exists() {
-        return Err(pyo3::exceptions::PyFileNotFoundError::new_err(format!(
-            "Audio not found: {}",
-            audio_path
-        )));
-    }
-
-    let output_path = format!("{}/clip{}.mp4", output_dir, id);
-    let duration_str = duration.to_string();
-    let n_words = words.len() as f64;
-    let highlight_duration = duration / n_words;
-
-    // Build complex filter graph
-    let mut filter_complex = String::new();
-    let mut last_output = "0:v".to_string();
-
-    for (i, (_, (x, y, w, h))) in words.iter().enumerate() {
-        let start = i as f64 * highlight_duration;
-        let end = start + highlight_duration;
-
-        filter_complex.push_str(&format!(
-            "[{last_out}]drawbox=x={x}:y={y}:w={w}:h={h}:[email protected]:t=fill:enable='between(t,{start:.3},{end:.3})'[v{i}];",
-            last_out = last_output,
-            x = x,
-            y = y,
-            w = w,
-            h = h,
-            start = start,
-            end = end,
-            i = i
-        ));
-        last_output = format!("[v{i}]");
-    }
-
-    // Remove trailing semicolon
-    filter_complex.pop();
-
-    // FFmpeg command
-    let status = Command::new("ffmpeg")
-        .args(&[
-            "-y",
-            "-hwaccel", "auto",
-            "-loop", "1",
-            "-i", &image_path,
-            "-i", &audio_path,
-            "-filter_complex", &filter_complex,
-            "-map", &last_output,
-            "-map", "1:a",
-            "-c:v", "libx264",
-            "-preset", "fast",
-            "-crf", "18",
-            "-pix_fmt", "yuv420p",
-            "-movflags", "+faststart",
-            "-c:a", "aac",
-            "-b:a", "192k",
-            "-r", "60",
-            "-t", &duration_str,
-            "-vsync", "2",
-            &output_path,
-        ])
-        .status();
-
-    match status {
-        Ok(exit_status) if exit_status.success() => Ok(output_path),
-        Ok(_) => Err(pyo3::exceptions::PyRuntimeError::new_err("FFmpeg command failed")),
-        Err(e) => Err(pyo3::exceptions::PyRuntimeError::new_err(format!(
-            "Failed to execute FFmpeg: {}",
-            e
-        ))),
-    }
-}
-
-#[pymodule]
-fn rust_highlight(_py: Python, m: &PyModule) -> PyResult<()> {
-    m.add_function(wrap_pyfunction!(render_video, m)?)?;
-    Ok(())
-}
+// rust_combiner/src/lib.rs use pyo3::prelude::*; use pyo3::wrap_pyfunction; use std::fs::File; use std::io::Write; use std::process::Command; use uuid::Uuid;
+
+#[pyfunction] fn combine_clips(clips: Vec<String>) -> PyResult<String> { let paths: Vec<&str> = clips.iter().map(|s| s.as_str()).collect(); concat_videos(paths) }
+
+fn concat_videos(clips: Vec<&str>) -> PyResult<String> { // Step 1: Write file list let list_file = format!("/tmp/clips_{}.txt", Uuid::new_v4()); let mut file = File::create(&list_file) .map_err(|e| pyo3::exceptions::PyIOError::new_err(e.to_string()))?; for clip in &clips { writeln!(file, "file '{}'", clip) .map_err(|e| pyo3::exceptions::PyIOError::new_err(e.to_string()))?; }
+
+// Step 2: Run FFmpeg
+let output_file = format!("/tmp/final_video_{}.mp4", Uuid::new_v4());
+let status = Command::new("ffmpeg")
+    .args(&[
+        "-y",
+        "-f", "concat",
+        "-safe", "0",
+        "-i", &list_file,
+        "-c", "copy",
+        &output_file,
+    ])
+    .status()
+    .map_err(|e| pyo3::exceptions::PyRuntimeError::new_err(e.to_string()))?;
+
+if status.success() {
+    Ok(output_file)
+} else {
+    Err(pyo3::exceptions::PyRuntimeError::new_err("FFmpeg command failed"))
+}
+
+}
+
+#[pymodule] fn rust_combiner(_py: Python, m: &PyModule) -> PyResult<()> { m.add_function(wrap_pyfunction!(combine_clips, m)?)?; Ok(()) }