From 8f27d5dd08930b772a04db61dd66d3fd4cfdf0b0 Mon Sep 17 00:00:00 2001 From: harisreedhar Date: Fri, 14 Nov 2025 21:02:57 +0530 Subject: [PATCH] remove output_path argument from merge_video() --- facefusion/ffmpeg.py | 3 ++- facefusion/workflows/image_to_video.py | 2 +- tests/test_ffmpeg.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/facefusion/ffmpeg.py b/facefusion/ffmpeg.py index ff2e8441..ba4d38c7 100644 --- a/facefusion/ffmpeg.py +++ b/facefusion/ffmpeg.py @@ -212,7 +212,8 @@ def replace_audio(target_path : str, audio_path : str, output_path : str) -> boo return run_ffmpeg(commands).returncode == 0 -def merge_video(target_path : str, output_path : str, temp_video_fps : Fps, output_video_resolution : Resolution, trim_frame_start : int, trim_frame_end : int) -> bool: +def merge_video(target_path : str, temp_video_fps : Fps, output_video_resolution : Resolution, trim_frame_start : int, trim_frame_end : int) -> bool: + output_path = state_manager.get_item('output_path') output_video_fps = state_manager.get_item('output_video_fps') output_video_encoder = state_manager.get_item('output_video_encoder') output_video_quality = state_manager.get_item('output_video_quality') diff --git a/facefusion/workflows/image_to_video.py b/facefusion/workflows/image_to_video.py index 26385bbb..e35fdebf 100644 --- a/facefusion/workflows/image_to_video.py +++ b/facefusion/workflows/image_to_video.py @@ -141,7 +141,7 @@ def merge_frames() -> ErrorCode: temp_video_fps = restrict_video_fps(state_manager.get_item('target_path'), state_manager.get_item('output_video_fps')) logger.info(translator.get('merging_video').format(resolution = pack_resolution(output_video_resolution), fps = state_manager.get_item('output_video_fps')), __name__) - if ffmpeg.merge_video(state_manager.get_item('target_path'), state_manager.get_item('output_path'), temp_video_fps, output_video_resolution, trim_frame_start, trim_frame_end): + if ffmpeg.merge_video(state_manager.get_item('target_path'), temp_video_fps, output_video_resolution, trim_frame_start, trim_frame_end): logger.debug(translator.get('merging_video_succeeded'), __name__) else: if is_process_stopping(): diff --git a/tests/test_ffmpeg.py b/tests/test_ffmpeg.py index 158a229c..d73cc893 100644 --- a/tests/test_ffmpeg.py +++ b/tests/test_ffmpeg.py @@ -105,12 +105,13 @@ def test_merge_video() -> None: for target_path in target_paths: for output_video_encoder in output_video_encoders: + state_manager.init_item('output_path', target_path) state_manager.init_item('output_video_fps', 25.0) state_manager.init_item('output_video_encoder', output_video_encoder) create_temp_directory(target_path) extract_frames(target_path, (452, 240), 25.0, 0, 1) - assert merge_video(target_path, target_path, 25.0, (452, 240), 0, 1) is True + assert merge_video(target_path, 25.0, (452, 240), 0, 1) is True clear_temp_directory(target_path)