Skip to content

Commit 32c6471

Browse files
committed
denoise: Replace removed rfilter usage in mc_degrain
1 parent 16d3fb2 commit 32c6471

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

vodesfunc/denoise.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ def MaybeNotTerrible(self) -> MVToolsPreset:
2424
"""
2525
This is just me throwing stuff at the wall to have some improvements without major slowdowns.
2626
"""
27-
from vsdenoise import AnalyzeArgs, RecalculateArgs
27+
from vsdenoise import AnalyzeArgs, RecalculateArgs, SuperArgs, RFilterMode
2828

2929
return MVToolsPreset(
3030
pel=1,
3131
search_clip=prefilter_to_full_range,
32+
super_args=SuperArgs(rfilter=RFilterMode.TRIANGLE),
3233
analyze_args=AnalyzeArgs(truemotion=MotionMode.SAD, search=SearchMode.HEXAGON, pelsearch=2),
3334
recalculate_args=RecalculateArgs(truemotion=MotionMode.SAD, search=SearchMode.HEXAGON, searchparam=1),
3435
)
@@ -39,12 +40,13 @@ def ActualOldWrapperMatch(self) -> MVToolsPreset:
3940
Preset to match the old wrapper as well as possible.
4041
It is arguable if this is desirable.
4142
"""
42-
from vsdenoise import AnalyzeArgs, RecalculateArgs
43+
from vsdenoise import AnalyzeArgs, RecalculateArgs, SuperArgs, RFilterMode
4344

4445
return MVToolsPreset(
4546
pel=1,
4647
pad=16,
4748
search_clip=prefilter_to_full_range,
49+
super_args=SuperArgs(rfilter=RFilterMode.TRIANGLE),
4850
analyze_args=AnalyzeArgs(truemotion=MotionMode.SAD, search=SearchMode.DIAMOND, pelsearch=2),
4951
recalculate_args=RecalculateArgs(truemotion=MotionMode.SAD, search=SearchMode.ONETIME, searchparam=0),
5052
)
@@ -102,10 +104,7 @@ def VMDegrain(
102104
block_size = 128
103105
overlap = 64
104106

105-
from vsdenoise import (
106-
mc_degrain,
107-
RFilterMode,
108-
)
107+
from vsdenoise import mc_degrain
109108

110109
if preset is None:
111110
raise ValueError("VMDegrain: preset cannot be None when on vsjetpack>=0.3.0!")
@@ -119,7 +118,6 @@ def VMDegrain(
119118
thsad_recalc=thSAD,
120119
blksize=block_size,
121120
refine=refine,
122-
rfilter=RFilterMode.TRIANGLE,
123121
preset=preset,
124122
tr=tr,
125123
)

0 commit comments

Comments
 (0)