History

avcodec/vvcdec: misc, move pcmf from min_tu_tl_init to min_cb_nz_tl_init

pcmf are cu level flags

Nuo Mi committed 2 years ago

Commit d78b43e1 parent 634780f3 files · +7 −7Browse files

Unified · Split

3 files
  1. libavcodec/vvc/ctu.c +5 −3
  2. libavcodec/vvc/dec.c +1 −3
  3. libavcodec/vvc/filter.c +1 −1
libavcodec/vvc/ctu.c+5−3
@@ -1240,16 +1240,18 @@ static void set_cu_tabs(const VVCLocalContext *lc, const CodingUnit *cu) · 1239 unmodified lines
1240 1240
1241 set_cb_tab(lc, fc->tab.mmi, pu->mi.motion_model_idc);1241 set_cb_tab(lc, fc->tab.mmi, pu->mi.motion_model_idc);
1242 set_cb_tab(lc, fc->tab.msf, pu->merge_subblock_flag);1242 set_cb_tab(lc, fc->tab.msf, pu->merge_subblock_flag);
1243 if (cu->tree_type != DUAL_TREE_CHROMA)1243 if (cu->tree_type != DUAL_TREE_CHROMA) {
1244 set_cb_tab(lc, fc->tab.skip, cu->skip_flag);1244 set_cb_tab(lc, fc->tab.skip, cu->skip_flag);
1245 set_cb_tab(lc, fc->tab.pcmf[LUMA], cu->bdpcm_flag[LUMA]);
1246 }
1247 if (cu->tree_type != DUAL_TREE_LUMA)
1248 set_cb_tab(lc, fc->tab.pcmf[CHROMA], cu->bdpcm_flag[CHROMA]);
1245 1249
1246 while (tu) {1250 while (tu) {
1247 for (int j = 0; j < tu->nb_tbs; j++) {1251 for (int j = 0; j < tu->nb_tbs; j++) {
1248 const TransformBlock *tb = tu->tbs + j;1252 const TransformBlock *tb = tu->tbs + j;
1249 if (tb->c_idx != LUMA)1253 if (tb->c_idx != LUMA)
1250 set_qp_c_tab(lc, tu, tb);1254 set_qp_c_tab(lc, tu, tb);
1251 if (tb->c_idx != CR && cu->bdpcm_flag[tb->c_idx])
1252 set_tb_tab(fc->tab.pcmf[tb->c_idx], 1, fc, tb);
1253 }1255 }
1254 tu = tu->next;1256 tu = tu->next;
1255 }1257 }
libavcodec/vvc/dec.c+1−3
@@ -150,6 +150,7 @@ static void min_cb_nz_tl_init(TabList *l, VVCFrameContext *fc) · 149 unmodified lines
150 TL_ADD(cb_height[i], pic_size_in_min_cb);150 TL_ADD(cb_height[i], pic_size_in_min_cb);
151 TL_ADD(cp_mv[i], pic_size_in_min_cb * MAX_CONTROL_POINTS);151 TL_ADD(cp_mv[i], pic_size_in_min_cb * MAX_CONTROL_POINTS);
152 TL_ADD(cpm[i], pic_size_in_min_cb);152 TL_ADD(cpm[i], pic_size_in_min_cb);
153 TL_ADD(pcmf[i], pic_size_in_min_cb);
153 }154 }
154 // For luma, qp can only change at the CU level, so the qp tab size is related to the CU.155 // For luma, qp can only change at the CU level, so the qp tab size is related to the CU.
155 TL_ADD(qp[LUMA], pic_size_in_min_cb);156 TL_ADD(qp[LUMA], pic_size_in_min_cb);
@@ -189,9 +190,6 @@ static void min_tu_tl_init(TabList *l, VVCFrameContext *fc) · 33 unmodified lines
189 190
190 TL_ADD(tu_joint_cbcr_residual_flag, pic_size_in_min_tu);191 TL_ADD(tu_joint_cbcr_residual_flag, pic_size_in_min_tu);
191 192
192 for (int i = LUMA; i <= CHROMA; i++)
193 TL_ADD(pcmf[i], pic_size_in_min_tu);
194
195 for (int i = 0; i < VVC_MAX_SAMPLE_ARRAYS; i++) {193 for (int i = 0; i < VVC_MAX_SAMPLE_ARRAYS; i++) {
196 TL_ADD(tu_coded_flag[i], pic_size_in_min_tu);194 TL_ADD(tu_coded_flag[i], pic_size_in_min_tu);
197 195
libavcodec/vvc/filter.c+1−1
@@ -543,9 +543,9 @@ static av_always_inline int deblock_bs(const VVCLocalContext *lc, · 542 unmodified lines
543 const uint8_t chroma = !!c_idx;543 const uint8_t chroma = !!c_idx;
544 const int tu_p = (y_p >> log2_min_tu_size) * min_tu_width + (x_p >> log2_min_tu_size);544 const int tu_p = (y_p >> log2_min_tu_size) * min_tu_width + (x_p >> log2_min_tu_size);
545 const int tu_q = (y_q >> log2_min_tu_size) * min_tu_width + (x_q >> log2_min_tu_size);545 const int tu_q = (y_q >> log2_min_tu_size) * min_tu_width + (x_q >> log2_min_tu_size);
546 const uint8_t pcmf = fc->tab.pcmf[chroma][tu_p] && fc->tab.pcmf[chroma][tu_q];
547 const int cb_p = (y_p >> log2_min_cb_size) * min_cb_width + (x_p >> log2_min_cb_size);546 const int cb_p = (y_p >> log2_min_cb_size) * min_cb_width + (x_p >> log2_min_cb_size);
548 const int cb_q = (y_q >> log2_min_cb_size) * min_cb_width + (x_q >> log2_min_cb_size);547 const int cb_q = (y_q >> log2_min_cb_size) * min_cb_width + (x_q >> log2_min_cb_size);
548 const uint8_t pcmf = fc->tab.pcmf[chroma][cb_p] && fc->tab.pcmf[chroma][cb_q];
549 const uint8_t intra = fc->tab.cpm[chroma][cb_p] == MODE_INTRA || fc->tab.cpm[chroma][cb_q] == MODE_INTRA;549 const uint8_t intra = fc->tab.cpm[chroma][cb_p] == MODE_INTRA || fc->tab.cpm[chroma][cb_q] == MODE_INTRA;
550 const uint8_t same_mode = fc->tab.cpm[chroma][cb_p] == fc->tab.cpm[chroma][cb_q];550 const uint8_t same_mode = fc->tab.cpm[chroma][cb_p] == fc->tab.cpm[chroma][cb_q];
551 551

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t