Anti-Ghosting + Stability Improvements
This commit is contained in:
+50
-118
@@ -1,7 +1,8 @@
|
||||
# Created By MSXYZ and Claude Opus 4.6
|
||||
# GPU başında ciddi işler döndürüyoruz. 🚀
|
||||
# TAA (Temporal Anti-Aliasing) + DLAA (Deep Learning Anti-Aliasing) Adaptation
|
||||
# v0.1.1 - Batch Processing + Stability Improvements
|
||||
# v0.1.1 - Anti-Ghosting
|
||||
|
||||
|
||||
import torch
|
||||
import torch.nn as nn
|
||||
@@ -10,15 +11,9 @@ import logging
|
||||
import comfy.model_management as mm
|
||||
|
||||
logger = logging.getLogger("VideoTAADLAA")
|
||||
if not logger.handlers:
|
||||
h = logging.StreamHandler()
|
||||
h.setFormatter(logging.Formatter("[%(name)s] %(message)s"))
|
||||
logger.addHandler(h)
|
||||
logger.setLevel(logging.INFO)
|
||||
|
||||
|
||||
# =========================
|
||||
# DLAA CORE (light CNN)
|
||||
# DLAA CORE
|
||||
# =========================
|
||||
class _DLAANet(nn.Module):
|
||||
def __init__(self):
|
||||
@@ -30,45 +25,21 @@ class _DLAANet(nn.Module):
|
||||
nn.ReLU(inplace=True),
|
||||
nn.Conv2d(16, 3, 3, padding=1, bias=False),
|
||||
)
|
||||
|
||||
self.register_buffer("sobel_x", torch.tensor(
|
||||
[[-1, 0, 1], [-2, 0, 2], [-1, 0, 1]], dtype=torch.float32
|
||||
).view(1, 1, 3, 3))
|
||||
|
||||
self.register_buffer("sobel_y", torch.tensor(
|
||||
[[-1, -2, -1], [0, 0, 0], [1, 2, 1]], dtype=torch.float32
|
||||
).view(1, 1, 3, 3))
|
||||
|
||||
self.register_buffer("jitter_offsets", torch.tensor([
|
||||
[0.25, 0.25],
|
||||
[-0.25, -0.25],
|
||||
[-0.25, 0.25],
|
||||
[0.25, -0.25]
|
||||
], dtype=torch.float32))
|
||||
|
||||
self.register_buffer("sobel_x", torch.tensor([[-1, 0, 1], [-2, 0, 2], [-1, 0, 1]], dtype=torch.float32).view(1, 1, 3, 3))
|
||||
self.register_buffer("sobel_y", torch.tensor([[-1, -2, -1], [0, 0, 0], [1, 2, 1]], dtype=torch.float32).view(1, 1, 3, 3))
|
||||
self.register_buffer("jitter_offsets", torch.tensor([[0.25, 0.25], [-0.25, -0.25], [-0.25, 0.25], [0.25, -0.25]], dtype=torch.float32))
|
||||
self._init()
|
||||
|
||||
def _init(self):
|
||||
convs = [m for m in self.conv if isinstance(m, nn.Conv2d)]
|
||||
nn.init.kaiming_normal_(convs[0].weight)
|
||||
# FIX v0.1.1: dirac_ yerine identity-benzeri başlatma.
|
||||
# dirac_ semantik olarak doğru ama in==out==16 durumunda
|
||||
# bazı PyTorch versiyonlarında uyarı üretebilir.
|
||||
# eye tabanlı init daha güvenli ve aynı etkiyi verir.
|
||||
|
||||
with torch.no_grad():
|
||||
convs[1].weight.zero_()
|
||||
for c in range(min(convs[1].weight.shape[0], convs[1].weight.shape[1])):
|
||||
convs[1].weight[c, c, 1, 1] = 1.0
|
||||
|
||||
nn.init.zeros_(convs[2].weight)
|
||||
|
||||
sharpen = torch.tensor([
|
||||
[ 0.0, -1.0, 0.0],
|
||||
[-1.0, 5.0, -1.0],
|
||||
[ 0.0, -1.0, 0.0]
|
||||
], dtype=torch.float32)
|
||||
|
||||
sharpen = torch.tensor([[0.0, -1.0, 0.0], [-1.0, 5.0, -1.0], [0.0, -1.0, 0.0]], dtype=torch.float32)
|
||||
with torch.no_grad():
|
||||
for out_c in range(3):
|
||||
for in_c in range(16):
|
||||
@@ -77,9 +48,8 @@ class _DLAANet(nn.Module):
|
||||
def forward(self, x):
|
||||
return torch.clamp(x + self.conv(x) * 0.12, 0.0, 1.0)
|
||||
|
||||
|
||||
# =========================
|
||||
# TEMPORAL STATE
|
||||
# TEMPORAL STATE (ANTİ-GHOSTİNG)
|
||||
# =========================
|
||||
class _TAAState:
|
||||
def __init__(self):
|
||||
@@ -90,22 +60,32 @@ class _TAAState:
|
||||
self.history = None
|
||||
self.frame_id = 0
|
||||
|
||||
def update(self, frame, alpha, motion_sensitivity):
|
||||
def update(self, frame, alpha, sensitivity):
|
||||
if self.history is None or self.history.shape != frame.shape:
|
||||
self.history = frame.clone()
|
||||
self.frame_id += 1
|
||||
return frame
|
||||
|
||||
diff = torch.mean(torch.abs(frame - self.history), dim=1, keepdim=True)
|
||||
motion = torch.sigmoid((diff - motion_sensitivity) * 8.0)
|
||||
dynamic_alpha = alpha * (1.0 - motion)
|
||||
out = dynamic_alpha * self.history + (1.0 - dynamic_alpha) * frame
|
||||
# GHOSTING'İ ÖLDÜREN KISIM: AGRESİF NEIGHBORHOOD CLAMPING
|
||||
# Mevcut karenin 3x3 çevresindeki mutlak min/max sınırlarını bulur.
|
||||
local_min = -F.max_pool2d(-frame, kernel_size=3, stride=1, padding=1)
|
||||
local_max = F.max_pool2d(frame, kernel_size=3, stride=1, padding=1)
|
||||
|
||||
# Geçmiş karesindeki pikselleri mevcut karedeki renk sınırlarına hapseder.
|
||||
# Bu işlem hayalet görüntünün sızmasını imkansız hale getirir.
|
||||
history_clipped = torch.clamp(self.history, local_min, local_max)
|
||||
|
||||
# HAREKET REDDİ (Motion Masking)
|
||||
diff = torch.abs(frame - history_clipped).mean(dim=1, keepdim=True)
|
||||
motion_mask = torch.sigmoid((diff - sensitivity) * 40.0)
|
||||
dynamic_alpha = alpha * (1.0 - motion_mask)
|
||||
|
||||
# Blend
|
||||
out = torch.lerp(frame, history_clipped, dynamic_alpha)
|
||||
self.history = out.detach()
|
||||
self.frame_id += 1
|
||||
return out
|
||||
|
||||
|
||||
# =========================
|
||||
# MAIN NODE
|
||||
# =========================
|
||||
@@ -119,11 +99,11 @@ class VideoTAADLAA:
|
||||
return {
|
||||
"required": {
|
||||
"images": ("IMAGE",),
|
||||
"taa_strength": ("FLOAT", {"default": 0.7, "min": 0, "max": 1, "step": 0.05}),
|
||||
"taa_alpha": ("FLOAT", {"default": 0.8, "min": 0, "max": 0.99, "step": 0.01}),
|
||||
"motion_sensitivity": ("FLOAT", {"default": 0.4, "min": 0, "max": 1, "step": 0.05}),
|
||||
"jitter_scale": ("FLOAT", {"default": 0.1, "min": 0, "max": 2, "step": 0.05}),
|
||||
"dlaa_strength": ("FLOAT", {"default": 0.6, "min": 0, "max": 1, "step": 0.05}),
|
||||
"taa_strength": ("FLOAT", {"default": 0.5, "min": 0, "max": 1, "step": 0.05}),
|
||||
"taa_alpha": ("FLOAT", {"default": 0.5, "min": 0, "max": 0.95, "step": 0.01}),
|
||||
"motion_sensitivity": ("FLOAT", {"default": 0.05, "min": 0.01, "max": 0.5, "step": 0.01}),
|
||||
"jitter_scale": ("FLOAT", {"default": 0.05, "min": 0, "max": 1, "step": 0.01}),
|
||||
"dlaa_strength": ("FLOAT", {"default": 0.4, "min": 0, "max": 1, "step": 0.05}),
|
||||
"edge_threshold": ("FLOAT", {"default": 0.15, "min": 0, "max": 1, "step": 0.01}),
|
||||
"blur_radius": ("INT", {"default": 1, "min": 0, "max": 5, "step": 1}),
|
||||
"reset_history": ("BOOLEAN", {"default": True}),
|
||||
@@ -134,105 +114,57 @@ class VideoTAADLAA:
|
||||
FUNCTION = "execute"
|
||||
CATEGORY = "CustomPostProcess"
|
||||
|
||||
def _device_key(self, device: torch.device) -> str:
|
||||
return f"{device.type}:{device.index if device.index is not None else 0}"
|
||||
def _net(self, device):
|
||||
if device not in self.net_cache:
|
||||
self.net_cache[device] = _DLAANet().to(device).eval()
|
||||
return self.net_cache[device]
|
||||
|
||||
def _net(self, device: torch.device) -> _DLAANet:
|
||||
k = self._device_key(device)
|
||||
if k not in self.net_cache:
|
||||
self.net_cache[k] = _DLAANet().to(device).eval()
|
||||
return self.net_cache[k]
|
||||
|
||||
def jitter(self, x: torch.Tensor, idx: int, scale: float, net: _DLAANet) -> torch.Tensor:
|
||||
def jitter(self, x, idx, scale, net):
|
||||
if scale < 1e-5: return x
|
||||
off = net.jitter_offsets[idx % 4]
|
||||
B, C, H, W = x.shape
|
||||
theta = torch.eye(2, 3, device=x.device).unsqueeze(0).repeat(B, 1, 1)
|
||||
theta[:, 0, 2] = off[0] * scale / W
|
||||
theta[:, 1, 2] = off[1] * scale / H
|
||||
theta[:, 0, 2], theta[:, 1, 2] = off[0] * scale / W, off[1] * scale / H
|
||||
grid = F.affine_grid(theta, x.shape, align_corners=False)
|
||||
return F.grid_sample(x, grid, mode="bilinear", padding_mode="reflection", align_corners=False)
|
||||
|
||||
def edge_aa(self, x: torch.Tensor, thr: float, blur: int, net: _DLAANet) -> torch.Tensor:
|
||||
def edge_aa(self, x, thr, blur, net):
|
||||
if blur <= 0: return x
|
||||
gray = 0.299*x[:, 0:1] + 0.587*x[:, 1:2] + 0.114*x[:, 2:3]
|
||||
sx = F.conv2d(gray, net.sobel_x, padding=1)
|
||||
sy = F.conv2d(gray, net.sobel_y, padding=1)
|
||||
sx, sy = F.conv2d(gray, net.sobel_x, padding=1), F.conv2d(gray, net.sobel_y, padding=1)
|
||||
edge = torch.sqrt(sx*sx + sy*sy + 1e-6)
|
||||
mask = torch.sigmoid((edge - thr) * 12.0)
|
||||
k = blur * 2 + 1
|
||||
blurred = F.avg_pool2d(F.pad(x, [blur]*4, mode="reflect"), k, stride=1)
|
||||
blurred = F.avg_pool2d(F.pad(x, [blur]*4, mode="reflect"), blur*2+1, stride=1)
|
||||
return x*(1-mask) + blurred*mask
|
||||
|
||||
def execute(
|
||||
self,
|
||||
images: torch.Tensor,
|
||||
taa_strength: float,
|
||||
taa_alpha: float,
|
||||
motion_sensitivity: float,
|
||||
jitter_scale: float,
|
||||
dlaa_strength: float,
|
||||
edge_threshold: float,
|
||||
blur_radius: int,
|
||||
reset_history: bool = False,
|
||||
):
|
||||
def execute(self, images, taa_strength, taa_alpha, motion_sensitivity, jitter_scale, dlaa_strength, edge_threshold, blur_radius, reset_history=False):
|
||||
device = mm.get_torch_device()
|
||||
offload_device = mm.intermediate_device() # CPU veya genel device
|
||||
|
||||
if reset_history:
|
||||
self.taa.reset()
|
||||
|
||||
if reset_history: self.taa.reset()
|
||||
net = self._net(device)
|
||||
B, H, W, C = images.shape
|
||||
|
||||
# FIX v0.1.1: images tensoru CPU'da tutulur, döngü içinde GPU'ya çekilir.
|
||||
out_list = []
|
||||
has_alpha = (C == 4)
|
||||
|
||||
|
||||
with torch.no_grad():
|
||||
for i in range(B):
|
||||
# Tek bir frame'i GPU'ya al
|
||||
img = images[i:i+1].to(device).permute(0, 3, 1, 2).float()
|
||||
|
||||
rgb = img[:, :3]
|
||||
alpha_chan = img[:, 3:4] if has_alpha else None
|
||||
|
||||
# 1. Jitter & Edge AA
|
||||
# 1. Jitter & Edge
|
||||
rgb = self.jitter(rgb, self.taa.frame_id, jitter_scale, net)
|
||||
rgb = self.edge_aa(rgb, edge_threshold, blur_radius, net)
|
||||
|
||||
# 2. TAA Update
|
||||
# 2. TAA (Nuclear Anti-Ghosting + Default Ayarlar)
|
||||
taa_out = self.taa.update(rgb, taa_alpha, motion_sensitivity)
|
||||
rgb = torch.lerp(rgb, taa_out, taa_strength)
|
||||
|
||||
# 3. DLAA (Sequential - Memory Safe)
|
||||
# 3. DLAA
|
||||
if dlaa_strength > 0:
|
||||
enhanced = net(rgb)
|
||||
rgb = torch.lerp(rgb, enhanced, dlaa_strength)
|
||||
rgb = torch.lerp(rgb, net(rgb), dlaa_strength)
|
||||
|
||||
rgb = rgb.clamp(0, 1)
|
||||
|
||||
# 4. Merge Alpha if exists
|
||||
if has_alpha:
|
||||
rgb = torch.cat([rgb, alpha_chan], dim=1)
|
||||
|
||||
# 5. Sonucu CPU'ya geri at (VRAM'i boşaltmak için)
|
||||
out_list.append(rgb.permute(0, 2, 3, 1).to(offload_device))
|
||||
|
||||
# Her 10 karede bir belleği temizle (Agresif temizlik)
|
||||
if i % 10 == 0:
|
||||
mm.soft_empty_cache()
|
||||
|
||||
# Sonuçları tek bir tensor yap
|
||||
out = torch.cat(out_list, dim=0)
|
||||
out_list.append(rgb.permute(0, 2, 3, 1).cpu())
|
||||
if i % 10 == 0: mm.soft_empty_cache()
|
||||
|
||||
return (out,)
|
||||
return (torch.cat(out_list, dim=0),)
|
||||
|
||||
|
||||
NODE_CLASS_MAPPINGS = {
|
||||
"VideoTAADLAA": VideoTAADLAA
|
||||
}
|
||||
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
"VideoTAADLAA": "🎮 Video TAA + DLAA Anti-Aliasing"
|
||||
}
|
||||
NODE_CLASS_MAPPINGS = {"VideoTAADLAA": VideoTAADLAA}
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {"VideoTAADLAA": "🎮 Video TAA + DLAA"}
|
||||
Reference in New Issue
Block a user