diff --git a/facefusion/ffmpeg.py b/facefusion/ffmpeg.py index c6fe6a84..b2fe36f5 100644 --- a/facefusion/ffmpeg.py +++ b/facefusion/ffmpeg.py @@ -124,8 +124,8 @@ def extract_frames(target_path : str, temp_video_resolution : Resolution, temp_v return process.returncode == 0 -def copy_image(target_path : str, temp_image_resolution : Resolution) -> bool: - temp_image_path = get_temp_file_path(target_path) +def copy_image(target_path : str, temp_image_resolution : Resolution, output_path : str) -> bool: + temp_image_path = get_temp_file_path(target_path, output_path) commands = ffmpeg_builder.chain( ffmpeg_builder.set_input(target_path), ffmpeg_builder.set_media_resolution(pack_resolution(temp_image_resolution)), @@ -137,11 +137,11 @@ def copy_image(target_path : str, temp_image_resolution : Resolution) -> bool: def finalize_image(target_path : str, output_path : str, output_image_resolution : Resolution) -> bool: output_image_quality = state_manager.get_item('output_image_quality') - temp_image_path = get_temp_file_path(target_path) + temp_image_path = get_temp_file_path(target_path, output_path) commands = ffmpeg_builder.chain( ffmpeg_builder.set_input(temp_image_path), ffmpeg_builder.set_media_resolution(pack_resolution(output_image_resolution)), - ffmpeg_builder.set_image_quality(target_path, output_image_quality), + ffmpeg_builder.set_image_quality(output_path, output_image_quality), ffmpeg_builder.force_output(output_path) ) return run_ffmpeg(commands).returncode == 0 @@ -169,8 +169,8 @@ def restore_audio(target_path : str, output_path : str, trim_frame_start : int, output_audio_quality = state_manager.get_item('output_audio_quality') output_audio_volume = state_manager.get_item('output_audio_volume') target_video_fps = detect_video_fps(target_path) - temp_video_path = get_temp_file_path(target_path) - temp_video_format = cast(VideoFormat, get_file_format(temp_video_path)) + temp_video_path = get_temp_file_path(target_path, output_path) + temp_video_format = cast(VideoFormat, get_file_format(output_path)) temp_video_duration = detect_video_duration(temp_video_path) output_audio_encoder = fix_audio_encoder(temp_video_format, output_audio_encoder) @@ -194,8 +194,8 @@ def replace_audio(target_path : str, audio_path : str, output_path : str) -> boo output_audio_encoder = state_manager.get_item('output_audio_encoder') output_audio_quality = state_manager.get_item('output_audio_quality') output_audio_volume = state_manager.get_item('output_audio_volume') - temp_video_path = get_temp_file_path(target_path) - temp_video_format = cast(VideoFormat, get_file_format(temp_video_path)) + temp_video_path = get_temp_file_path(target_path, output_path) + temp_video_format = cast(VideoFormat, get_file_format(output_path)) temp_video_duration = detect_video_duration(temp_video_path) output_audio_encoder = fix_audio_encoder(temp_video_format, output_audio_encoder) @@ -212,13 +212,13 @@ def replace_audio(target_path : str, audio_path : str, output_path : str) -> boo return run_ffmpeg(commands).returncode == 0 -def merge_video(target_path : str, temp_video_fps : Fps, output_video_resolution : Resolution, output_video_fps : Fps, trim_frame_start : int, trim_frame_end : int) -> bool: +def merge_video(target_path : str, temp_video_fps : Fps, output_video_resolution : Resolution, output_video_fps : Fps, trim_frame_start : int, trim_frame_end : int, output_path : str) -> bool: output_video_encoder = state_manager.get_item('output_video_encoder') output_video_quality = state_manager.get_item('output_video_quality') output_video_preset = state_manager.get_item('output_video_preset') merge_frame_total = predict_video_frame_total(target_path, output_video_fps, trim_frame_start, trim_frame_end) - temp_video_path = get_temp_file_path(target_path) - temp_video_format = cast(VideoFormat, get_file_format(temp_video_path)) + temp_video_path = get_temp_file_path(target_path, output_path) + temp_video_format = cast(VideoFormat, get_file_format(output_path)) temp_frames_pattern = get_temp_frames_pattern(target_path, '%08d') output_video_encoder = fix_video_encoder(temp_video_format, output_video_encoder) diff --git a/facefusion/processors/modules/age_modifier/core.py b/facefusion/processors/modules/age_modifier/core.py index 710d67d9..eb2d5a55 100755 --- a/facefusion/processors/modules/age_modifier/core.py +++ b/facefusion/processors/modules/age_modifier/core.py @@ -15,7 +15,7 @@ from facefusion.face_analyser import scale_face from facefusion.face_helper import merge_matrix, paste_back, scale_face_landmark_5, warp_face_by_face_landmark_5 from facefusion.face_masker import create_box_mask, create_occlusion_mask from facefusion.face_selector import select_faces -from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension +from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path from facefusion.processors.modules.age_modifier import choices as age_modifier_choices from facefusion.processors.modules.age_modifier.types import AgeModifierDirection, AgeModifierInputs from facefusion.processors.types import ProcessorOutputs @@ -111,9 +111,6 @@ def pre_process(mode : ProcessMode) -> bool: if mode == 'output' and not in_directory(state_manager.get_item('output_path')): logger.error(translator.get('specify_image_or_video_output') + translator.get('exclamation_mark'), __name__) return False - if mode == 'output' and not same_file_extension(state_manager.get_item('target_path'), state_manager.get_item('output_path')): - logger.error(translator.get('match_target_and_output_extension') + translator.get('exclamation_mark'), __name__) - return False return True diff --git a/facefusion/processors/modules/background_remover/core.py b/facefusion/processors/modules/background_remover/core.py index 1ce62788..222e457a 100644 --- a/facefusion/processors/modules/background_remover/core.py +++ b/facefusion/processors/modules/background_remover/core.py @@ -11,7 +11,7 @@ from facefusion import config, content_analyser, inference_manager, logger, stat from facefusion.common_helper import is_macos from facefusion.download import conditional_download_hashes, conditional_download_sources, resolve_download_url from facefusion.execution import has_execution_provider -from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension +from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path from facefusion.normalizer import normalize_color from facefusion.processors.modules.background_remover import choices as background_remover_choices from facefusion.processors.modules.background_remover.types import BackgroundRemoverInputs @@ -444,9 +444,6 @@ def pre_process(mode : ProcessMode) -> bool: if mode == 'output' and not in_directory(state_manager.get_item('output_path')): logger.error(translator.get('specify_image_or_video_output') + translator.get('exclamation_mark'), __name__) return False - if mode == 'output' and not same_file_extension(state_manager.get_item('target_path'), state_manager.get_item('output_path')): - logger.error(translator.get('match_target_and_output_extension') + translator.get('exclamation_mark'), __name__) - return False return True diff --git a/facefusion/processors/modules/deep_swapper/core.py b/facefusion/processors/modules/deep_swapper/core.py index dcb9bb2b..8e7fce73 100755 --- a/facefusion/processors/modules/deep_swapper/core.py +++ b/facefusion/processors/modules/deep_swapper/core.py @@ -15,7 +15,7 @@ from facefusion.face_analyser import scale_face from facefusion.face_helper import paste_back, warp_face_by_face_landmark_5 from facefusion.face_masker import create_area_mask, create_box_mask, create_occlusion_mask, create_region_mask from facefusion.face_selector import select_faces -from facefusion.filesystem import get_file_name, in_directory, is_image, is_video, resolve_file_paths, resolve_relative_path, same_file_extension +from facefusion.filesystem import get_file_name, in_directory, is_image, is_video, resolve_file_paths, resolve_relative_path from facefusion.processors.modules.deep_swapper import choices as deep_swapper_choices from facefusion.processors.modules.deep_swapper.types import DeepSwapperInputs, DeepSwapperMorph from facefusion.processors.types import ProcessorOutputs @@ -302,9 +302,6 @@ def pre_process(mode : ProcessMode) -> bool: if mode == 'output' and not in_directory(state_manager.get_item('output_path')): logger.error(translator.get('specify_image_or_video_output') + translator.get('exclamation_mark'), __name__) return False - if mode == 'output' and not same_file_extension(state_manager.get_item('target_path'), state_manager.get_item('output_path')): - logger.error(translator.get('match_target_and_output_extension') + translator.get('exclamation_mark'), __name__) - return False return True diff --git a/facefusion/processors/modules/expression_restorer/core.py b/facefusion/processors/modules/expression_restorer/core.py index 4892a18b..2c2fe00e 100755 --- a/facefusion/processors/modules/expression_restorer/core.py +++ b/facefusion/processors/modules/expression_restorer/core.py @@ -14,7 +14,7 @@ from facefusion.face_analyser import scale_face from facefusion.face_helper import paste_back, warp_face_by_face_landmark_5 from facefusion.face_masker import create_box_mask, create_occlusion_mask from facefusion.face_selector import select_faces -from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension +from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path from facefusion.processors.live_portrait import create_rotation, limit_expression from facefusion.processors.modules.expression_restorer import choices as expression_restorer_choices from facefusion.processors.modules.expression_restorer.types import ExpressionRestorerInputs @@ -128,9 +128,6 @@ def pre_process(mode : ProcessMode) -> bool: if mode == 'output' and not in_directory(state_manager.get_item('output_path')): logger.error(translator.get('specify_image_or_video_output') + translator.get('exclamation_mark'), __name__) return False - if mode == 'output' and not same_file_extension(state_manager.get_item('target_path'), state_manager.get_item('output_path')): - logger.error(translator.get('match_target_and_output_extension') + translator.get('exclamation_mark'), __name__) - return False return True diff --git a/facefusion/processors/modules/face_debugger/core.py b/facefusion/processors/modules/face_debugger/core.py index ab649d93..47b36416 100755 --- a/facefusion/processors/modules/face_debugger/core.py +++ b/facefusion/processors/modules/face_debugger/core.py @@ -10,7 +10,7 @@ from facefusion.face_analyser import scale_face from facefusion.face_helper import warp_face_by_face_landmark_5 from facefusion.face_masker import create_area_mask, create_box_mask, create_occlusion_mask, create_region_mask from facefusion.face_selector import select_faces -from facefusion.filesystem import in_directory, is_image, is_video, same_file_extension +from facefusion.filesystem import in_directory, is_image, is_video from facefusion.processors.modules.face_debugger import choices as face_debugger_choices from facefusion.processors.modules.face_debugger.types import FaceDebuggerInputs from facefusion.processors.types import ProcessorOutputs @@ -49,9 +49,6 @@ def pre_process(mode : ProcessMode) -> bool: if mode == 'output' and not in_directory(state_manager.get_item('output_path')): logger.error(translator.get('specify_image_or_video_output') + translator.get('exclamation_mark'), __name__) return False - if mode == 'output' and not same_file_extension(state_manager.get_item('target_path'), state_manager.get_item('output_path')): - logger.error(translator.get('match_target_and_output_extension') + translator.get('exclamation_mark'), __name__) - return False return True diff --git a/facefusion/processors/modules/face_editor/core.py b/facefusion/processors/modules/face_editor/core.py index cd5ed964..3b600c00 100755 --- a/facefusion/processors/modules/face_editor/core.py +++ b/facefusion/processors/modules/face_editor/core.py @@ -14,7 +14,7 @@ from facefusion.face_analyser import scale_face from facefusion.face_helper import paste_back, scale_face_landmark_5, warp_face_by_face_landmark_5 from facefusion.face_masker import create_box_mask from facefusion.face_selector import select_faces -from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension +from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path from facefusion.processors.live_portrait import create_rotation, limit_angle, limit_expression from facefusion.processors.modules.face_editor import choices as face_editor_choices from facefusion.processors.modules.face_editor.types import FaceEditorInputs @@ -179,9 +179,6 @@ def pre_process(mode : ProcessMode) -> bool: if mode == 'output' and not in_directory(state_manager.get_item('output_path')): logger.error(translator.get('specify_image_or_video_output') + translator.get('exclamation_mark'), __name__) return False - if mode == 'output' and not same_file_extension(state_manager.get_item('target_path'), state_manager.get_item('output_path')): - logger.error(translator.get('match_target_and_output_extension') + translator.get('exclamation_mark'), __name__) - return False return True diff --git a/facefusion/processors/modules/face_enhancer/core.py b/facefusion/processors/modules/face_enhancer/core.py index 9a1854b0..108ebb05 100755 --- a/facefusion/processors/modules/face_enhancer/core.py +++ b/facefusion/processors/modules/face_enhancer/core.py @@ -12,7 +12,7 @@ from facefusion.face_analyser import scale_face from facefusion.face_helper import paste_back, warp_face_by_face_landmark_5 from facefusion.face_masker import create_box_mask, create_occlusion_mask from facefusion.face_selector import select_faces -from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension +from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path from facefusion.processors.modules.face_enhancer import choices as face_enhancer_choices from facefusion.processors.modules.face_enhancer.types import FaceEnhancerInputs, FaceEnhancerWeight from facefusion.processors.types import ProcessorOutputs @@ -318,9 +318,6 @@ def pre_process(mode : ProcessMode) -> bool: if mode == 'output' and not in_directory(state_manager.get_item('output_path')): logger.error(translator.get('specify_image_or_video_output') + translator.get('exclamation_mark'), __name__) return False - if mode == 'output' and not same_file_extension(state_manager.get_item('target_path'), state_manager.get_item('output_path')): - logger.error(translator.get('match_target_and_output_extension') + translator.get('exclamation_mark'), __name__) - return False return True diff --git a/facefusion/processors/modules/face_swapper/core.py b/facefusion/processors/modules/face_swapper/core.py index 9e906ad5..e13676ee 100755 --- a/facefusion/processors/modules/face_swapper/core.py +++ b/facefusion/processors/modules/face_swapper/core.py @@ -16,7 +16,7 @@ from facefusion.face_analyser import get_average_face, get_many_faces, get_one_f from facefusion.face_helper import paste_back, warp_face_by_face_landmark_5 from facefusion.face_masker import create_area_mask, create_box_mask, create_occlusion_mask, create_region_mask from facefusion.face_selector import select_faces, sort_faces_by_order -from facefusion.filesystem import filter_image_paths, has_image, in_directory, is_image, is_video, resolve_relative_path, same_file_extension +from facefusion.filesystem import filter_image_paths, has_image, in_directory, is_image, is_video, resolve_relative_path from facefusion.model_helper import get_static_model_initializer from facefusion.processors.modules.face_swapper import choices as face_swapper_choices from facefusion.processors.modules.face_swapper.types import FaceSwapperInputs @@ -555,10 +555,6 @@ def pre_process(mode : ProcessMode) -> bool: logger.error(translator.get('specify_image_or_video_output') + translator.get('exclamation_mark'), __name__) return False - if mode == 'output' and not same_file_extension(state_manager.get_item('target_path'), state_manager.get_item('output_path')): - logger.error(translator.get('match_target_and_output_extension') + translator.get('exclamation_mark'), __name__) - return False - return True diff --git a/facefusion/processors/modules/frame_colorizer/core.py b/facefusion/processors/modules/frame_colorizer/core.py index d10ed18b..ae285010 100644 --- a/facefusion/processors/modules/frame_colorizer/core.py +++ b/facefusion/processors/modules/frame_colorizer/core.py @@ -11,7 +11,7 @@ from facefusion import config, content_analyser, inference_manager, logger, stat from facefusion.common_helper import create_int_metavar, is_macos from facefusion.download import conditional_download_hashes, conditional_download_sources, resolve_download_url from facefusion.execution import has_execution_provider -from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension +from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path from facefusion.processors.modules.frame_colorizer import choices as frame_colorizer_choices from facefusion.processors.modules.frame_colorizer.types import FrameColorizerInputs from facefusion.processors.types import ProcessorOutputs @@ -210,9 +210,6 @@ def pre_process(mode : ProcessMode) -> bool: if mode == 'output' and not in_directory(state_manager.get_item('output_path')): logger.error(translator.get('specify_image_or_video_output') + translator.get('exclamation_mark'), __name__) return False - if mode == 'output' and not same_file_extension(state_manager.get_item('target_path'), state_manager.get_item('output_path')): - logger.error(translator.get('match_target_and_output_extension') + translator.get('exclamation_mark'), __name__) - return False return True diff --git a/facefusion/processors/modules/frame_enhancer/core.py b/facefusion/processors/modules/frame_enhancer/core.py index 754302d3..981f1626 100644 --- a/facefusion/processors/modules/frame_enhancer/core.py +++ b/facefusion/processors/modules/frame_enhancer/core.py @@ -10,7 +10,7 @@ from facefusion import config, content_analyser, inference_manager, logger, stat from facefusion.common_helper import create_int_metavar, is_macos from facefusion.download import conditional_download_hashes, conditional_download_sources, resolve_download_url from facefusion.execution import has_execution_provider -from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path, same_file_extension +from facefusion.filesystem import in_directory, is_image, is_video, resolve_relative_path from facefusion.processors.modules.frame_enhancer import choices as frame_enhancer_choices from facefusion.processors.modules.frame_enhancer.types import FrameEnhancerInputs from facefusion.processors.types import ProcessorOutputs @@ -597,9 +597,6 @@ def pre_process(mode : ProcessMode) -> bool: if mode == 'output' and not in_directory(state_manager.get_item('output_path')): logger.error(translator.get('specify_image_or_video_output') + translator.get('exclamation_mark'), __name__) return False - if mode == 'output' and not same_file_extension(state_manager.get_item('target_path'), state_manager.get_item('output_path')): - logger.error(translator.get('match_target_and_output_extension') + translator.get('exclamation_mark'), __name__) - return False return True diff --git a/facefusion/temp_helper.py b/facefusion/temp_helper.py index 9622621b..d5c211f2 100644 --- a/facefusion/temp_helper.py +++ b/facefusion/temp_helper.py @@ -5,14 +5,14 @@ from facefusion import state_manager from facefusion.filesystem import create_directory, get_file_extension, get_file_name, move_file, remove_directory, resolve_file_pattern -def get_temp_file_path(file_path : str) -> str: +def get_temp_file_path(file_path : str, output_path : str) -> str: temp_directory_path = get_temp_directory_path(file_path) - temp_file_extension = get_file_extension(file_path) + temp_file_extension = get_file_extension(output_path) return os.path.join(temp_directory_path, 'temp' + temp_file_extension) def move_temp_file(file_path : str, move_path : str) -> bool: - temp_file_path = get_temp_file_path(file_path) + temp_file_path = get_temp_file_path(file_path, move_path) return move_file(temp_file_path, move_path) diff --git a/facefusion/workflows/image_to_image.py b/facefusion/workflows/image_to_image.py index bc6d8f95..6ab8445b 100644 --- a/facefusion/workflows/image_to_image.py +++ b/facefusion/workflows/image_to_image.py @@ -47,7 +47,7 @@ def prepare_image() -> ErrorCode: temp_image_resolution = restrict_image_resolution(state_manager.get_item('target_path'), output_image_resolution) logger.info(translator.get('copying_image').format(resolution = pack_resolution(temp_image_resolution)), __name__) - if ffmpeg.copy_image(state_manager.get_item('target_path'), temp_image_resolution): + if ffmpeg.copy_image(state_manager.get_item('target_path'), temp_image_resolution, state_manager.get_item('output_path')): logger.debug(translator.get('copying_image_succeeded'), __name__) else: logger.error(translator.get('copying_image_failed'), __name__) @@ -57,7 +57,7 @@ def prepare_image() -> ErrorCode: def process_image() -> ErrorCode: - temp_image_path = get_temp_file_path(state_manager.get_item('target_path')) + temp_image_path = get_temp_file_path(state_manager.get_item('target_path'), state_manager.get_item('output_path')) reference_vision_frame = read_static_image(temp_image_path) source_vision_frames = read_static_images(state_manager.get_item('source_paths')) source_audio_frame = create_empty_audio_frame() diff --git a/facefusion/workflows/image_to_video.py b/facefusion/workflows/image_to_video.py index 17f2c58e..d83719b9 100644 --- a/facefusion/workflows/image_to_video.py +++ b/facefusion/workflows/image_to_video.py @@ -141,7 +141,7 @@ def merge_frames() -> ErrorCode: temp_video_fps = restrict_video_fps(state_manager.get_item('target_path'), state_manager.get_item('output_video_fps')) logger.info(translator.get('merging_video').format(resolution = pack_resolution(output_video_resolution), fps = state_manager.get_item('output_video_fps')), __name__) - if ffmpeg.merge_video(state_manager.get_item('target_path'), temp_video_fps, output_video_resolution, state_manager.get_item('output_video_fps'), trim_frame_start, trim_frame_end): + if ffmpeg.merge_video(state_manager.get_item('target_path'), temp_video_fps, output_video_resolution, state_manager.get_item('output_video_fps'), trim_frame_start, trim_frame_end, state_manager.get_item('output_path')): logger.debug(translator.get('merging_video_succeeded'), __name__) else: if is_process_stopping(): diff --git a/tests/test_ffmpeg.py b/tests/test_ffmpeg.py index a3fa0f8f..93097271 100644 --- a/tests/test_ffmpeg.py +++ b/tests/test_ffmpeg.py @@ -109,7 +109,7 @@ def test_merge_video() -> None: create_temp_directory(target_path) extract_frames(target_path, (452, 240), 25.0, 0, 1) - assert merge_video(target_path, 25.0, (452, 240), 25.0, 0, 1) is True + assert merge_video(target_path, 25.0, (452, 240), 25.0, 0, 1, target_path) is True clear_temp_directory(target_path) @@ -152,7 +152,7 @@ def test_restore_audio() -> None: for output_audio_encoder in output_audio_encoders: state_manager.init_item('output_audio_encoder', output_audio_encoder) - copy_file(target_path, get_temp_file_path(target_path)) + copy_file(target_path, get_temp_file_path(target_path, output_path)) assert restore_audio(target_path, output_path, 0, 270) is True @@ -179,7 +179,7 @@ def test_replace_audio() -> None: for output_audio_encoder in output_audio_encoders: state_manager.init_item('output_audio_encoder', output_audio_encoder) - copy_file(target_path, get_temp_file_path(target_path)) + copy_file(target_path, get_temp_file_path(target_path, output_path)) assert replace_audio(target_path, get_test_example_file('source.mp3'), output_path) is True assert replace_audio(target_path, get_test_example_file('source.wav'), output_path) is True diff --git a/tests/test_temp_helper.py b/tests/test_temp_helper.py index 6903d2ca..e6cace7a 100644 --- a/tests/test_temp_helper.py +++ b/tests/test_temp_helper.py @@ -21,7 +21,7 @@ def before_all() -> None: def test_get_temp_file_path() -> None: temp_directory = tempfile.gettempdir() - assert get_temp_file_path(get_test_example_file('target-240p.mp4')) == os.path.join(temp_directory, 'facefusion', 'target-240p', 'temp.mp4') + assert get_temp_file_path(get_test_example_file('target-240p.mp4'), get_test_example_file('target-240p.mp4')) == os.path.join(temp_directory, 'facefusion', 'target-240p', 'temp.mp4') def test_get_temp_directory_path() -> None: