apextoaster
/
onnx-web
1
0
Fork 0
Code Actions

fix(api): switch between spiral and grid tiling based on outpaint margins (#101)

This commit is contained in:
Sean Sube 2023-02-05 16:56:11 -06:00
parent ca2f0a6404
commit 6fe278c744
Signed by: ssube
GPG Key ID: 3EED7B957D362AF1
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/onnx_web/chain/upscale_outpaint.py
View File

@ -11,7 +11,7 @@ from ..image import expand_image, mask_filter_none, noise_source_histogram
from ..output import save_image
from ..params import Border, ImageParams, Size, SizeChart, StageParams
from ..utils import ServerContext, is_debug
from .utils import process_tile_spiral
from .utils import process_tile_grid, process_tile_spiral
logger = getLogger(__name__)
@ -92,7 +92,16 @@ def upscale_outpaint(
draw_mask.rectangle((left, top, left + tile, top + tile), fill="black")
return result.images[0]
output = process_tile_spiral(source_image, SizeChart.auto, 1, [outpaint])
margin_x = float(max(border.left, border.right))
margin_y = float(max(border.top, border.bottom))
overlap = min(margin_x / source_image.width, margin_y / source_image.height)
if overlap > 0 and border.left == border.right and border.top == border.bottom:
logger.debug("outpainting with an even border, using spiral tiling")
output = process_tile_spiral(source_image, SizeChart.auto, 1, [outpaint], overlap=overlap)
else:
logger.debug("outpainting with an uneven border, using grid tiling")
output = process_tile_grid(source_image, SizeChart.auto, 1, [outpaint])
logger.info("final output image size: %sx%s", output.width, output.height)
return output

23
api/onnx_web/chain/utils.py
View File

@ -57,18 +57,17 @@ def process_tile_spiral(
center_x = (width // 2) - (tile // 2)
center_y = (height // 2) - (tile // 2)
# TODO: only valid for overlap = 0.5
if overlap == 0.5:
tiles = [
(0, tile * -overlap),
(tile * overlap, tile * -overlap),
(tile * overlap, 0),
(tile * overlap, tile * overlap),
(0, tile * overlap),
(tile * -overlap, tile * overlap),
(tile * -overlap, 0),
(tile * -overlap, tile * -overlap),
]
# TODO: should add/remove tiles when overlap != 0.5
tiles = [
(0, tile * -overlap),
(tile * overlap, tile * -overlap),
(tile * overlap, 0),
(tile * overlap, tile * overlap),
(0, tile * overlap),
(tile * -overlap, tile * overlap),
(tile * -overlap, 0),
(tile * -overlap, tile * -overlap),
]
# tile tuples is source, multiply by scale for dest
counter = 0