summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunqing Wang <yunqingwang@google.com>2011-05-18 09:52:56 -0400
committerYunqing Wang <yunqingwang@google.com>2011-05-18 09:52:56 -0400
commit9c62f94129fc3ed63fb710009a952afe11456ccd (patch)
tree2c94b728ab58a0f02e92e517d5f3f0fd7462948a
parenteafdc5e10acd025e3587ee56bfa90894eb52d5ba (diff)
downloadlibvpx-9c62f94129fc3ed63fb710009a952afe11456ccd.tar
libvpx-9c62f94129fc3ed63fb710009a952afe11456ccd.tar.gz
libvpx-9c62f94129fc3ed63fb710009a952afe11456ccd.tar.bz2
libvpx-9c62f94129fc3ed63fb710009a952afe11456ccd.zip
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
-rw-r--r--vp8/encoder/pickinter.c6
-rw-r--r--vp8/encoder/rdopt.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index 61d6612cd..9b2d3d231 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 7bd2dfbbe..d18bae3fe 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