Update dvd_converter.py

dvd_converter.py

@@ -1250,26 +1250,23 @@ def build_pre_scale_chain(info: dict, cfg: argparse.Namespace) -> str:
     else:
         log.info("   ⏭️  denoise skipped (--no-denoise)")
 
-    # 4. Scale — handled in build_filter_complex via letterbox (force_original_aspect_ratio + pad)
-    log.info("   ✅ scale/letterbox: %d×%d (fit-to-frame, black bars) %s",
-             cfg.width, cfg.height, cfg.scale_flags)
+    # 4. Final scale/fill is handled in build_filter_complex (letterbox or blur mode)
+    fill_mode = getattr(cfg, "bg_fill_mode", "letterbox")
+    log.info("   ✅ fill mode: %s — final scale/pad applied in filter_complex", fill_mode)
 
     return ",".join(filters) if filters else "null"
 
 
 def build_filter_complex(pre_scale: str, cfg: argparse.Namespace) -> str:
-    """Build the full filter_complex string with letterbox fill + deflicker + eq.
-
-    Letterboxing (fit-to-frame):
-      • Video is scaled so it fits entirely within the target W×H frame,
-        preserving the original aspect ratio — no cropping, no stretching.
-      • If the source is wider than the target (e.g. 16:9 into 4:3), black
-        bars are added to the top and bottom (letterbox).
-      • If the source is taller than the target, black bars are added to the
-        left and right (pillarbox).
-      • The frame always touches at least two edges; the player scales the
-        whole frame to fill its screen, so the video fills the horizontal
-        extent and the player shrinks it to keep the height in bounds.
+    """Build the full filter_complex string with selectable fill mode + deflicker + eq.
+
+    bg_fill_mode (cfg attribute, default "letterbox"):
+      "letterbox" — scale to fit inside W×H preserving aspect ratio, pad remainder
+                    with solid black bars.  No cropping, no blur, no stretching.
+                    This is standard Letterboxing / Pillarboxing behaviour.
+      "blur"      — scale to fill W×H, then composite the sharp foreground (scaled
+                    to fit) over a blurred, darkened copy of the same frame.
+                    Produces an aesthetically filled background instead of bars.
     """
 
     deflicker_part = (
@@ -1297,35 +1294,60 @@ def build_filter_complex(pre_scale: str, cfg: argparse.Namespace) -> str:
 
     post_filter = (f"{cfg.post_output_filter}," if cfg.post_output_filter else "")
 
-    # ── Letterbox scale + pad ────────────────────────────────────────────────
-    # Step 1: scale down (never up beyond target) preserving aspect ratio.
-    #         force_original_aspect_ratio=decrease ensures the result fits
-    #         inside W×H without cropping.
-    # Step 2: pad to exact target dimensions, centring the scaled picture,
-    #         filling the remainder with black.
-    letterbox = (
-        f"scale={cfg.width}:{cfg.height}"
-        f":force_original_aspect_ratio=decrease"
-        f":flags={cfg.scale_flags},"
-        f"pad={cfg.width}:{cfg.height}"
-        f":(ow-iw)/2:(oh-ih)/2"
-        f":black"
-    )
+    # Resolve bg_fill_mode — attribute may be missing on hand-built cfg objects
+    fill_mode = getattr(cfg, "bg_fill_mode", "letterbox")
 
-    log.info(
-        "   ✅ letterbox: scale→%d×%d (fit) + pad (black bars) [%s]",
-        cfg.width, cfg.height, cfg.scale_flags,
-    )
+    # ── MODE: letterbox (black bars) ─────────────────────────────────────────
+    # scale down to fit entirely inside W×H (never upscale beyond target),
+    # then pad to exact dimensions centring the picture with black.
+    if fill_mode != "blur":
+        log.info(
+            "   ✅ fill=letterbox: scale→%d×%d (fit) + pad black [%s]",
+            cfg.width, cfg.height, cfg.scale_flags,
+        )
+        fill_chain = (
+            f"[0:v]{pre_scale}[prescaled];"
+            f"[prescaled]"
+            f"scale={cfg.width}:{cfg.height}"
+            f":force_original_aspect_ratio=decrease"
+            f":flags={cfg.scale_flags},"
+            f"pad={cfg.width}:{cfg.height}"
+            f":(ow-iw)/2:(oh-ih)/2"
+            f":black"
+            f"[filled];"
+        )
+
+    # ── MODE: blur background ────────────────────────────────────────────────
+    # Split the pre-scaled stream into foreground (fit-scaled) and background
+    # (fill-scaled → blurred → darkened), then overlay the foreground centred.
+    else:
+        ov_x = cfg.overlay_x if hasattr(cfg, "overlay_x") else cfg.overlay_x_expr
+        ov_y = cfg.overlay_y if hasattr(cfg, "overlay_y") else cfg.overlay_y_expr
+        log.info(
+            "   ✅ fill=blur: avgblur r=%d bg_bright=%.2f bg_sat=%.2f [%s]",
+            cfg.blur_radius, cfg.bg_brightness, cfg.bg_saturation, cfg.bg_scale_flags,
+        )
+        fill_chain = (
+            f"[0:v]{pre_scale}[prescaled];"
+            "[prescaled]split=2[fg][bg_src];"
+            f"[fg]scale={cfg.width}:-2:flags={cfg.scale_flags}[fg_scaled];"
+            f"[bg_src]scale={cfg.width}:{cfg.height}:flags={cfg.bg_scale_flags},"
+            f"avgblur={cfg.blur_radius},"
+            f"eq=brightness={cfg.bg_brightness}"
+            f":saturation={cfg.bg_saturation}"
+            f":contrast={cfg.bg_contrast}"
+            f":gamma={cfg.bg_gamma}[bg];"
+            f"[bg][fg_scaled]overlay={ov_x}:{ov_y}[filled];"
+        )
 
     return (
-        f"[0:v]{pre_scale}[prescaled];"
-        f"[prescaled]{letterbox}[filled];"
-        "[filled]"
-        f"{deflicker_part}"
-        f"{sharpen_eq_part}"
-        f"setsar={cfg.sar},"
-        f"{post_filter}"
-        "null[out]"
+        fill_chain
+        + "[filled]"
+        + deflicker_part
+        + sharpen_eq_part
+        + f"setsar={cfg.sar},"
+        + post_filter
+        + "null[out]"
     ).replace(",null[out]", "[out]").replace("null[out]", "[out]")