Update app.py

app.py

@@ -398,7 +398,7 @@ def edit_video_raw(video_path: str) -> str:
         .set_duration(clip.duration) \
         .set_position((0, 0))  # Positioned at the top
 
-    # Laugh meme (2s + freeze + 2s)
+    # Laugh meme (2s + freeze + 2s) between caption and mid caption
     laugh_files = ["laugh/laugh_one.mp4", "laugh/laugh_two.mp4"]
     laugh_path = random.choice(laugh_files)
     if not os.path.exists(laugh_path):
@@ -410,29 +410,27 @@ def edit_video_raw(video_path: str) -> str:
     if laugh_raw.duration < 4:
         raise ValueError("Laugh meme must be at least 4 seconds.")
 
-    laugh_start = (
-        resized_laugh.subclip(0, 2)
-        .set_start(0)
-        .set_position((
-            0,
-            CAPTION_H  # Positioned below the top caption
-        ))
-    )
+    # Make the first 2 seconds of the laugh video silent
+    laugh_start = resized_laugh.subclip(0, 2).without_audio().set_position((
+        0, CAPTION_H  # Positioned below the top caption
+    ))
 
-    freeze_frame = (
-        laugh_start.to_ImageClip()
-        .set_start(2)
-        .set_duration(max(0, clip.duration - 4))
-        .set_position((0, CAPTION_H))  # Positioned below the caption
-    )
-    laugh_end = (
-        resized_laugh.subclip(laugh_raw.duration - 2)
-        .set_start(clip.duration - 2)
-        .set_position((
-            0,
-            CAPTION_H  # Positioned below the caption
-        ))
-    )
+    # Get the rest of the laugh video with sound
+    laugh_with_audio = resized_laugh.subclip(2).set_position((
+        0, CAPTION_H  # Positioned below the top caption
+    ))
+
+    # Freeze frame for laugh (just after 2s of silence)
+    freeze_frame = laugh_start.to_ImageClip().set_start(2).set_duration(
+        max(0, clip.duration - 4)).set_position((0, CAPTION_H))
+
+    # Adjust laugh_end to stop before mid caption
+    laugh_end = resized_laugh.subclip(laugh_raw.duration - 2).set_position((
+        0, CAPTION_H + LAUGH_H  # Positioned below the caption and laugh meme
+    ))
+
+    # Combine the silent and audible parts of the laugh meme
+    laugh_full = concatenate_videoclips([laugh_start, laugh_with_audio])
 
     # Mid caption
     mid_text = random.choice([
@@ -452,9 +450,16 @@ def edit_video_raw(video_path: str) -> str:
         .set_start(0) \
         .set_position((0, CAPTION_H + LAUGH_H))  # Positioned below laugh meme
 
-    # Main video
+    # Main video (resize width to 1080px and crop top and bottom)
+    resized_main = clip.resize(width=1080)
+    if resized_main.h > MAIN_H:
+        top_crop = (resized_main.h - MAIN_H) // 2
+        bottom_crop = resized_main.h - MAIN_H - top_crop
+        resized_main = resized_main.crop(
+            y1=top_crop, y2=bottom_crop
+        )
+    
     main_video_y = CAPTION_H + LAUGH_H + MID_H
-    resized_main = clip.resize(height=MAIN_H)  # Scale to fit the remaining height
     main_video_x = (vw - resized_main.w) // 2 if resized_main.w > vw else 0  # Center horizontally if wider than vw
     main_video = resized_main.set_start(0).set_position((
         main_video_x,
@@ -469,7 +474,8 @@ def edit_video_raw(video_path: str) -> str:
     # Final composition
     final = CompositeVideoClip([
         caption_clip,
-        laugh_start, freeze_frame, laugh_end,
+        laugh_full,  # Replace laugh_start with laugh_full to include both parts
+        freeze_frame, laugh_end,
         mid_caption_clip,
         main_video,
         overlay
@@ -488,7 +494,6 @@ def edit_video_raw(video_path: str) -> str:
         threads=4,
         fps=clip.fps
     )
-
     # Clean up resources
     clip.close()
     laugh_raw.close()