Update app.py

app.py

@@ -136,60 +136,39 @@ def combine_video_and_audio_ffmpeg(video_path, audio_path, output_video_path):
         raise RuntimeError(f"ffmpeg failed ({e.returncode}): {e.stderr.strip()}")
 
 
-def convert_video_to_30fps_and_clip(
-    input_video_path,
-    output_video_path,
-    duration_s=2,
-    target_fps=30,
-
-):
-    if is_portrait(input_video_path):
-        crop_width=720
-        crop_height=1280
-    else:
-        crop_width=1280
-        crop_height=720        
-
-    # Get input video dimensions using ffprobe
-    if crop_width and crop_height:
-        probe_cmd = [
-            'ffprobe', '-v', 'error', '-select_streams', 'v:0',
-            '-show_entries', 'stream=width,height',
-            '-of', 'json', input_video_path
-        ]
-        probe_result = subprocess.run(probe_cmd, capture_output=True, text=True, check=True)
-        video_info = json.loads(probe_result.stdout)
-        w = video_info['streams'][0]['width']
-        h = video_info['streams'][0]['height']
-
-        # Clamp crop size to not exceed actual dimensions
-        crop_width = min(crop_width, w)
-        crop_height = min(crop_height, h)
-
-        # Center crop offsets
-        crop_x = max((w - crop_width) // 2, 0)
-        crop_y = max((h - crop_height) // 2, 0)
-        crop_filter = f"crop={crop_width}:{crop_height}:{crop_x}:{crop_y}"
-    else:
-        crop_filter = None
+def convert_video_to_30fps_and_clip(input_video_path, output_video_path, duration_s=2, target_fps=30):
+    # Decide target box depending on orientation *as ffmpeg sees it*.
+    # We'll just compute both and let expressions pick the right one.
+    # If you truly want different targets by orientation, keep your is_portrait() and set these constants accordingly.
+
+    # Build a crop expression that:
+    #  - never exceeds the input size
+    #  - keeps values even (required by yuv420p)
+    #  - stays centered
+    crop_w_expr = "floor(min(in_w\,1280)/2)*2"
+    crop_h_expr = "floor(min(in_h\,720)/2)*2"
+    crop_x_expr = f"floor((in_w - {crop_w_expr})/2/2)*2"
+    crop_y_expr = f"floor((in_h - {crop_h_expr})/2/2)*2"
+
+    vf = (
+        f"crop={crop_w_expr}:{crop_h_expr}:{crop_x_expr}:{crop_y_expr},"
+        f"fps={target_fps}"
+    )
 
     cmd = [
-        'ffmpeg',
-        '-i', input_video_path,
-        '-r', str(target_fps),
-        '-t', str(duration_s),
-    ]
-
-    if crop_filter:
-        cmd += ['-vf', crop_filter]
-
-    cmd += [
-        '-c:v', 'libx264',
-        '-c:a', 'aac',
-        '-strict', 'experimental',
-        '-y',
-        '-loglevel', 'error',
-        output_video_path
+        "ffmpeg",
+        "-nostdin",
+        "-hide_banner",
+        "-y",
+        "-i", input_video_path,
+        "-t", str(duration_s),
+        # Do crop and fps in one -vf so they see the same frame geometry
+        "-vf", vf,
+        # Make sure the output has even dims and a standard pix_fmt
+        "-pix_fmt", "yuv420p",
+        "-c:v", "libx264",
+        "-c:a", "aac",
+        output_video_path,
     ]
 
     try:
@@ -197,6 +176,7 @@ def convert_video_to_30fps_and_clip(
     except subprocess.CalledProcessError as e:
         raise RuntimeError(f"ffmpeg failed ({e.returncode}): {e.stderr.strip()}")
 
+
 def is_portrait(video_file):
 
     # Get video information