Update app.py

app.py

@@ -344,61 +344,40 @@ def edit_video_raw(video_path: str) -> str:
     import os, uuid, random
     import numpy as np
     from moviepy.editor import (
-        VideoFileClip, ImageClip, ColorClip, TextClip,
-        CompositeVideoClip
+        VideoFileClip, ImageClip, ColorClip, CompositeVideoClip
     )
 
-    # Ensure the CAPTIONS list is defined
+    # Ensure CAPTIONS exist
     if not CAPTIONS:
         raise ValueError("CAPTIONS list is empty!")
 
     # Load main video
     clip = VideoFileClip(video_path)
+    vw, vh = 1080, 2100
 
-    vw, vh = 1080, 1920  # Standard resolution for vertical video
-    CAPTION_H = 179
-    LAUGH_H = 340
+    # Heights
+    CAPTION_H = 170
+    LAUGH_H = 500
     MID_H = 120
-    MAIN_H = vh - (CAPTION_H + LAUGH_H + MID_H)  # Calculate remaining height for the main video
+    MAIN_H = vh - (CAPTION_H + LAUGH_H + MID_H)
 
     if clip.duration < 6:
         raise ValueError("Main video must be at least 6 seconds.")
     if clip.duration > 180:
         clip = clip.subclip(0, 180)
 
-    # Top caption
-    caption = random.choice(CAPTIONS)
+    # === CAPTION ===
+    caption_text = random.choice(CAPTIONS)
     caption_img = create_text_image_2(
-        caption, vw, CAPTION_H,
+        caption_text, vw, CAPTION_H,
         font_size=72, align="center",
-        bg_color=(255, 255, 255), text_color=(0,0,0)
+        bg_color=(255, 255, 255), text_color=(0, 0, 0)
     )
     caption_clip = ImageClip(np.array(caption_img)) \
         .set_duration(clip.duration) \
         .set_position((0, 0))
 
