Update app.py

app.py

@@ -1,599 +1,106 @@
-import gradio as gr
-import os
-import subprocess
-import tempfile
-import shutil
-import time
-import glob
-
-
-# =========================================================
-# Helpers
-# =========================================================
-
-def run_cmd(cmd):
-    result = subprocess.run(
-        cmd,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        text=True,
-        check=False
-    )
-    return result
-
-
-def get_video_info(video_path):
-    """
-    Get original video properties.
-    """
-    if not video_path or not os.path.exists(video_path):
-        raise ValueError("Video file not found.")
-
-    # Resolution
-    cmd = [
-        "ffprobe",
-        "-v", "error",
-        "-select_streams", "v:0",
-        "-show_entries", "stream=width,height",
-        "-of", "csv=p=0:s=x",
-        video_path
-    ]
-
-    result = run_cmd(cmd)
-
-    if result.returncode != 0:
-        raise RuntimeError(result.stderr)
-
-    width, height = map(int, result.stdout.strip().split("x"))
-
-    # FPS
-    cmd = [
-        "ffprobe",
-        "-v", "error",
-        "-select_streams", "v:0",
-        "-show_entries", "stream=r_frame_rate",
-        "-of", "default=noprint_wrappers=1:nokey=1",
-        video_path
-    ]
-
-    result = run_cmd(cmd)
-
-    if result.returncode != 0:
-        raise RuntimeError(result.stderr)
-
-    fps_text = result.stdout.strip()
-
-    if "/" in fps_text:
-        num, den = fps_text.split("/")
-        fps = float(num) / float(den)
-    else:
-        fps = float(fps_text)
-
-    # Duration
-    cmd = [
-        "ffprobe",
-        "-v", "error",
-        "-show_entries", "format=duration",
-        "-of", "default=noprint_wrappers=1:nokey=1",
-        video_path
-    ]
-
-    result = run_cmd(cmd)
-
-    if result.returncode != 0:
-        raise RuntimeError(result.stderr)
-
-    duration = float(result.stdout.strip())
-
-    # Audio presence
-    cmd = [
-        "ffprobe",
-        "-v", "error",
-        "-select_streams", "a:0",
-        "-show_entries", "stream=index",
-        "-of", "csv=p=0",
-        video_path
-    ]
-
-    result = run_cmd(cmd)
-
-    has_audio = bool(result.stdout.strip())
-
-    return {
-        "width": width,
-        "height": height,
-        "fps": fps,
-        "duration": duration,
-        "has_audio": has_audio
-    }
-
-
-def format_time(seconds):
-    seconds = float(seconds)
-
-    hours = int(seconds // 3600)
-    minutes = int((seconds % 3600) // 60)
-    secs = seconds % 60
-
-    if hours > 0:
-        return f"{hours:02d}:{minutes:02d}:{secs:06.3f}"
-
-    return f"{minutes:02d}:{secs:06.3f}"
-
-
-# =========================================================
-# Extract frames
-# =========================================================
-
-def extract_frames(video_path, start_time, frame_count):
-    """
-    Extract consecutive frames beginning at start_time.
-    """
-
-    if not video_path:
-        return [], None, "Please upload a video first."
-
+import gradio as gr, subprocess, os, tempfile, glob, time
+
+def path(x):
+    if isinstance(x,str): return x
+    if isinstance(x,dict): return x.get("path") or x.get("name")
+    return None
+
+def info(v):
+    r=subprocess.run([
+        "ffprobe","-v","error","-select_streams","v:0",
+        "-show_entries","stream=width,height,r_frame_rate",
+        "-of","default=noprint_wrappers=1",v
+    ],capture_output=True,text=True,check=True)
+    d={}
+    for x in r.stdout.strip().splitlines():
+        if "=" in x:
+            k,val=x.split("=",1); d[k]=val
+    a= d["r_frame_rate"].split("/")
+    return int(d["width"]),int(d["height"]),float(a[0])/float(a[1])
+
+def extract(v,t,n):
+    v=path(v)
+    if not v: return [],None,"Upload a video."
     try:
-        start_time = float(start_time)
-        frame_count = int(frame_count)
-
-        if start_time < 0:
-            return [], None, "Start time cannot be negative."
-
-        if frame_count < 1:
-            return [], None, "Number of frames must be at least 1."
-
-        info = get_video_info(video_path)
-
-        if start_time >= info["duration"]:
-            return [], None, (
-                f"Start time is beyond the video duration "
-                f"({format_time(info['duration'])})."
-            )
-
-        max_possible = int(
-            (info["duration"] - start_time) * info["fps"]
-        )
-
-        if frame_count > max_possible:
-            frame_count = max_possible
-
-        if frame_count < 1:
-            return [], None, "No frames are available at that time."
-
-        work_dir = tempfile.mkdtemp(prefix="frame_editor_")
-        frame_pattern = os.path.join(
-            work_dir,
-            "frame_%06d.png"
-        )
-
-        # Exact consecutive frames from selected point
-        cmd = [
-            "ffmpeg",
-            "-y",
-            "-ss", str(start_time),
-            "-i", video_path,
-            "-frames:v", str(frame_count),
-            "-vsync", "0",
-            frame_pattern
-        ]
-
-        result = run_cmd(cmd)
-
-        if result.returncode != 0:
-            shutil.rmtree(work_dir, ignore_errors=True)
-
-            return [], None, (
-                "Frame extraction failed:\n\n"
-                + result.stderr
-            )
-
-        frames = sorted(
-            glob.glob(
-                os.path.join(work_dir, "frame_*.png")
-            )
-        )
-
-        if not frames:
-            shutil.rmtree(work_dir, ignore_errors=True)
-
-            return [], None, "No frames could be extracted."
-
-        # Gallery captions
-        gallery_items = []
-
-        for i, frame_path in enumerate(frames):
-            frame_time = start_time + (i / info["fps"])
-
-            gallery_items.append(
-                (
-                    frame_path,
-                    f"Frame {i + 1} • {format_time(frame_time)}"
-                )
-            )
-
-        state = {
-            "work_dir": work_dir,
-            "frames": frames,
-            "video_path": video_path,
-            "start_time": start_time,
-            "frame_count": len(frames),
-            "info": info
-        }
-
-        message = (
-            f"Extracted {len(frames)} frame(s)\n"
-            f"Starting at {format_time(start_time)}\n"
-            f"Original FPS: {info['fps']:.3f}\n"
-            f"Resolution: {info['width']} × {info['height']}"
-        )
-
-        return gallery_items, state, message
-
+        t=float(t); n=int(n)
+        w,h,fps=info(v)
+        d=tempfile.mkdtemp()
+        pat=os.path.join(d,"f_%05d.png")
+        r=subprocess.run([
+            "ffmpeg","-y","-ss",str(t),"-i",v,
+            "-frames:v",str(n),"-vsync","0",pat
+        ],capture_output=True,text=True)
+        if r.returncode: return [],None,r.stderr
+        fs=sorted(glob.glob(os.path.join(d,"f_*.png")))
+        if not fs: return [],None,"No frames found."
+        return [(f,f"Frame {i+1}") for i,f in enumerate(fs)],{
+            "video":v,"dir":d,"frames":fs,"fps":fps,"w":w,"h":h
+        },f"Extracted {len(fs)} frame(s) at {t:.3f}s"
     except Exception as e:
-        return [], None, f"Error: {str(e)}"
-
-
-# =========================================================
-# Prepend frames
-# =========================================================
-
-def prepend_frames(state):
-    """
-    Put the extracted frames at the beginning of the video.
-    Original audio stream is preserved with -c:a copy.
-    """
-
-    if not state:
-        return None, "Please extract frames first."
+        return [],None,str(e)
 
+def prepend(s):
+    if not s: return None,"Extract frames first."
     try:
-        work_dir = state["work_dir"]
-        frames = state["frames"]
-        video_path = state["video_path"]
-        info = state["info"]
-
-        if not frames:
-            return None, "No extracted frames found."
-
-        fps = info["fps"]
-        width = info["width"]
-        height = info["height"]
-
-        # -------------------------------------------------
-        # Create intro video from extracted PNG frames
-        # -------------------------------------------------
-
-        intro_video = os.path.join(
-            work_dir,
-            "intro.mp4"
-        )
-
-        # Use the exact source dimensions.
-        # High-quality H.264 encoding.
-        cmd = [
-            "ffmpeg",
-            "-y",
-            "-framerate", str(fps),
-            "-i", os.path.join(
-                work_dir,
-                "frame_%06d.png"
-            ),
-            "-vf",
-            f"scale={width}:{height}:flags=lanczos,"
-            f"format=yuv420p",
-            "-c:v", "libx264",
-            "-preset", "medium",
-            "-crf", "18",
-            "-movflags", "+faststart",
-            intro_video
+        d,fs,v,fps,w,h=s["dir"],s["frames"],s["video"],s["fps"],s["w"],s["h"]
+        intro=os.path.join(d,"intro.mp4")
+        out=f"edited_{int(time.time())}.mp4"
+
+        r=subprocess.run([
+            "ffmpeg","-y","-framerate",str(fps),
+            "-i",os.path.join(d,"f_%05d.png"),
+            "-c:v","libx264","-crf","18","-preset","medium",
+            "-pix_fmt","yuv420p",intro
+        ],capture_output=True,text=True)
+        if r.returncode: return None,r.stderr
+
+        cmd=[
+            "ffmpeg","-y","-i",intro,"-i",v,
+            "-filter_complex",
+            f"[0:v]scale={w}:{h},setsar=1[v0];"
+            f"[1:v]scale={w}:{h},setsar=1[v1];"
+            "[v0][v1]concat=n=2:v=1:a=0[v]",
+            "-map","[v]"
         ]
 
-        result = run_cmd(cmd)
-
-        if result.returncode != 0:
-            return None, (
-                "Could not create intro video:\n\n"
-                + result.stderr
-            )
-
-        # -------------------------------------------------
-        # Concatenate intro + original video
-        #
-        # Video must be rebuilt because new frames were
-        # inserted. Audio is taken directly from original.
-        # -------------------------------------------------
-
-        output_dir = "edited_videos"
-        os.makedirs(output_dir, exist_ok=True)
-
-        output_path = os.path.join(
-            output_dir,
-            f"video_with_intro_{int(time.time())}.mp4"
-        )
-
-        concat_video = os.path.join(
-            work_dir,
-            "combined_video.mp4"
-        )
-
-        # Normalize both video sections to the same format
-        # and concatenate them without touching the audio.
-        filter_complex = (
-            "[0:v]"
-            f"scale={width}:{height}:flags=lanczos,"
-            "format=yuv420p,"
-            "setpts=PTS-STARTPTS[v0];"
-
-            "[1:v]"
-            f"scale={width}:{height}:flags=lanczos,"
-            "format=yuv420p,"
-            "setpts=PTS-STARTPTS[v1];"
-
-            "[v0][v1]"
-            "concat=n=2:v=1:a=0[outv]"
-        )
-
-        if info["has_audio"]:
-
-            cmd = [
-                "ffmpeg",
-                "-y",
-
-                "-i", intro_video,
-                "-i", video_path,
-
-                "-filter_complex", filter_complex,
-
-                "-map", "[outv]",
-                "-map", "1:a:0",
-
-                # High visual quality
-                "-c:v", "libx264",
-                "-preset", "medium",
-                "-crf", "18",
-
-                # IMPORTANT:
-                # original audio copied without re-encoding
-                "-c:a", "copy",
-
-                "-movflags", "+faststart",
-
-                "-shortest",
-
-                output_path
-            ]
-
-        else:
-
-            cmd = [
-                "ffmpeg",
-                "-y",
-
-                "-i", intro_video,
-                "-i", video_path,
-
-                "-filter_complex", filter_complex,
-
-                "-map", "[outv]",
-
-                "-c:v", "libx264",
-                "-preset", "medium",
-                "-crf", "18",
-
-                "-movflags", "+faststart",
-
-                output_path
-            ]
-
-        result = run_cmd(cmd)
-
-        if result.returncode != 0:
-            return None, (
-                "Could not create final video:\n\n"
-                + result.stderr
-            )
-
-        # -------------------------------------------------
-        # Verify output
-        # -------------------------------------------------
-
-        if not os.path.exists(output_path):
-            return None, "Final video was not created."
-
-        original_duration = info["duration"]
-        intro_duration = len(frames) / fps
-        final_duration = original_duration + intro_duration
-
-        audio_text = (
-            "Original audio copied unchanged."
-            if info["has_audio"]
-            else "No audio track detected."
-        )
-
-        status = (
-            "✅ Frames copied to the beginning.\n\n"
-            f"Frames added: {len(frames)}\n"
-            f"Added duration: {intro_duration:.3f} s\n"
-            f"Original duration: {original_duration:.3f} s\n"
-            f"Final duration: {final_duration:.3f} s\n"
-            f"Resolution: {width} × {height}\n"
-            f"FPS: {fps:.3f}\n\n"
-            f"{audio_text}"
-        )
-
-        return output_path, status
+        # Keep original audio exactly as it is
+        r=subprocess.run([
+            *cmd,"-map","1:a?", "-c:v","libx264","-crf","18",
+            "-preset","medium","-c:a","copy","-movflags","+faststart",out
+        ],capture_output=True,text=True)
 
+        if r.returncode: return None,r.stderr
+        return out,f"✅ Added {len(fs)} frame(s) to the beginning."
     except Exception as e:
-        return None, f"Error: {str(e)}"
-
-
-# =========================================================
-# Clear / reset
-# =========================================================
-
-def reset_editor():
-    return (
-        None,
-        None,
-        None,
-        [],
-        None,
-        "Ready."
-    )
+        return None,str(e)
 
+with gr.Blocks(title="Video Frame Editor") as demo:
+    gr.Markdown("# 🎬 Video Frame Editor")
 
-# =========================================================
-# Gradio UI
-# =========================================================
-
-with gr.Blocks(
-    title="Frame Intro Video Editor"
-) as demo:
-
-    gr.Markdown(
-        """
-        # 🎬 Frame Intro Video Editor
-
-        Extract frames from any point in a video, preview them,
-        then copy those frames to the beginning of the video.
-        """
-    )
-
-    # -----------------------------------------------------
-    # Upload
-    # -----------------------------------------------------
-
-    video_input = gr.Video(
-        label="Input Video",
-        type="filepath"
-    )
-
-    # -----------------------------------------------------
-    # Controls
-    # -----------------------------------------------------
-
+    video=gr.Video(label="Video")
     with gr.Row():
-
-        start_time = gr.Number(
-            value=0,
-            label="Start Time (seconds)",
-            precision=3
-        )
-
-        frame_count = gr.Number(
-            value=1,
-            minimum=1,
-            precision=0,
-            label="Number of Frames"
-        )
-
-    extract_btn = gr.Button(
-        "🎞️ Extract Frames",
-        variant="primary"
-    )
-
-    # -----------------------------------------------------
-    # Extracted frames
-    # -----------------------------------------------------
-
-    frames_output = gr.Gallery(
-        label="Extracted Frames",
-        columns=4,
-        rows=1,
-        height="auto",
-        object_fit="contain",
-        preview=True
-    )
-
-    frame_state = gr.State(None)
-
-    extraction_status = gr.Textbox(
-        label="Extraction Status",
-        interactive=False
+        start=gr.Number(0,label="Start Time (seconds)")
+        count=gr.Number(1,label="Number of Frames",precision=0)
+
+    extract=gr.Button("Extract Frames",variant="primary")
+    gallery=gr.Gallery(label="Extracted Frames",columns=5,object_fit="contain")
+    state=gr.State()
+    status=gr.Textbox(label="Status")
+
+    copy=gr.Button("Copy Frames to Beginning",variant="primary")
+    output=gr.Video(label="Final Video")
+    outstatus=gr.Textbox(label="Output")
+
+    extract.click(
+        extract,
+        [video,start,count],
+        [gallery,state,status]
     )
 
-    # -----------------------------------------------------
-    # Copy to beginning
-    # -----------------------------------------------------
-
-    copy_btn = gr.Button(
-        "📋 Copy Frames to Intro",
-        variant="primary"
-    )
-
-    # -----------------------------------------------------
-    # Final output
-    # -----------------------------------------------------
-
-    final_video = gr.Video(
-        label="Final Video",
-        autoplay=False,
-        interactive=False
+    copy.click(
+        prepend,
+        state,
+        [output,outstatus]
     )
 
-    final_status = gr.Textbox(
-        label="Final Status",
-        interactive=False
-    )
-
-    # -----------------------------------------------------
-    # Reset
-    # -----------------------------------------------------
-
-    reset_btn = gr.Button(
-        "Reset"
-    )
-
-    # =====================================================
-    # Events
-    # =====================================================
-
-    extract_btn.click(
-        fn=extract_frames,
-        inputs=[
-            video_input,
-            start_time,
-            frame_count
-        ],
-        outputs=[
-            frames_output,
-            frame_state,
-            extraction_status
-        ]
-    )
-
-    copy_btn.click(
-        fn=prepend_frames,
-        inputs=[
-            frame_state
-        ],
-        outputs=[
-            final_video,
-            final_status
-        ]
-    )
-
-    reset_btn.click(
-        fn=reset_editor,
-        inputs=[],
-        outputs=[
-            video_input,
-            start_time,
-            frame_count,
-            frames_output,
-            final_video,
-            final_status
-        ]
-    )
-
-
-# =========================================================
-# Launch
-# =========================================================
-
-if __name__ == "__main__":
-    demo.launch(
-        server_name="0.0.0.0",
-        server_port=7860
-    )
+demo.launch(server_name="0.0.0.0",server_port=7860)