From ac468dde468c4f6f0a48ec14d63341d4677a5d1f Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Fri, 11 Oct 2013 15:49:05 -0700 Subject: Consistent names for inverse hybrid transforms (2 of 2). Renames: vp9_iht_add -> vp9_iht4x4_add vp9_iht_add_8x8 -> vp9_iht8x8_add vp9_iht_add_16x16 -> vp9_iht16x16_add Change-Id: I8f1a2913e02d90d41f174f27e4ee2fad0dbd4a21 --- vp9/common/vp9_idct.c | 6 +++--- vp9/common/vp9_idct.h | 16 +++++++--------- vp9/decoder/vp9_decodframe.c | 6 +++--- vp9/encoder/vp9_encodemb.c | 4 ++-- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/vp9/common/vp9_idct.c b/vp9/common/vp9_idct.c index 95a164bef..959f49cb2 100644 --- a/vp9/common/vp9_idct.c +++ b/vp9/common/vp9_idct.c @@ -1357,7 +1357,7 @@ void vp9_idct32x32_add(int16_t *input, uint8_t *dest, int stride, int eob) { } // iht -void vp9_iht_add(TX_TYPE tx_type, int16_t *input, uint8_t *dest, int stride, +void vp9_iht4x4_add(TX_TYPE tx_type, int16_t *input, uint8_t *dest, int stride, int eob) { if (tx_type == DCT_DCT) vp9_idct4x4_add(input, dest, stride, eob); @@ -1365,7 +1365,7 @@ void vp9_iht_add(TX_TYPE tx_type, int16_t *input, uint8_t *dest, int stride, vp9_iht4x4_16_add(input, dest, stride, tx_type); } -void vp9_iht_add_8x8(TX_TYPE tx_type, int16_t *input, uint8_t *dest, +void vp9_iht8x8_add(TX_TYPE tx_type, int16_t *input, uint8_t *dest, int stride, int eob) { if (tx_type == DCT_DCT) { vp9_idct8x8_add(input, dest, stride, eob); @@ -1376,7 +1376,7 @@ void vp9_iht_add_8x8(TX_TYPE tx_type, int16_t *input, uint8_t *dest, } } -void vp9_iht_add_16x16(TX_TYPE tx_type, int16_t *input, uint8_t *dest, +void vp9_iht16x16_add(TX_TYPE tx_type, int16_t *input, uint8_t *dest, int stride, int eob) { if (tx_type == DCT_DCT) { vp9_idct16x16_add(input, dest, stride, eob); diff --git a/vp9/common/vp9_idct.h b/vp9/common/vp9_idct.h index e34bbd83e..78aaabab5 100644 --- a/vp9/common/vp9_idct.h +++ b/vp9/common/vp9_idct.h @@ -87,21 +87,19 @@ typedef struct { transform_1d cols, rows; // vertical and horizontal } transform_2d; +void vp9_iwht4x4_add(int16_t *input, uint8_t *dest, int stride, int eob); void vp9_idct4x4_add(int16_t *input, uint8_t *dest, int stride, int eob); -void vp9_iwht4x4_add(int16_t *input, uint8_t *dest, int stride, int eob); void vp9_idct8x8_add(int16_t *input, uint8_t *dest, int stride, int eob); void vp9_idct16x16_add(int16_t *input, uint8_t *dest, int stride, int eob); void vp9_idct32x32_add(int16_t *input, uint8_t *dest, int stride, int eob); -void vp9_iht_add(TX_TYPE tx_type, int16_t *input, uint8_t *dest, - int stride, int eob); - -void vp9_iht_add_8x8(TX_TYPE tx_type, int16_t *input, uint8_t *dest, - int stride, int eob); - -void vp9_iht_add_16x16(TX_TYPE tx_type, int16_t *input, uint8_t *dest, - int stride, int eob); +void vp9_iht4x4_add(TX_TYPE tx_type, int16_t *input, uint8_t *dest, + int stride, int eob); +void vp9_iht8x8_add(TX_TYPE tx_type, int16_t *input, uint8_t *dest, + int stride, int eob); +void vp9_iht16x16_add(TX_TYPE tx_type, int16_t *input, uint8_t *dest, + int stride, int eob); #endif // VP9_COMMON_VP9_IDCT_H_ diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 64459cce3..cc3422f97 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -101,15 +101,15 @@ static void decode_block(int plane, int block, BLOCK_SIZE plane_bsize, if (tx_type == DCT_DCT) xd->itxm_add(qcoeff, dst, stride, eob); else - vp9_iht_add(tx_type, qcoeff, dst, stride, eob); + vp9_iht4x4_add(tx_type, qcoeff, dst, stride, eob); break; case TX_8X8: tx_type = get_tx_type_8x8(pd->plane_type, xd); - vp9_iht_add_8x8(tx_type, qcoeff, dst, stride, eob); + vp9_iht8x8_add(tx_type, qcoeff, dst, stride, eob); break; case TX_16X16: tx_type = get_tx_type_16x16(pd->plane_type, xd); - vp9_iht_add_16x16(tx_type, qcoeff, dst, stride, eob); + vp9_iht16x16_add(tx_type, qcoeff, dst, stride, eob); break; case TX_32X32: tx_type = DCT_DCT; diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 49bd02a94..a0a7bab27 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -564,7 +564,7 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize, p->quant, p->quant_shift, qcoeff, dqcoeff, pd->dequant, p->zbin_extra, eob, scan, iscan); if (!x->skip_encode && *eob) - vp9_iht_add_16x16(tx_type, dqcoeff, dst, pd->dst.stride, *eob); + vp9_iht16x16_add(tx_type, dqcoeff, dst, pd->dst.stride, *eob); break; case TX_8X8: tx_type = get_tx_type_8x8(pd->plane_type, xd); @@ -589,7 +589,7 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize, p->quant_shift, qcoeff, dqcoeff, pd->dequant, p->zbin_extra, eob, scan, iscan); if (!x->skip_encode && *eob) - vp9_iht_add_8x8(tx_type, dqcoeff, dst, pd->dst.stride, *eob); + vp9_iht8x8_add(tx_type, dqcoeff, dst, pd->dst.stride, *eob); break; case TX_4X4: tx_type = get_tx_type_4x4(pd->plane_type, xd, block); -- cgit v1.2.3