return ff_se_golomb_vlc_code[buf];
} else {
- int log = av_log2(buf);
+ int log = av_log2(buf), sign;
LAST_SKIP_BITS(re, gb, 31 - log);
UPDATE_CACHE(re, gb);
buf = GET_CACHE(re, gb);
LAST_SKIP_BITS(re, gb, 32 - log);
CLOSE_READER(re, gb);
- if (buf & 1)
- buf = -(buf >> 1);
- else
- buf = (buf >> 1);
+ sign = -(buf & 1);
+ buf = ((buf >> 1) ^ sign) - sign;
return buf;
}
static inline int get_se_golomb_long(GetBitContext *gb)
{
unsigned int buf = get_ue_golomb_long(gb);
+ int sign;
- if (buf & 1)
- buf = (buf + 1) >> 1;
- else
- buf = -(buf >> 1);
-
- return buf;
+ sign = (buf & 1) - 1;
+ return ((buf >> 1) ^ sign) + 1;
}
static inline int svq3_get_se_golomb(GetBitContext *gb)
uint32_t ret = svq3_get_ue_golomb(gb);
if (ret) {
- uint32_t buf;
- OPEN_READER(re, gb);
- UPDATE_CACHE(re, gb);
- buf = SHOW_SBITS(re, gb, 1);
- LAST_SKIP_BITS(re, gb, 1);
- ret = (ret ^ buf) - buf;
- CLOSE_READER(re, gb);
+ int sign;
+ sign = -get_bits1(gb);
+ ret = (ret ^ sign) - sign;
}
return ret;
int esc_len)
{
int v = get_ur_golomb(gb, k, limit, esc_len);
+ int sign;
v++;
- if (v & 1)
- return v >> 1;
- else
- return -(v >> 1);
-
-// return (v>>1) ^ -(v&1);
+ sign = (v & 1) - 1;
+ return ((v >> 1) ^ sign) - sign;
}
/**
static inline int get_sr_golomb_shorten(GetBitContext *gb, int k)
{
int uvar = get_ur_golomb_jpegls(gb, k + 1, INT_MAX, 0);
- if (uvar & 1)
- return ~(uvar >> 1);
- else
- return uvar >> 1;
+ return (uvar >> 1) ^ -(uvar & 1);
}
#ifdef TRACE