diff --git a/vskernels/kernels/abstract.py b/vskernels/kernels/abstract.py index 7bb4194..d6339c1 100644 --- a/vskernels/kernels/abstract.py +++ b/vskernels/kernels/abstract.py @@ -297,8 +297,8 @@ def descale( # type: ignore[override] sh if isinstance(sh, tuple) else (sh, sh) for sh in shift ) - kwargs_tf, shift = sample_grid_model.for_descale(clip, width, height, (shift_y[0], shift_x[0]), **kwargs) - kwargs_bf, shift = sample_grid_model.for_descale(clip, width, height, (shift_y[1], shift_x[1]), **kwargs) + kwargs_tf, shift = sample_grid_model.for_src(clip, width, height, (shift_y[0], shift_x[0]), **kwargs) + kwargs_bf, shift = sample_grid_model.for_src(clip, width, height, (shift_y[1], shift_x[1]), **kwargs) de_kwargs_tf = self.get_descale_args(clip, (shift_y[0], shift_x[0]), *de_base_args, **kwargs_tf) de_kwargs_bf = self.get_descale_args(clip, (shift_y[1], shift_x[1]), *de_base_args, **kwargs_bf) @@ -322,7 +322,7 @@ def descale( # type: ignore[override] if any(isinstance(sh, tuple) for sh in shift): raise CustomValueError('You can\'t descale per-field when the input is progressive!', self.descale) - kwargs, shift = sample_grid_model.for_descale(clip, width, height, shift, **kwargs) # type: ignore + kwargs, shift = sample_grid_model.for_src(clip, width, height, shift, **kwargs) # type: ignore de_kwargs = self.get_descale_args(clip, shift, *de_base_args, **kwargs) # type: ignore diff --git a/vskernels/kernels/complex.py b/vskernels/kernels/complex.py index 0ca8f9c..afa9cab 100644 --- a/vskernels/kernels/complex.py +++ b/vskernels/kernels/complex.py @@ -196,7 +196,7 @@ def scale( # type: ignore[override] kwargs, shift, out_sar = self._handle_crop_resize_kwargs(clip, width, height, shift, **kwargs) - kwargs, shift = sample_grid_model.for_scale(clip, width, height, shift, **kwargs) + kwargs, shift = sample_grid_model.for_dst(clip, width, height, shift, **kwargs) padded = border_handling.prepare_clip(clip, self.kernel_radius) diff --git a/vskernels/types.py b/vskernels/types.py index d321595..d892b40 100644 --- a/vskernels/types.py +++ b/vskernels/types.py @@ -59,7 +59,7 @@ def __call__( return kwargs, shift - def for_scale( + def for_dst( self, clip: vs.VideoNode, width: int, height: int, shift: tuple[float, float], **kwargs: Any ) -> tuple[KwargsT, tuple[float, float]]: src_width = kwargs.get('src_width', width) @@ -67,7 +67,7 @@ def for_scale( return self(src_width, src_height, width, height, shift, kwargs) - def for_descale( + def for_src( self, clip: vs.VideoNode, width: int, height: int, shift: tuple[float, float], **kwargs: Any ) -> tuple[KwargsT, tuple[float, float]]: src_width = kwargs.get('src_width', clip.width)