Coyote-A/ultimate-upscale-for-automatic1111
1
0
Fork 0
mirror of https://github.com/Coyote-A/ultimate-upscale-for-automatic1111.git synced 2026-04-30 03:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4-fix-upscale-factor' into 'master'

Browse Source 
Resolve "Fix upscale factor"

Closes #4

See merge request mirzam/ultimate-upscale-for-automatic1111!7
This commit is contained in:
Anton Antonov
2023-01-02 17:58:07 +00:00
parent 1af5b9baea 91544a9711
commit 86a9ec00f9
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
scripts/ultimate-upscale.py
View File

@@ -8,6 +8,16 @@ from modules import processing, shared, sd_samplers, images, devices
from modules.processing import Processed from modules.processing import Processed
from modules.shared import opts, cmd_opts, state from modules.shared import opts, cmd_opts, state
def getFactor(num):
if num == 1:
return 2
if num % 4 == 0:
return 4
if num % 3 == 0:
return 3
if num % 2 == 0:
return 2
return 0
def upscale(p, init_img, upscaler_index, tileSize, padding): def upscale(p, init_img, upscaler_index, tileSize, padding):
scale_factor = max(p.width, p.height) // max(init_img.width, init_img.height) scale_factor = max(p.width, p.height) // max(init_img.width, init_img.height)
@@ -26,24 +36,20 @@ def upscale(p, init_img, upscaler_index, tileSize, padding):
upscaled_img = init_img upscaled_img = init_img
if upscaler.name == "None": if upscaler.name == "None":
return upscaled_img.resize((p.width, p.height), resample=Image.LANCZOS) return upscaled_img.resize((p.width, p.height), resample=Image.LANCZOS)
if scale_factor > 4: current_scale = 1
iterations = math.ceil(scale_factor / 4) iteration = 0
else: current_scale_factor = getFactor(scale_factor)
iterations = 1 while current_scale_factor == 0:
scale_factor += 1
print(f"Total iterations: {iterations}") current_scale_factor = getFactor(scale_factor)
while current_scale < scale_factor:
for i in range(iterations): iteration += 1
if i + 1 == iterations: current_scale_factor = getFactor(scale_factor // current_scale)
current_scale_factor = scale_factor - i * 4 current_scale = current_scale * current_scale_factor
else: if current_scale_factor == 0:
current_scale_factor = 4 break
print(f"Upscaling iteration {iteration} with scale factor {current_scale_factor}")
if current_scale_factor == 1:
current_scale_factor = 2
print(f"Upscaling iteration {i} with scale factor {current_scale_factor}")
upscaled_img = upscaler.scaler.upscale(upscaled_img, current_scale_factor, upscaler.data_path) upscaled_img = upscaler.scaler.upscale(upscaled_img, current_scale_factor, upscaler.data_path)
return upscaled_img.resize((p.width, p.height), resample=Image.LANCZOS) return upscaled_img.resize((p.width, p.height), resample=Image.LANCZOS)
@@ -131,7 +137,7 @@ class Script(scripts.Script):
"<p style=\"margin-bottom:0.75em\">Will upscale the image to selected with and height</p>") "<p style=\"margin-bottom:0.75em\">Will upscale the image to selected with and height</p>")
gr.HTML("<p style=\"margin-bottom:0.75em\">Redraw options:</p>") gr.HTML("<p style=\"margin-bottom:0.75em\">Redraw options:</p>")
with gr.Row(): with gr.Row():
redraw_enabled = gr.Checkbox(label="Enabled") redraw_enabled = gr.Checkbox(label="Enabled", value=True)
tileSize = gr.Slider(minimum=256, maximum=2048, step=64, label='Tile size', value=512) tileSize = gr.Slider(minimum=256, maximum=2048, step=64, label='Tile size', value=512)
mask_blur = gr.Slider(label='Mask blur', minimum=0, maximum=64, step=1, value=8) mask_blur = gr.Slider(label='Mask blur', minimum=0, maximum=64, step=1, value=8)
padding = gr.Slider(label='Padding', minimum=0, maximum=128, step=1, value=32) padding = gr.Slider(label='Padding', minimum=0, maximum=128, step=1, value=32)