History

avcodec/vvcdec: deblock_bs, fix intra check for IBC

An Intra Block Copy clip may use different modes for luma and chroma. For example, MODE_IBC for luma and MODE_INTRA for chroma. We have to check luma and chroma CuPredMode (cpm) separately.

Nuo Mi committed 2 years ago

Commit dd3650c1 parent 37ebebd1 file · +6 −1Browse files

Unified · Split

libavcodec/vvc/vvc_filter.c+6−1
@@ -482,8 +482,10 @@ static av_always_inline int deblock_bs(const VVCLocalContext *lc, · 481 unmodified lines
482 const MvField *tab_mvf = fc->tab.mvf;482 const MvField *tab_mvf = fc->tab.mvf;
483 const int log2_min_pu_size = MIN_PU_LOG2;483 const int log2_min_pu_size = MIN_PU_LOG2;
484 const int log2_min_tu_size = MIN_TU_LOG2;484 const int log2_min_tu_size = MIN_TU_LOG2;
485 const int log2_min_cb_size = fc->ps.sps->min_cb_log2_size_y;
485 const int min_pu_width = fc->ps.pps->min_pu_width;486 const int min_pu_width = fc->ps.pps->min_pu_width;
486 const int min_tu_width = fc->ps.pps->min_tu_width;487 const int min_tu_width = fc->ps.pps->min_tu_width;
488 const int min_cb_width = fc->ps.pps->min_cb_width;
487 const int pu_p = (y_p >> log2_min_pu_size) * min_pu_width + (x_p >> log2_min_pu_size);489 const int pu_p = (y_p >> log2_min_pu_size) * min_pu_width + (x_p >> log2_min_pu_size);
488 const int pu_q = (y_q >> log2_min_pu_size) * min_pu_width + (x_q >> log2_min_pu_size);490 const int pu_q = (y_q >> log2_min_pu_size) * min_pu_width + (x_q >> log2_min_pu_size);
489 const MvField *mvf_p = &tab_mvf[pu_p];491 const MvField *mvf_p = &tab_mvf[pu_p];
@@ -492,11 +494,14 @@ static av_always_inline int deblock_bs(const VVCLocalContext *lc, · 2 unmodified lines
492 const int tu_p = (y_p >> log2_min_tu_size) * min_tu_width + (x_p >> log2_min_tu_size);494 const int tu_p = (y_p >> log2_min_tu_size) * min_tu_width + (x_p >> log2_min_tu_size);
493 const int tu_q = (y_q >> log2_min_tu_size) * min_tu_width + (x_q >> log2_min_tu_size);495 const int tu_q = (y_q >> log2_min_tu_size) * min_tu_width + (x_q >> log2_min_tu_size);
494 const uint8_t pcmf = fc->tab.pcmf[chroma][tu_p] && fc->tab.pcmf[chroma][tu_q];496 const uint8_t pcmf = fc->tab.pcmf[chroma][tu_p] && fc->tab.pcmf[chroma][tu_q];
497 const int cb_p = (y_p >> log2_min_cb_size) * min_cb_width + (x_p >> log2_min_cb_size);
498 const int cb_q = (y_q >> log2_min_cb_size) * min_cb_width + (x_q >> log2_min_cb_size);
499 const uint8_t intra = fc->tab.cpm[chroma][cb_p] == MODE_INTRA || fc->tab.cpm[chroma][cb_q] == MODE_INTRA;
495 500
496 if (pcmf)501 if (pcmf)
497 return 0;502 return 0;
498 503
499 if (mvf_p->pred_flag == PF_INTRA || mvf_q->pred_flag == PF_INTRA || mvf_p->ciip_flag || mvf_q->ciip_flag)504 if (intra || mvf_p->ciip_flag || mvf_q->ciip_flag)
500 return 2;505 return 2;
501 506
502 if (chroma) {507 if (chroma) {

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