From e01b39254b7289f124b2ba2b0fcdfb1e64aadd0c Mon Sep 17 00:00:00 2001
From: Yaowu Xu <yaowu@google.com>
Date: Thu, 10 Nov 2011 12:54:22 -0800
Subject: [PATCH] changed function name for clarity
The dequantizer functions for 2nd order haar block had confusing 8x8
in their names. this commit fixed their name to avoid confusion.
Change-Id: I6ae4e7888330865f831436313637d4395b1fc273
---
vp8/decoder/decodframe.c | 2 +-
vp8/decoder/dequantize.c | 4 ++--
vp8/decoder/dequantize.h | 8 ++++----
vp8/decoder/generic/dsystemdependent.c | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index 57b781a116..963939cf05 100644
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -408,7 +408,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
#if CONFIG_T8X8
if( tx_type == TX_8X8 )
{
- DEQUANT_INVOKE(&pbi->dequant, block_8x8)(b);
+ DEQUANT_INVOKE(&pbi->dequant, block_2x2)(b);
#ifdef DEC_DEBUG
if (dec_debug)
{
diff --git a/vp8/decoder/dequantize.c b/vp8/decoder/dequantize.c
index 903d44a3ff..a39b544f5b 100644
--- a/vp8/decoder/dequantize.c
+++ b/vp8/decoder/dequantize.c
@@ -122,7 +122,7 @@ void vp8_dequant_dc_idct_add_c(short *input, short *dq, unsigned char *pred,
}
#if CONFIG_T8X8
-void vp8_dequantize_b_8x8_c(BLOCKD *d)//just for 2x2 haar transform
+void vp8_dequantize_b_2x2_c(BLOCKD *d)
{
int i;
short *DQ = d->dqcoeff;
@@ -346,4 +346,4 @@ void vp8_dequant_dc_idct_add_8x8_c(short *input, short *dq, unsigned char *pred,
#endif
}
-#endif
+#endif
\ No newline at end of file
diff --git a/vp8/decoder/dequantize.h b/vp8/decoder/dequantize.h
index 5ae6f96192..c7344d3941 100644
--- a/vp8/decoder/dequantize.h
+++ b/vp8/decoder/dequantize.h
@@ -100,10 +100,10 @@ extern prototype_dequant_idct_add_y_block(vp8_dequant_idct_add_y_block);
extern prototype_dequant_idct_add_uv_block(vp8_dequant_idct_add_uv_block);
#if CONFIG_T8X8
-#ifndef vp8_dequant_block_8x8
-#define vp8_dequant_block_8x8 vp8_dequantize_b_8x8_c
+#ifndef vp8_dequant_block_2x2
+#define vp8_dequant_block_2x2 vp8_dequantize_b_2x2_c
#endif
-extern prototype_dequant_block(vp8_dequant_block_8x8);
+extern prototype_dequant_block(vp8_dequant_block_2x2);
#ifndef vp8_dequant_idct_add_8x8
#define vp8_dequant_idct_add_8x8 vp8_dequant_idct_add_8x8_c
@@ -160,7 +160,7 @@ typedef struct
vp8_dequant_idct_add_y_block_fn_t idct_add_y_block;
vp8_dequant_idct_add_uv_block_fn_t idct_add_uv_block;
#if CONFIG_T8X8
- vp8_dequant_block_fn_t block_8x8;
+ vp8_dequant_block_fn_t block_2x2;
vp8_dequant_idct_add_fn_t idct_add_8x8;
vp8_dequant_dc_idct_add_fn_t dc_idct_add_8x8;
vp8_dequant_dc_idct_add_y_block_fn_t_8x8 dc_idct_add_y_block_8x8;
diff --git a/vp8/decoder/generic/dsystemdependent.c b/vp8/decoder/generic/dsystemdependent.c
index fc5fdb39b5..40aa8bd6ee 100644
--- a/vp8/decoder/generic/dsystemdependent.c
+++ b/vp8/decoder/generic/dsystemdependent.c
@@ -24,7 +24,7 @@ void vp8_dmachine_specific_config(VP8D_COMP *pbi)
#if CONFIG_T8X8
- pbi->dequant.block_8x8 = vp8_dequantize_b_8x8_c;
+ pbi->dequant.block_2x2 = vp8_dequantize_b_2x2_c;
pbi->dequant.idct_add_8x8 = vp8_dequant_idct_add_8x8_c;
pbi->dequant.dc_idct_add_8x8 = vp8_dequant_dc_idct_add_8x8_c;
pbi->dequant.dc_idct_add_y_block_8x8 = vp8_dequant_dc_idct_add_y_block_8x8_c;
--
GitLab