From 5daaff527e9d55115c286d2f30ef44922ac5cf8a Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Mon, 3 Feb 2014 18:03:17 -0800 Subject: [PATCH] Moving x1 & y1 calculation under if condition. Change-Id: Iae787d491f7cfe24855ef8f2d04e2c6c19350378 --- vp9/common/vp9_reconinter.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c index d554cc0..3746631 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c @@ -280,8 +280,8 @@ static void dec_build_inter_predictors(MACROBLOCKD *xd, int plane, int block, pd->subsampling_y); MV32 scaled_mv; - int xs, ys, x0, y0, x0_16, y0_16, x1, y1, frame_width, - frame_height, subpel_x, subpel_y, buf_stride; + int xs, ys, x0, y0, x0_16, y0_16, frame_width, frame_height, buf_stride, + subpel_x, subpel_y; uint8_t *ref_frame, *buf_ptr; const YV12_BUFFER_CONFIG *ref_buf = xd->block_refs[ref]->buf; @@ -327,10 +327,6 @@ static void dec_build_inter_predictors(MACROBLOCKD *xd, int plane, int block, x0_16 += scaled_mv.col; y0_16 += scaled_mv.row; - // Get reference block bottom right coordinate. - x1 = ((x0_16 + (w - 1) * xs) >> SUBPEL_BITS) + 1; - y1 = ((y0_16 + (h - 1) * ys) >> SUBPEL_BITS) + 1; - // Get reference block pointer. buf_ptr = ref_frame + y0 * pre_buf->stride + x0; buf_stride = pre_buf->stride; @@ -339,6 +335,9 @@ static void dec_build_inter_predictors(MACROBLOCKD *xd, int plane, int block, // width/height is not a multiple of 8 pixels. if (scaled_mv.col || scaled_mv.row || (frame_width & 0x7) || (frame_height & 0x7)) { + // Get reference block bottom right coordinate. + int x1 = ((x0_16 + (w - 1) * xs) >> SUBPEL_BITS) + 1; + int y1 = ((y0_16 + (h - 1) * ys) >> SUBPEL_BITS) + 1; int x_pad = 0, y_pad = 0; if (subpel_x || (sf->x_step_q4 & SUBPEL_MASK)) { -- 2.7.4