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

[rdoq] implement kvz_get_ic_rate correct bit values

Browse source
This commit is contained in:
Marko Viitanen 2021-02-26 13:27:40 +02:00
parent 3c75500cd4
commit d6379c02e0
1 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/rdo.c
View file

@ -330,43 +330,33 @@ INLINE int32_t kvz_get_ic_rate(encoder_state_t * const state,
}
rate += (COEF_REMAIN_BIN_REDUCTION+length+1-abs_go_rice+length) * (1 << CTX_FRAC_BITS);
}
//ToDo: fix for VVC
/*
rate += CTX_ENTROPY_BITS(&base_one_ctx[ctx_num_one],0);
iRate += fracBitsPar.intBits[(uiAbsLevel - 1) & 1];
iRate += fracBitsGt1.intBits[1];
iRate += fracBitsGt2.intBits[1];
*/
rate += CTX_ENTROPY_BITS(&base_par_ctx[ctx_num_par], (abs_level - 1) & 1);
rate += CTX_ENTROPY_BITS(&base_gt1_ctx[ctx_num_gt1], 1);
rate += CTX_ENTROPY_BITS(&base_gt2_ctx[ctx_num_gt2], 1);
}
else if (abs_level == 1)
{
/*
iRate += fracBitsPar.intBits[0];
iRate += fracBitsGt1.intBits[0];
*/
rate += CTX_ENTROPY_BITS(&base_par_ctx[ctx_num_par], 0);
rate += CTX_ENTROPY_BITS(&base_gt1_ctx[ctx_num_gt1], 0);
}
else if (abs_level == 2)
{
/*
iRate += fracBitsPar.intBits[1];
iRate += fracBitsGt1.intBits[0];
*/
rate += CTX_ENTROPY_BITS(&base_par_ctx[ctx_num_par], 1);
rate += CTX_ENTROPY_BITS(&base_gt1_ctx[ctx_num_gt1], 0);
}
else if (abs_level == 3)
{
/*
iRate += fracBitsPar.intBits[0];
iRate += fracBitsGt1.intBits[1];
iRate += fracBitsGt2.intBits[0];
*/
rate += CTX_ENTROPY_BITS(&base_par_ctx[ctx_num_par], 0);
rate += CTX_ENTROPY_BITS(&base_gt1_ctx[ctx_num_gt1], 1);
rate += CTX_ENTROPY_BITS(&base_gt2_ctx[ctx_num_gt2], 0);
}
else if (abs_level == 4)
{
/*
iRate += fracBitsPar.intBits[1];
iRate += fracBitsGt1.intBits[1];
iRate += fracBitsGt2.intBits[0];
*/
rate += CTX_ENTROPY_BITS(&base_par_ctx[ctx_num_par], 1);
rate += CTX_ENTROPY_BITS(&base_gt1_ctx[ctx_num_gt1], 1);
rate += CTX_ENTROPY_BITS(&base_gt2_ctx[ctx_num_gt2], 0);
}
return rate;