diff options
Diffstat (limited to 'vp8/decoder/idct_blk.c')
| -rw-r--r-- | vp8/decoder/idct_blk.c | 367 |
1 files changed, 168 insertions, 199 deletions
diff --git a/vp8/decoder/idct_blk.c b/vp8/decoder/idct_blk.c index ee23130de..36eea5d6f 100644 --- a/vp8/decoder/idct_blk.c +++ b/vp8/decoder/idct_blk.c @@ -21,257 +21,226 @@ void vp8_dc_only_idct_add_c(short input_dc, unsigned char *pred_ptr, unsigned char *dst_ptr, int pitch, int stride); #if CONFIG_LOSSLESS void vp8_dequant_idct_add_lossless_c(short *input, short *dq, unsigned char *pred, - unsigned char *dest, int pitch, int stride); + unsigned char *dest, int pitch, int stride); void vp8_dc_only_idct_add_lossless_c(short input_dc, unsigned char *pred_ptr, - unsigned char *dst_ptr, int pitch, int stride); + unsigned char *dst_ptr, int pitch, int stride); #endif void vp8_dequant_dc_idct_add_y_block_c - (short *q, short *dq, unsigned char *pre, - unsigned char *dst, int stride, char *eobs, short *dc) -{ - int i, j; - - for (i = 0; i < 4; i++) - { - for (j = 0; j < 4; j++) - { - if (*eobs++ > 1) - vp8_dequant_dc_idct_add_c (q, dq, pre, dst, 16, stride, dc[0]); - else - vp8_dc_only_idct_add_c (dc[0], pre, dst, 16, stride); - - q += 16; - pre += 4; - dst += 4; - dc ++; - } - - pre += 64 - 16; - dst += 4*stride - 16; +(short *q, short *dq, unsigned char *pre, + unsigned char *dst, int stride, char *eobs, short *dc) { + int i, j; + + for (i = 0; i < 4; i++) { + for (j = 0; j < 4; j++) { + if (*eobs++ > 1) + vp8_dequant_dc_idct_add_c(q, dq, pre, dst, 16, stride, dc[0]); + else + vp8_dc_only_idct_add_c(dc[0], pre, dst, 16, stride); + + q += 16; + pre += 4; + dst += 4; + dc++; } + + pre += 64 - 16; + dst += 4 * stride - 16; + } } void vp8_dequant_idct_add_y_block_c - (short *q, short *dq, unsigned char *pre, - unsigned char *dst, int stride, char *eobs) -{ - int i, j; - - for (i = 0; i < 4; i++) - { - for (j = 0; j < 4; j++) - { - if (*eobs++ > 1) - vp8_dequant_idct_add_c (q, dq, pre, dst, 16, stride); - else - { - vp8_dc_only_idct_add_c (q[0]*dq[0], pre, dst, 16, stride); - ((int *)q)[0] = 0; - } - - q += 16; - pre += 4; - dst += 4; - } - - pre += 64 - 16; - dst += 4*stride - 16; +(short *q, short *dq, unsigned char *pre, + unsigned char *dst, int stride, char *eobs) { + int i, j; + + for (i = 0; i < 4; i++) { + for (j = 0; j < 4; j++) { + if (*eobs++ > 1) + vp8_dequant_idct_add_c(q, dq, pre, dst, 16, stride); + else { + vp8_dc_only_idct_add_c(q[0]*dq[0], pre, dst, 16, stride); + ((int *)q)[0] = 0; + } + + q += 16; + pre += 4; + dst += 4; } + + pre += 64 - 16; + dst += 4 * stride - 16; + } } void vp8_dequant_idct_add_uv_block_c - (short *q, short *dq, unsigned char *pre, - unsigned char *dstu, unsigned char *dstv, int stride, char *eobs) -{ - int i, j; - - for (i = 0; i < 2; i++) - { - for (j = 0; j < 2; j++) - { - if (*eobs++ > 1) - vp8_dequant_idct_add_c (q, dq, pre, dstu, 8, stride); - else - { - vp8_dc_only_idct_add_c (q[0]*dq[0], pre, dstu, 8, stride); - ((int *)q)[0] = 0; - } - - q += 16; - pre += 4; - dstu += 4; - } - - pre += 32 - 8; - dstu += 4*stride - 8; +(short *q, short *dq, unsigned char *pre, + unsigned char *dstu, unsigned char *dstv, int stride, char *eobs) { + int i, j; + + for (i = 0; i < 2; i++) { + for (j = 0; j < 2; j++) { + if (*eobs++ > 1) + vp8_dequant_idct_add_c(q, dq, pre, dstu, 8, stride); + else { + vp8_dc_only_idct_add_c(q[0]*dq[0], pre, dstu, 8, stride); + ((int *)q)[0] = 0; + } + + q += 16; + pre += 4; + dstu += 4; } - for (i = 0; i < 2; i++) - { - for (j = 0; j < 2; j++) - { - if (*eobs++ > 1) - vp8_dequant_idct_add_c (q, dq, pre, dstv, 8, stride); - else - { - vp8_dc_only_idct_add_c (q[0]*dq[0], pre, dstv, 8, stride); - ((int *)q)[0] = 0; - } - - q += 16; - pre += 4; - dstv += 4; - } - - pre += 32 - 8; - dstv += 4*stride - 8; + pre += 32 - 8; + dstu += 4 * stride - 8; + } + + for (i = 0; i < 2; i++) { + for (j = 0; j < 2; j++) { + if (*eobs++ > 1) + vp8_dequant_idct_add_c(q, dq, pre, dstv, 8, stride); + else { + vp8_dc_only_idct_add_c(q[0]*dq[0], pre, dstv, 8, stride); + ((int *)q)[0] = 0; + } + + q += 16; + pre += 4; + dstv += 4; } + + pre += 32 - 8; + dstv += 4 * stride - 8; + } } void vp8_dequant_dc_idct_add_y_block_8x8_c - (short *q, short *dq, unsigned char *pre, - unsigned char *dst, int stride, char *eobs, short *dc, MACROBLOCKD *xd) -{ +(short *q, short *dq, unsigned char *pre, + unsigned char *dst, int stride, char *eobs, short *dc, MACROBLOCKD *xd) { - vp8_dequant_dc_idct_add_8x8_c (q, dq, pre, dst, 16, stride, dc[0]); - vp8_dequant_dc_idct_add_8x8_c (&q[64], dq, pre+8, dst+8, 16, stride, dc[1]); - vp8_dequant_dc_idct_add_8x8_c (&q[128], dq, pre+8*16, dst+8*stride, 16, stride, dc[4]); - vp8_dequant_dc_idct_add_8x8_c (&q[192], dq, pre+8*16+8, dst+8*stride+8, 16, stride, dc[8]); + vp8_dequant_dc_idct_add_8x8_c(q, dq, pre, dst, 16, stride, dc[0]); + vp8_dequant_dc_idct_add_8x8_c(&q[64], dq, pre + 8, dst + 8, 16, stride, dc[1]); + vp8_dequant_dc_idct_add_8x8_c(&q[128], dq, pre + 8 * 16, dst + 8 * stride, 16, stride, dc[4]); + vp8_dequant_dc_idct_add_8x8_c(&q[192], dq, pre + 8 * 16 + 8, dst + 8 * stride + 8, 16, stride, dc[8]); } void vp8_dequant_idct_add_y_block_8x8_c - (short *q, short *dq, unsigned char *pre, - unsigned char *dst, int stride, char *eobs, MACROBLOCKD *xd) -{ +(short *q, short *dq, unsigned char *pre, + unsigned char *dst, int stride, char *eobs, MACROBLOCKD *xd) { unsigned char *origdest = dst; unsigned char *origpred = pre; - vp8_dequant_idct_add_8x8_c (q, dq, pre, dst, 16, stride); - vp8_dequant_idct_add_8x8_c (&q[64], dq, origpred+8, origdest+8, 16, stride); - vp8_dequant_idct_add_8x8_c (&q[128], dq, origpred+8*16, origdest+8*stride, 16, stride); - vp8_dequant_idct_add_8x8_c (&q[192], dq, origpred+8*16+8, origdest+8*stride+8, 16, stride); + vp8_dequant_idct_add_8x8_c(q, dq, pre, dst, 16, stride); + vp8_dequant_idct_add_8x8_c(&q[64], dq, origpred + 8, origdest + 8, 16, stride); + vp8_dequant_idct_add_8x8_c(&q[128], dq, origpred + 8 * 16, origdest + 8 * stride, 16, stride); + vp8_dequant_idct_add_8x8_c(&q[192], dq, origpred + 8 * 16 + 8, origdest + 8 * stride + 8, 16, stride); } void vp8_dequant_idct_add_uv_block_8x8_c - (short *q, short *dq, unsigned char *pre, - unsigned char *dstu, unsigned char *dstv, int stride, char *eobs, MACROBLOCKD *xd) -{ - vp8_dequant_idct_add_8x8_c (q, dq, pre, dstu, 8, stride); +(short *q, short *dq, unsigned char *pre, + unsigned char *dstu, unsigned char *dstv, int stride, char *eobs, MACROBLOCKD *xd) { + vp8_dequant_idct_add_8x8_c(q, dq, pre, dstu, 8, stride); q += 64; pre += 64; - vp8_dequant_idct_add_8x8_c (q, dq, pre, dstv, 8, stride); + vp8_dequant_idct_add_8x8_c(q, dq, pre, dstv, 8, stride); } #if CONFIG_LOSSLESS void vp8_dequant_dc_idct_add_y_block_lossless_c - (short *q, short *dq, unsigned char *pre, - unsigned char *dst, int stride, char *eobs, short *dc) -{ - int i, j; - - for (i = 0; i < 4; i++) - { - for (j = 0; j < 4; j++) - { - if (*eobs++ > 1) - vp8_dequant_dc_idct_add_lossless_c (q, dq, pre, dst, 16, stride, dc[0]); - else - vp8_dc_only_inv_walsh_add_c(dc[0], pre, dst, 16, stride); - - q += 16; - pre += 4; - dst += 4; - dc ++; - } - - pre += 64 - 16; - dst += 4*stride - 16; +(short *q, short *dq, unsigned char *pre, + unsigned char *dst, int stride, char *eobs, short *dc) { + int i, j; + + for (i = 0; i < 4; i++) { + for (j = 0; j < 4; j++) { + if (*eobs++ > 1) + vp8_dequant_dc_idct_add_lossless_c(q, dq, pre, dst, 16, stride, dc[0]); + else + vp8_dc_only_inv_walsh_add_c(dc[0], pre, dst, 16, stride); + + q += 16; + pre += 4; + dst += 4; + dc++; } + + pre += 64 - 16; + dst += 4 * stride - 16; + } } void vp8_dequant_idct_add_y_block_lossless_c - (short *q, short *dq, unsigned char *pre, - unsigned char *dst, int stride, char *eobs) -{ - int i, j; - - for (i = 0; i < 4; i++) - { - for (j = 0; j < 4; j++) - { - if (*eobs++ > 1) - vp8_dequant_idct_add_lossless_c (q, dq, pre, dst, 16, stride); - else - { - vp8_dc_only_inv_walsh_add_c(q[0]*dq[0], pre, dst, 16, stride); - ((int *)q)[0] = 0; - } - - q += 16; - pre += 4; - dst += 4; - } - - pre += 64 - 16; - dst += 4*stride - 16; +(short *q, short *dq, unsigned char *pre, + unsigned char *dst, int stride, char *eobs) { + int i, j; + + for (i = 0; i < 4; i++) { + for (j = 0; j < 4; j++) { + if (*eobs++ > 1) + vp8_dequant_idct_add_lossless_c(q, dq, pre, dst, 16, stride); + else { + vp8_dc_only_inv_walsh_add_c(q[0]*dq[0], pre, dst, 16, stride); + ((int *)q)[0] = 0; + } + + q += 16; + pre += 4; + dst += 4; } + + pre += 64 - 16; + dst += 4 * stride - 16; + } } void vp8_dequant_idct_add_uv_block_lossless_c - (short *q, short *dq, unsigned char *pre, - unsigned char *dstu, unsigned char *dstv, int stride, char *eobs) -{ - int i, j; - - for (i = 0; i < 2; i++) - { - for (j = 0; j < 2; j++) - { - if (*eobs++ > 1) - vp8_dequant_idct_add_lossless_c (q, dq, pre, dstu, 8, stride); - else - { - vp8_dc_only_inv_walsh_add_c(q[0]*dq[0], pre, dstu, 8, stride); - ((int *)q)[0] = 0; - } - - q += 16; - pre += 4; - dstu += 4; - } - - pre += 32 - 8; - dstu += 4*stride - 8; +(short *q, short *dq, unsigned char *pre, + unsigned char *dstu, unsigned char *dstv, int stride, char *eobs) { + int i, j; + + for (i = 0; i < 2; i++) { + for (j = 0; j < 2; j++) { + if (*eobs++ > 1) + vp8_dequant_idct_add_lossless_c(q, dq, pre, dstu, 8, stride); + else { + vp8_dc_only_inv_walsh_add_c(q[0]*dq[0], pre, dstu, 8, stride); + ((int *)q)[0] = 0; + } + + q += 16; + pre += 4; + dstu += 4; } - for (i = 0; i < 2; i++) - { - for (j = 0; j < 2; j++) - { - if (*eobs++ > 1) - vp8_dequant_idct_add_lossless_c (q, dq, pre, dstv, 8, stride); - else - { - vp8_dc_only_inv_walsh_add_c(q[0]*dq[0], pre, dstv, 8, stride); - ((int *)q)[0] = 0; - } - - q += 16; - pre += 4; - dstv += 4; - } - - pre += 32 - 8; - dstv += 4*stride - 8; + pre += 32 - 8; + dstu += 4 * stride - 8; + } + + for (i = 0; i < 2; i++) { + for (j = 0; j < 2; j++) { + if (*eobs++ > 1) + vp8_dequant_idct_add_lossless_c(q, dq, pre, dstv, 8, stride); + else { + vp8_dc_only_inv_walsh_add_c(q[0]*dq[0], pre, dstv, 8, stride); + ((int *)q)[0] = 0; + } + + q += 16; + pre += 4; + dstv += 4; } + + pre += 32 - 8; + dstv += 4 * stride - 8; + } } #endif |