CalvinBackup/facefusion
1
0
Fork 0
mirror of https://github.com/facefusion/facefusion.git synced 2026-07-27 12:30:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup Part1 (#1201)

Browse Source 
* remove some todos, improve video manager, simplify ffmpeg commands and more

* do more

* remove thread count for filters
This commit is contained in:
Henry Ruhs
2026-07-25 11:47:36 +02:00
committed by GitHub
parent 4a8bfec297
commit 585a7d75da
10 changed files with 87 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_ffmpeg_builder.py
+7 -12
View File
@@ -1,7 +1,7 @@
from shutil import which
from facefusion import ffmpeg_builder
from facefusion.ffmpeg_builder import chain, concat, convert_color_space, keep_video_alpha, restrict_color_transfer, run, select_frame_range, set_audio_quality, set_audio_sample_size, set_faststart, set_filter_thread_count, set_global_thread_count, set_input_seek, set_output_format, set_stream_mode, set_video_encoder, set_video_fps, set_video_quality, set_video_tag
from facefusion.ffmpeg_builder import chain, concat, convert_color_space, keep_video_alpha, restrict_color_transfer, run, seek_to, select_frame_range, set_audio_quality, set_audio_sample_size, set_faststart, set_output_format, set_stream_mode, set_thread_count, set_video_encoder, set_video_fps, set_video_quality, set_video_tag
def test_run() -> None:
@@ -41,9 +41,9 @@ def test_set_stream_mode() -> None:
assert set_stream_mode('v4l2') == [ '-f', 'v4l2' ]
def test_set_input_seek() -> None:
assert set_input_seek(0.0) == [ '-ss', '0.0' ]
assert set_input_seek(1.5) == [ '-ss', '1.5' ]
def test_seek_to() -> None:
assert seek_to(0.0) == [ '-ss', '0.0' ]
assert seek_to(1.5) == [ '-ss', '1.5' ]
def test_set_output_format() -> None:
@@ -92,14 +92,9 @@ def test_set_audio_quality() -> None:
assert set_audio_quality('flac', 100) == []
def test_set_global_thread_count() -> None:
assert set_global_thread_count(8) == [ '-threads', '8' ]
assert set_global_thread_count(16) == [ '-threads', '16' ]
def test_set_filter_thread_count() -> None:
assert set_filter_thread_count(8) == [ '-filter_threads', '8' ]
assert set_filter_thread_count(16) == [ '-filter_threads', '16' ]
def test_set_thread_count() -> None:
assert set_thread_count(8) == [ '-threads', '8' ]
assert set_thread_count(16) == [ '-threads', '16' ]
def test_set_faststart() -> None:
tests/test_video_manager.py
+13 -12
View File
@@ -9,7 +9,7 @@ from facefusion.download import conditional_download
from facefusion.ffprobe import extract_video_metadata
from facefusion.frame_store import get_frame_store
from facefusion.temp_helper import create_temp_directory, get_temp_file_path
from facefusion.video_manager import clear_video_pool, close_video_writer, conditional_set_video_reader_position, get_reader, get_writer, read_video_reader_frame, read_video_reader_window, refresh_video_reader, write_video_writer_frame
from facefusion.video_manager import clear_video_pool, close_video_writer, conditional_set_video_reader_position, get_reader, get_writer, read_video_reader_frame, read_video_reader_window, refresh_video_reader, write_video_writer
from .helper import get_test_example_file, get_test_examples_directory
@@ -134,24 +134,23 @@ def test_read_video_reader_window() -> None:
#todo: run mutation testing, strip down to the minimum, test with real data
def test_get_writer() -> None:
target_path = get_test_example_file('target-240p-25fps.mp4')
video_metadata = extract_video_metadata(target_path)
create_temp_directory(target_path)
video_writer = get_writer(target_path, video_metadata, 25.0, (426, 226), (426, 226), 25.0)
video_writer = get_writer(target_path, 25.0, (426, 226), (426, 226), 25.0)
assert get_writer(target_path, video_metadata, 25.0, (426, 226), (426, 226), 25.0) is video_writer
assert get_writer(target_path, 25.0, (426, 226), (426, 226), 25.0) is video_writer
#todo: needs review - [testing] question if the assertions are good
#todo: run mutation testing, strip down to the minimum, test with real data
def test_write_video_writer_frame() -> None:
def test_write_video_writer() -> None:
target_path = get_test_example_file('target-240p-25fps.mp4')
create_temp_directory(target_path)
video_reader = get_reader(target_path)
video_writer = get_writer(target_path, video_reader.get('metadata'), 25.0, (426, 226), (426, 226), 25.0)
video_writer = get_writer(target_path, 25.0, (426, 226), (426, 226), 25.0)
for frame_number in range(25):
vision_frame = read_video_reader_frame(video_reader)
write_video_writer_frame(video_writer, vision_frame)
write_video_writer(video_writer, vision_frame)
assert close_video_writer(video_writer) is True
@@ -170,9 +169,9 @@ def test_close_video_writer() -> None:
target_path = get_test_example_file('target-240p-30fps.mp4')
create_temp_directory(target_path)
video_reader = get_reader(target_path)
video_writer = get_writer(target_path, video_reader.get('metadata'), 30.0, (426, 226), (426, 226), 30.0)
video_writer = get_writer(target_path, 30.0, (426, 226), (426, 226), 30.0)
vision_frame = read_video_reader_frame(video_reader)
write_video_writer_frame(video_writer, vision_frame)
write_video_writer(video_writer, vision_frame)
assert close_video_writer(video_writer) is True
@@ -183,13 +182,15 @@ def test_clear_video_pool() -> None:
target_path = get_test_example_file('target-240p-25fps.mp4')
create_temp_directory(target_path)
video_reader = get_reader(target_path)
video_writer = get_writer(target_path, video_reader.get('metadata'), 25.0, (426, 226), (426, 226), 25.0)
video_writer = get_writer(target_path, 25.0, (426, 226), (426, 226), 25.0)
vision_frame = read_video_reader_frame(video_reader)
write_video_writer(video_writer, vision_frame)
clear_video_pool()
if is_windows():
assert video_reader.get('process').returncode == 1
assert video_writer.get('process').returncode == 1
if is_linux() or is_macos():
assert video_reader.get('process').returncode == -9
assert video_writer.get('process').returncode == -9
assert video_writer.get('process').returncode == 0