Improve ResolutionSelector (#14309)
This commit is contained in:
parent
fc258b10e5
commit
a1c434eb65
|
|
@ -6,24 +6,24 @@ from comfy_api.latest import ComfyExtension, io
|
||||||
|
|
||||||
class AspectRatio(str, Enum):
|
class AspectRatio(str, Enum):
|
||||||
SQUARE = "1:1 (Square)"
|
SQUARE = "1:1 (Square)"
|
||||||
|
PHOTO_V = "2:3 (Portrait Photo)"
|
||||||
PHOTO_H = "3:2 (Photo)"
|
PHOTO_H = "3:2 (Photo)"
|
||||||
|
STANDARD_V = "3:4 (Portrait Standard)"
|
||||||
STANDARD_H = "4:3 (Standard)"
|
STANDARD_H = "4:3 (Standard)"
|
||||||
|
WIDESCREEN_V = "9:16 (Portrait Widescreen)"
|
||||||
WIDESCREEN_H = "16:9 (Widescreen)"
|
WIDESCREEN_H = "16:9 (Widescreen)"
|
||||||
ULTRAWIDE_H = "21:9 (Ultrawide)"
|
ULTRAWIDE_H = "21:9 (Ultrawide)"
|
||||||
PHOTO_V = "2:3 (Portrait Photo)"
|
|
||||||
STANDARD_V = "3:4 (Portrait Standard)"
|
|
||||||
WIDESCREEN_V = "9:16 (Portrait Widescreen)"
|
|
||||||
|
|
||||||
|
|
||||||
ASPECT_RATIOS: dict[AspectRatio, tuple[int, int]] = {
|
ASPECT_RATIOS: dict[AspectRatio, tuple[int, int]] = {
|
||||||
AspectRatio.SQUARE: (1, 1),
|
AspectRatio.SQUARE: (1, 1),
|
||||||
|
AspectRatio.PHOTO_V: (2, 3),
|
||||||
AspectRatio.PHOTO_H: (3, 2),
|
AspectRatio.PHOTO_H: (3, 2),
|
||||||
|
AspectRatio.STANDARD_V: (3, 4),
|
||||||
AspectRatio.STANDARD_H: (4, 3),
|
AspectRatio.STANDARD_H: (4, 3),
|
||||||
|
AspectRatio.WIDESCREEN_V: (9, 16),
|
||||||
AspectRatio.WIDESCREEN_H: (16, 9),
|
AspectRatio.WIDESCREEN_H: (16, 9),
|
||||||
AspectRatio.ULTRAWIDE_H: (21, 9),
|
AspectRatio.ULTRAWIDE_H: (21, 9),
|
||||||
AspectRatio.PHOTO_V: (2, 3),
|
|
||||||
AspectRatio.STANDARD_V: (3, 4),
|
|
||||||
AspectRatio.WIDESCREEN_V: (9, 16),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -50,26 +50,35 @@ class ResolutionSelector(io.ComfyNode):
|
||||||
min=0.1,
|
min=0.1,
|
||||||
max=16.0,
|
max=16.0,
|
||||||
step=0.1,
|
step=0.1,
|
||||||
tooltip="Target total megapixels. 1.0 MP ≈ 1024×1024 for square.",
|
tooltip="Target total megapixels. 1.0 MP ≈ 1024x1024 for square.",
|
||||||
|
),
|
||||||
|
io.Int.Input(
|
||||||
|
id="multiple",
|
||||||
|
default=8,
|
||||||
|
min=8,
|
||||||
|
max=128,
|
||||||
|
step=4,
|
||||||
|
tooltip="Nearest multiple of the result to set the selected resolution to.",
|
||||||
|
advanced=True,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
outputs=[
|
outputs=[
|
||||||
io.Int.Output(
|
io.Int.Output(
|
||||||
"width", tooltip="Calculated width in pixels (multiple of 8)."
|
"width", tooltip="Calculated width in pixels multiplied by the selected multiple."
|
||||||
),
|
),
|
||||||
io.Int.Output(
|
io.Int.Output(
|
||||||
"height", tooltip="Calculated height in pixels (multiple of 8)."
|
"height", tooltip="Calculated height in pixels multiplied by the selected multiple."
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def execute(cls, aspect_ratio: str, megapixels: float) -> io.NodeOutput:
|
def execute(cls, aspect_ratio: str, megapixels: float, multiple: int) -> io.NodeOutput:
|
||||||
w_ratio, h_ratio = ASPECT_RATIOS[aspect_ratio]
|
w_ratio, h_ratio = ASPECT_RATIOS[aspect_ratio]
|
||||||
total_pixels = megapixels * 1024 * 1024
|
total_pixels = megapixels * 1024 * 1024
|
||||||
scale = math.sqrt(total_pixels / (w_ratio * h_ratio))
|
scale = math.sqrt(total_pixels / (w_ratio * h_ratio))
|
||||||
width = round(w_ratio * scale / 8) * 8
|
width = round(w_ratio * scale / multiple) * multiple
|
||||||
height = round(h_ratio * scale / 8) * 8
|
height = round(h_ratio * scale / multiple) * multiple
|
||||||
return io.NodeOutput(width, height)
|
return io.NodeOutput(width, height)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue