remove auto live previews format option, fix slow PNG generation

1 files changed, 9 insertions, 10 deletions

diff --git a/modules/progress.py b/modules/progress.py
index c2e37834..269863c9 100644
--- a/modules/progress.py
+++ b/modules/progress.py
@@ -95,17 +95,16 @@ def progressapi(req: ProgressRequest):
         image = shared.state.current_image

         if image is not None:

             buffered = io.BytesIO()

-            format = opts.live_previews_format

-            save_kwargs = {}

-            if format == "auto":

-                if max(*image.size) > 256:

-                    format = "jpeg"

-                else:

-                    format = "png"

-                    save_kwargs = {"optimize": True}

-            image.save(buffered, format=format, **save_kwargs)

+

+            if opts.live_previews_image_format == "png":

+                # using optimize for large images takes an enormous amount of time

+                save_kwargs = {"optimize": max(*image.size) > 256}

+            else:

+                save_kwargs = {}

+

+            image.save(buffered, format=opts.live_previews_image_format, **save_kwargs)

             base64_image = base64.b64encode(buffered.getvalue()).decode('ascii')

-            live_preview = f"data:image/{format};base64,{base64_image}"

+            live_preview = f"data:image/{opts.live_previews_image_format};base64,{base64_image}"

             id_live_preview = shared.state.id_live_preview

         else:

             live_preview = None