Skip to content

Commit 16d3fb2

Browse files
committed
rescale: Replace deprecated Scaler/KernelT usage
1 parent 4df5940 commit 16d3fb2

3 files changed

Lines changed: 7 additions & 197 deletions

File tree

vodesfunc/rescale.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
CustomValueError,
1313
get_video_format,
1414
)
15-
from vskernels import KernelT, Kernel, ScalerT, Bilinear, Hermite, Scaler
15+
from vskernels import KernelLike, Kernel, ScalerLike, Bilinear, Hermite, Scaler
1616
from vsmasktools import EdgeDetectT, KirschTCanny
1717
from vsrgtools import removegrain
1818
from vsscale import ArtCNN
@@ -50,7 +50,7 @@ def __init__(self, clip: vs.VideoNode):
5050

5151
def descale(
5252
self,
53-
kernel: KernelT,
53+
kernel: KernelLike,
5454
width: int | float,
5555
height: int | float,
5656
base_height: int | None = None,
@@ -126,7 +126,7 @@ def post_descale(self, func: GenericVSFunction | list[GenericVSFunction]) -> Sel
126126
def linemask(
127127
self,
128128
mask: vs.VideoNode | EdgeDetectT | None = None,
129-
downscaler: ScalerT | None = None,
129+
downscaler: ScalerLike | None = None,
130130
maximum_iter: int = 0,
131131
inflate_iter: int = 0,
132132
expand: int | tuple[int, int | None] = 0,
@@ -222,15 +222,15 @@ def errormask_zoned(
222222
self.errormask_clip = replace_ranges(self.errormask_clip, err_mask, ranges)
223223
return self
224224

225-
def double(self, upscaler: ScalerT = ArtCNN.R8F64) -> Self:
225+
def double(self, upscaler: ScalerLike = ArtCNN.R8F64) -> Self:
226226
"""
227227
Upscales the descaled clip by 2x
228228
229229
:param upscaler: Any kind of vsscale scaler. Defaults to ArtCNN.R8F64.
230230
"""
231231

232232
scaler = Scaler.ensure_obj(upscaler)
233-
self.doubled = scaler.multi(self.descaled)
233+
self.doubled = scaler.supersample(self.descaled)
234234
return self
235235

236236
def post_double(self, func: GenericVSFunction | list[GenericVSFunction]) -> Self:
@@ -254,7 +254,7 @@ def post_double(self, func: GenericVSFunction | list[GenericVSFunction]) -> Self
254254

255255
return self
256256

257-
def downscale(self, downscaler: ScalerT | None = None) -> Self:
257+
def downscale(self, downscaler: ScalerLike | None = None) -> Self:
258258
"""
259259
Downscales the clip back the size of the original input clip and applies the masks, if any.
260260

vodesfunc/rescale_ext/regular_rescale.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from vstools import vs, KwargsT
2+
from vsscale import ScalingArgs
23

34
from .base import RescaleBase, descale_rescale
4-
from .scaling_args import ScalingArgs
55

66
__all__ = ["RescBuildNonFB"]
77

vodesfunc/rescale_ext/scaling_args.py

Lines changed: 0 additions & 190 deletions
This file was deleted.

0 commit comments

Comments
 (0)