From e7b3b692e1782759dd9957de07907dcb15054d23 Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Tue, 2 Apr 2013 12:23:22 -0700 Subject: [PATCH] Remove unused inplace idct_add functions Change-Id: I1c29e041d6db4af4508356315cd65718acb1f668 --- vp9/decoder/vp9_dequantize.h | 34 ---------------- vp9/decoder/vp9_idct_blk.c | 79 ------------------------------------ 2 files changed, 113 deletions(-) diff --git a/vp9/decoder/vp9_dequantize.h b/vp9/decoder/vp9_dequantize.h index bde27bb7a..933108dae 100644 --- a/vp9/decoder/vp9_dequantize.h +++ b/vp9/decoder/vp9_dequantize.h @@ -59,38 +59,4 @@ void vp9_ht_dequant_idct_add_16x16_c(TX_TYPE tx_type, int16_t *input, unsigned char *dest, int pitch, int stride, int eob); -void vp9_dequant_dc_idct_add_y_block_8x8_inplace_c(int16_t *q, const int16_t *dq, - unsigned char *dst, - int stride, - const int16_t *dc, - MACROBLOCKD *xd); - -void vp9_dequant_idct_add_y_block_8x8_inplace_c(int16_t *q, const int16_t *dq, - unsigned char *dst, - int stride, - MACROBLOCKD *xd); - -void vp9_dequant_dc_idct_add_y_block_4x4_inplace_c(int16_t *q, const int16_t *dq, - unsigned char *dst, - int stride, - const int16_t *dc, - MACROBLOCKD *xd); - -void vp9_dequant_idct_add_y_block_4x4_inplace_c(int16_t *q, const int16_t *dq, - unsigned char *dst, - int stride, - MACROBLOCKD *xd); - -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, - MACROBLOCKD *xd); - -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, - MACROBLOCKD *xd); - #endif // VP9_DECODER_VP9_DEQUANTIZE_H_ diff --git a/vp9/decoder/vp9_idct_blk.c b/vp9/decoder/vp9_idct_blk.c index b17955b1c..d74b61919 100644 --- a/vp9/decoder/vp9_idct_blk.c +++ b/vp9/decoder/vp9_idct_blk.c @@ -12,24 +12,6 @@ #include "vp9/common/vp9_blockd.h" #include "vp9/decoder/vp9_dequantize.h" -void vp9_dequant_idct_add_y_block_4x4_inplace_c(int16_t *q, - const int16_t *dq, - uint8_t *dst, - int stride, - MACROBLOCKD *xd) { - int i, j; - - for (i = 0; i < 4; i++) { - for (j = 0; j < 4; j++) { - xd->itxm_add(q, dq, dst, dst, stride, stride, xd->eobs[i * 4 + j]); - q += 16; - dst += 4; - } - - dst += 4 * stride - 16; - } -} - void vp9_dequant_idct_add_y_block_c(int16_t *q, const int16_t *dq, uint8_t *pre, uint8_t *dst, @@ -82,53 +64,6 @@ void vp9_dequant_idct_add_uv_block_c(int16_t *q, const int16_t *dq, } } -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, - MACROBLOCKD *xd) { - int i, j; - - for (i = 0; i < 2; i++) { - for (j = 0; j < 2; j++) { - xd->itxm_add(q, dq, dstu, dstu, stride, stride, xd->eobs[16 + i * 2 + j]); - q += 16; - dstu += 4; - } - - dstu += 4 * stride - 8; - } - - for (i = 0; i < 2; i++) { - for (j = 0; j < 2; j++) { - xd->itxm_add(q, dq, dstv, dstv, stride, stride, xd->eobs[20 + i * 2 + j]); - q += 16; - dstv += 4; - } - - dstv += 4 * stride - 8; - } -} - -void vp9_dequant_idct_add_y_block_8x8_inplace_c(int16_t *q, - const int16_t *dq, - uint8_t *dst, - int stride, - MACROBLOCKD *xd) { - vp9_dequant_idct_add_8x8_c(q, dq, dst, dst, stride, stride, xd->eobs[0]); - - vp9_dequant_idct_add_8x8_c(&q[64], dq, dst + 8, - dst + 8, stride, stride, xd->eobs[4]); - - vp9_dequant_idct_add_8x8_c(&q[128], dq, dst + 8 * stride, - dst + 8 * stride, stride, stride, - xd->eobs[8]); - - vp9_dequant_idct_add_8x8_c(&q[192], dq, dst + 8 * stride + 8, - dst + 8 * stride + 8, stride, stride, - xd->eobs[12]); -} - void vp9_dequant_idct_add_y_block_8x8_c(int16_t *q, const int16_t *dq, uint8_t *pre, uint8_t *dst, @@ -160,20 +95,6 @@ void vp9_dequant_idct_add_uv_block_8x8_c(int16_t *q, const int16_t *dq, vp9_dequant_idct_add_8x8_c(q, dq, pre, dstv, 8, stride, xd->eobs[20]); } -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, - MACROBLOCKD *xd) { - vp9_dequant_idct_add_8x8_c(q, dq, dstu, dstu, stride, stride, - xd->eobs[16]); - - q += 64; - vp9_dequant_idct_add_8x8_c(q, dq, dstv, dstv, stride, stride, - xd->eobs[20]); -} - - void vp9_dequant_idct_add_y_block_lossless_c(int16_t *q, const int16_t *dq, uint8_t *pre, uint8_t *dst,