jones/facefusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More edge case testing

Browse Source
This commit is contained in:
henryruhs
2025-05-23 19:20:56 +02:00
parent fc0de4eec2
commit 068f6c86d1
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
facefusion/ffmpeg.py
View File

@@ -211,10 +211,10 @@ def merge_video(target_path : str, temp_video_fps : Fps, output_video_resolution
temp_file_path = get_temp_file_path(target_path) temp_file_path = get_temp_file_path(target_path)
temp_frames_pattern = get_temp_frames_pattern(target_path, '%08d') temp_frames_pattern = get_temp_frames_pattern(target_path, '%08d')
if output_file_format in [ 'm4v', 'mkv', 'mp4' ] and output_video_encoder == 'rawvideo': if output_file_format == 'm4v':
output_video_encoder = 'libx264' output_video_encoder = 'libx264'
if output_file_format == 'm4v': if output_file_format in [ 'mkv', 'mp4' ] and output_video_encoder == 'rawvideo':
output_video_encoder = 'libx264' output_video_encoder = 'libx264'
if output_file_format == 'mov' and output_video_encoder == 'libvpx-vp9': if output_file_format == 'mov' and output_video_encoder == 'libvpx-vp9':

14
tests/test_ffmpeg.py
View File

@@ -46,7 +46,6 @@ def before_each() -> None:
prepare_test_output_directory() prepare_test_output_directory()
@pytest.mark.skip()
def test_get_available_encoder_set() -> None: def test_get_available_encoder_set() -> None:
available_encoder_set = get_available_encoder_set() available_encoder_set = get_available_encoder_set()
@@ -93,14 +92,15 @@ def test_merge_video() -> None:
for target_path in merge_set: for target_path in merge_set:
for output_video_encoder in get_available_encoder_set().get('video'): for output_video_encoder in get_available_encoder_set().get('video'):
state_manager.init_item('output_video_encoder', output_video_encoder) if output_video_encoder not in [ 'h264_amf', 'hevc_amf', 'h264_qsv', 'hevc_qsv' ]:
create_temp_directory(target_path) state_manager.init_item('output_video_encoder', output_video_encoder)
extract_frames(target_path, '452x240', 25.0, 0, 1) create_temp_directory(target_path)
extract_frames(target_path, '452x240', 25.0, 0, 1)
#assert merge_video(target_path, 25.0, '452x240', 25.0, 0, 1) is True #assert merge_video(target_path, 25.0, '452x240', 25.0, 0, 1) is True
if merge_video(target_path, 25.0, '452x240', 25.0, 0, 1) is False: if merge_video(target_path, 25.0, '452x240', 25.0, 0, 1) is False:
assert 'this does not work' == output_video_encoder assert 'this does not work' == output_video_encoder
clear_temp_directory(target_path) clear_temp_directory(target_path)