1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00

avcodec/vvcdec: ff_vvc_set_intra_mvf, refact to support dmvr tab

This commit is contained in:
Nuo Mi 2024-02-22 15:14:02 +08:00
parent 3241aa26d1
commit c503c0b33e
3 changed files with 4 additions and 4 deletions

View File

@ -1776,7 +1776,7 @@ static int hls_coding_unit(VVCLocalContext *lc, int x0, int y0, int cb_width, in
} else {
intra_luma_pred_modes(lc);
}
ff_vvc_set_intra_mvf(lc);
ff_vvc_set_intra_mvf(lc, 0);
}
if ((tree_type == SINGLE_TREE || tree_type == DUAL_TREE_CHROMA) && sps->r->sps_chroma_format_idc) {
if (pred_mode_plt_flag && tree_type == DUAL_TREE_CHROMA) {

View File

@ -262,11 +262,11 @@ void ff_vvc_set_mvf(const VVCLocalContext *lc, const int x0, const int y0, const
}
}
void ff_vvc_set_intra_mvf(const VVCLocalContext *lc)
void ff_vvc_set_intra_mvf(const VVCLocalContext *lc, const int dmvr)
{
const VVCFrameContext *fc = lc->fc;
const CodingUnit *cu = lc->cu;
MvField *tab_mvf = fc->tab.mvf;
MvField *tab_mvf = dmvr ? fc->ref->tab_dmvr_mvf : fc->tab.mvf;
const int min_pu_width = fc->ps.pps->min_pu_width;
const int min_pu_size = 1 << MIN_PU_LOG2;
for (int dy = 0; dy < cu->cb_height; dy += min_pu_size) {

View File

@ -41,6 +41,6 @@ void ff_vvc_update_hmvp(VVCLocalContext *lc, const MotionInfo *mi);
int ff_vvc_no_backward_pred_flag(const VVCLocalContext *lc);
MvField* ff_vvc_get_mvf(const VVCFrameContext *fc, const int x0, const int y0);
void ff_vvc_set_mvf(const VVCLocalContext *lc, const int x0, const int y0, const int w, const int h, const MvField *mvf);
void ff_vvc_set_intra_mvf(const VVCLocalContext *lc);
void ff_vvc_set_intra_mvf(const VVCLocalContext *lc, int dmvr);
#endif //AVCODEC_VVC_VVC_MVS_H