Commit e01b3925 authored by Yaowu Xu's avatar Yaowu Xu
Browse files

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
parent 0c846f66
......@@ -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)
{
......
......@@ -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
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment