soifunc 0.8.2__tar.gz → 0.9.0__tar.gz

{soifunc-0.8.2 → soifunc-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: soifunc
-Version: 0.8.2
+Version: 0.9.0
 Summary: Soichiro's VapourSynth Functions Collection
 License: MIT
 Author: Josh Holmer
@@ -11,12 +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: vsdeband (>=1.2.2,<2.0.0)
-Requires-Dist: vsdenoise (>=2.7.1,<3.0.0)
-Requires-Dist: vskernels (>=3.3.1,<4.0.0)
-Requires-Dist: vsmasktools (>=1.3.2,<2.0.0)
-Requires-Dist: vsscale (>=2.2.1,<3.0.0)
-Requires-Dist: vstools (>=3.3.4,<4.0.0)
+Requires-Dist: vsjetpack (>=0.3.4,<0.4.0)
 Description-Content-Type: text/markdown
 
 ## soifunc

{soifunc-0.8.2 → soifunc-0.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "soifunc"
-version = "0.8.2"
+version = "0.9.0"
 description = "Soichiro's VapourSynth Functions Collection"
 authors = ["Josh Holmer <jholmer.in@gmail.com>"]
 license = "MIT"
@@ -9,12 +9,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = ">=3.12,<4.0"
 vapoursynth = ">=68"
-vstools = "^3.3.4"
-vsscale = "^2.2.1"
-vsdenoise = "^2.7.1"
-vsmasktools = "^1.3.2"
-vsdeband = "^1.2.2"
-vskernels = "^3.3.1"
+vsjetpack = "^0.3.4"
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.4.2"

{soifunc-0.8.2 → soifunc-0.9.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
+from vsdenoise import DFTTest, FilterType, Profile, mc_degrain
 from vstools import core, vs
 
 __all__ = ["MCDenoise", "magic_denoise", "hqbm3d", "mc_dfttest"]
@@ -21,20 +21,18 @@ def hqbm3d(
 
     Sane strength values will typically be below 1.0.
     """
-    mv = vsdenoise.MVTools.denoise(
+    mv = mc_degrain(
         clip,
+        preset=vsdenoise.MVToolsPresets.HQ_SAD,
         tr=2,
-        thSAD=100,
-        block_size=32,
-        overlap=16,
-        range_conversion=3.5,
-        sad_mode=vsdenoise.SADMode.SPATIAL.same_recalc,
-        search=vsdenoise.SearchMode.DIAMOND,
-        motion=vsdenoise.MotionMode.HIGH_SAD,
+        thsad=100,
+        refine=3,
+        blksize=select_block_size(clip),
         prefilter=vsdenoise.Prefilter.DFTTEST(
             clip,
             slocation=[(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,
@@ -53,13 +51,30 @@ def mc_dfttest(
     Even at the default `thSAD` of 75, it works well at eliminating noise.
     Turn it up to 150 if you really need to nuke something.
     It does an *okay* job at preserving details, but not nearly as good
-    as bm3d, so this is not recommended on high quality sources.
-    Use it to fix sources that are already dog water.
+    as bm3d, so this is not recommended on clean, high quality sources.
+
+    The `noisy` parameter helps preserve more detail on high-quality but grainy sources,
+    but is slower.
     """
-    profile = vsdenoise.MVToolsPresets.NOISY if noisy else vsdenoise.MVToolsPresets.CMDE
-    pre = vsdenoise.Prefilter.DFTTEST(clip)
-    mc = vsdenoise.MVTools(pre, **profile)
-    return mc.degrain(ref=clip, thSAD=thSAD)
+    # TODO: Do we need to tweak anything for the `noisy` param?
+    return mc_degrain(
+        clip,
+        prefilter=vsdenoise.Prefilter.DFTTEST,
+        preset=vsdenoise.MVToolsPresets.HQ_SAD,
+        thsad=thSAD,
+        tr=2,
+        refine=3,
+        blksize=select_block_size(clip),
+    )
+
+def select_block_size(clip: vs.VideoNode):
+    if clip.width >= 1920 or clip.height >= 1080:
+        return 64
+    if clip.width >= 1600 or clip.height >= 900:
+        return 48
+    if clip.width >= 1280 or clip.height >= 720:
+        return 32
+    return 16
 
 
 def MCDenoise(