virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Code Issues Releases Activity

avcodec/vvcdec: do not zero frame msf mmi table

Browse Source
This commit is contained in:
Nuo Mi 2024-07-28 11:18:05 +08:00
parent 0c7106f618
commit ca2caeb21d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vvc/ctu.c
View File

@ -1234,9 +1234,12 @@ static CodingUnit* add_cu(VVCLocalContext *lc, const int x0, const int y0,
static void set_cu_tabs(const VVCLocalContext *lc, const CodingUnit *cu)
{
const VVCFrameContext *fc = lc->fc;
const TransformUnit *tu = cu->tus.head;
const VVCFrameContext *fc = lc->fc;
const PredictionUnit *pu = &cu->pu;
const TransformUnit *tu = cu->tus.head;
set_cb_tab(lc, fc->tab.mmi, pu->mi.motion_model_idc);
set_cb_tab(lc, fc->tab.msf, pu->merge_subblock_flag);
if (cu->tree_type != DUAL_TREE_CHROMA)
set_cb_tab(lc, fc->tab.skip, cu->skip_flag);
@ -1325,7 +1328,6 @@ static void merge_data_subblock(VVCLocalContext *lc)
PredictionUnit *pu = &cu->pu;
int merge_subblock_idx = 0;
set_cb_tab(lc, fc->tab.msf, pu->merge_subblock_flag);
if (ph->max_num_subblock_merge_cand > 1) {
merge_subblock_idx = ff_vvc_merge_subblock_idx(lc, ph->max_num_subblock_merge_cand);
}

4
libavcodec/vvc/dec.c
View File

@ -155,9 +155,7 @@ static void min_pu_tl_init(TabList *l, VVCFrameContext *fc)
tl_init(l, 1, changed);
TL_ADD(msf, pic_size_in_min_pu);
TL_ADD(iaf, pic_size_in_min_pu);
TL_ADD(mmi, pic_size_in_min_pu);
}
static void min_pu_nz_tl_init(TabList *l, VVCFrameContext *fc)
@ -168,6 +166,8 @@ static void min_pu_nz_tl_init(TabList *l, VVCFrameContext *fc)
tl_init(l, 0, changed);
TL_ADD(msf, pic_size_in_min_pu);
TL_ADD(mmi, pic_size_in_min_pu);
TL_ADD(mvf, pic_size_in_min_pu);
}

1
libavcodec/vvc/mvs.c
View File

@ -399,7 +399,6 @@ static void store_cp_mv(const VVCLocalContext *lc, const MotionInfo *mi, const i
const int offset = (y_cb * min_cb_width + x_cb) * MAX_CONTROL_POINTS;
memcpy(&fc->tab.cp_mv[lx][offset], mi->mv[lx], sizeof(Mv) * num_cp_mv);
SAMPLE_CTB(fc->tab.mmi, x_cb, y_cb) = mi->motion_model_idc;
}
}
}