From 17cddb4e269150560e3167653f84b02fab4c3122 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Wed, 27 Mar 2013 16:19:27 -0700 Subject: [PATCH] Removing redundant function arguments. Almost all arguments for vp9_build_inter32x32_predictors_sb and vp9_build_inter64x64_predictors_sb can be deduced from the first macroblock argument. Change-Id: I5d477a607586d05698d5b3b9b9bc03891dd3fe83 --- vp9/common/vp9_reconinter.c | 54 +++++++++++++++++++------------------------ vp9/common/vp9_reconinter.h | 20 ++++------------ vp9/decoder/vp9_decodframe.c | 26 ++++----------------- vp9/encoder/vp9_encodeframe.c | 10 ++------ vp9/encoder/vp9_rdopt.c | 32 ++++--------------------- 5 files changed, 38 insertions(+), 104 deletions(-) diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c index 110af5e..d8fffcd 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c @@ -1340,22 +1340,19 @@ void vp9_build_inter32x32_predictors_sbuv(MACROBLOCKD *x, } #endif -void vp9_build_inter32x32_predictors_sb(MACROBLOCKD *x, - uint8_t *dst_y, - uint8_t *dst_u, - uint8_t *dst_v, - int dst_ystride, - int dst_uvstride, - int mb_row, - int mb_col) { - vp9_build_inter32x32_predictors_sby(x, dst_y, dst_ystride, - mb_row, mb_col); - vp9_build_inter32x32_predictors_sbuv(x, dst_u, dst_v, dst_uvstride, - mb_row, mb_col); +void vp9_build_inter32x32_predictors_sb(MACROBLOCKD *mb, + int mb_row, int mb_col) { + uint8_t *const y = mb->dst.y_buffer; + uint8_t *const u = mb->dst.u_buffer; + uint8_t *const v = mb->dst.v_buffer; + const int y_stride = mb->dst.y_stride; + const int uv_stride = mb->dst.uv_stride; + + vp9_build_inter32x32_predictors_sby(mb, y, y_stride, mb_row, mb_col); + vp9_build_inter32x32_predictors_sbuv(mb, u, v, uv_stride, mb_row, mb_col); #if CONFIG_COMP_INTERINTRA_PRED - if (x->mode_info_context->mbmi.second_ref_frame == INTRA_FRAME) { - vp9_build_interintra_32x32_predictors_sb( - x, dst_y, dst_u, dst_v, dst_ystride, dst_uvstride); + if (mb->mode_info_context->mbmi.second_ref_frame == INTRA_FRAME) { + vp9_build_interintra_32x32_predictors_sb(mb, y, u, v, y_stride, uv_stride); } #endif } @@ -1539,22 +1536,19 @@ void vp9_build_inter64x64_predictors_sbuv(MACROBLOCKD *x, } } -void vp9_build_inter64x64_predictors_sb(MACROBLOCKD *x, - uint8_t *dst_y, - uint8_t *dst_u, - uint8_t *dst_v, - int dst_ystride, - int dst_uvstride, - int mb_row, - int mb_col) { - vp9_build_inter64x64_predictors_sby(x, dst_y, dst_ystride, - mb_row, mb_col); - vp9_build_inter64x64_predictors_sbuv(x, dst_u, dst_v, dst_uvstride, - mb_row, mb_col); +void vp9_build_inter64x64_predictors_sb(MACROBLOCKD *mb, + int mb_row, int mb_col) { + uint8_t *const y = mb->dst.y_buffer; + uint8_t *const u = mb->dst.u_buffer; + uint8_t *const v = mb->dst.v_buffer; + const int y_stride = mb->dst.y_stride; + const int uv_stride = mb->dst.uv_stride; + + vp9_build_inter64x64_predictors_sby(mb, y, y_stride, mb_row, mb_col); + vp9_build_inter64x64_predictors_sbuv(mb, u, v, uv_stride, mb_row, mb_col); #if CONFIG_COMP_INTERINTRA_PRED - if (x->mode_info_context->mbmi.second_ref_frame == INTRA_FRAME) { - vp9_build_interintra_64x64_predictors_sb(x, dst_y, dst_u, dst_v, - dst_ystride, dst_uvstride); + if (mb->mode_info_context->mbmi.second_ref_frame == INTRA_FRAME) { + vp9_build_interintra_64x64_predictors_sb(mb, y, u, v, y_stride, uv_stride); } #endif } diff --git a/vp9/common/vp9_reconinter.h b/vp9/common/vp9_reconinter.h index 831ce2a..f09c8e4 100644 --- a/vp9/common/vp9_reconinter.h +++ b/vp9/common/vp9_reconinter.h @@ -38,23 +38,11 @@ void vp9_build_inter16x16_predictors_mb(MACROBLOCKD *xd, int mb_row, int mb_col); -void vp9_build_inter32x32_predictors_sb(MACROBLOCKD *x, - uint8_t *dst_y, - uint8_t *dst_u, - uint8_t *dst_v, - int dst_ystride, - int dst_uvstride, - int mb_row, - int mb_col); +void vp9_build_inter32x32_predictors_sb(MACROBLOCKD *mb, + int mb_row, int mb_col); -void vp9_build_inter64x64_predictors_sb(MACROBLOCKD *x, - uint8_t *dst_y, - uint8_t *dst_u, - uint8_t *dst_v, - int dst_ystride, - int dst_uvstride, - int mb_row, - int mb_col); +void vp9_build_inter64x64_predictors_sb(MACROBLOCKD *mb, + int mb_row, int mb_col); void vp9_build_inter_predictors_mb(MACROBLOCKD *xd, int mb_row, diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 40e5b14..4e62e76 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -171,21 +171,9 @@ static void skip_recon_mb(VP9D_COMP *pbi, MACROBLOCKD *xd, } } else { if (sb_type == BLOCK_SIZE_SB64X64) { - vp9_build_inter64x64_predictors_sb(xd, - xd->dst.y_buffer, - xd->dst.u_buffer, - xd->dst.v_buffer, - xd->dst.y_stride, - xd->dst.uv_stride, - mb_row, mb_col); + vp9_build_inter64x64_predictors_sb(xd, mb_row, mb_col); } else if (sb_type == BLOCK_SIZE_SB32X32) { - vp9_build_inter32x32_predictors_sb(xd, - xd->dst.y_buffer, - xd->dst.u_buffer, - xd->dst.v_buffer, - xd->dst.y_stride, - xd->dst.uv_stride, - mb_row, mb_col); + vp9_build_inter32x32_predictors_sb(xd, mb_row, mb_col); } else { vp9_build_inter16x16_predictors_mb(xd, xd->dst.y_buffer, @@ -492,10 +480,7 @@ static void decode_superblock64(VP9D_COMP *pbi, MACROBLOCKD *xd, vp9_build_intra_predictors_sb64y_s(xd); vp9_build_intra_predictors_sb64uv_s(xd); } else { - vp9_build_inter64x64_predictors_sb(xd, xd->dst.y_buffer, - xd->dst.u_buffer, xd->dst.v_buffer, - xd->dst.y_stride, xd->dst.uv_stride, - mb_row, mb_col); + vp9_build_inter64x64_predictors_sb(xd, mb_row, mb_col); } /* dequantization and idct */ @@ -665,10 +650,7 @@ static void decode_superblock32(VP9D_COMP *pbi, MACROBLOCKD *xd, vp9_build_intra_predictors_sby_s(xd); vp9_build_intra_predictors_sbuv_s(xd); } else { - vp9_build_inter32x32_predictors_sb(xd, xd->dst.y_buffer, - xd->dst.u_buffer, xd->dst.v_buffer, - xd->dst.y_stride, xd->dst.uv_stride, - mb_row, mb_col); + vp9_build_inter32x32_predictors_sb(xd, mb_row, mb_col); } /* dequantization and idct */ diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index fc95c32..b00031c 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2408,10 +2408,7 @@ static void encode_superblock32(VP9_COMP *cpi, TOKENEXTRA **t, &xd->scale_factor[1], &xd->scale_factor_uv[1]); } - vp9_build_inter32x32_predictors_sb(xd, xd->dst.y_buffer, - xd->dst.u_buffer, xd->dst.v_buffer, - xd->dst.y_stride, xd->dst.uv_stride, - mb_row, mb_col); + vp9_build_inter32x32_predictors_sb(xd, mb_row, mb_col); } if (!x->skip) { @@ -2628,10 +2625,7 @@ static void encode_superblock64(VP9_COMP *cpi, TOKENEXTRA **t, &xd->scale_factor[1], &xd->scale_factor_uv[1]); } - vp9_build_inter64x64_predictors_sb(xd, xd->dst.y_buffer, - xd->dst.u_buffer, xd->dst.v_buffer, - xd->dst.y_stride, xd->dst.uv_stride, - mb_row, mb_col); + vp9_build_inter64x64_predictors_sb(xd, mb_row, mb_col); } if (!x->skip) { diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index ad9b960..7d67150 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3725,13 +3725,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, unsigned int sse, var; int tmp_rate_y, tmp_rate_u, tmp_rate_v; int tmp_dist_y, tmp_dist_u, tmp_dist_v; - vp9_build_inter64x64_predictors_sb(xd, - xd->dst.y_buffer, - xd->dst.u_buffer, - xd->dst.v_buffer, - xd->dst.y_stride, - xd->dst.uv_stride, - mb_row, mb_col); + vp9_build_inter64x64_predictors_sb(xd, mb_row, mb_col); var = vp9_variance64x64(*(b->base_src), b->src_stride, xd->dst.y_buffer, xd->dst.y_stride, &sse); // Note our transform coeffs are 8 times an orthogonal transform. @@ -3810,13 +3804,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, unsigned int sse, var; int tmp_rate_y, tmp_rate_u, tmp_rate_v; int tmp_dist_y, tmp_dist_u, tmp_dist_v; - vp9_build_inter32x32_predictors_sb(xd, - xd->dst.y_buffer, - xd->dst.u_buffer, - xd->dst.v_buffer, - xd->dst.y_stride, - xd->dst.uv_stride, - mb_row, mb_col); + vp9_build_inter32x32_predictors_sb(xd, mb_row, mb_col); var = vp9_variance32x32(*(b->base_src), b->src_stride, xd->dst.y_buffer, xd->dst.y_stride, &sse); // Note our transform coeffs are 8 times an orthogonal transform. @@ -3983,21 +3971,9 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, // Handles the special case when a filter that is not in the // switchable list (ex. bilinear, 6-tap) is indicated at the frame level if (block_size == BLOCK_64X64) { - vp9_build_inter64x64_predictors_sb(xd, - xd->dst.y_buffer, - xd->dst.u_buffer, - xd->dst.v_buffer, - xd->dst.y_stride, - xd->dst.uv_stride, - mb_row, mb_col); + vp9_build_inter64x64_predictors_sb(xd, mb_row, mb_col); } else if (block_size == BLOCK_32X32) { - vp9_build_inter32x32_predictors_sb(xd, - xd->dst.y_buffer, - xd->dst.u_buffer, - xd->dst.v_buffer, - xd->dst.y_stride, - xd->dst.uv_stride, - mb_row, mb_col); + vp9_build_inter32x32_predictors_sb(xd, mb_row, mb_col); } else { vp9_build_inter16x16_predictors_mb(xd, xd->predictor, xd->predictor + 256, -- 2.7.4