From ec414372e808269ded36f90e07a558e702e09212 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Tue, 22 Oct 2013 13:09:36 -0700 Subject: [PATCH] Removing quantize_b_4x4 function pointer. The pointer was asigned only once with vp9_regular_quantize_b_4x4, calling this function directly now. Also removing unused declarations: prototype_quantize_block prototype_quantize_block_pair prototype_quantize_mb vp9_regular_quantize_b_4x4_pair vp9_regular_quantize_b_8x8 Change-Id: I14325bc2f082336820671eafbc06126651b79f73 --- vp9/encoder/vp9_block.h | 2 -- vp9/encoder/vp9_onyx_if.c | 2 -- vp9/encoder/vp9_quantize.h | 13 ------------- vp9/encoder/vp9_rdopt.c | 13 +++++-------- 4 files changed, 5 insertions(+), 25 deletions(-) diff --git a/vp9/encoder/vp9_block.h b/vp9/encoder/vp9_block.h index 61e837c..12dad03 100644 --- a/vp9/encoder/vp9_block.h +++ b/vp9/encoder/vp9_block.h @@ -174,8 +174,6 @@ struct macroblock { BLOCK_SIZE sb64_partitioning; void (*fwd_txm4x4)(int16_t *input, int16_t *output, int pitch); - void (*quantize_b_4x4)(MACROBLOCK *x, int b_idx, TX_TYPE tx_type, - int y_blocks); }; // TODO(jingning): the variables used here are little complicated. need further diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index a2556f4..05b1662 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -964,8 +964,6 @@ void vp9_set_speed_features(VP9_COMP *cpi) { cpi->mb.fwd_txm4x4 = vp9_short_walsh4x4; } - cpi->mb.quantize_b_4x4 = vp9_regular_quantize_b_4x4; - if (cpi->sf.subpel_search_method == SUBPEL_ITERATIVE) { cpi->find_fractional_mv_step = vp9_find_best_sub_pixel_iterative; cpi->find_fractional_mv_step_comp = vp9_find_best_sub_pixel_comp_iterative; diff --git a/vp9/encoder/vp9_quantize.h b/vp9/encoder/vp9_quantize.h index 3191c49..459aa33 100644 --- a/vp9/encoder/vp9_quantize.h +++ b/vp9/encoder/vp9_quantize.h @@ -13,21 +13,8 @@ #include "vp9/encoder/vp9_block.h" -#define prototype_quantize_block(sym) \ - void (sym)(MACROBLOCK *mb, int b_idx) - -#define prototype_quantize_block_pair(sym) \ - void (sym)(MACROBLOCK *mb, int b_idx1, int b_idx2) - -#define prototype_quantize_mb(sym) \ - void (sym)(MACROBLOCK *x) - -void vp9_regular_quantize_b_4x4_pair(MACROBLOCK *mb, int b_idx1, int b_idx2, - int y_blocks); void vp9_regular_quantize_b_4x4(MACROBLOCK *mb, int b_idx, TX_TYPE tx_type, int y_blocks); -void vp9_regular_quantize_b_8x8(MACROBLOCK *mb, int b_idx, TX_TYPE tx_type, - int y_blocks); struct VP9_COMP; void vp9_set_quantizer(struct VP9_COMP *cpi, int q); diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index b6f37e9..f166b10 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1085,16 +1085,13 @@ static int64_t rd_pick_intra4x4block(VP9_COMP *cpi, MACROBLOCK *x, int ib, dst, dst_stride); tx_type = get_tx_type_4x4(PLANE_TYPE_Y_WITH_DC, xd, block); - if (tx_type != DCT_DCT) { + if (tx_type != DCT_DCT) vp9_short_fht4x4(src_diff, coeff, 8, tx_type); - x->quantize_b_4x4(x, block, tx_type, 16); - } else { + else x->fwd_txm4x4(src_diff, coeff, 8); - x->quantize_b_4x4(x, block, tx_type, 16); - } + vp9_regular_quantize_b_4x4(x, block, tx_type, 16); - get_scan_nb_4x4(get_tx_type_4x4(PLANE_TYPE_Y_WITH_DC, xd, block), - &scan, &nb); + get_scan_nb_4x4(tx_type, &scan, &nb); ratey += cost_coeffs(x, 0, block, tempa + idx, templ + idy, TX_4X4, scan, nb); distortion += vp9_block_error(coeff, BLOCK_OFFSET(pd->dqcoeff, block), @@ -1564,7 +1561,7 @@ static int64_t encode_inter_mb_segment(VP9_COMP *cpi, coeff = BLOCK_OFFSET(p->coeff, k); x->fwd_txm4x4(raster_block_offset_int16(BLOCK_8X8, k, p->src_diff), coeff, 8); - x->quantize_b_4x4(x, k, DCT_DCT, 16); + vp9_regular_quantize_b_4x4(x, k, DCT_DCT, 16); thisdistortion += vp9_block_error(coeff, BLOCK_OFFSET(pd->dqcoeff, k), 16, &ssz); thissse += ssz; -- 2.7.4