-    # Laugh meme (4 seconds)
-    laugh_files = ["laugh/laugh_one.mp4", "laugh/laugh_two.mp4"]
-    laugh_path = random.choice(laugh_files)
-    if not os.path.exists(laugh_path):
-        raise FileNotFoundError(f"❌ Laugh meme not found: {laugh_path}")
-
-    laugh_raw = VideoFileClip(laugh_path).resize(width=vw)
-
-    # Ensure the laugh meme is exactly 4 seconds long
-    if laugh_raw.duration != 4:
-        laugh_raw = laugh_raw.subclip(0, 4)
-
-    # Crop laugh meme equally from top and bottom to fit within LAUGH_H
-    laugh_crop = laugh_raw.crop(
-        y1=(laugh_raw.h - LAUGH_H) // 2,  
-        y2=(laugh_raw.h + LAUGH_H) // 2
-    ).set_start(0).set_position((0, CAPTION_H))
-
-    # Freeze frame for the first 2 seconds (without audio)
-    freeze_frame = laugh_crop.subclip(0, 2).without_audio()
-
-    # Mid caption
+    # === MID CAPTION ===
     mid_text = random.choice([
         "Pura 1 din laga tab ye reel mili 🤣",
         "Ye miss mat kr dena 😜",
@@ -412,35 +391,47 @@ def edit_video_raw(video_path: str) -> str:
     )
     mid_caption_clip = ImageClip(np.array(mid_img)) \
         .set_duration(clip.duration) \
-        .set_start(0) \
         .set_position((0, CAPTION_H + LAUGH_H))
 
-    # Main video
-    main_video_y = CAPTION_H + LAUGH_H + MID_H
-    main_video = clip.resize(width=vw).crop(
-        y1=(clip.h - MAIN_H) // 2,  # Crop equally from top and bottom to fit the height
-        y2=(clip.h + MAIN_H) // 2
-    ).set_start(0).set_position((0, main_video_y))
+    # === MAIN VIDEO ===
+    clip = clip.resize(width=vw)
+    crop_y1 = 200
+    crop_y2 = crop_y1 + MAIN_H
+    main_video = clip.crop(y1=crop_y1, y2=crop_y2) \
+        .set_position((0, CAPTION_H + LAUGH_H + MID_H))
 
-    # Light filter over main video to reduce copyright detection
+    # Overlay (optional soft filter)
     overlay = ColorClip(size=(vw, MAIN_H), color=(255, 255, 255), duration=clip.duration) \
-        .set_opacity(0.06) \
-        .set_position((0, main_video_y))
-
-    # Final composition: 
-    # - Start laugh meme at the same time as main video
-    # - Freeze for first 2 seconds without audio
-    # - Freeze from 2s to (end-2) (no audio)
-    # - Last 2 seconds of meme with audio, starting at (end-2)
+        .set_opacity(0.1).set_position((0, CAPTION_H + LAUGH_H + MID_H))
+
+    # === LAUGH MEME ===
+    laugh_files = ["laugh/laugh_one.mp4", "laugh/laugh_two.mp4"]
+    laugh_path = random.choice(laugh_files)
+    if not os.path.exists(laugh_path):
+        raise FileNotFoundError(f"❌ Laugh meme not found: {laugh_path}")
+
+    laugh_clip = VideoFileClip(laugh_path).resize(width=vw).subclip(0, 4)
+    y1 = (laugh_clip.h - LAUGH_H) // 2
+    y2 = y1 + LAUGH_H
+    laugh_crop = laugh_clip.crop(y1=y1, y2=y2).set_position((0, CAPTION_H))
+
+    # Parts:
+    laugh_part1 = laugh_crop.subclip(0, 2).set_start(0)
+    laugh_frozen = ImageClip(laugh_crop.get_frame(2)) \
+        .set_duration(clip.duration - 4).set_start(2) \
+        .set_position((0, CAPTION_H))
+    laugh_part3 = laugh_crop.subclip(2, 4).set_start(clip.duration - 2)
+
+    # === FINAL COMPOSITION ===
     final = CompositeVideoClip([
-        caption_clip,
-        freeze_frame,  # Freeze first 2 seconds
-        laugh_crop.subclip(2, clip.duration-2).without_audio(),  # Freeze for the rest of the meme (no audio)
-        laugh_crop.subclip(clip.duration-2, clip.duration).with_audio(),  # Last 2 seconds with audio
-        mid_caption_clip,
-        main_video,
-        overlay
-    ], size=(vw, vh))
+        caption_clip,        # 📝 Caption
+        laugh_part1,         # 😂 Laugh 0–2s (video)
+        laugh_frozen,        # 🧊 Freeze mid
+        laugh_part3,         # 😂 Laugh end 2s (video)
+        mid_caption_clip,    # 💬 Mid caption
+        main_video,          # 🎥 Main video
+        overlay              # ✨ Optional light filter
+    ], size=(vw, vh)).set_duration(clip.duration)
 
     # Export
     os.makedirs("edited", exist_ok=True)
@@ -450,15 +441,13 @@ def edit_video_raw(video_path: str) -> str:
         codec="libx264",
         audio_codec="aac",
         preset="veryslow",
-        logger=None,
         bitrate="15000k",
         threads=4,
         fps=clip.fps
     )
 
-    clip.close(), laugh_raw.close(), final.close()
+    clip.close(), laugh_clip.close(), final.close()
     return out_path
-
 # ───────────────────────────── LOGGING
 logging.basicConfig(
     level=logging.INFO,
@@ -812,4 +801,4 @@ if __name__ == "__main__":
     Thread(target=lambda: app.run(host="0.0.0.0", port=7860, debug=False, use_reloader=False)).start()
 
     # ✅ Run uploader loop in background
-    Thread(target=auto_loop, daemon=True).start()
+    Thread(target=auto_loop, daemon=True).start()