Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deblock_qed #122

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Fix deblock_qed #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5b23bb
Fix deblock_qed
emotion3459 Sep 3, 2024
3581742
fix flake8 mald
emotion3459 Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 85 additions & 4 deletions vsdenoise/deblock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@
from vsmasktools import FDoG, GenericMaskT, adg_mask, normalize_mask
from vsrgtools import gauss_blur
from vstools import (
ColorRange, CustomStrEnum, DependencyNotFoundError, FrameRangeN, FrameRangesN, InvalidColorFamilyError, KwargsT,
LengthMismatchError, Matrix, MatrixT, UnsupportedVideoFormatError, check_variable, core, depth, fallback, get_depth,
get_nvidia_version, get_y, join, padder, replace_ranges, vs
FunctionUtil, ColorRange, CustomStrEnum, DependencyNotFoundError, FrameRangeN, FrameRangesN, Matrix, MatrixT,
Align, KwargsT, PlanesT, InvalidColorFamilyError, LengthMismatchError, UnsupportedVideoFormatError, check_variable,
core, depth, fallback, get_depth, get_nvidia_version, get_y, join, padder, get_plane_sizes, replace_ranges, vs
)

__all__ = [
'dpir', 'dpir_mask'
'dpir', 'dpir_mask',

'deblock_qed'
]


