avcodec/vvcdec: do not zero frame cpm table

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Nuo Mi 2024-07-28 11:18:04 +08:00 committed by Paul B Mahol
parent 95da160818
commit e57949afe5
2 changed files with 10 additions and 10 deletions

View File

@ -1080,10 +1080,15 @@ static PredMode pred_mode_decode(VVCLocalContext *lc,
}
if (pred_mode_ibc_flag)
pred_mode = MODE_IBC;
return pred_mode;
} else {
return MODE_INTRA;
pred_mode = MODE_INTRA;
}
set_cb_tab(lc, fc->tab.cpm[cu->ch_type], pred_mode);
if (tree_type == SINGLE_TREE)
set_cb_tab(lc, fc->tab.cpm[CHROMA], pred_mode);
return pred_mode;
}
static void sbt_info(VVCLocalContext *lc, const VVCSPS *sps)
@ -1232,12 +1237,8 @@ static void set_cu_tabs(const VVCLocalContext *lc, const CodingUnit *cu)
const VVCFrameContext *fc = lc->fc;
const TransformUnit *tu = cu->tus.head;
if (cu->tree_type != DUAL_TREE_CHROMA) {
set_cb_tab(lc, fc->tab.cpm[LUMA], cu->pred_mode);
if (cu->tree_type != DUAL_TREE_CHROMA)
set_cb_tab(lc, fc->tab.skip, cu->skip_flag);
}
if (fc->ps.sps->r->sps_chroma_format_idc && cu->tree_type != DUAL_TREE_LUMA)
set_cb_tab(lc, fc->tab.cpm[CHROMA], cu->pred_mode);
while (tu) {
for (int j = 0; j < tu->nb_tbs; j++) {

View File

@ -121,10 +121,8 @@ static void min_cb_tl_init(TabList *l, VVCFrameContext *fc)
TL_ADD(imf, pic_size_in_min_cb);
TL_ADD(imm, pic_size_in_min_cb);
for (int i = LUMA; i <= CHROMA; i++) {
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)
@ -145,6 +143,7 @@ static void min_cb_nz_tl_init(TabList *l, VVCFrameContext *fc)
TL_ADD(cb_pos_y[i], pic_size_in_min_cb);
TL_ADD(cb_height[i], pic_size_in_min_cb);
TL_ADD(cp_mv[i], pic_size_in_min_cb * MAX_CONTROL_POINTS);
TL_ADD(cpm[i], pic_size_in_min_cb);
}
}