From e6592a11bff713eb3c135eae6fa7b17821a62d79 Mon Sep 17 00:00:00 2001 From: Tran Xen <137925069+glucauze@users.noreply.github.com> Date: Sun, 6 Aug 2023 17:44:14 +0200 Subject: [PATCH] add warning on improved mask and upscaling and make it disabled in settings by default --- scripts/faceswaplab_settings/faceswaplab_settings.py | 2 +- scripts/faceswaplab_swapping/upscaled_inswapper.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/faceswaplab_settings/faceswaplab_settings.py b/scripts/faceswaplab_settings/faceswaplab_settings.py index d173e34..289ee25 100644 --- a/scripts/faceswaplab_settings/faceswaplab_settings.py +++ b/scripts/faceswaplab_settings/faceswaplab_settings.py @@ -201,7 +201,7 @@ def on_ui_settings() -> None: shared.opts.add_option( "faceswaplab_default_upscaled_swapper_improved_mask", shared.OptionInfo( - True, + False, "Default Use improved segmented mask (use pastenet to mask only the face) (requires restart)", gr.Checkbox, {"interactive": True}, diff --git a/scripts/faceswaplab_swapping/upscaled_inswapper.py b/scripts/faceswaplab_swapping/upscaled_inswapper.py index b3e14cb..691f929 100644 --- a/scripts/faceswaplab_swapping/upscaled_inswapper.py +++ b/scripts/faceswaplab_swapping/upscaled_inswapper.py @@ -210,6 +210,11 @@ def compute_diff(bgr_fake: CV2ImgU8, aimg: CV2ImgU8) -> CV2ImgU8: ) if options.improved_mask: + if k == 1: + logger.warning( + "Please note that improved mask does not work well without upscaling. Set upscaling to Lanczos at least if you want speed and want to use improved mask." + ) + logger.info("improved_mask") mask = get_face_mask(aimg, bgr_fake) bgr_fake = merge_images_with_mask(aimg, bgr_fake, mask)