From 9c62f94129fc3ed63fb710009a952afe11456ccd Mon Sep 17 00:00:00 2001 From: Yunqing Wang Date: Wed, 18 May 2011 09:52:56 -0400 Subject: [PATCH] Fix a bug in vp8_clamp_mv function Scott fixed the bug in MV clamping function in encoder, which could cause artifacts. Change-Id: Id05f2794c43c31cdd45e66179c8811f3ee452cb9 --- vp8/encoder/pickinter.c | 6 +++--- vp8/encoder/rdopt.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 61d6612..9b2d3d2 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -637,10 +637,10 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int re /* adjust mvp to make sure it is within MV range */ vp8_clamp_mv(&mvp, - best_ref_mv.as_mv.row - MAX_FULL_PEL_VAL, - best_ref_mv.as_mv.row + MAX_FULL_PEL_VAL, best_ref_mv.as_mv.col - MAX_FULL_PEL_VAL, - best_ref_mv.as_mv.col + MAX_FULL_PEL_VAL); + best_ref_mv.as_mv.col + MAX_FULL_PEL_VAL, + best_ref_mv.as_mv.row - MAX_FULL_PEL_VAL, + best_ref_mv.as_mv.row + MAX_FULL_PEL_VAL); } switch (this_mode) diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 7bd2dfb..d18bae3 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -1878,10 +1878,10 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int /* adjust mvp to make sure it is within MV range */ vp8_clamp_mv(&mvp, - best_ref_mv.as_mv.row - MAX_FULL_PEL_VAL, - best_ref_mv.as_mv.row + MAX_FULL_PEL_VAL, best_ref_mv.as_mv.col - MAX_FULL_PEL_VAL, - best_ref_mv.as_mv.col + MAX_FULL_PEL_VAL); + best_ref_mv.as_mv.col + MAX_FULL_PEL_VAL, + best_ref_mv.as_mv.row - MAX_FULL_PEL_VAL, + best_ref_mv.as_mv.row + MAX_FULL_PEL_VAL); } // Check to see if the testing frequency for this mode is at its max -- 2.7.4