diff --git a/facefusion/ffprobe.py b/facefusion/ffprobe.py index c0cf7191..e0c08e65 100644 --- a/facefusion/ffprobe.py +++ b/facefusion/ffprobe.py @@ -96,11 +96,11 @@ def extract_static_video_metadata(video_path : str) -> VideoMetadata: def extract_video_metadata(video_path : str) -> VideoMetadata: - video_entries = probe_video_entries(video_path, [ 'width', 'height', 'r_frame_rate', 'color_transfer' ]) + video_entries = probe_video_entries(video_path, [ 'width', 'height', 'avg_frame_rate', 'r_frame_rate', 'color_transfer' ]) format_entries = probe_format_entries(video_path, [ 'duration', 'bit_rate' ]) duration = float(format_entries.get('duration')) - fps = extract_video_fps(video_entries.get('r_frame_rate')) + fps = extract_video_fps(video_entries) frame_total = round(duration * fps) width = int(video_entries.get('width')) height = int(video_entries.get('height')) @@ -120,11 +120,12 @@ def extract_video_metadata(video_path : str) -> VideoMetadata: return video_metadata -def extract_video_fps(frame_rate : str) -> Fps: - if frame_rate and '/' in frame_rate: - numerator, denominator = frame_rate.split('/') +def extract_video_fps(video_entries : Dict[str, str]) -> Fps: + for frame_rate in [ video_entries.get('avg_frame_rate'), video_entries.get('r_frame_rate') ]: + if frame_rate and '/' in frame_rate: + numerator, denominator = frame_rate.split('/') - if int(numerator) and int(denominator): - return int(numerator) / int(denominator) + if int(numerator) and int(denominator): + return int(numerator) / int(denominator) return 0.0 diff --git a/facefusion/installer.py b/facefusion/installer.py index 36f39fb5..553ed08c 100644 --- a/facefusion/installer.py +++ b/facefusion/installer.py @@ -19,15 +19,15 @@ LOCALES =\ } ONNXRUNTIME_SET =\ { - 'default': ('onnxruntime', '1.28.0') + 'default': ('onnxruntime', '1.29.0') } if is_windows() or is_linux(): ONNXRUNTIME_SET['cuda@12'] = ('onnxruntime-gpu', '1.24.4') - ONNXRUNTIME_SET['cuda@13'] = ('onnxruntime-gpu', '1.28.0') + ONNXRUNTIME_SET['cuda@13'] = ('onnxruntime-gpu', '1.29.0') ONNXRUNTIME_SET['openvino'] = ('onnxruntime-openvino', '1.24.1') if is_windows(): ONNXRUNTIME_SET['directml'] = ('onnxruntime-directml', '1.24.4') - ONNXRUNTIME_SET['qnn'] = ('onnxruntime-qnn', '2.4.0') + ONNXRUNTIME_SET['qnn'] = ('onnxruntime-qnn', '2.5.0') if is_linux(): ONNXRUNTIME_SET['migraphx'] = ('onnxruntime-migraphx', '1.27.1') ONNXRUNTIME_SET['rocm'] = ('onnxruntime-rocm', '1.22.2.post3') diff --git a/facefusion/metadata.py b/facefusion/metadata.py index fcc3c5ca..0d0a0e16 100644 --- a/facefusion/metadata.py +++ b/facefusion/metadata.py @@ -4,7 +4,7 @@ METADATA =\ { 'name': 'FaceFusion', 'description': 'Industry leading face manipulation platform', - 'version': '3.8.2', + 'version': '3.8.3', 'license': 'OpenRAIL-AS', 'author': 'Henry Ruhs', 'url': 'https://facefusion.io' diff --git a/facefusion/uis/assets/overrides.css b/facefusion/uis/assets/overrides.css index 71d6022e..4ec4c1c1 100644 --- a/facefusion/uis/assets/overrides.css +++ b/facefusion/uis/assets/overrides.css @@ -131,8 +131,9 @@ background: currentColor; } -:root:root:root:root .slider_input_container > span, -:root:root:root:root .feather-upload, +:root:root:root:root .slider_input_container .min_value, +:root:root:root:root .slider_input_container .max_value, +:root:root:root:root .icon-wrap .feather-upload, :root:root:root:root footer { display: none; diff --git a/facefusion/vision.py b/facefusion/vision.py index 79610765..d9297796 100644 --- a/facefusion/vision.py +++ b/facefusion/vision.py @@ -117,11 +117,22 @@ def count_video_frame_total(video_path : str) -> int: def predict_video_frame_total(video_path : str, fps : Fps, trim_frame_start : int, trim_frame_end : int) -> int: if is_video(video_path): video_fps = detect_video_fps(video_path) - extract_frame_total = count_trim_frame_total(video_path, trim_frame_start, trim_frame_end) * fps / video_fps - return math.floor(extract_frame_total) + trim_frame_start, trim_frame_end = restrict_trim_frame(video_path, trim_frame_start, trim_frame_end) + extract_frame_start = resolve_extract_frame_number(video_fps, fps, trim_frame_start) + extract_frame_end = resolve_extract_frame_number(video_fps, fps, trim_frame_end) + + return extract_frame_end - extract_frame_start return 0 +def resolve_extract_frame_number(video_fps : Fps, fps : Fps, frame_number : int) -> int: + return math.floor(frame_number * fps / video_fps + 0.5) + + +def resolve_target_frame_number(video_fps : Fps, fps : Fps, frame_number : int) -> int: + return math.ceil((frame_number + 0.5) * video_fps / fps) - 1 + + def detect_video_fps(video_path : str) -> Optional[float]: if is_video(video_path): return ffprobe.extract_static_video_metadata(video_path).get('fps') diff --git a/facefusion/workflows/core.py b/facefusion/workflows/core.py index 274efd42..bde1f021 100644 --- a/facefusion/workflows/core.py +++ b/facefusion/workflows/core.py @@ -9,7 +9,7 @@ from facefusion.filesystem import filter_audio_paths from facefusion.processors.core import get_processors_modules from facefusion.temp_helper import clear_temp_directory, create_temp_directory from facefusion.types import AudioFrame, ErrorCode, VisionFrame -from facefusion.vision import conditional_merge_vision_mask, extract_vision_mask, read_static_image, read_static_images, read_static_video_frame, restrict_trim_frame, restrict_video_fps, select_video_frames +from facefusion.vision import conditional_merge_vision_mask, detect_video_fps, extract_vision_mask, read_static_image, read_static_images, read_static_video_frame, resolve_extract_frame_number, resolve_target_frame_number, restrict_trim_frame, restrict_video_fps, select_video_frames def is_process_stopping() -> bool: @@ -65,7 +65,13 @@ def conditional_get_source_voice_frame(frame_number : int) -> AudioFrame: def conditional_get_target_vision_frames(frame_number : int) -> List[VisionFrame]: if state_manager.get_item('workflow_mode') == 'image-to-video': - return select_video_frames(state_manager.get_item('target_path'), frame_number, state_manager.get_item('target_frame_amount')) + trim_frame_start, _ = restrict_trim_frame(state_manager.get_item('target_path'), state_manager.get_item('trim_frame_start'), state_manager.get_item('trim_frame_end')) + temp_video_fps = restrict_video_fps(state_manager.get_item('target_path'), state_manager.get_item('output_video_fps')) + video_fps = detect_video_fps(state_manager.get_item('target_path')) + temp_frame_number = resolve_extract_frame_number(video_fps, temp_video_fps, trim_frame_start) + frame_number - trim_frame_start + video_frame_number = resolve_target_frame_number(video_fps, temp_video_fps, temp_frame_number) + + return select_video_frames(state_manager.get_item('target_path'), video_frame_number, state_manager.get_item('target_frame_amount')) return [ read_static_image(state_manager.get_item('target_path')) ] diff --git a/facefusion/workflows/to_video.py b/facefusion/workflows/to_video.py index ef02b0ba..0df61622 100644 --- a/facefusion/workflows/to_video.py +++ b/facefusion/workflows/to_video.py @@ -13,7 +13,7 @@ from facefusion.processors.core import get_processors_modules from facefusion.temp_helper import move_temp_file, resolve_temp_frame_set from facefusion.time_helper import calculate_end_time from facefusion.types import ErrorCode, Resolution, VisionFrame -from facefusion.vision import detect_video_resolution, pack_resolution, read_static_image, read_static_video_frame, restrict_trim_frame, restrict_video_fps, restrict_video_resolution, scale_resolution, select_video_frames, write_image +from facefusion.vision import detect_video_resolution, pack_resolution, predict_video_frame_total, read_static_image, read_static_video_frame, restrict_trim_frame, restrict_video_fps, restrict_video_resolution, scale_resolution, write_image from facefusion.workflows.core import conditional_get_target_vision_frames, is_process_stopping, process_temp_frame @@ -91,7 +91,7 @@ def process_disk_frames() -> ErrorCode: def process_memory_frame(frame_number : int, temp_video_resolution : Resolution, output_video_resolution : Resolution) -> VisionFrame: - target_vision_frames = select_video_frames(state_manager.get_item('target_path'), frame_number, state_manager.get_item('target_frame_amount')) + target_vision_frames = conditional_get_target_vision_frames(frame_number) target_vision_frame = get_middle(target_vision_frames) temp_vision_frame = target_vision_frame.copy() @@ -117,7 +117,8 @@ def process_memory_frames() -> ErrorCode: output_video_resolution = scale_resolution(detect_video_resolution(state_manager.get_item('target_path')), state_manager.get_item('output_video_scale')) temp_video_resolution = restrict_video_resolution(state_manager.get_item('target_path'), output_video_resolution) temp_video_fps = restrict_video_fps(state_manager.get_item('target_path'), state_manager.get_item('output_video_fps')) - temp_frame_range = range(trim_frame_start, trim_frame_end) + temp_frame_total = predict_video_frame_total(state_manager.get_item('target_path'), temp_video_fps, trim_frame_start, trim_frame_end) + temp_frame_range = range(trim_frame_start, trim_frame_start + temp_frame_total) if temp_frame_range: video_writer = video_manager.get_writer(state_manager.get_item('target_path'), temp_video_fps, output_video_resolution, output_video_resolution, state_manager.get_item('output_video_fps')) diff --git a/requirements.txt b/requirements.txt index e8bc2da7..8b04c9d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ gradio-rangeslider==0.0.8 gradio==5.50.0 numpy==2.4.6 onnx==1.22.0 -onnxruntime==1.28.0 +onnxruntime==1.29.0 opencv-python-headless==5.0.0.93 tqdm==4.70.0 scipy==1.18.0 diff --git a/tests/test_cli_age_modifier.py b/tests/test_cli_age_modifier.py index 5ac84a4c..332e8219 100644 --- a/tests/test_cli_age_modifier.py +++ b/tests/test_cli_age_modifier.py @@ -3,9 +3,11 @@ import sys import pytest +import facefusion.choices from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.jobs.job_manager import clear_jobs, init_jobs +from facefusion.types import WorkflowStrategy from .helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_file, is_test_output_file, prepare_test_output_directory @@ -36,15 +38,17 @@ def before_each() -> None: prepare_test_output_directory() -def test_modify_age_to_image() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'age_modifier', '--age-modifier-direction', '100', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-age-face-to-image.jpg') ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_modify_age_to_image(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'age_modifier', '--age-modifier-direction', '100', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-age-face-to-image.jpg') ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-age-face-to-image.jpg') is True -def test_modify_age_to_video() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'age_modifier', '--age-modifier-direction', '100', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-age-face-to-video.mp4'), '--trim-frame-end', '1' ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_modify_age_to_video(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'age_modifier', '--age-modifier-direction', '100', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-age-face-to-video.mp4'), '--trim-frame-end', '1' ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-age-face-to-video.mp4') is True diff --git a/tests/test_cli_background_remover.py b/tests/test_cli_background_remover.py index 460565ee..fd420caf 100644 --- a/tests/test_cli_background_remover.py +++ b/tests/test_cli_background_remover.py @@ -3,9 +3,11 @@ import sys import pytest +import facefusion.choices from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.jobs.job_manager import clear_jobs, init_jobs +from facefusion.types import WorkflowStrategy from .helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_file, is_test_output_file, prepare_test_output_directory @@ -37,15 +39,17 @@ def before_each() -> None: prepare_test_output_directory() -def test_remove_background_to_image() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'background_remover', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-remove-background-to-image.jpg') ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_remove_background_to_image(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'background_remover', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-remove-background-to-image.jpg') ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-remove-background-to-image.jpg') is True -def test_remove_background_to_video() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'background_remover', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-remove-background-to-video.mp4'), '--trim-frame-end', '1' ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_remove_background_to_video(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'background_remover', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-remove-background-to-video.mp4'), '--trim-frame-end', '1' ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-remove-background-to-video.mp4') is True diff --git a/tests/test_cli_expression_restorer.py b/tests/test_cli_expression_restorer.py index 2d4632c8..1d26847f 100644 --- a/tests/test_cli_expression_restorer.py +++ b/tests/test_cli_expression_restorer.py @@ -3,9 +3,11 @@ import sys import pytest +import facefusion.choices from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.jobs.job_manager import clear_jobs, init_jobs +from facefusion.types import WorkflowStrategy from .helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_file, is_test_output_file, prepare_test_output_directory @@ -36,15 +38,17 @@ def before_each() -> None: prepare_test_output_directory() -def test_restore_expression_to_image() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'expression_restorer', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-restore-expression-to-image.jpg') ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_restore_expression_to_image(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'expression_restorer', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-restore-expression-to-image.jpg') ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-restore-expression-to-image.jpg') is True -def test_restore_expression_to_video() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'expression_restorer', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-restore-expression-to-video.mp4'), '--trim-frame-end', '1' ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_restore_expression_to_video(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'expression_restorer', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-restore-expression-to-video.mp4'), '--trim-frame-end', '1' ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-restore-expression-to-video.mp4') is True diff --git a/tests/test_cli_face_debugger.py b/tests/test_cli_face_debugger.py index c78f5293..4c47cc0b 100644 --- a/tests/test_cli_face_debugger.py +++ b/tests/test_cli_face_debugger.py @@ -3,9 +3,11 @@ import sys import pytest +import facefusion.choices from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.jobs.job_manager import clear_jobs, init_jobs +from facefusion.types import WorkflowStrategy from .helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_file, is_test_output_file, prepare_test_output_directory @@ -37,15 +39,17 @@ def before_each() -> None: prepare_test_output_directory() -def test_debug_face_to_image() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'face_debugger', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-debug-face-to-image.jpg') ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_debug_face_to_image(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'face_debugger', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-debug-face-to-image.jpg') ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-debug-face-to-image.jpg') is True -def test_debug_face_to_video() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'face_debugger', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-debug-face-to-video.mp4'), '--trim-frame-end', '1' ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_debug_face_to_video(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'face_debugger', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-debug-face-to-video.mp4'), '--trim-frame-end', '1' ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-debug-face-to-video.mp4') is True diff --git a/tests/test_cli_face_editor.py b/tests/test_cli_face_editor.py index adcd3d4a..0b6a5f24 100644 --- a/tests/test_cli_face_editor.py +++ b/tests/test_cli_face_editor.py @@ -3,9 +3,11 @@ import sys import pytest +import facefusion.choices from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.jobs.job_manager import clear_jobs, init_jobs +from facefusion.types import WorkflowStrategy from .helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_file, is_test_output_file, prepare_test_output_directory @@ -37,15 +39,17 @@ def before_each() -> None: prepare_test_output_directory() -def test_edit_face_to_image() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'face_editor', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-edit-face-to-image.jpg') ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_edit_face_to_image(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'face_editor', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-edit-face-to-image.jpg') ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-edit-face-to-image.jpg') is True -def test_edit_face_to_video() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'face_editor', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-edit-face-to-video.mp4'), '--trim-frame-end', '1' ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_edit_face_to_video(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'face_editor', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-edit-face-to-video.mp4'), '--trim-frame-end', '1' ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-edit-face-to-video.mp4') is True diff --git a/tests/test_cli_face_enhancer.py b/tests/test_cli_face_enhancer.py index a5dece12..7757f6ae 100644 --- a/tests/test_cli_face_enhancer.py +++ b/tests/test_cli_face_enhancer.py @@ -3,9 +3,11 @@ import sys import pytest +import facefusion.choices from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.jobs.job_manager import clear_jobs, init_jobs +from facefusion.types import WorkflowStrategy from .helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_file, is_test_output_file, prepare_test_output_directory @@ -37,15 +39,17 @@ def before_each() -> None: prepare_test_output_directory() -def test_enhance_face_to_image() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'face_enhancer', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-enhance-face-to-image.jpg') ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_enhance_face_to_image(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'face_enhancer', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-enhance-face-to-image.jpg') ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-enhance-face-to-image.jpg') is True -def test_enhance_face_to_video() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'face_enhancer', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-enhance-face-to-video.mp4'), '--trim-frame-end', '1' ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_enhance_face_to_video(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'face_enhancer', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-enhance-face-to-video.mp4'), '--trim-frame-end', '1' ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-enhance-face-to-video.mp4') is True diff --git a/tests/test_cli_face_swapper.py b/tests/test_cli_face_swapper.py index 708fc479..469781c8 100644 --- a/tests/test_cli_face_swapper.py +++ b/tests/test_cli_face_swapper.py @@ -3,9 +3,11 @@ import sys import pytest +import facefusion.choices from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.jobs.job_manager import clear_jobs, init_jobs +from facefusion.types import WorkflowStrategy from .helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_file, is_test_output_file, prepare_test_output_directory @@ -37,15 +39,17 @@ def before_each() -> None: prepare_test_output_directory() -def test_swap_face_to_image() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'face_swapper', '-s', get_test_example_file('source.jpg'), '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-swap-face-to-image.jpg') ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_swap_face_to_image(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'face_swapper', '-s', get_test_example_file('source.jpg'), '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-swap-face-to-image.jpg') ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-swap-face-to-image.jpg') is True -def test_swap_face_to_video() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'face_swapper', '-s', get_test_example_file('source.jpg'), '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-swap-face-to-video.mp4'), '--trim-frame-end', '1' ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_swap_face_to_video(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'face_swapper', '-s', get_test_example_file('source.jpg'), '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-swap-face-to-video.mp4'), '--trim-frame-end', '1' ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-swap-face-to-video.mp4') is True diff --git a/tests/test_cli_frame_colorizer.py b/tests/test_cli_frame_colorizer.py index 6a19a5a1..046ef134 100644 --- a/tests/test_cli_frame_colorizer.py +++ b/tests/test_cli_frame_colorizer.py @@ -3,9 +3,11 @@ import sys import pytest +import facefusion.choices from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.jobs.job_manager import clear_jobs, init_jobs +from facefusion.types import WorkflowStrategy from .helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_file, is_test_output_file, prepare_test_output_directory @@ -51,15 +53,17 @@ def before_each() -> None: prepare_test_output_directory() -def test_colorize_frame_to_image() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'frame_colorizer', '-t', get_test_example_file('target-240p-0sat.jpg'), '-o', get_test_output_file('test_colorize-frame-to-image.jpg') ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_colorize_frame_to_image(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'frame_colorizer', '-t', get_test_example_file('target-240p-0sat.jpg'), '-o', get_test_output_file('test_colorize-frame-to-image.jpg') ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test_colorize-frame-to-image.jpg') is True -def test_colorize_frame_to_video() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'frame_colorizer', '-t', get_test_example_file('target-240p-0sat.mp4'), '-o', get_test_output_file('test-colorize-frame-to-video.mp4'), '--trim-frame-end', '1' ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_colorize_frame_to_video(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'frame_colorizer', '-t', get_test_example_file('target-240p-0sat.mp4'), '-o', get_test_output_file('test-colorize-frame-to-video.mp4'), '--trim-frame-end', '1' ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-colorize-frame-to-video.mp4') is True diff --git a/tests/test_cli_frame_enhancer.py b/tests/test_cli_frame_enhancer.py index 69c25806..73e59f2b 100644 --- a/tests/test_cli_frame_enhancer.py +++ b/tests/test_cli_frame_enhancer.py @@ -3,9 +3,11 @@ import sys import pytest +import facefusion.choices from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.jobs.job_manager import clear_jobs, init_jobs +from facefusion.types import WorkflowStrategy from .helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_file, is_test_output_file, prepare_test_output_directory @@ -37,15 +39,17 @@ def before_each() -> None: prepare_test_output_directory() -def test_enhance_frame_to_image() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'frame_enhancer', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-enhance-frame-to-image.jpg') ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_enhance_frame_to_image(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'frame_enhancer', '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test-enhance-frame-to-image.jpg') ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-enhance-frame-to-image.jpg') is True -def test_enhance_frame_to_video() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'frame_enhancer', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-enhance-frame-to-video.mp4'), '--trim-frame-end', '1' ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_enhance_frame_to_video(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'frame_enhancer', '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test-enhance-frame-to-video.mp4'), '--trim-frame-end', '1' ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test-enhance-frame-to-video.mp4') is True diff --git a/tests/test_cli_lip_syncer.py b/tests/test_cli_lip_syncer.py index 9e01fc26..dfdf48c0 100644 --- a/tests/test_cli_lip_syncer.py +++ b/tests/test_cli_lip_syncer.py @@ -3,9 +3,11 @@ import sys import pytest +import facefusion.choices from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.jobs.job_manager import clear_jobs, init_jobs +from facefusion.types import WorkflowStrategy from .helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_file, is_test_output_file, prepare_test_output_directory @@ -38,15 +40,17 @@ def before_each() -> None: prepare_test_output_directory() -def test_sync_lip_to_image() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'lip_syncer', '-s', get_test_example_file('source.mp3'), '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test_sync_lip_to_image.jpg') ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_sync_lip_to_image(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'lip_syncer', '-s', get_test_example_file('source.mp3'), '-t', get_test_example_file('target-240p.jpg'), '-o', get_test_output_file('test_sync_lip_to_image.jpg') ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test_sync_lip_to_image.jpg') is True -def test_sync_lip_to_video() -> None: - commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--processors', 'lip_syncer', '-s', get_test_example_file('source.mp3'), '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test_sync_lip_to_video.mp4'), '--trim-frame-end', '1' ] +@pytest.mark.parametrize('workflow_strategy', facefusion.choices.workflow_strategies) +def test_sync_lip_to_video(workflow_strategy : WorkflowStrategy) -> None: + commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '--processors', 'lip_syncer', '-s', get_test_example_file('source.mp3'), '-t', get_test_example_file('target-240p.mp4'), '-o', get_test_output_file('test_sync_lip_to_video.mp4'), '--trim-frame-end', '1' ] assert subprocess.run(commands).returncode == 0 assert is_test_output_file('test_sync_lip_to_video.mp4') is True diff --git a/tests/test_cli_output_fps.py b/tests/test_cli_output_fps.py new file mode 100644 index 00000000..f269864e --- /dev/null +++ b/tests/test_cli_output_fps.py @@ -0,0 +1,72 @@ +import subprocess +import sys + +import numpy +import pytest + +from facefusion import ffmpeg, ffmpeg_builder, process_manager +from facefusion.download import conditional_download +from facefusion.jobs.job_manager import clear_jobs, init_jobs +from facefusion.types import Fps, WorkflowStrategy +from facefusion.vision import count_video_frame_total, detect_video_fps, read_video_frame +from .helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_file, prepare_test_output_directory + + +@pytest.fixture(scope = 'module', autouse = True) +def before_all() -> None: + process_manager.start() + conditional_download(get_test_examples_directory(), + [ + 'https://github.com/facefusion/facefusion-assets/releases/download/examples-3.0.0/source.jpg', + 'https://github.com/facefusion/facefusion-assets/releases/download/examples-3.0.0/target-240p.mp4' + ]) + + for output_video_fps in [ 30, 60 ]: + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + ffmpeg_builder.select_frame_range(0, 30, output_video_fps), + ffmpeg_builder.set_video_encoder('libx264'), + ffmpeg_builder.enforce_pixel_format('yuv420p'), + [ + '-crf', + '0', + '-an' + ], + ffmpeg_builder.force_output(get_test_example_file('target-240p-30frames-' + str(output_video_fps) + 'fps.mp4')) + ) + ) + + +@pytest.fixture(scope = 'function', autouse = True) +def before_each() -> None: + clear_jobs(get_test_jobs_directory()) + init_jobs(get_test_jobs_directory()) + prepare_test_output_directory() + + +@pytest.mark.parametrize('workflow_strategy, output_video_fps, trim_frame_end, output_video_frame_total', +[ + ('disk', 30, 30, 36), + ('memory', 30, 30, 36), + ('disk', 60, 30, 72), + ('memory', 60, 30, 72) +]) +def test_output_video_fps(workflow_strategy : WorkflowStrategy, output_video_fps : Fps, trim_frame_end : int, output_video_frame_total : int) -> None: + actual_file_path = get_test_output_file('test-output-video-fps-actual-' + workflow_strategy + '-' + str(output_video_fps) + '.mp4') + expect_file_path = get_test_output_file('test-output-video-fps-expect-' + workflow_strategy + '-' + str(output_video_fps) + '.mp4') + actual_commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '-s', get_test_example_file('source.jpg'), '-t', get_test_example_file('target-240p.mp4'), '-o', actual_file_path, '--trim-frame-end', str(trim_frame_end), '--output-video-fps', str(output_video_fps) ] + expect_commands = [ sys.executable, 'facefusion.py', 'headless-run', '--jobs-path', get_test_jobs_directory(), '--workflow-strategy', workflow_strategy, '-s', get_test_example_file('source.jpg'), '-t', get_test_example_file('target-240p-30frames-' + str(output_video_fps) + 'fps.mp4'), '-o', expect_file_path ] + + assert subprocess.run(actual_commands).returncode == 0 + assert subprocess.run(expect_commands).returncode == 0 + + assert detect_video_fps(actual_file_path) == output_video_fps + assert count_video_frame_total(actual_file_path) == output_video_frame_total + assert count_video_frame_total(expect_file_path) == output_video_frame_total + + for frame_number in range(output_video_frame_total): + actual_vision_frame = read_video_frame(actual_file_path, frame_number) + expect_vision_frame = read_video_frame(expect_file_path, frame_number) + + assert numpy.array_equal(actual_vision_frame, expect_vision_frame) is True diff --git a/tests/test_ffmpeg.py b/tests/test_ffmpeg.py index 4edd4474..df42ebd7 100644 --- a/tests/test_ffmpeg.py +++ b/tests/test_ffmpeg.py @@ -11,7 +11,7 @@ from facefusion.ffprobe import extract_video_metadata from facefusion.filesystem import copy_file from facefusion.temp_helper import clear_temp_directory, create_temp_directory, get_temp_file_path, resolve_temp_frame_set from facefusion.types import EncoderSet -from facefusion.vision import read_image +from facefusion.vision import predict_video_frame_total, read_image from .helper import get_test_example_file, get_test_examples_directory, get_test_output_file, prepare_test_output_directory @@ -126,6 +126,7 @@ def test_extract_frames() -> None: assert extract_frames(target_path, (452, 240), 30.0, trim_frame_start, trim_frame_end) is True assert len(resolve_temp_frame_set(target_path)) == frame_total + assert predict_video_frame_total(target_path, 30.0, trim_frame_start, trim_frame_end) == frame_total temp_vision_frame = read_image(resolve_temp_frame_set(target_path).get(trim_frame_start)) diff --git a/tests/test_vision.py b/tests/test_vision.py index 9a4c3b1a..5247c2de 100644 --- a/tests/test_vision.py +++ b/tests/test_vision.py @@ -6,7 +6,7 @@ import pytest from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.common_helper import is_linux from facefusion.download import conditional_download -from facefusion.vision import calculate_histogram_difference, count_trim_frame_total, count_video_frame_total, detect_image_resolution, detect_video_duration, detect_video_fps, detect_video_resolution, match_frame_color, normalize_resolution, pack_resolution, predict_video_frame_total, read_image, read_video_frame, restrict_image_resolution, restrict_trim_frame, restrict_video_fps, restrict_video_resolution, scale_resolution, select_video_frames, unpack_resolution, write_image +from facefusion.vision import calculate_histogram_difference, count_trim_frame_total, count_video_frame_total, detect_image_resolution, detect_video_duration, detect_video_fps, detect_video_resolution, match_frame_color, normalize_resolution, pack_resolution, predict_video_frame_total, read_image, read_video_frame, resolve_extract_frame_number, resolve_target_frame_number, restrict_image_resolution, restrict_trim_frame, restrict_video_fps, restrict_video_resolution, scale_resolution, select_video_frames, unpack_resolution, write_image from .helper import get_test_example_file, get_test_examples_directory, get_test_output_file, prepare_test_output_directory @@ -156,9 +156,25 @@ def test_predict_video_frame_total() -> None: assert predict_video_frame_total(get_test_example_file('target-240p-25fps.mp4'), 12.5, 0, 100) == 50 assert predict_video_frame_total(get_test_example_file('target-240p-25fps.mp4'), 25, 0, 100) == 100 assert predict_video_frame_total(get_test_example_file('target-240p-25fps.mp4'), 25, 0, 200) == 200 + assert predict_video_frame_total(get_test_example_file('target-240p-25fps.mp4'), 6.25, 0, 270) == 68 + assert predict_video_frame_total(get_test_example_file('target-240p-30fps.mp4'), 9.49, 40, 200) == 50 assert predict_video_frame_total('invalid', 25, 0, 100) == 0 +def test_resolve_extract_frame_number() -> None: + assert resolve_extract_frame_number(25, 12.5, 100) == 50 + assert resolve_extract_frame_number(25, 25, 100) == 100 + assert resolve_extract_frame_number(25, 6.25, 270) == 68 + assert resolve_extract_frame_number(30, 9.49, 40) == 13 + + +def test_resolve_target_frame_number() -> None: + assert resolve_target_frame_number(25, 12.5, 50) == 100 + assert resolve_target_frame_number(25, 25, 100) == 100 + assert resolve_target_frame_number(25, 6.25, 1) == 5 + assert resolve_target_frame_number(30, 9.49, 13) == 42 + + def test_detect_video_fps() -> None: assert detect_video_fps(get_test_example_file('target-240p-25fps.mp4')) == 25.0 assert detect_video_fps(get_test_example_file('target-240p-30fps.mp4')) == 30.0