From 4f609614983bcabc277d354ef8bc4e65e52faaf6 Mon Sep 17 00:00:00 2001 From: Nuo Mi Date: Sun, 28 Jul 2024 11:17:59 +0800 Subject: [PATCH] avcodec/vvcdec: remove unnecessary perframe initializations deblock, sao, alf skip, imtf, ipm, cqt_depth, cb_pos_x, cb_pos_y, cb_height, cp_mv, tb_pos_x0, tb_pos_y0, tb_width, tb_height --- libavcodec/vvc/dec.c | 63 ++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index ee009d4181..d609fc5184 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -99,9 +99,6 @@ static void ctu_tl_init(TabList *l, VVCFrameContext *fc) tl_init(l, 1, changed); - TL_ADD(deblock, ctu_count); - TL_ADD(sao, ctu_count); - TL_ADD(alf, ctu_count); TL_ADD(ctus, ctu_count); } @@ -114,6 +111,10 @@ static void ctu_nz_tl_init(TabList *l, VVCFrameContext *fc) const int changed = fc->tab.sz.ctu_count != ctu_count || fc->tab.sz.ctu_size != ctu_size; tl_init(l, 0, changed); + + TL_ADD(deblock, ctu_count); + TL_ADD(sao, ctu_count); + TL_ADD(alf, ctu_count); TL_ADD(slice_idx, ctu_count); TL_ADD(coeffs, ctu_count * ctu_size * VVC_MAX_SAMPLE_ARRAYS); } @@ -126,21 +127,34 @@ static void min_cb_tl_init(TabList *l, VVCFrameContext *fc) tl_init(l, 1, changed); - TL_ADD(skip, pic_size_in_min_cb); TL_ADD(imf, pic_size_in_min_cb); - TL_ADD(imtf, pic_size_in_min_cb); TL_ADD(imm, pic_size_in_min_cb); + + for (int i = LUMA; i <= CHROMA; i++) { + TL_ADD(cb_width[i], pic_size_in_min_cb); //is_a0_available requires this + TL_ADD(cpm[i], pic_size_in_min_cb); + }; +} + +static void min_cb_nz_tl_init(TabList *l, VVCFrameContext *fc) +{ + const VVCPPS *pps = fc->ps.pps; + const int pic_size_in_min_cb = pps ? pps->min_cb_width * pps->min_cb_height : 0; + const int changed = fc->tab.sz.pic_size_in_min_cb != pic_size_in_min_cb; + + tl_init(l, 0, changed); + + TL_ADD(skip, pic_size_in_min_cb); + TL_ADD(imtf, pic_size_in_min_cb); TL_ADD(ipm, pic_size_in_min_cb); for (int i = LUMA; i <= CHROMA; i++) { + TL_ADD(cqt_depth[i], pic_size_in_min_cb); TL_ADD(cb_pos_x[i], pic_size_in_min_cb); TL_ADD(cb_pos_y[i], pic_size_in_min_cb); - TL_ADD(cb_width[i], pic_size_in_min_cb); TL_ADD(cb_height[i], pic_size_in_min_cb); - TL_ADD(cqt_depth[i], pic_size_in_min_cb); - TL_ADD(cpm[i], pic_size_in_min_cb); TL_ADD(cp_mv[i], pic_size_in_min_cb * MAX_CONTROL_POINTS); - }; + } } static void min_pu_tl_init(TabList *l, VVCFrameContext *fc) @@ -166,22 +180,35 @@ static void min_tu_tl_init(TabList *l, VVCFrameContext *fc) tl_init(l, 1, changed); TL_ADD(tu_joint_cbcr_residual_flag, pic_size_in_min_tu); + + for (int i = LUMA; i <= CHROMA; i++) + TL_ADD(pcmf[i], pic_size_in_min_tu); + + for (int i = 0; i < VVC_MAX_SAMPLE_ARRAYS; i++) { + TL_ADD(tu_coded_flag[i], pic_size_in_min_tu); + TL_ADD(qp[i], pic_size_in_min_tu); + + for (int vertical = 0; vertical < 2; vertical++) + TL_ADD(bs[vertical][i], pic_size_in_min_tu); + } +} + +static void min_tu_nz_tl_init(TabList *l, VVCFrameContext *fc) +{ + const VVCPPS *pps = fc->ps.pps; + const int pic_size_in_min_tu = pps ? pps->min_tu_width * pps->min_tu_height : 0; + const int changed = fc->tab.sz.pic_size_in_min_tu != pic_size_in_min_tu; + + tl_init(l, 0, changed); + for (int i = LUMA; i <= CHROMA; i++) { TL_ADD(tb_pos_x0[i], pic_size_in_min_tu); TL_ADD(tb_pos_y0[i], pic_size_in_min_tu); TL_ADD(tb_width[i], pic_size_in_min_tu); TL_ADD(tb_height[i], pic_size_in_min_tu); - TL_ADD(pcmf[i], pic_size_in_min_tu); - } - - for (int i = 0; i < VVC_MAX_SAMPLE_ARRAYS; i++) { - TL_ADD(tu_coded_flag[i], pic_size_in_min_tu); - TL_ADD(qp[i], pic_size_in_min_tu); } for (int vertical = 0; vertical < 2; vertical++) { - for (int j = 0; j < VVC_MAX_SAMPLE_ARRAYS; j++) - TL_ADD(bs[vertical][j], pic_size_in_min_tu); TL_ADD(max_len_p[vertical], pic_size_in_min_tu); TL_ADD(max_len_q[vertical], pic_size_in_min_tu); } @@ -283,8 +310,10 @@ static int frame_context_for_each_tl(VVCFrameContext *fc, int (*unary_fn)(TabLis ctu_tl_init, ctu_nz_tl_init, min_cb_tl_init, + min_cb_nz_tl_init, min_pu_tl_init, min_tu_tl_init, + min_tu_nz_tl_init, pixel_buffer_nz_tl_init, msm_tl_init, ispmf_tl_init,