Index: source/libvpx/vp9/decoder/vp9_idct_blk.c |
=================================================================== |
--- source/libvpx/vp9/decoder/vp9_idct_blk.c (revision 177019) |
+++ source/libvpx/vp9/decoder/vp9_idct_blk.c (working copy) |
@@ -14,11 +14,11 @@ |
#include "vp9/decoder/vp9_dequantize.h" |
#endif |
-void vp9_dequant_dc_idct_add_y_block_c(short *q, const short *dq, |
- unsigned char *pre, |
- unsigned char *dst, |
- int stride, unsigned short *eobs, |
- const short *dc) { |
+void vp9_dequant_dc_idct_add_y_block_c(int16_t *q, const int16_t *dq, |
+ uint8_t *pre, |
+ uint8_t *dst, |
+ int stride, uint16_t *eobs, |
+ const int16_t *dc) { |
int i, j; |
for (i = 0; i < 4; i++) { |
@@ -39,12 +39,12 @@ |
} |
} |
-#if CONFIG_SUPERBLOCKS |
-void vp9_dequant_dc_idct_add_y_block_4x4_inplace_c(short *q, const short *dq, |
- unsigned char *dst, |
+void vp9_dequant_dc_idct_add_y_block_4x4_inplace_c(int16_t *q, |
+ const int16_t *dq, |
+ uint8_t *dst, |
int stride, |
- unsigned short *eobs, |
- const short *dc, |
+ uint16_t *eobs, |
+ const int16_t *dc, |
MACROBLOCKD *xd) { |
int i, j; |
@@ -63,12 +63,11 @@ |
dst += 4 * stride - 16; |
} |
} |
-#endif |
-void vp9_dequant_idct_add_y_block_c(short *q, const short *dq, |
- unsigned char *pre, |
- unsigned char *dst, |
- int stride, unsigned short *eobs) { |
+void vp9_dequant_idct_add_y_block_c(int16_t *q, const int16_t *dq, |
+ uint8_t *pre, |
+ uint8_t *dst, |
+ int stride, uint16_t *eobs) { |
int i, j; |
for (i = 0; i < 4; i++) { |
@@ -90,10 +89,10 @@ |
} |
} |
-void vp9_dequant_idct_add_uv_block_c(short *q, const short *dq, |
- unsigned char *pre, unsigned char *dstu, |
- unsigned char *dstv, int stride, |
- unsigned short *eobs) { |
+void vp9_dequant_idct_add_uv_block_c(int16_t *q, const int16_t *dq, |
+ uint8_t *pre, uint8_t *dstu, |
+ uint8_t *dstv, int stride, |
+ uint16_t *eobs) { |
int i, j; |
for (i = 0; i < 2; i++) { |
@@ -133,12 +132,11 @@ |
} |
} |
-#if CONFIG_SUPERBLOCKS |
-void vp9_dequant_idct_add_uv_block_4x4_inplace_c(short *q, const short *dq, |
- unsigned char *dstu, |
- unsigned char *dstv, |
+void vp9_dequant_idct_add_uv_block_4x4_inplace_c(int16_t *q, const int16_t *dq, |
+ uint8_t *dstu, |
+ uint8_t *dstv, |
int stride, |
- unsigned short *eobs, |
+ uint16_t *eobs, |
MACROBLOCKD *xd) { |
int i, j; |
@@ -174,13 +172,12 @@ |
dstv += 4 * stride - 8; |
} |
} |
-#endif |
-void vp9_dequant_dc_idct_add_y_block_8x8_c(short *q, const short *dq, |
- unsigned char *pre, |
- unsigned char *dst, |
- int stride, unsigned short *eobs, |
- const short *dc, |
+void vp9_dequant_dc_idct_add_y_block_8x8_c(int16_t *q, const int16_t *dq, |
+ uint8_t *pre, |
+ uint8_t *dst, |
+ int stride, uint16_t *eobs, |
+ const int16_t *dc, |
MACROBLOCKD *xd) { |
q[0] = dc[0]; |
vp9_dequant_idct_add_8x8_c(q, dq, pre, dst, 16, stride, 1, xd->eobs[0]); |
@@ -199,12 +196,12 @@ |
xd->eobs[12]); |
} |
-#if CONFIG_SUPERBLOCKS |
-void vp9_dequant_dc_idct_add_y_block_8x8_inplace_c(short *q, const short *dq, |
- unsigned char *dst, |
+void vp9_dequant_dc_idct_add_y_block_8x8_inplace_c(int16_t *q, |
+ const int16_t *dq, |
+ uint8_t *dst, |
int stride, |
- unsigned short *eobs, |
- const short *dc, |
+ uint16_t *eobs, |
+ const int16_t *dc, |
MACROBLOCKD *xd) { |
q[0] = dc[0]; |
vp9_dequant_idct_add_8x8_c(q, dq, dst, dst, stride, stride, 1, xd->eobs[0]); |
@@ -223,15 +220,14 @@ |
dst + 8 * stride + 8, stride, stride, 1, |
xd->eobs[12]); |
} |
-#endif |
-void vp9_dequant_idct_add_y_block_8x8_c(short *q, const short *dq, |
- unsigned char *pre, |
- unsigned char *dst, |
- int stride, unsigned short *eobs, |
+void vp9_dequant_idct_add_y_block_8x8_c(int16_t *q, const int16_t *dq, |
+ uint8_t *pre, |
+ uint8_t *dst, |
+ int stride, uint16_t *eobs, |
MACROBLOCKD *xd) { |
- unsigned char *origdest = dst; |
- unsigned char *origpred = pre; |
+ uint8_t *origdest = dst; |
+ uint8_t *origpred = pre; |
vp9_dequant_idct_add_8x8_c(q, dq, pre, dst, 16, stride, 0, xd->eobs[0]); |
vp9_dequant_idct_add_8x8_c(&q[64], dq, origpred + 8, |
@@ -243,11 +239,11 @@ |
xd->eobs[12]); |
} |
-void vp9_dequant_idct_add_uv_block_8x8_c(short *q, const short *dq, |
- unsigned char *pre, |
- unsigned char *dstu, |
- unsigned char *dstv, |
- int stride, unsigned short *eobs, |
+void vp9_dequant_idct_add_uv_block_8x8_c(int16_t *q, const int16_t *dq, |
+ uint8_t *pre, |
+ uint8_t *dstu, |
+ uint8_t *dstv, |
+ int stride, uint16_t *eobs, |
MACROBLOCKD *xd) { |
vp9_dequant_idct_add_8x8_c(q, dq, pre, dstu, 8, stride, 0, xd->eobs[16]); |
@@ -257,12 +253,11 @@ |
vp9_dequant_idct_add_8x8_c(q, dq, pre, dstv, 8, stride, 0, xd->eobs[20]); |
} |
-#if CONFIG_SUPERBLOCKS |
-void vp9_dequant_idct_add_uv_block_8x8_inplace_c(short *q, const short *dq, |
- unsigned char *dstu, |
- unsigned char *dstv, |
+void vp9_dequant_idct_add_uv_block_8x8_inplace_c(int16_t *q, const int16_t *dq, |
+ uint8_t *dstu, |
+ uint8_t *dstv, |
int stride, |
- unsigned short *eobs, |
+ uint16_t *eobs, |
MACROBLOCKD *xd) { |
vp9_dequant_idct_add_8x8_c(q, dq, dstu, dstu, stride, stride, 0, |
xd->eobs[16]); |
@@ -271,15 +266,14 @@ |
vp9_dequant_idct_add_8x8_c(q, dq, dstv, dstv, stride, stride, 0, |
xd->eobs[20]); |
} |
-#endif |
#if CONFIG_LOSSLESS |
-void vp9_dequant_dc_idct_add_y_block_lossless_c(short *q, const short *dq, |
- unsigned char *pre, |
- unsigned char *dst, |
+void vp9_dequant_dc_idct_add_y_block_lossless_c(int16_t *q, const int16_t *dq, |
+ uint8_t *pre, |
+ uint8_t *dst, |
int stride, |
- unsigned short *eobs, |
- const short *dc) { |
+ uint16_t *eobs, |
+ const int16_t *dc) { |
int i, j; |
for (i = 0; i < 4; i++) { |
@@ -300,10 +294,10 @@ |
} |
} |
-void vp9_dequant_idct_add_y_block_lossless_c(short *q, const short *dq, |
- unsigned char *pre, |
- unsigned char *dst, |
- int stride, unsigned short *eobs) { |
+void vp9_dequant_idct_add_y_block_lossless_c(int16_t *q, const int16_t *dq, |
+ uint8_t *pre, |
+ uint8_t *dst, |
+ int stride, uint16_t *eobs) { |
int i, j; |
for (i = 0; i < 4; i++) { |
@@ -325,12 +319,12 @@ |
} |
} |
-void vp9_dequant_idct_add_uv_block_lossless_c(short *q, const short *dq, |
- unsigned char *pre, |
- unsigned char *dstu, |
- unsigned char *dstv, |
+void vp9_dequant_idct_add_uv_block_lossless_c(int16_t *q, const int16_t *dq, |
+ uint8_t *pre, |
+ uint8_t *dstu, |
+ uint8_t *dstv, |
int stride, |
- unsigned short *eobs) { |
+ uint16_t *eobs) { |
int i, j; |
for (i = 0; i < 2; i++) { |