Merge "Revert "Correct the inter prediction coordinate...""

This commit is contained in:
James Zern 2015-07-03 18:44:00 +00:00 committed by Gerrit Code Review
commit 823a126d4c

View File

@ -575,10 +575,10 @@ static void dec_build_inter_predictors(VP9Decoder *const pbi, MACROBLOCKD *xd,
// width/height is not a multiple of 8 pixels.
if (is_scaled || scaled_mv.col || scaled_mv.row ||
(frame_width & 0x7) || (frame_height & 0x7)) {
int y1 = (y0_16 + (h - 1) * ys) >> SUBPEL_BITS;
int y1 = ((y0_16 + (h - 1) * ys) >> SUBPEL_BITS) + 1;
// Get reference block bottom right horizontal coordinate.
int x1 = (x0_16 + (w - 1) * xs) >> SUBPEL_BITS;
int x1 = ((x0_16 + (w - 1) * xs) >> SUBPEL_BITS) + 1;
int x_pad = 0, y_pad = 0;
if (subpel_x || (sf->x_step_q4 != SUBPEL_SHIFTS)) {