Update main.py

main.py

@@ -1,14 +1,14 @@
 from fastapi import FastAPI, HTTPException
 from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel, HttpUrl
-from typing import List, Optional
+from typing import List
 import os
 import asyncio
 import uuid
+import aiohttp
 import re
+from urllib.parse import urlparse
 import shutil
-# Install these packages using pip if needed
-import aiohttp
 import aiofiles
 
 # Create FastAPI app
@@ -23,7 +23,7 @@ class SlideshowRequest(BaseModel):
     image_urls: List[HttpUrl]
     audio_url: HttpUrl
     duration: int
-    zoom: Optional[bool] = False  # Optional zoom parameter with default value of False
+    zoom: bool = False
 
 def extract_google_drive_id(url):
     """Extract file ID from a Google Drive URL"""
@@ -60,44 +60,65 @@ async def create_slideshow(image_paths, audio_path, output_path, duration, zoom=
     # Create temporary file list for ffmpeg concat
     concat_file = "temp_concat.txt"
     
-    async with aiofiles.open(concat_file, "w") as f:
-        for img in image_paths:
-            await f.write(f"file '{img}'\n")
-            await f.write(f"duration {duration}\n")
+    if not zoom:
+        # Original implementation without zoom effect
+        async with aiofiles.open(concat_file, "w") as f:
+            for img in image_paths:
+                await f.write(f"file '{img}'\n")
+                await f.write(f"duration {duration}\n")
+            
+            # Add the last image again without duration (required by ffmpeg)
+            if image_paths:
+                await f.write(f"file '{image_paths[-1]}'\n")
         
-        # Add the last image again without duration (required by ffmpeg)
-        if image_paths:
-            await f.write(f"file '{image_paths[-1]}'\n")
-    
-    # Run ffmpeg command to create slideshow with audio
-    total_duration = len(image_paths) * duration
-
-    cmd = [
-        "ffmpeg",
-        "-f", "concat",
-        "-safe", "0",
-        "-i", concat_file,
-        "-i", audio_path,
-    ]
-    
-    # Add zoom effect if requested
-    if zoom:
-        # Create a single zooming filter for all images instead of individual filters
-        zoom_filter = (
-            f"[0:v]scale=1920:1080,zoompan=z='min(1.1,1+(on/{duration*25}/8))':"
-            f"d={duration*25}:s=1920x1080:fps=25[outv]"
-        )
-        cmd.extend(["-filter_complex", zoom_filter, "-map", "[outv]", "-map", "1:a"])
-    
-    cmd.extend([
-        "-c:v", "libx264",
-        "-pix_fmt", "yuv420p",
-        "-c:a", "aac",
-        "-shortest",
-        "-y",
-        "-t", str(total_duration),
-        output_path
-    ])
+        # Run ffmpeg command to create slideshow with audio
+        total_duration = len(image_paths) * duration
+        cmd = [
+            "ffmpeg",
+            "-f", "concat",
+            "-safe", "0",
+            "-i", concat_file,
+            "-i", audio_path,
+            "-c:v", "libx264",
+            "-pix_fmt", "yuv420p",
+            "-c:a", "aac",
+            "-shortest",
+            "-y",
+            "-t", str(total_duration),
+            output_path
+        ]
+    else:
+        # With zoom effect - use complex filtergraph instead of concat
+        total_duration = len(image_paths) * duration
+        filter_complex = ""
+        inputs = []
+        
+        # Add each image with zoompan effect
+        for i, img in enumerate(image_paths):
+            inputs.extend(["-loop", "1", "-t", str(duration), "-i", img])
+            # Apply zoom effect: start at 100% size and zoom to 110% over the duration
+            filter_complex += f"[{i}:v]scale=1920:1080:force_original_aspect_ratio=decrease,pad=1920:1080:(ow-iw)/2:(oh-ih)/2,setsar=1,zoompan=z='min(zoom+0.0015,1.1)':d={duration*25}:s=1920x1080[v{i}];"
+        
+        # Concatenate all video segments
+        for i in range(len(image_paths)):
+            filter_complex += f"[v{i}]"
+        filter_complex += f"concat=n={len(image_paths)}:v=1:a=0[outv]"
+        
+        cmd = [
+            "ffmpeg",
+            *inputs,
+            "-i", audio_path,
+            "-filter_complex", filter_complex,
+            "-map", "[outv]",
+            "-map", f"{len(image_paths)}:a",
+            "-c:v", "libx264",
+            "-pix_fmt", "yuv420p",
+            "-c:a", "aac",
+            "-shortest",
+            "-y",
+            "-t", str(total_duration),
+            output_path
+        ]
     
     try:
         process = await asyncio.create_subprocess_exec(
@@ -112,16 +133,13 @@ async def create_slideshow(image_paths, audio_path, output_path, duration, zoom=
             
         if process.returncode != 0:
             print(f"FFmpeg error: {stderr.decode()}")
-        _, stderr = await process.communicate()
-        
-        if os.path.exists(concat_file):
-            os.remove(concat_file)
+            return False
+        return True
+    except Exception as e:
+        print(f"FFmpeg error: {str(e)}")
         if os.path.exists(concat_file):
             os.remove(concat_file)
         return False
-    except Exception as e:
-        print(f"Error creating slideshow: {str(e)}")
-        return False
 
 @app.post("/make_slideshow")
 async def make_slideshow(request: SlideshowRequest):