From 196041aeddb6f245303484a6fb3b63ae70fb413f Mon Sep 17 00:00:00 2001 From: Setsugennoao <41454651+Setsugennoao@users.noreply.github.com> Date: Sun, 5 Nov 2023 22:07:05 +0100 Subject: [PATCH] Simplify SSIM code --- vsscale/scale.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/vsscale/scale.py b/vsscale/scale.py index cee0402..7ddf830 100644 --- a/vsscale/scale.py +++ b/vsscale/scale.py @@ -10,7 +10,7 @@ from vsrgtools import box_blur, gauss_blur from vstools import ( DependencyNotFoundError, KwargsT, Matrix, MatrixT, PlanesT, VSFunction, check_ref_clip, check_variable, core, depth, - expect_bits, fallback, get_nvidia_version, inject_self, padder, vs + fallback, get_nvidia_version, inject_self, padder, vs ) from .helpers import GenericScaler @@ -124,8 +124,6 @@ def _linear_scale( ) -> vs.VideoNode: assert check_variable(clip, self.scale) - clip, bits = expect_bits(clip, 32) - l1 = self.scaler.scale(clip, width, height, shift, **(kwargs | self.kwargs)) l1_sq, c_sq = [expr_func(x, 'x dup *') for x in (l1, clip)] @@ -143,9 +141,7 @@ def _linear_scale( t = expr_func([r, m], 'x y *') - merge = expr_func([self.filter_func(m), self.filter_func(r), l1, self.filter_func(t)], 'x y z * + a -') - - return depth(merge, bits) + return expr_func([self.filter_func(m), self.filter_func(r), l1, self.filter_func(t)], 'x y z * + a -') @dataclass