soifunc 0.9.0__tar.gz → 0.9.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: soifunc
-Version: 0.9.0
+Version: 0.9.2
 Summary: Soichiro's VapourSynth Functions Collection
 License: MIT
 Author: Josh Holmer

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "soifunc"
-version = "0.9.0"
+version = "0.9.2"
 description = "Soichiro's VapourSynth Functions Collection"
 authors = ["Josh Holmer <jholmer.in@gmail.com>"]
 license = "MIT"

{soifunc-0.9.0 → soifunc-0.9.2}/soifunc/denoise.py

@@ -21,13 +21,14 @@ def hqbm3d(
 
     Sane strength values will typically be below 1.0.
     """
+    blksize = select_block_size(clip)
     mv = mc_degrain(
         clip,
         preset=vsdenoise.MVToolsPresets.HQ_SAD,
         tr=2,
         thsad=100,
-        refine=3,
-        blksize=select_block_size(clip),
+        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)],
@@ -57,22 +58,22 @@ def mc_dfttest(
     but is slower.
     """
     # TODO: Do we need to tweak anything for the `noisy` param?
+    blksize = select_block_size(clip)
     return mc_degrain(
         clip,
         prefilter=vsdenoise.Prefilter.DFTTEST,
         preset=vsdenoise.MVToolsPresets.HQ_SAD,
         thsad=thSAD,
         tr=2,
-        refine=3,
-        blksize=select_block_size(clip),
+        refine=3 if blksize > 16 else 2,
+        blksize=blksize,
     )
 
+
 def select_block_size(clip: vs.VideoNode):
-    if clip.width >= 1920 or clip.height >= 1080:
+    if clip.width * clip.height >= 1920 * 800:
         return 64
-    if clip.width >= 1600 or clip.height >= 900:
-        return 48
-    if clip.width >= 1280 or clip.height >= 720:
+    if clip.width * clip.height >= 1280 * 720:
         return 32
     return 16