diff --git a/vsdenoise/funcs.py b/vsdenoise/funcs.py index d039a03..4b98070 100644 --- a/vsdenoise/funcs.py +++ b/vsdenoise/funcs.py @@ -292,7 +292,7 @@ def block_coherence(self, block_size: int) -> int: if isinstance(contra, float): sharpened = contrasharpening_dehalo(dnWindow, func.work_clip, contra, 2.5, func.norm_planes) else: - sharpened = contrasharpening(dnWindow, func.work_clip, contra, 13, func.norm_planes) + sharpened = contrasharpening(dnWindow, func.work_clip, contra, None, 13, func.norm_planes) else: sharpened = dnWindow diff --git a/vsdenoise/prefilters.py b/vsdenoise/prefilters.py index c6eaf95..e8cf922 100644 --- a/vsdenoise/prefilters.py +++ b/vsdenoise/prefilters.py @@ -12,7 +12,7 @@ from vsexprtools import ExprOp, complexpr_available, norm_expr from vskernels import Bicubic, Bilinear, Scaler, ScalerT from vsmasktools import retinex -from vsrgtools import bilateral, blur, gauss_blur, min_blur +from vsrgtools import bilateral, box_blur, gauss_blur, min_blur from vstools import ( MISSING, ColorRange, ConvMode, CustomEnum, CustomIntEnum, CustomRuntimeError, MissingT, PlanesT, SingleOrArr, SingleOrArrOpt, check_variable, clamp, core, depth, disallow_variable_format, disallow_variable_resolution, @@ -71,11 +71,11 @@ def _run(clip: vs.VideoNode, planes: PlanesT, **kwargs: Any) -> vs.VideoNode: return clip if pref_type.value in {Prefilter.MINBLUR1, Prefilter.MINBLUR2, Prefilter.MINBLUR3}: - return min_blur(clip, int(pref_type._name_[-1]), planes) + return min_blur(clip, int(pref_type._name_[-1]), planes=planes) if pref_type == Prefilter.MINBLURFLUX: temp_thr, spat_thr = kwargs.get('temp_thr', 2), kwargs.get('spat_thr', 2) - return min_blur(clip, 2, planes).flux.SmoothST( # type: ignore + return min_blur(clip, 2, planes=planes).flux.SmoothST( # type: ignore scale_delta(temp_thr, 8, clip), scale_delta(spat_thr, 8, clip), planes @@ -149,7 +149,7 @@ def _run(clip: vs.VideoNode, planes: PlanesT, **kwargs: Any) -> vs.VideoNode: downscale = downscaler.scale(clip, clip.width // scale, clip.height // scale) - boxblur = blur(downscale, kwargs.pop('radius', 1), kwargs.pop('mode', ConvMode.HV), planes) + boxblur = box_blur(downscale, kwargs.pop('radius', 1), mode=kwargs.pop('mode', ConvMode.HV), planes=planes) return upscaler.scale(boxblur, clip.width, clip.height) @@ -166,7 +166,7 @@ def _run(clip: vs.VideoNode, planes: PlanesT, **kwargs: Any) -> vs.VideoNode: return gauss_blur(clip, **(kwargs | dict[str, Any](planes=planes))) if pref_type in {Prefilter.GAUSSBLUR1, Prefilter.GAUSSBLUR2}: - boxblur = blur(clip, kwargs.pop('radius', 1), kwargs.get('mode', ConvMode.HV), planes=planes) + boxblur = box_blur(clip, kwargs.pop('radius', 1), mode=kwargs.get('mode', ConvMode.HV), planes=planes) if 'sharp' not in kwargs and 'sigma' not in kwargs: kwargs |= dict(sigma=1.75)