The second part of this condition is intended to check whether the current quantisation group is in the first CTU column of the current tile. The issue is that ctb_to_col_bd gives the x-ordinate of the first column of the current tile *in CTUs*, while xQg gives the x-ordinate of the quantisation group *in samples*. Rectify this by shifting xQg by ctb_log2_size to get xQg in CTUs before comparing. Fixes FFVVC issues #201 and #203.
Showing the changes to libavcodec (1 of 1 file). Show all
Unified · Split
| @@ -96,7 +96,7 @@ static int get_qp_y_pred(const VVCLocalContext *lc) · 95 unmodified lines | ||
| 96 | 96 | if (lc->na.cand_up) { |
| 97 | 97 | const int first_qg_in_ctu = !(xQg & ctb_size_mask) && !(yQg & ctb_size_mask); |
| 98 | 98 | const int qPy_up = fc->tab.qp[LUMA][x_cb + (y_cb - 1) * min_cb_width]; |
| 99 | − if (first_qg_in_ctu && pps->ctb_to_col_bd[xQg >> ctb_log2_size] == xQg) | |
| 99 | + if (first_qg_in_ctu && pps->ctb_to_col_bd[xQg >> ctb_log2_size] == xQg >> ctb_log2_size) | |
| 100 | 100 | return qPy_up; |
| 101 | 101 | } |
| 102 | 102 | |