RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/vvcdec: fix dmvr, bdof, cb_prof for RPR

This commit is contained in:
Nuo Mi 2024-05-19 21:27:44 +08:00
parent 77acd0a0dd
commit ac4575594f
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/vvc/ctu.c
View File

@ -1689,25 +1689,25 @@ static void derive_dmvr_bdof_flag(const VVCLocalContext *lc, PredictionUnit *pu)
const VVCPH *ph = &fc->ps.ph;
const VVCSH *sh = &lc->sc->sh;
const int poc = ph->poc;
const RefPicList *rpl0 = lc->sc->rpl + L0;
const RefPicList *rpl1 = lc->sc->rpl + L1;
const int8_t *ref_idx = pu->mi.ref_idx;
const MotionInfo *mi = &pu->mi;
const int8_t *ref_idx = mi->ref_idx;
const VVCRefPic *rp0 = &lc->sc->rpl[L0].refs[ref_idx[L0]];
const VVCRefPic *rp1 = &lc->sc->rpl[L1].refs[ref_idx[L1]];
const CodingUnit *cu = lc->cu;
const PredWeightTable *w = pps->r->pps_wp_info_in_ph_flag ? &fc->ps.ph.pwt : &sh->pwt;
pu->bdof_flag = 0;
if (mi->pred_flag == PF_BI &&
(poc - rpl0->refs[ref_idx[L0]].poc == rpl1->refs[ref_idx[L1]].poc - poc) &&
!rpl0->refs[ref_idx[L0]].is_lt && !rpl1->refs[ref_idx[L1]].is_lt &&
(poc - rp0->poc == rp1->poc - poc) &&
!rp0->is_lt && !rp1->is_lt &&
!cu->ciip_flag &&
!mi->bcw_idx &&
!w->weight_flag[L0][LUMA][mi->ref_idx[L0]] && !w->weight_flag[L1][LUMA][mi->ref_idx[L1]] &&
!w->weight_flag[L0][CHROMA][mi->ref_idx[L0]] && !w->weight_flag[L1][CHROMA][mi->ref_idx[L1]] &&
!w->weight_flag[L0][LUMA][ref_idx[L0]] && !w->weight_flag[L1][LUMA][ref_idx[L1]] &&
!w->weight_flag[L0][CHROMA][ref_idx[L0]] && !w->weight_flag[L1][CHROMA][ref_idx[L1]] &&
cu->cb_width >= 8 && cu->cb_height >= 8 &&
(cu->cb_width * cu->cb_height >= 128)) {
// fixme: for RprConstraintsActiveFlag
(cu->cb_width * cu->cb_height >= 128) &&
!rp0->is_scaled && !rp1->is_scaled) {
if (!ph->r->ph_bdof_disabled_flag &&
mi->motion_model_idc == MOTION_TRANSLATION &&
!pu->merge_subblock_flag &&

3
libavcodec/vvc/mvs.c
View File

@ -297,7 +297,8 @@ static int derive_cb_prof_flag_lx(const VVCLocalContext *lc, const PredictionUni
if (IS_SAME_MV(cp_mv, cp_mv + 1) && IS_SAME_MV(cp_mv, cp_mv + 2))
return 0;
}
//fixme: RprConstraintsActiveFlag
if (lc->sc->rpl[lx].refs[mi->ref_idx[lx]].is_scaled)
return 0;
return 1;
}