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

[intrapred] Change kvz_luma_mode_bits to make it return more correct costs

Browse source
This commit is contained in:
Marko Viitanen 2021-06-14 12:20:31 +03:00
parent 403531554e
commit b22fd61c7f
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/search_intra.c
View file

@ -771,20 +771,23 @@ double kvz_luma_mode_bits(const encoder_state_t *state, int8_t luma_mode, const
{
double mode_bits;
bool mode_in_preds = false;
for (int i = 0; i < 3; ++i) {
int8_t mode_in_preds = -1;
for (int i = 0; i < INTRA_MPM_COUNT; ++i) {
if (luma_mode == intra_preds[i]) {
mode_in_preds = true;
mode_in_preds = i;
break;
}
}
const cabac_ctx_t *ctx = &(state->cabac.ctx.intra_luma_mpm_flag_model);
mode_bits = CTX_ENTROPY_FBITS(ctx, mode_in_preds);
mode_bits = CTX_ENTROPY_FBITS(ctx, mode_in_preds!=-1);
if (mode_in_preds) {
mode_bits += ((luma_mode == intra_preds[0]) ? 1 : 2);
if (mode_in_preds != -1) {
ctx = &(state->cabac.ctx.luma_planar_model[0]);
//mode_bits += CTX_ENTROPY_FBITS(ctx, mode_in_preds>0);
mode_bits += MIN(4.0,mode_in_preds);
} else {
mode_bits += 5;
mode_bits += 6.0;
}
return mode_bits;