Update faceless_processing.py

faceless_processing.py

@@ -86,16 +86,16 @@ class LineartConfig:
     # Silhouette outline — thicker for embroidery visibility
     silhouette_line_thickness: int = 6     # bold outer contour
 
-    # Edge detection — balanced: enough blur to skip fabric texture,
-    # but not so much that body structure (arms, clothing borders) disappears.
-    canny_low: int = 40                    # fallback only (auto-Canny is used by default)
-    canny_high: int = 150                  # fallback only
-    bilateral_d: int = 9                   # reduced: was 11, too blurry
-    bilateral_sigma_color: int = 110.0
-    bilateral_sigma_space: int = 110
-    gaussian_ksize: int = 13              # reduced: was 17, too blurry
-    min_contour_perimeter: float = 60.0   # reduced: was 100, was filtering too much
-    interior_line_thickness: int = 5      # thicker interior lines
+    # Edge detection — bilateral smoothing suppresses texture, auto-Canny adapts thresholds.
+    # These are proven values: enough smoothing to kill wrinkles, enough signal for structure.
+    canny_low: int = 30                    # fallback only (auto-Canny active by default)
+    canny_high: int = 120                  # fallback only
+    bilateral_d: int = 7                   # classic recommended diameter
+    bilateral_sigma_color: int = 75
+    bilateral_sigma_space: int = 75
+    gaussian_ksize: int = 9               # moderate pre-blur
+    min_contour_perimeter: float = 50.0   # keeps arms/clothing borders
+    interior_line_thickness: int = 5
 
     # Secondary detail pass — OFF (adds too much clothing/texture noise)
     enable_detail_pass: bool = False
@@ -106,18 +106,16 @@ class LineartConfig:
     detail_bilateral_d: int = 7
     detail_bilateral_sigma: int = 60
 
-    # Embroidery stitch feasibility — balanced: removes micro-noise but keeps body lines
-    min_embroidery_stitch_px: int = 45
+    # Embroidery stitch feasibility
+    min_embroidery_stitch_px: int = 30
 
     # Auto-Canny: sigma controls threshold spread around the image median.
     # Higher sigma = more edges detected. 0.25–0.35 recovers body structure.
     # Set to 0 to use fixed canny_low/canny_high instead.
-    canny_sigma: float = 0.28
+    canny_sigma: float = 0.33   # proven standard (pyimagesearch auto-Canny)
 
-    # Aspect ratio filter: contours whose bounding box aspect ratio is below
-    # this value are treated as texture blobs and dropped.
-    # 1.5 is relaxed enough to keep arm/clothing boundaries.
-    min_aspect_ratio: float = 1.5
+    # Aspect ratio filter: 0 = disabled. Enable (e.g. 1.8) only if blob noise reappears.
+    min_aspect_ratio: float = 0
 
     # Face detection
     face_scale_factor: float = 1.05
@@ -358,37 +356,30 @@ def build_interior_edges(rgb: np.ndarray, subject_mask: np.ndarray, cfg: Lineart
     """
     Detect structural body lines.
 
-    Pipeline (robust to any photo):
-      1. CLAHE normalises uneven lighting before any detection.
-      2. Strong bilateral + gaussian smoothing suppresses fabric texture.
-      3. Auto-Canny (median-based adaptive thresholds) replaces fixed values
-         so the detector self-tunes to each photo's brightness/contrast.
-      4. XDoG pass (optional) adds smooth artistic edges on top.
-      5. Contours are filtered by perimeter, embroidery length, AND aspect
-         ratio — discarding small texture blobs while keeping body structure.
+    Pipeline:
+      1. Convert to grayscale (no CLAHE — CLAHE amplifies skin/fabric noise).
+      2. Bilateral + Gaussian smooth to suppress fine texture.
+      3. Auto-Canny (median-based) adapts thresholds to each photo's brightness.
+      4. Contours filtered by perimeter and embroidery stitch length.
     """
     gray = cv2.cvtColor(rgb, cv2.COLOR_RGB2GRAY)
+    # NOTE: No CLAHE here — it locally boosts contrast in skin/fabric regions,
+    # causing the auto-Canny to detect thousands of micro-edges.
 
-    # --- 1. CLAHE: normalise lighting so Canny thresholds work on any photo ---
-    clahe = cv2.createCLAHE(clipLimit=2.0, tileGridSize=(8, 8))
-    gray = clahe.apply(gray)
-
-    # --- 2. Strong bilateral + gaussian smooth (suppress fabric texture) ---
-    blurred_primary = cv2.bilateralFilter(gray, cfg.bilateral_d,
-                                          cfg.bilateral_sigma_color,
-                                          cfg.bilateral_sigma_space)
-    blurred_primary = cv2.GaussianBlur(blurred_primary,
-                                        (cfg.gaussian_ksize, cfg.gaussian_ksize), 0)
+    # --- Bilateral + Gaussian smooth ---
+    blurred = cv2.bilateralFilter(gray, cfg.bilateral_d,
+                                   cfg.bilateral_sigma_color,
+                                   cfg.bilateral_sigma_space)
+    blurred = cv2.GaussianBlur(blurred, (cfg.gaussian_ksize, cfg.gaussian_ksize), 0)
 
-    # --- 3. Edge detection: auto-Canny (adaptive) or fixed fallback ---
-    sigma = getattr(cfg, 'canny_sigma', 0.20)
+    # --- Auto-Canny (adaptive) or fixed fallback ---
+    sigma = getattr(cfg, 'canny_sigma', 0.33)
     if sigma > 0:
-        edges_primary = _auto_canny(blurred_primary, sigma)
+        edges = _auto_canny(blurred, sigma)
     else:
-        edges_primary = cv2.Canny(blurred_primary, cfg.canny_low, cfg.canny_high)
+        edges = cv2.Canny(blurred, cfg.canny_low, cfg.canny_high)
 
-    # --- 4. Detail pass (disabled by default — adds too much clothing noise) ---
-    edges_detail = np.zeros_like(edges_primary)
+    # --- Detail pass (disabled by default) ---
     if getattr(cfg, 'enable_detail_pass', False):
         detail_d = getattr(cfg, 'detail_bilateral_d', 7)
         detail_sigma = getattr(cfg, 'detail_bilateral_sigma', 60)
@@ -400,9 +391,7 @@ def build_interior_edges(rgb: np.ndarray, subject_mask: np.ndarray, cfg: Lineart
             getattr(cfg, 'detail_canny_low', 15),
             getattr(cfg, 'detail_canny_high', 55)
         )
-
-    # Combine passes
-    edges = cv2.bitwise_or(edges_primary, edges_detail)
+        edges = cv2.bitwise_or(edges, edges_detail)
 
     # Erode subject mask to avoid catching the outer boundary twice
     erode_size = max(5, cfg.silhouette_line_thickness * 2 + 3)