From b7e160a87d07b2fd1c12812c43786e141cc86bd5 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Thu, 11 May 2023 08:14:45 +0300
Subject: change live preview format to jpeg to prevent unreasonably slow
 previews for large images, and add an option to let user select the format

---
 modules/progress.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/progress.py')

diff --git a/modules/progress.py b/modules/progress.py
index 948e6f00..289dd311 100644
--- a/modules/progress.py
+++ b/modules/progress.py
@@ -95,9 +95,9 @@ def progressapi(req: ProgressRequest):
         image = shared.state.current_image
         if image is not None:
             buffered = io.BytesIO()
-            image.save(buffered, format="png")
+            image.save(buffered, format=opts.live_previews_format)
             base64_image = base64.b64encode(buffered.getvalue()).decode('ascii')
-            live_preview = f"data:image/png;base64,{base64_image}"
+            live_preview = f"data:image/{opts.live_previews_format};base64,{base64_image}"
             id_live_preview = shared.state.id_live_preview
         else:
             live_preview = None
-- 
cgit v1.2.1


From da10de022f69e7847bcc64a7914d56246d852e20 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Thu, 11 May 2023 20:52:30 +0300
Subject: Make live previews use JPEG only when the image is lorge enough

---
 modules/progress.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'modules/progress.py')

diff --git a/modules/progress.py b/modules/progress.py
index 289dd311..c2e37834 100644
--- a/modules/progress.py
+++ b/modules/progress.py
@@ -95,9 +95,17 @@ def progressapi(req: ProgressRequest):
         image = shared.state.current_image
         if image is not None:
             buffered = io.BytesIO()
-            image.save(buffered, format=opts.live_previews_format)
+            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)
             base64_image = base64.b64encode(buffered.getvalue()).decode('ascii')
-            live_preview = f"data:image/{opts.live_previews_format};base64,{base64_image}"
+            live_preview = f"data:image/{format};base64,{base64_image}"
             id_live_preview = shared.state.id_live_preview
         else:
             live_preview = None
-- 
cgit v1.2.1


From a58ae0b7174d9903fa426def2eda842dbbfcb53c Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sun, 14 May 2023 11:15:15 +0300
Subject: remove auto live previews format option, fix slow PNG generation

---
 modules/progress.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'modules/progress.py')

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
-- 
cgit v1.2.1