Merge pull request #35 from glucauze/v1.2.1

add warning on improved mask and upscaling and make it disabled in settings by default
glucauze · Aug 6, 2023 · c835e97 · c835e97
2 parents 55b845c + e6592a1
commit c835e97
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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)