diff options
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_detokenize.c | 7 | ||||
| -rw-r--r-- | vp9/decoder/vp9_onyxd_int.h | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c index 1e3608fb2..5e5861aad 100644 --- a/vp9/decoder/vp9_detokenize.c +++ b/vp9/decoder/vp9_detokenize.c @@ -9,7 +9,6 @@ */ -#include "vp9/common/vp9_type_aliases.h" #include "vp9/common/vp9_blockd.h" #include "vp9/decoder/vp9_onyxd_int.h" #include "vpx_mem/vpx_mem.h" @@ -91,7 +90,7 @@ static int get_signed(BOOL_DECODER *br, int value_to_sign) { #define WRITE_COEF_CONTINUE(val, token) \ { \ - qcoeff_ptr[scan[c]] = (INT16) get_signed(br, val); \ + qcoeff_ptr[scan[c]] = (int16_t) get_signed(br, val); \ INCREMENT_COUNT(token); \ c++; \ continue; \ @@ -100,7 +99,7 @@ static int get_signed(BOOL_DECODER *br, int value_to_sign) { #define ADJUST_COEF(prob, bits_count) \ do { \ if (vp9_read(br, prob)) \ - val += (UINT16)(1 << bits_count);\ + val += (uint16_t)(1 << bits_count);\ } while (0); static int decode_coefs(VP9D_COMP *dx, const MACROBLOCKD *xd, @@ -108,7 +107,7 @@ static int decode_coefs(VP9D_COMP *dx, const MACROBLOCKD *xd, ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l, PLANE_TYPE type, TX_TYPE tx_type, - int seg_eob, INT16 *qcoeff_ptr, + int seg_eob, int16_t *qcoeff_ptr, const int *const scan, TX_SIZE txfm_size, const int *coef_bands) { FRAME_CONTEXT *const fc = &dx->common.fc; diff --git a/vp9/decoder/vp9_onyxd_int.h b/vp9/decoder/vp9_onyxd_int.h index 471442944..73229ed83 100644 --- a/vp9/decoder/vp9_onyxd_int.h +++ b/vp9/decoder/vp9_onyxd_int.h @@ -35,22 +35,22 @@ typedef struct { typedef struct { int const *scan; int const *scan_8x8; - UINT8 const *ptr_block2leftabove; + uint8_t const *ptr_block2leftabove; vp9_tree_index const *vp9_coef_tree_ptr; unsigned char *norm_ptr; - UINT8 *ptr_coef_bands_x; - UINT8 *ptr_coef_bands_x_8x8; + uint8_t *ptr_coef_bands_x; + uint8_t *ptr_coef_bands_x_8x8; ENTROPY_CONTEXT_PLANES *A; ENTROPY_CONTEXT_PLANES *L; - INT16 *qcoeff_start_ptr; + int16_t *qcoeff_start_ptr; vp9_prob const *coef_probs_4x4[BLOCK_TYPES_4X4]; vp9_prob const *coef_probs_8x8[BLOCK_TYPES_8X8]; vp9_prob const *coef_probs_16X16[BLOCK_TYPES_16X16]; - UINT8 eob[25]; + uint8_t eob[25]; } DETOK; |