soifunc 0.10.1__tar.gz → 0.11.0__tar.gz

{soifunc-0.10.1 → soifunc-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: soifunc
-Version: 0.10.1
+Version: 0.11.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.4.0,<0.5.0)
+Requires-Dist: vsjetpack (>=0.5.1,<0.6.0)
 Description-Content-Type: text/markdown
 
 ## soifunc

{soifunc-0.10.1 → soifunc-0.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "soifunc"
-version = "0.10.1"
+version = "0.11.0"
 description = "Soichiro's VapourSynth Functions Collection"
 authors = ["Josh Holmer <jholmer.in@gmail.com>"]
 license = "MIT"
@@ -9,7 +9,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = ">=3.12,<4.0"
 vapoursynth = ">=68"
-vsjetpack = "^0.4.0"
+vsjetpack = "^0.5.1"
 
 [tool.poetry.group.dev.dependencies]
 black = "^25.1.0"

{soifunc-0.10.1 → soifunc-0.11.0}/soifunc/__init__.py

@@ -1,3 +1,4 @@
 from .deband import *  # noqa: F401, F403
 from .denoise import *  # noqa: F401, F403
+from .interpolate import *  # noqa: F401, F403
 from .resize import *  # noqa: F401, F403

{soifunc-0.10.1 → soifunc-0.11.0}/soifunc/deband.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from vsdeband import F3kdb
+from vsdeband import f3k_deband
 from vsmasktools import dre_edgemask
 from vstools import InvalidVideoFormatError, check_variable, core, vs
 
@@ -19,7 +19,7 @@ def retinex_deband(
     16 might be a more sane starting point. Increase as needed.
 
     This function does not add grain on its own. Use another function like
-    `vsdeband.sized_grain` to do that.
+    `vsdeband.AddNoise` to do that.
     """
     assert check_variable(clip, retinex_deband)
 
@@ -39,5 +39,5 @@ def retinex_deband(
     if showmask:
         return mask
 
-    deband = F3kdb().deband(clip, thr=(threshold << 2))
+    deband = f3k_deband(clip, thr=(threshold << 2))
     return core.std.MaskedMerge(deband, clip, mask)

{soifunc-0.10.1 → soifunc-0.11.0}/soifunc/denoise.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import Callable, Optional
 
 import vsdenoise
-from vsdenoise import DFTTest, FilterType, Profile, mc_degrain
+from vsdenoise import DFTTest, bm3d, mc_degrain
 from vstools import core, vs
 
 __all__ = ["MCDenoise", "magic_denoise", "hqbm3d", "mc_dfttest"]
@@ -13,7 +13,7 @@ def hqbm3d(
     clip: vs.VideoNode,
     luma_str: float = 0.45,
     chroma_str: float = 0.4,
-    profile: Profile = Profile.FAST,
+    profile: bm3d.Profile = bm3d.Profile.FAST,
 ) -> vs.VideoNode:
     """
     High-quality presets for motion compensated denoising.
@@ -24,24 +24,22 @@ def hqbm3d(
     blksize = select_block_size(clip)
     mv = mc_degrain(
         clip,
-        preset=vsdenoise.MVToolsPresets.HQ_SAD,
+        preset=vsdenoise.MVToolsPreset.HQ_SAD,
         tr=2,
         thsad=100,
         refine=3 if blksize > 16 else 2,
         blksize=blksize,
         prefilter=vsdenoise.Prefilter.DFTTEST(
             clip,
-            slocation=[(0.0, 1.0), (0.2, 4.0), (0.35, 12.0), (1.0, 48.0)],
+            sloc=[(0.0, 1.0), (0.2, 4.0), (0.35, 12.0), (1.0, 48.0)],
             ssystem=1,
             full_range=3.5,
             planes=0,
         ),
         planes=None,
     )
-    bm3d = vsdenoise.BM3D.denoise(
-        clip, sigma=luma_str, tr=1, ref=mv, profile=profile, planes=0
-    )
-    return vsdenoise.nl_means(bm3d, strength=chroma_str, tr=1, ref=mv, planes=[1, 2])
+    out = bm3d(clip, sigma=luma_str, tr=1, ref=mv, profile=profile, planes=0)
+    return vsdenoise.nl_means(out, h=chroma_str, tr=1, ref=mv, planes=[1, 2])
 
 
 def mc_dfttest(
@@ -62,7 +60,7 @@ def mc_dfttest(
     return mc_degrain(
         clip,
         prefilter=vsdenoise.Prefilter.DFTTEST,
-        preset=vsdenoise.MVToolsPresets.HQ_SAD,
+        preset=vsdenoise.MVToolsPreset.HQ_SAD,
         thsad=thSAD,
         tr=2,
         refine=3 if blksize > 16 else 2,
@@ -201,12 +199,12 @@ def magic_denoise(clip: vs.VideoNode) -> vs.VideoNode:
         thscd1=300,
     )
 
-    return DFTTest.denoise(
+    return DFTTest().denoise(
         clip,
         sloc=[(0.0, 0.8), (0.06, 1.1), (0.12, 1.0), (1.0, 1.0)],
         pmax=1000000,
         pmin=1.25,
-        ftype=FilterType.MULT_RANGE,
+        ftype=DFTTest.FilterType.MULT_RANGE,
         tbsize=3,
         ssystem=1,
     )

soifunc-0.11.0/soifunc/interpolate.py

@@ -0,0 +1,146 @@
+from __future__ import annotations
+
+import platform
+
+import vstools
+from vsmlrt import backendT
+from vstools import vs
+
+__all__ = ["rate_doubler", "decimation_fixer"]
+
+
+def rate_doubler(
+    clip: vs.VideoNode, multi: int = 2, backend: backendT | None = None
+) -> vs.VideoNode:
+    """
+    A utility to scale the framerate of a video via frame interpolation.
+
+    Probably shouldn't just go spraying this everywhere,
+    it's more for fun and science than anything.
+    """
+    import vsmlrt
+
+    width = clip.width
+    height = clip.height
+    matrix = vstools.Matrix.from_video(clip)
+    transfer = vstools.Transfer.from_video(clip)
+    primaries = vstools.Primaries.from_video(clip)
+    clip = clip.misc.SCDetect()
+    clip = clip.resize.Bicubic(
+        format=vs.RGBS,
+        width=next_multiple_of(64, width),
+        height=next_multiple_of(64, height),
+    )
+    clip = vsmlrt.RIFE(
+        clip,
+        multi=multi,
+        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_RTX()
+            )
+        ),
+    )
+    # TODO: Handle other chroma samplings
+    clip = clip.resize.Bicubic(
+        format=vs.YUV420P16,
+        width=width,
+        height=height,
+        matrix=matrix,
+        transfer=transfer,
+        primaries=primaries,
+    )
+    return clip
+
+
+def decimation_fixer(
+    clip: vs.VideoNode, cycle: int, offset: int = 0, backend: backendT | None = None
+) -> vs.VideoNode:
+    """
+    Attempts to interpolate frames that were removed by bad decimation.
+    Only works with static decimation cycles.
+    `cycle` should be the output cycle, i.e. what did the idiot who decimated this
+    pass into the decimation filter to achieve this monstrosity?
+
+    Yeah, I know, "ThiS is bAd AND yOu shoUldn'T Do IT".
+    Maybe people shouldn't decimate clips that don't need decimation.
+    Sometimes you can't "just get a better source".
+    """
+    import vsmlrt
+
+    if offset >= cycle - 1:
+        raise Exception("offset must be less than cycle - 1")
+    if cycle <= 0:
+        raise Exception("cycle must be greater than zero")
+
+    width = clip.width
+    height = clip.height
+    fps = clip.fps
+    input_cycle = cycle - 1
+    matrix = vstools.Matrix.from_video(clip)
+    transfer = vstools.Transfer.from_video(clip)
+    primaries = vstools.Primaries.from_video(clip)
+    clip = clip.misc.SCDetect()
+    clip = clip.resize.Bicubic(
+        format=vs.RGBS,
+        width=next_multiple_of(64, width),
+        height=next_multiple_of(64, height),
+    )
+    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_RTX()
+            )
+        ),
+    )
+
+    out_clip = None
+    # This is the frame after our insertion point
+    src_frame = offset
+    last_src_frame = 0
+    # This is the frame we want to grab from the doubled clip
+    doub_frame = offset * 2 - 1
+    while src_frame < clip.num_frames:
+        if src_frame > 0:
+            interp = doubled[doub_frame]
+            if out_clip is None:
+                out_clip = clip[last_src_frame:src_frame] + interp
+            else:
+                out_clip = out_clip + clip[last_src_frame:src_frame] + interp
+        last_src_frame = src_frame
+        src_frame += input_cycle
+        doub_frame += input_cycle * 2
+    out_clip += clip[last_src_frame:]
+    out_clip = out_clip.std.AssumeFPS(
+        fpsnum=fps.numerator * cycle // input_cycle, fpsden=fps.denominator
+    )
+
+    # TODO: Handle other chroma samplings
+    out_clip = out_clip.resize.Bicubic(
+        format=vs.YUV420P16,
+        width=width,
+        height=height,
+        matrix=matrix,
+        transfer=transfer,
+        primaries=primaries,
+    )
+    return out_clip
+
+
+def next_multiple_of(multiple: int, param: int) -> int:
+    rem = param % multiple
+    if rem == 0:
+        return param
+    return param + (multiple - rem)

{soifunc-0.10.1 → soifunc-0.11.0}/soifunc/resize.py

@@ -4,11 +4,11 @@ from dataclasses import dataclass
 from inspect import getfullargspec
 from typing import Any
 
-from vsaa.antialiasers.nnedi3 import Nnedi3SS
+from vsaa.deinterlacers import NNEDI3
 from vskernels import (
     Hermite,
     Scaler,
-    ScalerT,
+    ScalerLike,
     Spline36,
 )
 from vsscale import SSIM, ArtCNN, GenericScaler
@@ -58,11 +58,11 @@ def good_resize(
             if gpu:
                 luma_scaler = ArtCNN()
             else:
-                luma_scaler = Nnedi3SS(scaler=Hermite(sigmoid=True))
+                luma_scaler = NNEDI3(scaler=Hermite(sigmoid=True))
         else:
             luma_scaler = Hermite(sigmoid=True)
     elif is_upscale:
-        luma_scaler = Nnedi3SS(scaler=SSIM())
+        luma_scaler = NNEDI3(scaler=SSIM())
     else:
         luma_scaler = SSIM()
 
@@ -73,8 +73,8 @@ def good_resize(
 
 @dataclass
 class HybridScaler(GenericScaler):
-    luma_scaler: ScalerT
-    chroma_scaler: ScalerT
+    luma_scaler: ScalerLike
+    chroma_scaler: ScalerLike
 
     def __post_init__(self) -> None:
         super().__post_init__()
@@ -82,7 +82,7 @@ class HybridScaler(GenericScaler):
         self._luma = Scaler.ensure_obj(self.luma_scaler)
         self._chroma = Scaler.ensure_obj(self.chroma_scaler)
 
-    @inject_self.cached.property
+    @Scaler.cached_property
     def kernel_radius(self) -> int:
         return self._luma.kernel_radius
 
@@ -106,7 +106,7 @@ class HybridScaler(GenericScaler):
         return join(luma, chroma)
 
 
-def _get_scaler(scaler: ScalerT, **kwargs: Any) -> Scaler:
+def _get_scaler(scaler: ScalerLike, **kwargs: Any) -> Scaler:
     scaler_cls = Scaler.from_param(scaler, _get_scaler)
 
     args = getfullargspec(scaler_cls).args