From 362a8672d1ebcc291108c79e068267dfb565e13a Mon Sep 17 00:00:00 2001 From: louis Date: Mon, 31 May 2021 18:17:42 -0400 Subject: [PATCH] yt_common: upstream sraa changes --- Tensei Shitara Slime Datta Ken S2/mypy.ini | 1 + Tensei Shitara Slime Datta Ken S2/setup.py | 25 +++++++++++++++++++ .../tensura_common/filter.py | 6 ++--- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 120000 Tensei Shitara Slime Datta Ken S2/mypy.ini create mode 100755 Tensei Shitara Slime Datta Ken S2/setup.py diff --git a/Tensei Shitara Slime Datta Ken S2/mypy.ini b/Tensei Shitara Slime Datta Ken S2/mypy.ini new file mode 120000 index 0000000..f79cd28 --- /dev/null +++ b/Tensei Shitara Slime Datta Ken S2/mypy.ini @@ -0,0 +1 @@ +../yt_common/mypy.ini \ No newline at end of file diff --git a/Tensei Shitara Slime Datta Ken S2/setup.py b/Tensei Shitara Slime Datta Ken S2/setup.py new file mode 100755 index 0000000..da8b1b5 --- /dev/null +++ b/Tensei Shitara Slime Datta Ken S2/setup.py @@ -0,0 +1,25 @@ +#!/usr/bin/env python3 + +import setuptools + +name = "tensura_common" +version = "0.0.0" +release = "0.0.0" + +setuptools.setup( + name=name, + version=release, + author="louis", + author_email="louis@poweris.moe", + description="tensura common module", + packages=["tensura_common"], + classifiers=[ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + ], + package_data={ + 'pripri_common': ['py.typed', 'final-settings'], + }, + python_requires='>=3.8', +) diff --git a/Tensei Shitara Slime Datta Ken S2/tensura_common/filter.py b/Tensei Shitara Slime Datta Ken S2/tensura_common/filter.py index 91ed198..53e3256 100644 --- a/Tensei Shitara Slime Datta Ken S2/tensura_common/filter.py +++ b/Tensei Shitara Slime Datta Ken S2/tensura_common/filter.py @@ -1,6 +1,6 @@ import vapoursynth as vs -from yt_common.antialiasing import mask_strong, sraa_clamp, supersample_aa +from yt_common.antialiasing import mask_strong, sraa_clamp from yt_common.data import FSRCNNX from yt_common.scale import nnedi3_double @@ -72,11 +72,11 @@ def deband(clip: vs.VideoNode, strong: Optional[List[Range]] = None, def antialias(clip: vs.VideoNode, strong: List[Range], sangnom: Optional[List[Tuple[Range, List[BoundingBox]]]] = None) -> vs.VideoNode: clamp = sraa_clamp(clip, mask=mask_strong) - sraa_13 = upscaled_sraa(clip, rfactor=1.3, downscaler=Bicubic(b=0, c=1/2).scale) + sraa_13 = upscaled_sraa(clip, rfactor=1.3) sraa_13 = core.std.MaskedMerge(clip, sraa_13, mask_strong(sraa_13)) clamp = replace_ranges(clamp, sraa_13, strong) if sangnom: - sn = supersample_aa(sraa_13, rfactor=1.5, aafun=lambda c, s: c.sangnom.SangNom()) + sn = upscaled_sraa(sraa_13, aafun=lambda c: c.sangnom.SangNom()) sn = core.std.MaskedMerge(sraa_13, sn, mask_strong(sn)) for r, ms in sangnom: mask = core.std.BlankClip(clip.std.ShufflePlanes(planes=0, colorfamily=vs.GRAY))