soifunc 0.11.2__py3-none-any.whl → 0.12.0__py3-none-any.whl

soifunc/interpolate.py

@@ -4,6 +4,7 @@ import platform
 from typing import TYPE_CHECKING
 
 import vstools
+from vsscale import autoselect_backend
 from vstools import vs
 
 if TYPE_CHECKING:
@@ -40,15 +41,7 @@ def rate_doubler(
         model=vsmlrt.RIFEModel.v4_25_heavy,
         # Why these defaults? Because running ML stuff on AMD on Windows sucks hard.
         # Trial and error led me to finally find that ORT_DML works.
-        backend=(
-            backend
-            if backend
-            else (
-                vsmlrt.Backend.ORT_DML()
-                if platform.system() == "Windows"
-                else vsmlrt.Backend.TRT()
-            )
-        ),
+        backend=(backend if backend else autoselect_backend()),
     )
     # TODO: Handle other chroma samplings
     clip = clip.resize.Bicubic(
@@ -98,15 +91,7 @@ def decimation_fixer(
     doubled = vsmlrt.RIFE(
         clip,
         model=vsmlrt.RIFEModel.v4_25_heavy,
-        backend=(
-            backend
-            if backend
-            else (
-                vsmlrt.Backend.ORT_DML()
-                if platform.system() == "Windows"
-                else vsmlrt.Backend.TRT()
-            )
-        ),
+        backend=(backend if backend else autoselect_backend()),
     )
 
     out_clip = None

soifunc/resize.py

@@ -1,22 +1,15 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
-from inspect import getfullargspec
-from typing import Any
-
 from vsaa.deinterlacers import NNEDI3
 from vskernels import (
     Hermite,
-    Scaler,
-    ScalerLike,
     Spline36,
 )
-from vsscale import ArtCNN, GenericScaler
-from vstools import check_variable_format, inject_self, is_gpu_available, join, vs
+from vsscale import ArtCNN
+from vstools import check_variable_format, is_gpu_available, join, vs
 
 __all__ = [
     "good_resize",
-    "HybridScaler",
 ]
 
 
@@ -62,51 +55,13 @@ def good_resize(
     else:
         luma_scaler = Hermite(sigmoid=True)
 
-    return HybridScaler(luma_scaler, chroma_scaler).scale(
-        clip, width, height, shift=shift
-    )
-
-
-@dataclass
-class HybridScaler(GenericScaler):
-    luma_scaler: ScalerLike
-    chroma_scaler: ScalerLike
-
-    def __post_init__(self) -> None:
-        super().__post_init__()
-
-        self._luma = Scaler.ensure_obj(self.luma_scaler)
-        self._chroma = Scaler.ensure_obj(self.chroma_scaler)
-
-    @Scaler.cached_property
-    def kernel_radius(self) -> int:
-        return self._luma.kernel_radius
-
-    def scale(  # type:ignore
-        self,
-        clip: vs.VideoNode,
-        width: int,
-        height: int,
-        shift: tuple[float, float] = (0, 0),
-        **kwargs: Any,
-    ) -> vs.VideoNode:
-        assert check_variable_format(clip, self.__class__)
-
-        luma = self._luma.scale(clip, width, height, shift, **kwargs)
-
-        if clip.format.num_planes == 1:
-            return luma
-
-        chroma = self._chroma.scale(clip, width, height, shift, **kwargs)
-
-        return join(luma, chroma)
-
+    assert check_variable_format(clip, "good_resize")
 
-def _get_scaler(scaler: ScalerLike, **kwargs: Any) -> Scaler:
-    scaler_cls = Scaler.from_param(scaler, _get_scaler)
+    luma = luma_scaler.scale(clip, width, height, shift)
 
-    args = getfullargspec(scaler_cls).args
+    if clip.format.num_planes == 1:
+        return luma
 
-    clean_kwargs = {key: value for key, value in kwargs.items() if key in args}
+    chroma = chroma_scaler.scale(clip, width, height, shift)
 
-    return scaler_cls(**clean_kwargs)
+    return join(luma, chroma)

{soifunc-0.11.2.dist-info → soifunc-0.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: soifunc
-Version: 0.11.2
+Version: 0.12.0
 Summary: Soichiro's VapourSynth Functions Collection
 License: MIT
 Author: Josh Holmer
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: vapoursynth (>=68)
-Requires-Dist: vsjetpack (>=0.5.1,<0.6.0)
+Requires-Dist: vsjetpack (>=0.7.1,<0.8.0)
 Description-Content-Type: text/markdown
 
 ## soifunc

soifunc-0.12.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+soifunc/__init__.py,sha256=H6BWoCLRW2ZD47wQtL72SIZvTpD6REH7cUqIYWvCn0k,174
+soifunc/deband.py,sha256=MbI5OOG8JpWqM5B5ux6OU784-39PtCMQWrh9mk4k2xY,1273
+soifunc/denoise.py,sha256=ALTftqL9Q1cPLKtAU60mT3-RUkVHXBqgg2Pa9GwjGIY,6982
+soifunc/interpolate.py,sha256=dgYczCdn716afJ3sZgQgcF6KfAkaU2J_obJD-Kp7wP4,4091
+soifunc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+soifunc/resize.py,sha256=pSoQtrsxfWr44Wg4M9GRyMJnOsgnjsWEr6ZyoJW7Qkk,1781
+soifunc-0.12.0.dist-info/LICENSE,sha256=vgEDSMEV1J2nMiCgXE5_sjNtw2VT7_lP7rkAnrFKOWI,1068
+soifunc-0.12.0.dist-info/METADATA,sha256=cIZ9ZFeGwNCWcyiyKTStP51OvnaG7pLWRX3fTcv0vzo,1214
+soifunc-0.12.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+soifunc-0.12.0.dist-info/RECORD,,

soifunc-0.11.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-soifunc/__init__.py,sha256=H6BWoCLRW2ZD47wQtL72SIZvTpD6REH7cUqIYWvCn0k,174
-soifunc/deband.py,sha256=MbI5OOG8JpWqM5B5ux6OU784-39PtCMQWrh9mk4k2xY,1273
-soifunc/denoise.py,sha256=ALTftqL9Q1cPLKtAU60mT3-RUkVHXBqgg2Pa9GwjGIY,6982
-soifunc/interpolate.py,sha256=MNpYyO037H00vqA5d-WijeBd475oMssEvFLGXgeXPxw,4400
-soifunc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-soifunc/resize.py,sha256=jr1kLU8IrXcLphjkhcXhls1HjhIKiryD8n6Kvwe1DU4,2988
-soifunc-0.11.2.dist-info/LICENSE,sha256=vgEDSMEV1J2nMiCgXE5_sjNtw2VT7_lP7rkAnrFKOWI,1068
-soifunc-0.11.2.dist-info/METADATA,sha256=1u10t9uHSCroEByTObR45ceT88YjOqtW28dHejnV1e0,1214
-soifunc-0.11.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-soifunc-0.11.2.dist-info/RECORD,,