Update rust_highlight/src/lib.rs

rust_highlight/src/lib.rs

@@ -1,12 +1,7 @@
 use pyo3::prelude::*;
-use pyo3::wrap_pyfunction;
-use std::fs::File;
-use std::io::Write;
-use std::path::Path;
 use std::process::Command;
-use uuid::Uuid;
+use std::path::Path;
 
-/// Renders a video by highlighting regions over time
 #[pyfunction]
 fn render_video(
     id: usize,
@@ -35,26 +30,42 @@ fn render_video(
     let n_words = words.len() as f64;
     let highlight_duration = duration / n_words;
 
-    // Build filter graph
-    let mut filters = vec![];
+    // 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;
-        filters.push(format!(
-            "drawbox=x={x}:y={y}:w={w}:h={h}:color=yellow@0.5:t=fill:enable='between(t,{start:.2},{end:.2})'"
+
+        filter_complex.push_str(&format!(
+            "[{last_out}]drawbox=x={x}:y={y}:w={w}:h={h}:color=yellow@0.5: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}]");
     }
 
-    let filter_chain = filters.join(",");
+    // 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,
-            "-vf", &filter_chain,
+            "-filter_complex", &filter_complex,
+            "-map", &last_output,
+            "-map", "1:a",
             "-c:v", "libx264",
             "-preset", "fast",
             "-crf", "18",
@@ -63,17 +74,15 @@ fn render_video(
             "-c:a", "aac",
             "-b:a", "192k",
             "-r", "60",
-            "-fps_mode", "vfr",
             "-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. Check filter syntax.",
-        )),
+        Ok(_) => Err(pyo3::exceptions::PyRuntimeError::new_err("FFmpeg command failed")),
         Err(e) => Err(pyo3::exceptions::PyRuntimeError::new_err(format!(
             "Failed to execute FFmpeg: {}",
             e
@@ -81,52 +90,8 @@ fn render_video(
     }
 }
 
-/// Combines multiple video clips into one
-#[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_highlight(_py: Python, m: &PyModule) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(render_video, m)?)?;
     Ok(())
-}
-
-#[pymodule]
-fn rust_combiner(_py: Python, m: &PyModule) -> PyResult<()> {
-    m.add_function(wrap_pyfunction!(combine_clips, m)?)?;
-    Ok(())
 }