diff options
Diffstat (limited to 'third_party/aom/aom_dsp/entcode.h')
| -rw-r--r-- | third_party/aom/aom_dsp/entcode.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/third_party/aom/aom_dsp/entcode.h b/third_party/aom/aom_dsp/entcode.h index 981a951e6..5c15526e9 100644 --- a/third_party/aom/aom_dsp/entcode.h +++ b/third_party/aom/aom_dsp/entcode.h @@ -9,11 +9,16 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#if !defined(_entcode_H) -#define _entcode_H (1) +#ifndef AOM_DSP_ENTCODE_H_ +#define AOM_DSP_ENTCODE_H_ + #include <limits.h> #include <stddef.h> #include "av1/common/odintrin.h" +#include "aom_dsp/prob.h" + +#define EC_PROB_SHIFT 6 +#define EC_MIN_PROB 4 // must be <= (1<<EC_PROB_SHIFT)/16 /*OPT: od_ec_window must be at least 32 bits, but if you have fast arithmetic on a larger type, you can speed up the decoder by using it here.*/ @@ -21,22 +26,15 @@ typedef uint32_t od_ec_window; #define OD_EC_WINDOW_SIZE ((int)sizeof(od_ec_window) * CHAR_BIT) -/*The number of bits to use for the range-coded part of unsigned integers.*/ -#define OD_EC_UINT_BITS (4) - /*The resolution of fractional-precision bit usage measurements, i.e., 3 => 1/8th bits.*/ #define OD_BITRES (3) -/*The value stored in an iCDF is 32768 minus the actual Q15 cumulative - probability (an "inverse" CDF). - This function converts from one representation to the other (and is its own - inverse).*/ -#define OD_ICDF(x) (32768U - (x)) +#define OD_ICDF AOM_ICDF /*See entcode.c for further documentation.*/ OD_WARN_UNUSED_RESULT uint32_t od_ec_tell_frac(uint32_t nbits_total, uint32_t rng); -#endif +#endif // AOM_DSP_ENTCODE_H_ |