| Index: source/libvpx/vp9/decoder/vp9_dequantize.h
|
| ===================================================================
|
| --- source/libvpx/vp9/decoder/vp9_dequantize.h (revision 177019)
|
| +++ source/libvpx/vp9/decoder/vp9_dequantize.h (working copy)
|
| @@ -14,90 +14,88 @@
|
| #include "vp9/common/vp9_blockd.h"
|
|
|
| #if CONFIG_LOSSLESS
|
| -extern void vp9_dequant_idct_add_lossless_c(short *input, const short *dq,
|
| +extern void vp9_dequant_idct_add_lossless_c(int16_t *input, const int16_t *dq,
|
| unsigned char *pred,
|
| unsigned char *output,
|
| int pitch, int stride);
|
| -extern void vp9_dequant_dc_idct_add_lossless_c(short *input, const short *dq,
|
| +extern void vp9_dequant_dc_idct_add_lossless_c(int16_t *input, const int16_t *dq,
|
| unsigned char *pred,
|
| unsigned char *output,
|
| int pitch, int stride, int dc);
|
| -extern void vp9_dequant_dc_idct_add_y_block_lossless_c(short *q,
|
| - const short *dq,
|
| +extern void vp9_dequant_dc_idct_add_y_block_lossless_c(int16_t *q,
|
| + const int16_t *dq,
|
| unsigned char *pre,
|
| unsigned char *dst,
|
| int stride,
|
| - unsigned short *eobs,
|
| - const short *dc);
|
| -extern void vp9_dequant_idct_add_y_block_lossless_c(short *q, const short *dq,
|
| + uint16_t *eobs,
|
| + const int16_t *dc);
|
| +extern void vp9_dequant_idct_add_y_block_lossless_c(int16_t *q, const int16_t *dq,
|
| unsigned char *pre,
|
| unsigned char *dst,
|
| int stride,
|
| - unsigned short *eobs);
|
| -extern void vp9_dequant_idct_add_uv_block_lossless_c(short *q, const short *dq,
|
| + uint16_t *eobs);
|
| +extern void vp9_dequant_idct_add_uv_block_lossless_c(int16_t *q, const int16_t *dq,
|
| unsigned char *pre,
|
| unsigned char *dst_u,
|
| unsigned char *dst_v,
|
| int stride,
|
| - unsigned short *eobs);
|
| + uint16_t *eobs);
|
| #endif
|
|
|
| -typedef void (*vp9_dequant_idct_add_fn_t)(short *input, const short *dq,
|
| +typedef void (*vp9_dequant_idct_add_fn_t)(int16_t *input, const int16_t *dq,
|
| unsigned char *pred, unsigned char *output, int pitch, int stride);
|
| -typedef void(*vp9_dequant_dc_idct_add_fn_t)(short *input, const short *dq,
|
| +typedef void(*vp9_dequant_dc_idct_add_fn_t)(int16_t *input, const int16_t *dq,
|
| unsigned char *pred, unsigned char *output, int pitch, int stride, int dc);
|
|
|
| -typedef void(*vp9_dequant_dc_idct_add_y_block_fn_t)(short *q, const short *dq,
|
| - unsigned char *pre, unsigned char *dst, int stride, unsigned short *eobs,
|
| - const short *dc);
|
| -typedef void(*vp9_dequant_idct_add_y_block_fn_t)(short *q, const short *dq,
|
| - unsigned char *pre, unsigned char *dst, int stride, unsigned short *eobs);
|
| -typedef void(*vp9_dequant_idct_add_uv_block_fn_t)(short *q, const short *dq,
|
| +typedef void(*vp9_dequant_dc_idct_add_y_block_fn_t)(int16_t *q, const int16_t *dq,
|
| + unsigned char *pre, unsigned char *dst, int stride, uint16_t *eobs,
|
| + const int16_t *dc);
|
| +typedef void(*vp9_dequant_idct_add_y_block_fn_t)(int16_t *q, const int16_t *dq,
|
| + unsigned char *pre, unsigned char *dst, int stride, uint16_t *eobs);
|
| +typedef void(*vp9_dequant_idct_add_uv_block_fn_t)(int16_t *q, const int16_t *dq,
|
| unsigned char *pre, unsigned char *dst_u, unsigned char *dst_v, int stride,
|
| - unsigned short *eobs);
|
| + uint16_t *eobs);
|
|
|
| -void vp9_ht_dequant_idct_add_c(TX_TYPE tx_type, short *input, const short *dq,
|
| +void vp9_ht_dequant_idct_add_c(TX_TYPE tx_type, int16_t *input, const int16_t *dq,
|
| unsigned char *pred, unsigned char *dest,
|
| int pitch, int stride, uint16_t eobs);
|
|
|
| -void vp9_ht_dequant_idct_add_8x8_c(TX_TYPE tx_type, short *input,
|
| - const short *dq, unsigned char *pred,
|
| +void vp9_ht_dequant_idct_add_8x8_c(TX_TYPE tx_type, int16_t *input,
|
| + const int16_t *dq, unsigned char *pred,
|
| unsigned char *dest, int pitch, int stride,
|
| uint16_t eobs);
|
|
|
| -void vp9_ht_dequant_idct_add_16x16_c(TX_TYPE tx_type, short *input,
|
| - const short *dq, unsigned char *pred,
|
| +void vp9_ht_dequant_idct_add_16x16_c(TX_TYPE tx_type, int16_t *input,
|
| + const int16_t *dq, unsigned char *pred,
|
| unsigned char *dest,
|
| int pitch, int stride, uint16_t eobs);
|
|
|
| -#if CONFIG_SUPERBLOCKS
|
| -void vp9_dequant_dc_idct_add_y_block_8x8_inplace_c(short *q, const short *dq,
|
| +void vp9_dequant_dc_idct_add_y_block_8x8_inplace_c(int16_t *q, const int16_t *dq,
|
| unsigned char *dst,
|
| int stride,
|
| - unsigned short *eobs,
|
| - const short *dc,
|
| + uint16_t *eobs,
|
| + const int16_t *dc,
|
| MACROBLOCKD *xd);
|
|
|
| -void vp9_dequant_dc_idct_add_y_block_4x4_inplace_c(short *q, const short *dq,
|
| +void vp9_dequant_dc_idct_add_y_block_4x4_inplace_c(int16_t *q, const int16_t *dq,
|
| unsigned char *dst,
|
| int stride,
|
| - unsigned short *eobs,
|
| - const short *dc,
|
| + uint16_t *eobs,
|
| + const int16_t *dc,
|
| MACROBLOCKD *xd);
|
|
|
| -void vp9_dequant_idct_add_uv_block_8x8_inplace_c(short *q, const short *dq,
|
| +void vp9_dequant_idct_add_uv_block_8x8_inplace_c(int16_t *q, const int16_t *dq,
|
| unsigned char *dstu,
|
| unsigned char *dstv,
|
| int stride,
|
| - unsigned short *eobs,
|
| + uint16_t *eobs,
|
| MACROBLOCKD *xd);
|
|
|
| -void vp9_dequant_idct_add_uv_block_4x4_inplace_c(short *q, const short *dq,
|
| +void vp9_dequant_idct_add_uv_block_4x4_inplace_c(int16_t *q, const int16_t *dq,
|
| unsigned char *dstu,
|
| unsigned char *dstv,
|
| int stride,
|
| - unsigned short *eobs,
|
| + uint16_t *eobs,
|
| MACROBLOCKD *xd);
|
| -#endif
|
|
|
| #endif
|
|
|