diff options
Diffstat (limited to 'third_party/aom/aom_dsp/binary_codes_reader.h')
| -rw-r--r-- | third_party/aom/aom_dsp/binary_codes_reader.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/third_party/aom/aom_dsp/binary_codes_reader.h b/third_party/aom/aom_dsp/binary_codes_reader.h index 8885142c9..5253c6154 100644 --- a/third_party/aom/aom_dsp/binary_codes_reader.h +++ b/third_party/aom/aom_dsp/binary_codes_reader.h @@ -18,40 +18,30 @@ extern "C" { #include <assert.h> -#include "./aom_config.h" +#include "config/aom_config.h" + #include "aom/aom_integer.h" #include "aom_dsp/bitreader.h" #include "aom_dsp/bitreader_buffer.h" -#define aom_read_primitive_symmetric(r, n, ACCT_STR_NAME) \ - aom_read_primitive_symmetric_(r, n ACCT_STR_ARG(ACCT_STR_NAME)) #define aom_read_primitive_quniform(r, n, ACCT_STR_NAME) \ aom_read_primitive_quniform_(r, n ACCT_STR_ARG(ACCT_STR_NAME)) -#define aom_read_primitive_refbilevel(r, n, p, ref, ACCT_STR_NAME) \ - aom_read_primitive_refbilevel_(r, n, p, ref ACCT_STR_ARG(ACCT_STR_NAME)) #define aom_read_primitive_subexpfin(r, n, k, ACCT_STR_NAME) \ aom_read_primitive_subexpfin_(r, n, k ACCT_STR_ARG(ACCT_STR_NAME)) #define aom_read_primitive_refsubexpfin(r, n, k, ref, ACCT_STR_NAME) \ aom_read_primitive_refsubexpfin_(r, n, k, ref ACCT_STR_ARG(ACCT_STR_NAME)) -#define aom_read_signed_primitive_refsubexpfin(r, n, k, ref, ACCT_STR_NAME) \ - aom_read_signed_primitive_refsubexpfin_(r, n, k, \ - ref ACCT_STR_ARG(ACCT_STR_NAME)) -int16_t aom_read_primitive_symmetric_(aom_reader *r, - unsigned int mag_bits ACCT_STR_PARAM); uint16_t aom_read_primitive_quniform_(aom_reader *r, uint16_t n ACCT_STR_PARAM); -uint16_t aom_read_primitive_refbilevel_(aom_reader *r, uint16_t n, uint16_t p, - uint16_t ref ACCT_STR_PARAM); uint16_t aom_read_primitive_subexpfin_(aom_reader *r, uint16_t n, uint16_t k ACCT_STR_PARAM); uint16_t aom_read_primitive_refsubexpfin_(aom_reader *r, uint16_t n, uint16_t k, uint16_t ref ACCT_STR_PARAM); -int16_t aom_read_signed_primitive_refsubexpfin_(aom_reader *r, uint16_t n, - uint16_t k, - int16_t ref ACCT_STR_PARAM); int16_t aom_rb_read_signed_primitive_refsubexpfin( struct aom_read_bit_buffer *rb, uint16_t n, uint16_t k, int16_t ref); + +uint32_t aom_rb_read_uvlc(struct aom_read_bit_buffer *rb); + #ifdef __cplusplus } // extern "C" #endif |