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

[isp] Fix search. Best LFNST and MTS modes were not selected correctly for ISP modes.

Browse source
This commit is contained in:
siivonek 2022-09-27 14:10:03 +03:00 committed by Marko Viitanen
parent b4cc321349
commit 3c861e4c02
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/search_intra.c
View file

@ -1392,7 +1392,12 @@ static int8_t search_intra_rdo(
int8_t best_isp_mode = -1; int8_t best_isp_mode = -1;
int max_isp_modes = can_do_isp_search && uvg_can_use_isp(width, height) && state->encoder_control->cfg.isp ? NUM_ISP_MODES : 1; int max_isp_modes = can_do_isp_search && uvg_can_use_isp(width, height) && state->encoder_control->cfg.isp ? NUM_ISP_MODES : 1;
//
int best_mts_mode_for_isp[NUM_ISP_MODES] = {0};
int best_lfnst_mode_for_isp[NUM_ISP_MODES] = {0};
for (int isp_mode = 0; isp_mode < max_isp_modes; ++isp_mode) { for (int isp_mode = 0; isp_mode < max_isp_modes; ++isp_mode) {
search_data[mode].pred_cu.intra.isp_mode = isp_mode; search_data[mode].pred_cu.intra.isp_mode = isp_mode;
double rdo_bitcost = uvg_luma_mode_bits(state, &search_data[mode].pred_cu, x_px, y_px, depth, lcu); double rdo_bitcost = uvg_luma_mode_bits(state, &search_data[mode].pred_cu, x_px, y_px, depth, lcu);
search_data[mode].pred_cu.tr_idx = MTS_TR_NUM; search_data[mode].pred_cu.tr_idx = MTS_TR_NUM;
@ -1400,6 +1405,8 @@ static int8_t search_intra_rdo(
search_data[mode].cost = rdo_bitcost * state->lambda; search_data[mode].cost = rdo_bitcost * state->lambda;
double mode_cost = search_intra_trdepth(state, x_px, y_px, depth, tr_depth, MAX_INT, &search_data[mode], lcu, tree_type); double mode_cost = search_intra_trdepth(state, x_px, y_px, depth, tr_depth, MAX_INT, &search_data[mode], lcu, tree_type);
best_mts_mode_for_isp[isp_mode] = search_data[mode].pred_cu.tr_idx;
best_lfnst_mode_for_isp[isp_mode] = search_data[mode].pred_cu.lfnst_idx;
search_data[mode].cost += mode_cost; search_data[mode].cost += mode_cost;
if (search_data[mode].cost < best_isp_cost) { if (search_data[mode].cost < best_isp_cost) {
best_isp_cost = search_data[mode].cost; best_isp_cost = search_data[mode].cost;
@ -1414,6 +1421,8 @@ static int8_t search_intra_rdo(
search_data[mode].cost = best_isp_cost; search_data[mode].cost = best_isp_cost;
search_data[mode].bits = best_bits; search_data[mode].bits = best_bits;
search_data[mode].pred_cu.intra.isp_mode = best_isp_mode; search_data[mode].pred_cu.intra.isp_mode = best_isp_mode;
search_data[mode].pred_cu.tr_idx = best_mts_mode_for_isp[best_isp_mode];
search_data[mode].pred_cu.lfnst_idx = best_lfnst_mode_for_isp[best_isp_mode];
} }
// Update order according to new costs // Update order according to new costs