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

Add part mode bitcost when using SMP/AMP blocks

Browse source
This commit is contained in:
Arttu Ylä-Outinen 2018-01-12 12:22:00 +02:00
parent fc43643ba5
commit 89a930d6dd
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/search.c
View file

@ -463,7 +463,6 @@ static double search_cu(encoder_state_t * const state, int x, int y, int depth,
mp_modes[i],
&work_tree[depth + 1],
&mode_cost, &mode_bitcost);
// TODO: take cost of coding part mode into account
if (mode_cost < cost) {
cost = mode_cost;
inter_bitcost = mode_bitcost;

15
src/search_inter.c
View file

@ -1696,4 +1696,19 @@ void kvz_search_cu_smp(encoder_state_t * const state,
}
}
}
// Count bits spent for coding the partition mode.
int smp_extra_bits = 1; // horizontal or vertical
if (state->encoder_control->cfg.amp_enable) {
smp_extra_bits += 1; // symmetric or asymmetric
if (part_mode != SIZE_2NxN && part_mode != SIZE_Nx2N) {
smp_extra_bits += 1; // U,L or D,R
}
}
// The transform is split for SMP and AMP blocks so we need more bits for
// coding the CBF.
smp_extra_bits += 6;
*inter_cost += state->lambda_sqrt * smp_extra_bits;
*inter_bitcost += smp_extra_bits;
}