hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 11:24:05 +00:00
Code Issues Actions Projects Releases Wiki Activity

[cclm] fix cclm for 4x4

Browse source
This commit is contained in:
Joose Sainio 2022-06-28 12:07:07 +03:00
parent b8b603feb7
commit 2fbbae834b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/search.c
View file

@ -929,7 +929,7 @@ static double search_cu(
double intra_cost = intra_search.cost; double intra_cost = intra_search.cost;
if (intra_cost < cost && tree_type != UVG_LUMA_T) { if (intra_cost < cost && tree_type != UVG_LUMA_T) {
int8_t intra_mode = intra_search.pred_cu.intra.mode; int8_t intra_mode = intra_search.pred_cu.intra.mode;
if(state->encoder_control->cfg.cclm && tree_type == UVG_BOTH_T) { if (state->encoder_control->cfg.cclm && tree_type == UVG_BOTH_T) {
intra_search.pred_cu.intra.mode_chroma = -1; intra_search.pred_cu.intra.mode_chroma = -1;
uvg_intra_recon_cu(state, uvg_intra_recon_cu(state,
x, y, x, y,
@ -941,10 +941,10 @@ static double search_cu(
state, x, y, cu_width / 2, cu_width / 2, lcu->rec.y, lcu->left_ref.y[64] state, x, y, cu_width / 2, cu_width / 2, lcu->rec.y, lcu->left_ref.y[64]
); );
} }
intra_search.pred_cu.joint_cb_cr = 0;
// TODO: This heavily relies to square CUs // TODO: This heavily relies to square CUs
if ((depth != 4 || (x % 8 && y % 8)) && state->encoder_control->chroma_format != UVG_CSP_400 && tree_type != UVG_LUMA_T) { if ((depth != 4 || (x % 8 && y % 8)) && state->encoder_control->chroma_format != UVG_CSP_400 && tree_type != UVG_LUMA_T) {
intra_search.pred_cu.joint_cb_cr = 0;
// There is almost no benefit to doing the chroma mode search for // There is almost no benefit to doing the chroma mode search for
// rd2. Possibly because the luma mode search already takes chroma // rd2. Possibly because the luma mode search already takes chroma
// into account, so there is less of a chanse of luma mode being // into account, so there is less of a chanse of luma mode being
@ -985,6 +985,9 @@ static double search_cu(
intra_search.pred_cu.violates_lfnst_constrained_chroma = false; intra_search.pred_cu.violates_lfnst_constrained_chroma = false;
intra_search.pred_cu.lfnst_last_scan_pos = false; intra_search.pred_cu.lfnst_last_scan_pos = false;
} }
else {
intra_search.pred_cu.intra.mode_chroma = intra_mode;
}
intra_search.pred_cu.intra.mode = intra_mode; intra_search.pred_cu.intra.mode = intra_mode;
} }