hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-30 12:44:07 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Fix incorrect precedence.

Browse source 
- This bug was due to incorrect translation of ternary to if-expression
  during refactoring. Addition has higher precedence than bit shift.
This commit is contained in:
Ari Koivula 2013-09-19 13:10:32 +03:00
parent 33df8e3db5
commit d6932128aa
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/context.c
View file

@ -55,10 +55,9 @@ void ctx_init(cabac_ctx *ctx, uint32_t qp, uint32_t init_value)
int slope = (init_value >> 4) * 5 - 45; int slope = (init_value >> 4) * 5 - 45;
int offset = ((init_value & 15) << 3) - 16; int offset = ((init_value & 15) << 3) - 16;
int init_state = MIN(MAX(1, ((slope * (int)qp) >> 4) + offset), 126); int init_state = MIN(MAX(1, ((slope * (int)qp) >> 4) + offset), 126);
uint8_t mp_state = (init_state >= 64) ? 1 : 0;
if (mp_state) { if (init_state >= 64) {
ctx->uc_state = (init_state - 64) << 1 + mp_state; ctx->uc_state = ((init_state - 64) << 1) + 1;
} else { } else {
ctx->uc_state = (63 - init_state) << 1; ctx->uc_state = (63 - init_state) << 1;
} }