[adaptive_detector] Remove deprecated min_delta_hsv argument

Author: Breakthrough

docs/cli.rst

@@ -178,11 +178,7 @@ Options
 
   Default: ``15.0``
 
-.. option:: -d VAL, --min-delta-hsv VAL
 
-  [DEPRECATED] Use :option:`-c/--min-content-val <-c>` instead.
-
-  Default: ``15.0``
 
 .. option:: -f VAL, --frame-window VAL
 

scenedetect/_cli/__init__.py

@@ -615,16 +615,6 @@ def detect_content_command(
     help='Minimum threshold (float) that "content_val" must exceed to trigger a cut.%s'
     % (USER_CONFIG.get_help_string("detect-adaptive", "min-content-val")),
 )
-@click.option(
-    "--min-delta-hsv",
-    "-d",
-    metavar="VAL",
-    type=click.FLOAT,
-    default=None,
-    help="[DEPRECATED] Use -c/--min-content-val instead.%s"
-    % (USER_CONFIG.get_help_string("detect-adaptive", "min-delta-hsv")),
-    hidden=True,
-)
 @click.option(
     "--frame-window",
     "-f",
@@ -677,7 +667,6 @@ def detect_adaptive_command(
     ctx: click.Context,
     threshold: ty.Optional[float],
     min_content_val: ty.Optional[float],
-    min_delta_hsv: ty.Optional[float],
     frame_window: ty.Optional[int],
     weights: ty.Optional[ty.Tuple[float, float, float, float]],
     luma_only: bool,
@@ -689,7 +678,6 @@ def detect_adaptive_command(
     detector_args = ctx.get_detect_adaptive_params(
         threshold=threshold,
         min_content_val=min_content_val,
-        min_delta_hsv=min_delta_hsv,
         frame_window=frame_window,
         luma_only=luma_only,
         min_scene_len=min_scene_len,

scenedetect/_cli/config.py

@@ -325,7 +325,6 @@ class XmlFormat(Enum):
 DEFAULT_JPG_QUALITY = 95
 DEFAULT_WEBP_QUALITY = 100
 
-# TODO(v0.7): Remove [detect-adaptive] min-delta-hsv
 CONFIG_MAP: ConfigDict = {
     "backend-opencv": {
         "max-decode-attempts": 5,
@@ -339,7 +338,6 @@ class XmlFormat(Enum):
         "kernel-size": KernelSizeValue(-1),
         "luma-only": False,
         "min-content-val": RangeValue(15.0, min_val=0.0, max_val=255.0),
-        "min-delta-hsv": RangeValue(15.0, min_val=0.0, max_val=255.0),
         "min-scene-len": TimecodeValue(0),
         "threshold": RangeValue(3.0, min_val=0.0, max_val=255.0),
         "weights": ScoreWeightsValue(ContentDetector.DEFAULT_COMPONENT_WEIGHTS),

scenedetect/_cli/context.py

@@ -357,26 +357,9 @@ def get_detect_adaptive_params(
         min_scene_len: ty.Optional[str] = None,
         weights: ty.Optional[ty.Tuple[float, float, float, float]] = None,
         kernel_size: ty.Optional[int] = None,
-        min_delta_hsv: ty.Optional[float] = None,
     ) -> ty.Dict[str, ty.Any]:
         """Handle detect-adaptive command options and return args to construct one with."""
 
-        # TODO(v0.7): Remove these branches when removing -d/--min-delta-hsv.
-        if min_delta_hsv is not None:
-            logger.error("-d/--min-delta-hsv is deprecated, use -c/--min-content-val instead.")
-            if min_content_val is None:
-                min_content_val = min_delta_hsv
-        # Handle case where deprecated min-delta-hsv is set, and use it to set min-content-val.
-        if not self.config.is_default("detect-adaptive", "min-delta-hsv"):
-            logger.error(
-                "[detect-adaptive] config file option `min-delta-hsv` is deprecated"
-                ", use `min-delta-hsv` instead."
-            )
-            if self.config.is_default("detect-adaptive", "min-content-val"):
-                self.config.config_dict["detect-adaptive"]["min-content-val"] = (
-                    self.config.config_dict["detect-adaptive"]["min-deleta-hsv"]
-                )
-
         if self.drop_short_scenes:
             min_scene_len = 0
         else:

scenedetect/detectors/adaptive_detector.py

@@ -44,7 +44,6 @@ def __init__(
         weights: ContentDetector.Components = ContentDetector.DEFAULT_COMPONENT_WEIGHTS,
         luma_only: bool = False,
         kernel_size: ty.Optional[int] = None,
-        min_delta_hsv: ty.Optional[float] = None,
     ):
         """
         Arguments:
@@ -65,11 +64,7 @@ def __init__(
                 Overrides `weights` if both are set.
             kernel_size: Size of kernel to use for post edge detection filtering. If None,
                 automatically set based on video resolution.
-            min_delta_hsv: [DEPRECATED] DO NOT USE. Use `min_content_val` instead.
         """
-        if min_delta_hsv is not None:
-            logger.error("min_delta_hsv is deprecated, use min_content_val instead.")
-            min_content_val = min_delta_hsv
         if window_width < 1:
             raise ValueError("window_width must be at least 1.")
 

website/pages/changelog.md

@@ -658,6 +658,7 @@ Although there have been minimal changes to most API examples, there are several
 
 ### CLI Changes
 
+- [refactor] Remove deprecated `-d`/`--min-delta-hsv` option from `detect-adaptive` command.
 - [feature] WORK IN PROGRESS: New `save-xml` command supports saving scenes in Final Cut Pro format [#156](https://github.com/Breakthrough/PySceneDetect/issues/156)