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

Merge branch 'master' into rc-intra

Browse source
This commit is contained in:
Joose Sainio 2020-02-24 15:30:57 +02:00
parent 7deb22c8e8 1dfc69b42e
commit f81de41775
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/search_inter.c
View file

@ -1606,6 +1606,9 @@ static void search_pu_inter(encoder_state_t * const state,
mrg_costs[num_rdo_cands] = kvz_satd_any_size(width, height, mrg_costs[num_rdo_cands] = kvz_satd_any_size(width, height,
lcu->rec.y + y_local * LCU_WIDTH + x_local, LCU_WIDTH, lcu->rec.y + y_local * LCU_WIDTH + x_local, LCU_WIDTH,
lcu->ref.y + y_local * LCU_WIDTH + x_local, LCU_WIDTH); lcu->ref.y + y_local * LCU_WIDTH + x_local, LCU_WIDTH);
// Add cost of coding the merge index
mrg_costs[num_rdo_cands] += merge_idx * info.state->lambda_sqrt;
mrg_cands[num_rdo_cands] = merge_idx; mrg_cands[num_rdo_cands] = merge_idx;
num_rdo_cands++; num_rdo_cands++;
@ -1650,7 +1653,7 @@ static void search_pu_inter(encoder_state_t * const state,
cur_cu->merge_idx = merge_idx; cur_cu->merge_idx = merge_idx;
cur_cu->skipped = true; cur_cu->skipped = true;
*inter_cost = 0.0; // TODO: Check this *inter_cost = 0.0; // TODO: Check this
*inter_bitcost = 0; // TODO: Check this *inter_bitcost = merge_idx; // TODO: Check this
return; return;
} }
} }