hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-12-18 03:04:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix MTS and actually select the best intra mode for rd < 2

Browse source
This commit is contained in:
Joose Sainio 2022-04-14 09:49:18 +03:00
parent 901d60b8e7
commit 24faf0024d
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_intra.c
View file

@ -346,7 +346,6 @@ static double search_intra_trdepth(
derive_mts_constraints(pred_cu, lcu, depth, lcu_px); derive_mts_constraints(pred_cu, lcu, depth, lcu_px);
if (pred_cu->violates_mts_coeff_constraint || !pred_cu->mts_last_scan_pos) if (pred_cu->violates_mts_coeff_constraint || !pred_cu->mts_last_scan_pos)
{ {
assert(pred_cu->tr_idx == MTS_TR_NUM); //mts mode should not be decided and then not allowed to be used. (might be some exception here)
continue; continue;
} }
} }
@ -1195,8 +1194,12 @@ void kvz_search_cu_intra(
number_of_modes_to_search, number_of_modes_to_search,
search_data, search_data,
lcu); lcu);
// Reset these
search_data[0].pred_cu.violates_mts_coeff_constraint = false;
search_data[0].pred_cu.mts_last_scan_pos = false;
}
else {
sort_modes(search_data, number_of_modes);
} }
*mode_out = search_data[0]; *mode_out = search_data[0];
} }