Update modules/app.py

modules/app.py

@@ -97,24 +97,6 @@ async def add_audio_to_image(input_data: AudioImageInput):
         print(traceback.format_exc())
         raise HTTPException(status_code=500, detail=f"An unexpected error occurred: {str(e)}")
 
-def concatenate_video_audio_clips(clip_names, output_filename):
-    inputs = []
-    filter_complex = []
-
-    for i, name in enumerate(clip_names):
-        # For each clip, create separate inputs for video and audio
-        inputs.append(ffmpeg.input(name))
-        # Create filter_complex entries for concatenating without losing sync
-        filter_complex.append(f"[{i}:v][{i}:a]")
-
-    # Generate the filter_complex string for concatenating all clips together
-    filter_complex_string = "".join(f"{x}concat=n={len(clip_names)}:v=1:a=1[v][a];" for x in filter_complex)[:-1]
-
-    # Execute ffmpeg command with complex filter
-    ffmpeg.output(inputs, output_filename, vcodec='libx264', acodec='aac', **{'filter_complex': filter_complex_string}).run()
-
-    return output_filename
-
 @app.post("/concatenate_videos")
 async def concatenate_videos(input_data: VideosInput):
     try:
@@ -124,12 +106,23 @@ async def concatenate_videos(input_data: VideosInput):
         for video_url in input_data.video_urls:
             temp_video_paths.append(await download_file(str(video_url), ".mp4"))
 
-        # Generate a unique filename for the output video
+        # Generate a unique filename for the output
         output_filename = f"{uuid.uuid4()}.mp4"
         output_path = os.path.join(OUTPUT_DIR, output_filename)
 
-        # Concatenate video and audio clips
-        concatenate_video_audio_clips(temp_video_paths, output_path)
+        # Separate video and audio streams
+        video_and_audio_streams = []
+        for path in temp_video_paths:
+            video = ffmpeg.input(path).video
+            audio = ffmpeg.input(path).audio
+            video_and_audio_streams.append(video)
+            video_and_audio_streams.append(audio)
+
+        # Concatenate video and audio streams
+        joined = ffmpeg.concat(*video_and_audio_streams, v=1, a=1).node
+
+        # Merge video and audio
+        ffmpeg.output(joined[0], joined[1], output_path, vcodec='libx264', acodec='aac').run()
 
         # Clean up temporary files
         for path in temp_video_paths: