diff --git a/tests/test_api_assets.py b/tests/test_api_assets.py index f01241a9..4f2ffc2f 100644 --- a/tests/test_api_assets.py +++ b/tests/test_api_assets.py @@ -1,11 +1,10 @@ -import subprocess import tempfile from typing import Iterator import pytest from starlette.testclient import TestClient -from facefusion import metadata, session_manager, state_manager +from facefusion import ffmpeg, ffmpeg_builder, metadata, process_manager, session_manager, state_manager from facefusion.apis import asset_store from facefusion.apis.core import create_api from facefusion.download import conditional_download @@ -14,6 +13,7 @@ from .assert_helper import get_test_example_file, get_test_examples_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', @@ -21,7 +21,16 @@ def before_all() -> None: 'https://github.com/facefusion/facefusion-assets/releases/download/examples-3.0.0/target-240p.mp4' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_api_state.py b/tests/test_api_state.py index b1912353..3032c1d3 100644 --- a/tests/test_api_state.py +++ b/tests/test_api_state.py @@ -1,11 +1,10 @@ -import subprocess from argparse import ArgumentParser from typing import Iterator import pytest from starlette.testclient import TestClient -from facefusion import capability_store, metadata, session_manager, state_manager +from facefusion import capability_store, ffmpeg, ffmpeg_builder, metadata, process_manager, session_manager, state_manager from facefusion.apis import asset_store from facefusion.apis.core import create_api from facefusion.download import conditional_download @@ -14,6 +13,7 @@ from .assert_helper import get_test_example_file, get_test_examples_directory @pytest.fixture(scope = 'module', autouse = True) def before_all() -> None: + process_manager.start() program = ArgumentParser() capability_store.register_capability_set( [ @@ -50,7 +50,16 @@ def before_all() -> None: 'https://github.com/facefusion/facefusion-assets/releases/download/examples-3.0.0/target-240p.mp4' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_audio.py b/tests/test_audio.py index 80bb957e..c7c92c3a 100644 --- a/tests/test_audio.py +++ b/tests/test_audio.py @@ -1,8 +1,8 @@ -import subprocess import pytest from pytest import approx +from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.audio import detect_audio_duration, get_audio_frame, read_static_audio, restrict_trim_audio_frame from facefusion.download import conditional_download from .assert_helper import get_test_example_file, get_test_examples_directory @@ -10,12 +10,18 @@ from .assert_helper import get_test_example_file, get_test_examples_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.mp3' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.mp3'), get_test_example_file('source.wav') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('source.mp3')), + ffmpeg_builder.set_output(get_test_example_file('source.wav')) + ) + ) def test_get_audio_frame() -> None: diff --git a/tests/test_cli_age_modifier.py b/tests/test_cli_age_modifier.py index 808325c4..3ea1a48b 100644 --- a/tests/test_cli_age_modifier.py +++ b/tests/test_cli_age_modifier.py @@ -3,6 +3,7 @@ import sys 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 .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_path, is_test_output_file, is_test_output_sequence, prepare_test_output_directory @@ -10,12 +11,22 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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/target-240p.mp4' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_cli_background_remover.py b/tests/test_cli_background_remover.py index 00c5d780..5a631dc6 100644 --- a/tests/test_cli_background_remover.py +++ b/tests/test_cli_background_remover.py @@ -3,6 +3,7 @@ import sys 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 .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_path, is_test_output_file, is_test_output_sequence, prepare_test_output_directory @@ -10,13 +11,23 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_cli_batch_runner.py b/tests/test_cli_batch_runner.py index 322dc0d9..8bafe2b8 100644 --- a/tests/test_cli_batch_runner.py +++ b/tests/test_cli_batch_runner.py @@ -3,6 +3,7 @@ import sys 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 .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_path, is_test_output_file, prepare_test_output_directory @@ -10,13 +11,23 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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/target-240p.mp4' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p-batch-1.jpg') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '2', get_test_example_file('target-240p-batch-2.jpg') ]) + for frame_number in [ 1, 2 ]: + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + str(frame_number) + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p-batch-' + str(frame_number) + '.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_cli_expression_restorer.py b/tests/test_cli_expression_restorer.py index 29254b6a..b8d1b417 100644 --- a/tests/test_cli_expression_restorer.py +++ b/tests/test_cli_expression_restorer.py @@ -3,6 +3,7 @@ import sys 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 .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_path, is_test_output_file, is_test_output_sequence, prepare_test_output_directory @@ -10,12 +11,22 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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/target-240p.mp4' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_cli_face_debugger.py b/tests/test_cli_face_debugger.py index 5362d1f1..3631062d 100644 --- a/tests/test_cli_face_debugger.py +++ b/tests/test_cli_face_debugger.py @@ -3,6 +3,7 @@ import sys 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 .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_path, is_test_output_file, is_test_output_sequence, prepare_test_output_directory @@ -10,13 +11,23 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_cli_face_editor.py b/tests/test_cli_face_editor.py index e82c2c59..11db41f6 100644 --- a/tests/test_cli_face_editor.py +++ b/tests/test_cli_face_editor.py @@ -3,6 +3,7 @@ import sys 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 .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_path, is_test_output_file, is_test_output_sequence, prepare_test_output_directory @@ -10,13 +11,23 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_cli_face_enhancer.py b/tests/test_cli_face_enhancer.py index 034d27b7..39c980aa 100644 --- a/tests/test_cli_face_enhancer.py +++ b/tests/test_cli_face_enhancer.py @@ -3,6 +3,7 @@ import sys 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 .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_path, is_test_output_file, is_test_output_sequence, prepare_test_output_directory @@ -10,13 +11,23 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_cli_face_swapper.py b/tests/test_cli_face_swapper.py index df074c44..8242cbed 100644 --- a/tests/test_cli_face_swapper.py +++ b/tests/test_cli_face_swapper.py @@ -3,6 +3,7 @@ import sys 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 .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_path, is_test_output_file, is_test_output_sequence, prepare_test_output_directory @@ -10,13 +11,23 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_cli_frame_colorizer.py b/tests/test_cli_frame_colorizer.py index 446b46c5..caa353c3 100644 --- a/tests/test_cli_frame_colorizer.py +++ b/tests/test_cli_frame_colorizer.py @@ -3,6 +3,7 @@ import sys 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 .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_path, is_test_output_file, is_test_output_sequence, prepare_test_output_directory @@ -10,14 +11,37 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', '-vf', 'hue=s=0', get_test_example_file('target-240p-0sat.jpg') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vf', 'hue=s=0', get_test_example_file('target-240p-0sat.mp4') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + [ + '-vf', + 'hue=s=0' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p-0sat.jpg')) + ) + ) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vf', + 'hue=s=0' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p-0sat.mp4')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_cli_frame_enhancer.py b/tests/test_cli_frame_enhancer.py index 2342caf4..9fdceaad 100644 --- a/tests/test_cli_frame_enhancer.py +++ b/tests/test_cli_frame_enhancer.py @@ -3,6 +3,7 @@ import sys 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 .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_path, is_test_output_file, is_test_output_sequence, prepare_test_output_directory @@ -10,13 +11,23 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_cli_job_manager.py b/tests/test_cli_job_manager.py index 1c556317..a08212f4 100644 --- a/tests/test_cli_job_manager.py +++ b/tests/test_cli_job_manager.py @@ -3,6 +3,7 @@ import sys import pytest +from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.jobs.job_manager import clear_jobs, count_step_total, init_jobs from .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_path, is_test_job_file @@ -10,13 +11,23 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_cli_job_runner.py b/tests/test_cli_job_runner.py index 75b3ae0f..0a96dc23 100644 --- a/tests/test_cli_job_runner.py +++ b/tests/test_cli_job_runner.py @@ -3,6 +3,7 @@ import sys 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, move_job_file, set_steps_status from .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_path, is_test_output_file, prepare_test_output_directory @@ -10,13 +11,23 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_cli_lip_syncer.py b/tests/test_cli_lip_syncer.py index b82434e9..e918bf78 100644 --- a/tests/test_cli_lip_syncer.py +++ b/tests/test_cli_lip_syncer.py @@ -3,6 +3,7 @@ import sys 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 .assert_helper import get_test_example_file, get_test_examples_directory, get_test_jobs_directory, get_test_output_path, is_test_output_file, is_test_output_sequence, prepare_test_output_directory @@ -10,6 +11,7 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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', @@ -17,7 +19,16 @@ def before_all() -> None: 'https://github.com/facefusion/facefusion-assets/releases/download/examples-3.0.0/target-240p.mp4' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_cli_output_scale.py b/tests/test_cli_output_scale.py index 40d01452..176d1a24 100644 --- a/tests/test_cli_output_scale.py +++ b/tests/test_cli_output_scale.py @@ -3,6 +3,7 @@ import sys 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 Resolution, Scale @@ -12,13 +13,23 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_face_creator.py b/tests/test_face_creator.py index da7495a2..40d66109 100644 --- a/tests/test_face_creator.py +++ b/tests/test_face_creator.py @@ -1,9 +1,8 @@ -import subprocess import numpy import pytest -from facefusion import face_classifier, face_detector, face_landmarker, face_recognizer, state_manager +from facefusion import face_classifier, face_detector, face_landmarker, face_recognizer, ffmpeg, ffmpeg_builder, process_manager, state_manager from facefusion.download import conditional_download from facefusion.face_creator import average_face_geometry, get_many_faces, get_one_face, refill_faces from facefusion.face_store import clear_faces @@ -13,13 +12,23 @@ from .assert_helper import get_test_example_file, get_test_examples_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' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.jpg'), '-vf', 'crop=iw*0.8:ih*0.8', get_test_example_file('source-80crop.jpg') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.jpg'), '-vf', 'crop=iw*0.7:ih*0.7', get_test_example_file('source-70crop.jpg') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.jpg'), '-vf', 'crop=iw*0.6:ih*0.6', get_test_example_file('source-60crop.jpg') ]) + + for crop_scale in [ 80, 70, 60 ]: + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('source.jpg')), + [ + '-vf', + 'crop=iw*0.' + str(crop_scale) + ':ih*0.' + str(crop_scale) + ], + ffmpeg_builder.set_output(get_test_example_file('source-' + str(crop_scale) + 'crop.jpg')) + ) + ) state_manager.init_item('execution_device_ids', [ 0 ]) state_manager.init_item('execution_providers', [ 'cpu' ]) diff --git a/tests/test_face_detector.py b/tests/test_face_detector.py index 800e147f..80898992 100644 --- a/tests/test_face_detector.py +++ b/tests/test_face_detector.py @@ -1,8 +1,7 @@ -import subprocess import pytest -from facefusion import face_detector, state_manager +from facefusion import face_detector, ffmpeg, ffmpeg_builder, process_manager, state_manager from facefusion.download import conditional_download from facefusion.face_detector import detect_with_retinaface, detect_with_scrfd, detect_with_yolo_face, detect_with_yunet from facefusion.face_helper import apply_nms, get_nms_threshold @@ -12,13 +11,23 @@ from .assert_helper import get_test_example_file, get_test_examples_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' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.jpg'), '-vf', 'crop=iw*0.8:ih*0.8', get_test_example_file('source-80crop.jpg') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.jpg'), '-vf', 'crop=iw*0.7:ih*0.7', get_test_example_file('source-70crop.jpg') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.jpg'), '-vf', 'crop=iw*0.6:ih*0.6', get_test_example_file('source-60crop.jpg') ]) + + for crop_scale in [ 80, 70, 60 ]: + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('source.jpg')), + [ + '-vf', + 'crop=iw*0.' + str(crop_scale) + ':ih*0.' + str(crop_scale) + ], + ffmpeg_builder.set_output(get_test_example_file('source-' + str(crop_scale) + 'crop.jpg')) + ) + ) state_manager.init_item('execution_device_ids', [ 0 ]) state_manager.init_item('execution_providers', [ 'cpu' ]) @@ -34,9 +43,17 @@ def before_all() -> None: 'https://github.com/facefusion/facefusion-assets/releases/download/examples-3.0.0/source.jpg' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.jpg'), '-vf', 'crop=iw*0.8:ih*0.8', get_test_example_file('source-80crop.jpg') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.jpg'), '-vf', 'crop=iw*0.7:ih*0.7', get_test_example_file('source-70crop.jpg') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.jpg'), '-vf', 'crop=iw*0.6:ih*0.6', get_test_example_file('source-60crop.jpg') ]) + for crop_scale in [ 80, 70, 60 ]: + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('source.jpg')), + [ + '-vf', + 'crop=iw*0.' + str(crop_scale) + ':ih*0.' + str(crop_scale) + ], + ffmpeg_builder.set_output(get_test_example_file('source-' + str(crop_scale) + 'crop.jpg')) + ) + ) @pytest.fixture(autouse = True) diff --git a/tests/test_ffmpeg.py b/tests/test_ffmpeg.py index aed468a5..54bea288 100644 --- a/tests/test_ffmpeg.py +++ b/tests/test_ffmpeg.py @@ -1,11 +1,10 @@ import os -import subprocess import tempfile import pytest import facefusion.ffmpeg -from facefusion import process_manager, state_manager +from facefusion import ffmpeg, ffmpeg_builder, process_manager, state_manager from facefusion.download import conditional_download from facefusion.ffmpeg import concat_video, extract_frames, merge_video, read_audio_buffer, replace_audio, restore_audio, sanitize_audio, sanitize_image, sanitize_video, spawn_frames from facefusion.ffprobe import probe_entries @@ -34,16 +33,44 @@ def before_all() -> None: 'https://github.com/facefusion/facefusion-assets/releases/download/examples-3.0.0/target-240p.mp4' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.mp3'), get_test_example_file('source.wav') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vf', 'fps=25', get_test_example_file('target-240p-25fps.mp4') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vf', 'fps=30', get_test_example_file('target-240p-30fps.mp4') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vf', 'fps=60', get_test_example_file('target-240p-60fps.mp4') ]) + for video_fps in [ 25, 30, 60 ]: + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + ffmpeg_builder.set_video_fps(video_fps), + ffmpeg_builder.set_output(get_test_example_file('target-240p-' + str(video_fps) + 'fps.mp4')) + ) + ) for output_video_format in [ 'avi', 'm4v', 'mkv', 'mov', 'mp4', 'webm', 'wmv' ]: - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.mp3'), '-i', get_test_example_file('target-240p.mp4'), '-ar', '16000', get_test_example_file('target-240p-16khz.' + output_video_format) ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('source.mp3')), + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + ffmpeg_builder.set_audio_sample_rate(16000), + ffmpeg_builder.set_output(get_test_example_file('target-240p-16khz.' + output_video_format)) + ) + ) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.mp3'), '-i', get_test_example_file('target-240p.mp4'), '-ar', '48000', get_test_example_file('target-240p-48khz.mp4') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-c:v', 'libx265', '-an', '-movflags', '+faststart', get_test_example_file('target-240p-h265.mp4') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('source.mp3')), + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + ffmpeg_builder.set_audio_sample_rate(48000), + ffmpeg_builder.set_output(get_test_example_file('target-240p-48khz.mp4')) + ) + ) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + ffmpeg_builder.set_video_encoder('libx265'), + [ + '-an' + ], + ffmpeg_builder.set_faststart('mp4'), + ffmpeg_builder.set_output(get_test_example_file('target-240p-h265.mp4')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_ffprobe.py b/tests/test_ffprobe.py index 5e672ed3..8240c3f8 100644 --- a/tests/test_ffprobe.py +++ b/tests/test_ffprobe.py @@ -1,8 +1,7 @@ -import subprocess import pytest -from facefusion import process_manager +from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.ffprobe import extract_audio_metadata, extract_video_metadata from .assert_helper import get_test_example_file, get_test_examples_directory @@ -18,8 +17,22 @@ def before_all() -> None: 'https://github.com/facefusion/facefusion-assets/releases/download/examples-3.0.0/target-240p.mp4' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('source.mp3'), '-t', '1.9', '-ar', '48000', '-ac', '2', get_test_example_file('source-48000khz-2ch.wav') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-t', '1', get_test_example_file('target-240p-1s.mov') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('source.mp3')), + ffmpeg_builder.set_video_duration(1.9), + ffmpeg_builder.set_audio_sample_rate(48000), + ffmpeg_builder.set_audio_channel_total(2), + ffmpeg_builder.set_output(get_test_example_file('source-48000khz-2ch.wav')) + ) + ) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + ffmpeg_builder.set_video_duration(1), + ffmpeg_builder.set_output(get_test_example_file('target-240p-1s.mov')) + ) + ) def test_extract_audio_metadata() -> None: diff --git a/tests/test_job_runner.py b/tests/test_job_runner.py index eef2c64d..2698afed 100644 --- a/tests/test_job_runner.py +++ b/tests/test_job_runner.py @@ -1,8 +1,8 @@ import os -import subprocess import pytest +from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.filesystem import copy_file, create_directory, get_file_extension from facefusion.jobs.job_manager import add_step, clear_jobs, create_job, init_jobs, move_job_file, submit_job, submit_jobs @@ -13,13 +13,23 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p.jpg')) + ) + ) @pytest.fixture(scope = 'function', autouse = True) diff --git a/tests/test_vision.py b/tests/test_vision.py index ec4b8e77..04a8071b 100644 --- a/tests/test_vision.py +++ b/tests/test_vision.py @@ -1,8 +1,8 @@ -import subprocess import numpy import pytest +from facefusion import ffmpeg, ffmpeg_builder, process_manager from facefusion.download import conditional_download from facefusion.vision import calculate_histogram_difference, 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_chunk, read_video_frame, restrict_image_resolution, restrict_trim_video_frame, restrict_video_fps, restrict_video_resolution, scale_resolution, select_video_frames, unpack_resolution, write_image from .assert_helper import get_test_example_file, get_test_examples_directory, get_test_output_path, prepare_test_output_directory @@ -10,6 +10,7 @@ from .assert_helper import get_test_example_file, get_test_examples_directory, g @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', @@ -17,17 +18,80 @@ def before_all() -> None: 'https://github.com/facefusion/facefusion-assets/releases/download/examples-3.0.0/target-1080p.mp4' ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('target-240p.jpg') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', get_test_example_file('目标-240p.webp') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-1080p.mp4'), '-vframes', '1', get_test_example_file('target-1080p.jpg') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', '-vf', 'hue=s=0', get_test_example_file('target-240p-0sat.jpg') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vframes', '1', '-vf', 'transpose=0', get_test_example_file('target-240p-90deg.jpg') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-1080p.mp4'), '-vframes', '1', '-vf', 'transpose=0', get_test_example_file('target-1080p-90deg.jpg') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vf', 'fps=25', get_test_example_file('target-240p-25fps.mp4') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vf', 'fps=30', get_test_example_file('target-240p-30fps.mp4') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vf', 'fps=60', get_test_example_file('target-240p-60fps.mp4') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-240p.mp4'), '-vf', 'transpose=0', get_test_example_file('target-240p-90deg.mp4') ]) - subprocess.run([ 'ffmpeg', '-i', get_test_example_file('target-1080p.mp4'), '-vf', 'transpose=0', get_test_example_file('target-1080p-90deg.mp4') ]) + for target_name in [ 'target-240p', 'target-1080p' ]: + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file(target_name + '.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file(target_name + '.jpg')) + ) + ) + + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + ffmpeg_builder.set_output(get_test_example_file('目标-240p.webp')) + ) + ) + + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + [ + '-vframes', + '1' + ], + [ + '-vf', + 'hue=s=0' + ], + ffmpeg_builder.set_output(get_test_example_file('target-240p-0sat.jpg')) + ) + ) + + for target_name in [ 'target-240p', 'target-1080p' ]: + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file(target_name + '.mp4')), + [ + '-vframes', + '1' + ], + [ + '-vf', + 'transpose=0' + ], + ffmpeg_builder.set_output(get_test_example_file(target_name + '-90deg.jpg')) + ) + ) + + for video_fps in [ 25, 30, 60 ]: + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file('target-240p.mp4')), + ffmpeg_builder.set_video_fps(video_fps), + ffmpeg_builder.set_output(get_test_example_file('target-240p-' + str(video_fps) + 'fps.mp4')) + ) + ) + + for target_name in [ 'target-240p', 'target-1080p' ]: + ffmpeg.run_ffmpeg( + ffmpeg_builder.chain( + ffmpeg_builder.set_input(get_test_example_file(target_name + '.mp4')), + [ + '-vf', + 'transpose=0' + ], + ffmpeg_builder.set_output(get_test_example_file(target_name + '-90deg.mp4')) + ) + ) @pytest.fixture(scope = 'function', autouse = True)