Skip to content

vvc_deblock: Add accelerated luma deblocker #129

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

Open
zackerthescar wants to merge 4 commits into
base: 20240120
Choose a base branch
from
Open

vvc_deblock: Add accelerated luma deblocker #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d80c53e
vvc_deblock: add checkasm for vvc deblocker
zackerthescar Aug 13, 2023
fe34cb4
vvc_deblock: add simple AVX2-accelerated chroma deblocker
zackerthescar Aug 22, 2023
f16e806
Add luma deblocker; has issues
zackerthescar Aug 22, 2023
fa4a41d
Merge branch 'ffvvc:main' into deblock_luma
zackerthescar Aug 26, 2023
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
38 changes: 30 additions & 8 deletions libavcodec/vvc/vvc_filter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,11 +918,21 @@ void ff_vvc_deblock_vertical(const VVCLocalContext *lc, int x0, int y0)
max_filter_length(fc, x, y, c_idx, 1, 0, bs, &max_len_p, &max_len_q);

if (!c_idx) {
fc->vvcdsp.lf.filter_luma[1](src,
fc->frame->linesize[c_idx], beta, tc, no_p, no_q, max_len_p, max_len_q, 0);
if ((no_p || no_q) || (max_len_p == 3 || max_len_q == 3)) {
fc->vvcdsp.lf.filter_luma_c[1](src,
fc->frame->linesize[c_idx], beta, tc, no_p, no_q, max_len_p, max_len_q, 0);
} else {
fc->vvcdsp.lf.filter_luma[1](src,
fc->frame->linesize[c_idx], beta, tc, no_p, no_q, max_len_p, max_len_q, 0);
}
} else {
fc->vvcdsp.lf.filter_chroma[1](src,
fc->frame->linesize[c_idx], beta, tc, no_p, no_q, vs, max_len_p, max_len_q);
if (vs || (no_p || no_q) || (max_len_p == 3 || max_len_q == 3) || (!max_len_p || !max_len_q)) {
fc->vvcdsp.lf.filter_chroma_c[1](src,
fc->frame->linesize[c_idx], beta, tc, no_p, no_q, vs, max_len_p, max_len_q);
} else {
fc->vvcdsp.lf.filter_chroma_c[1](src,
fc->frame->linesize[c_idx], beta, tc, no_p, no_q, vs, max_len_p, max_len_q);
}
}
}
}
Expand Down Expand Up @@ -987,11 +997,23 @@ void ff_vvc_deblock_horizontal(const VVCLocalContext *lc, int x0, int y0)
max_filter_length(fc, x, y, c_idx, 0, horizontal_ctu_edge, bs, &max_len_p, &max_len_q);

if (!c_idx) {
fc->vvcdsp.lf.filter_luma[0](src, fc->frame->linesize[c_idx],
beta, tc, no_p, no_q, max_len_p, max_len_q, horizontal_ctu_edge);
if ((no_p || no_q) || ((max_len_p > 3 && !horizontal_ctu_edge) || max_len_q > 3)) {
fc->vvcdsp.lf.filter_luma_c[0](src, fc->frame->linesize[c_idx],
beta, tc, no_p, no_q, max_len_p, max_len_q, horizontal_ctu_edge);
} else {
fc->vvcdsp.lf.filter_luma[0](src, fc->frame->linesize[c_idx],
beta, tc, no_p, no_q, max_len_p, max_len_q, horizontal_ctu_edge);
}

} else {
fc->vvcdsp.lf.filter_chroma[0](src, fc->frame->linesize[c_idx], beta,
tc, no_p, no_q, hs, max_len_p, max_len_q);
if (hs || (no_p || no_q) || (!max_len_p || !max_len_q) || (max_len_p == 3 || max_len_q == 3)) {
fc->vvcdsp.lf.filter_chroma_c[0](src, fc->frame->linesize[c_idx], beta,
tc, no_p, no_q, hs, max_len_p, max_len_q);
} else {
fc->vvcdsp.lf.filter_chroma[0](src, fc->frame->linesize[c_idx], beta,
tc, no_p, no_q, hs, max_len_p, max_len_q);
}

}
}
}
Expand Down
4 changes: 4 additions & 0 deletions libavcodec/vvc/vvc_filter_template.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,6 +1066,10 @@ static void FUNC(ff_vvc_lf_dsp_init)(VVCLFDSPContext *const lf)
lf->filter_luma[1] = FUNC(vvc_v_loop_filter_luma);
lf->filter_chroma[0] = FUNC(vvc_h_loop_filter_chroma);
lf->filter_chroma[1] = FUNC(vvc_v_loop_filter_chroma);
lf->filter_luma_c[0] = FUNC(vvc_h_loop_filter_luma);
lf->filter_luma_c[1] = FUNC(vvc_v_loop_filter_luma);
lf->filter_chroma_c[0] = FUNC(vvc_h_loop_filter_chroma);
lf->filter_chroma_c[1] = FUNC(vvc_v_loop_filter_chroma);
}

static void FUNC(ff_vvc_sao_dsp_init)(VVCSAODSPContext *const sao)
Expand Down
4 changes: 4 additions & 0 deletions libavcodec/vvc/vvcdsp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,10 @@ typedef struct VVCLFDSPContext {
uint8_t no_p, uint8_t no_q, uint8_t max_len_p, uint8_t max_len_q, int hor_ctu_edge);
void (*filter_chroma[2 /* h, v */])(uint8_t *pix, ptrdiff_t stride, int beta, int32_t tc,
uint8_t no_p, uint8_t no_q, int shift, int max_len_p, int max_len_q);
void (*filter_luma_c[2 /* h, v */])(uint8_t *pix, ptrdiff_t stride, int beta, int32_t tc,
uint8_t no_p, uint8_t no_q, uint8_t max_len_p, uint8_t max_len_q, int hor_ctu_edge);
void (*filter_chroma_c[2 /* h, v */])(uint8_t *pix, ptrdiff_t stride, int beta, int32_t tc,
uint8_t no_p, uint8_t no_q, int shift, int max_len_p, int max_len_q);
} VVCLFDSPContext;

struct SAOParams;
Expand Down
3 changes: 2 additions & 1 deletion libavcodec/x86/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,5 +206,6 @@ X86ASM-OBJS-$(CONFIG_VP9_DECODER) += x86/vp9intrapred.o \
X86ASM-OBJS-$(CONFIG_VVC_DECODER) += x86/vvc_alf.o \
x86/vvc_sao.o \
x86/vvc_sao_10bit.o \
x86/vvc_mc.o
x86/vvc_mc.o \
x86/vvc_deblock.o
X86ASM-OBJS-$(CONFIG_WEBP_DECODER) += x86/vp8dsp.o
Loading