Expand Down Expand Up @@ -324,3 +326,82 @@ def dpir_mask(
mask = mask.std.MaskedMerge(lines_clip, linemask)

return mask


def deblock_qed(
clip: vs.VideoNode,
quant_edge: int = 24,
quant_inner: int = 26,
alpha_edge: int = 1, beta_edge: int = 2,
alpha_inner: int = 1, beta_inner: int = 2,
chroma_mode: int = 0,
align: Align = Align.TOP_LEFT,
planes: PlanesT = None
) -> vs.VideoNode:
"""
A postprocessed Deblock: Uses full frequencies of Deblock's changes on block borders,
but DCT-lowpassed changes on block interiours.

:param clip: Clip to process.
:param quant_edge: Strength of block edge deblocking.
:param quant_inner: Strength of block internal deblocking.
:param alpha_edge: Halfway "sensitivity" and halfway a strength modifier for borders.
:param beta_edge: "Sensitivity to detect blocking" for borders.
:param alpha_inner: Halfway "sensitivity" and halfway a strength modifier for block interiors.
:param beta_inner: "Sensitivity to detect blocking" for block interiors.
:param chroma_mode: Chroma deblocking behaviour.
- 0 = use proposed method for chroma deblocking
- 1 = directly use chroma deblock from the normal Deblock
- 2 = directly use chroma deblock from the strong Deblock
:param align: Where to align the blocks for eventual padding.
:param planes: What planes to process.

:return: Deblocked clip
"""
func = FunctionUtil(clip, deblock_qed, planes)
if not func.chroma:
chroma_mode = 0

with padder.ctx(8, align=align) as p8:
clip = p8.MIRROR(func.work_clip)

block = padder.COLOR(
clip.std.BlankClip(
width=6, height=6, length=1, color=0,
format=func.work_clip.format.replace(color_family=vs.GRAY, subsampling_w=0, subsampling_h=0)
), 1, 1, 1, 1, True
)
block = core.std.StackHorizontal([block] * (clip.width // block.width))
block = core.std.StackVertical([block] * (clip.height // block.height))

if func.chroma:
blockc = block.std.CropAbs(*get_plane_sizes(clip, 1))
block = join(block, blockc, blockc)

block = block * clip.num_frames

normal, strong = (
clip.deblock.Deblock(quant_edge, alpha_edge, beta_edge, func.norm_planes if chroma_mode < 2 else 0),
clip.deblock.Deblock(quant_inner, alpha_inner, beta_inner, func.norm_planes if chroma_mode != 1 else 0)
)

normalD2, strongD2 = (
norm_expr([clip, dclip, block], 'z x y - 0 ? range_diff +', planes)
for dclip in (normal, strong)
)

with padder.ctx(16, align=align) as p16:
strongD2 = p16.CROP(
norm_expr(p16.MIRROR(strongD2), 'x range_diff - 1.01 * range_diff +', planes)
.dctf.DCTFilter([1, 1, 0, 0, 0, 0, 0, 0], planes)
)

strongD4 = norm_expr([strongD2, normalD2], 'y range_diff = x y ?', planes)
deblocked = clip.std.MakeDiff(strongD4, planes)

if func.chroma and chroma_mode:
deblocked = join([deblocked, strong if chroma_mode == 2 else normal])

deblocked = p8.CROP(deblocked)

return func.return_clip(deblocked)
95 changes: 3 additions & 92 deletions vsdenoise/freqs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
from __future__ import annotations

from typing import Any, Iterable, Sequence
from typing import Any, Iterable

from vsexprtools import norm_expr
from vsrgtools import MeanMode
from vstools import (
Align, CustomValueError, FunctionUtil, GenericVSFunction, KwargsT, PlanesT, core, fallback, flatten_vnodes,
get_plane_sizes, get_video_format, join, normalize_planes, normalize_seq, padder, to_arr, vs
CustomValueError, GenericVSFunction, KwargsT, PlanesT, fallback, flatten_vnodes,
get_video_format, normalize_planes, normalize_seq, vs
)

from .fft import DFTTest
from .mvtools import MVTools

__all__ = [
'frequency_merge',

'deblock_qed'
]


Expand Down Expand Up @@ -93,89 +90,3 @@ def frequency_merge(
high_freqs = mv.compensate(mode_tr, ref=high_freqs) # type: ignore

return low_freqs.std.MergeDiff(high_freqs, planes)


def deblock_qed(
clip: vs.VideoNode,
quant_edge: int | Sequence[int] = 24,
quant_inner: int | Sequence[int] = 26,
alpha_edge: int = 1, beta_edge: int = 2,
alpha_inner: int = 1, beta_inner: int = 2,
chroma_str: int = 0,
align: Align = Align.TOP_LEFT,
mean_edge: MeanMode = MeanMode.ARITHMETIC,
mean_inner: MeanMode | None = None,
planes: PlanesT = None
) -> vs.VideoNode:
"""
A postprocessed Deblock: Uses full frequencies of Deblock's changes on block borders,
but DCT-lowpassed changes on block interiours.

:param clip: Clip to process.
:param quant_edge: Strength of block edge deblocking.
:param quant_inner: Strength of block internal deblocking.
:param alpha_edge: Halfway "sensitivity" and halfway a strength modifier for borders.
:param beta_edge: "Sensitivity to detect blocking" for borders.
:param alpha_inner: Halfway "sensitivity" and halfway a strength modifier for block interiors.
:param beta_inner: "Sensitivity to detect blocking" for block interiors.
:param chroma_str: Chroma deblocking behaviour/strength.
- 0 = use proposed method for chroma deblocking
- 1 = directly use chroma debl. from the normal Deblock
- 2 = directly use chroma debl. from the strong Deblock
:param align: Where to align the blocks for eventual padding.
:param planes: What planes to process.

:return: Deblocked clip
"""
func = FunctionUtil(clip, deblock_qed, planes)
if not func.chroma:
chroma_str = 0

with padder.ctx(8, align=align) as p8:
clip = p8.MIRROR(func.work_clip)

block = padder.COLOR(
clip.std.BlankClip(
width=6, height=6, length=1, color=0,
format=func.work_clip.format.replace(color_family=vs.GRAY, subsampling_w=0, subsampling_h=0)
), 1, 1, 1, 1, True
)
block = core.std.StackHorizontal([block] * (clip.width // block.width))
block = core.std.StackVertical([block] * (clip.height // block.height))

if func.chroma:
blockc = block.std.CropAbs(*get_plane_sizes(clip, 1))
block = join(block, blockc, blockc)

block = block * clip.num_frames

normal, strong = (
mean_mode(
clip.deblock.Deblock(quant, alpha, beta, func.norm_planes if chroma_str == cstr else 0)
for quant in quants
) for mean_mode, quants, alpha, beta, cstr in [
(mean_edge, to_arr(quant_edge), alpha_edge, beta_edge, 1),
(mean_inner or mean_edge, to_arr(quant_inner), alpha_inner, beta_inner, 2)
]
)

normalD2, strongD2 = (
norm_expr([clip, dclip, block], 'z x y - 0 ? range_diff +', planes)
for dclip in (normal, strong)
)

with padder.ctx(16, align=align) as p16:
strongD2 = p16.CROP(
norm_expr(p16.MIRROR(strongD2), 'x range_diff - 1.01 * range_diff +', planes)
.dctf.DCTFilter([1, 1, 0, 0, 0, 0, 0, 0], planes)
)

strongD4 = norm_expr([strongD2, normalD2], 'y range_diff = x y ?', planes)
deblocked = clip.std.MakeDiff(strongD4, planes)

if func.chroma and chroma_str:
deblocked = join([deblocked, strong if chroma_str == 2 else normal])

deblocked = p8.CROP(deblocked)

return func.return_clip(deblocked)
Loading