CalvinBackup/facefusion
1
0
Fork 0
mirror of https://github.com/facefusion/facefusion.git synced 2026-04-23 01:46:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove output_video_fps argument from merge_video()

Browse Source
This commit is contained in:
harisreedhar
2025-11-14 20:55:12 +05:30
committed by henryruhs
parent 3ef90673b5
commit a6bd2cdcc7
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
facefusion/ffmpeg.py
+2 -1
View File
@@ -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, output_video_fps : Fps, trim_frame_start : int, trim_frame_end : int) -> bool:
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:
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')
output_video_preset = state_manager.get_item('output_video_preset')
facefusion/workflows/image_to_video.py
+1 -1
View File
@@ -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, state_manager.get_item('output_video_fps'), trim_frame_start, trim_frame_end):
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):
logger.debug(translator.get('merging_video_succeeded'), __name__)
else:
if is_process_stopping():
tests/test_ffmpeg.py
+2 -1
View File
@@ -105,11 +105,12 @@ def test_merge_video() -> None:
for target_path in target_paths:
for output_video_encoder in output_video_encoders:
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), 25.0, 0, 1) is True
assert merge_video(target_path, target_path, 25.0, (452, 240), 0, 1) is True
clear_temp_directory(target_path)