virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/vvc: add adaptive color transform support

Browse Source 
passed files:
    ACT_A_Kwai_3.bit
    ACT_B_Kwai_3.bit

Signed-off-by: Wu Jianhua <toqsxw@outlook.com>
This commit is contained in:
Wu Jianhua
2025-05-14 21:40:29 +08:00
committed by Nuo Mi
parent 0e4c0db317
commit fd5d754b2a
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vvc/ctu.c
View File

@@ -392,6 +392,8 @@ static int hls_transform_unit(VVCLocalContext *lc, int x0, int y0,int tu_width,
if (ret < 0) if (ret < 0)
return ret; return ret;
set_tb_tab(fc->tab.tu_coded_flag[tb->c_idx], tu->coded_flag[tb->c_idx], fc, tb); set_tb_tab(fc->tab.tu_coded_flag[tb->c_idx], tu->coded_flag[tb->c_idx], fc, tb);
} else if (cu->act_enabled_flag) {
memset(tb->coeffs, 0, tb->tb_width * tb->tb_height * sizeof(*tb->coeffs));
} }
if (tb->c_idx != CR) if (tb->c_idx != CR)
set_tb_size(fc, tb); set_tb_size(fc, tb);

13
libavcodec/vvc/intra.c
View File

@@ -523,13 +523,14 @@ static void lmcs_scale_chroma(VVCLocalContext *lc, TransformUnit *tu, TransformB
static void add_residual(const VVCLocalContext *lc, TransformUnit *tu, const int target_ch_type) static void add_residual(const VVCLocalContext *lc, TransformUnit *tu, const int target_ch_type)
{ {
const VVCFrameContext *fc = lc->fc; const VVCFrameContext *fc = lc->fc;
const CodingUnit *cu = lc->cu;
for (int i = 0; i < tu->nb_tbs; i++) { for (int i = 0; i < tu->nb_tbs; i++) {
TransformBlock *tb = tu->tbs + i; TransformBlock *tb = tu->tbs + i;
const int c_idx = tb->c_idx; const int c_idx = tb->c_idx;
const int ch_type = c_idx > 0; const int ch_type = c_idx > 0;
const ptrdiff_t stride = fc->frame->linesize[c_idx]; const ptrdiff_t stride = fc->frame->linesize[c_idx];
const bool has_residual = tb->has_coeffs || const bool has_residual = tb->has_coeffs || cu->act_enabled_flag ||
(c_idx && tu->joint_cbcr_residual_flag); (c_idx && tu->joint_cbcr_residual_flag);
uint8_t *dst = POS(c_idx, tb->x0, tb->y0); uint8_t *dst = POS(c_idx, tb->x0, tb->y0);
@@ -543,12 +544,13 @@ static void itransform(VVCLocalContext *lc, TransformUnit *tu, const int target_
const VVCFrameContext *fc = lc->fc; const VVCFrameContext *fc = lc->fc;
const CodingUnit *cu = lc->cu; const CodingUnit *cu = lc->cu;
TransformBlock *tbs = tu->tbs; TransformBlock *tbs = tu->tbs;
const bool is_act_luma = cu->act_enabled_flag && target_ch_type == LUMA;
for (int i = 0; i < tu->nb_tbs; i++) { for (int i = 0; i < tu->nb_tbs; i++) {
TransformBlock *tb = tbs + i; TransformBlock *tb = tbs + i;
const int c_idx = tb->c_idx; const int c_idx = tb->c_idx;
const int ch_type = c_idx > 0; const int ch_type = c_idx > 0;
const bool do_itx = ch_type == target_ch_type; const bool do_itx = is_act_luma || !cu->act_enabled_flag && ch_type == target_ch_type;
if (tb->has_coeffs && do_itx) { if (tb->has_coeffs && do_itx) {
if (cu->bdpcm_flag[tb->c_idx]) if (cu->bdpcm_flag[tb->c_idx])
@@ -568,6 +570,13 @@ static void itransform(VVCLocalContext *lc, TransformUnit *tu, const int target_
lmcs_scale_chroma(lc, tu, tb, target_ch_type); lmcs_scale_chroma(lc, tu, tb, target_ch_type);
} }
} }
if (is_act_luma) {
fc->vvcdsp.itx.adaptive_color_transform(
tbs[LUMA].coeffs, tbs[CB].coeffs, tbs[CR].coeffs,
tbs[LUMA].tb_width, tbs[LUMA].tb_height);
}
add_residual(lc, tu, target_ch_type); add_residual(lc, tu, target_ch_type);
} }