summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco <marpan@google.com>2016-01-21 15:13:10 -0800
committerMarco <marpan@google.com>2016-01-21 15:16:52 -0800
commitdbc963a42fa4b3544a0188867561050511d3ad33 (patch)
tree621149f9e69dd370c07230fa3c14786fb0164a18
parent8c4360ed89127a0946f36dfe6a2919a72922f2bd (diff)
downloadlibvpx-dbc963a42fa4b3544a0188867561050511d3ad33.tar
libvpx-dbc963a42fa4b3544a0188867561050511d3ad33.tar.gz
libvpx-dbc963a42fa4b3544a0188867561050511d3ad33.tar.bz2
libvpx-dbc963a42fa4b3544a0188867561050511d3ad33.zip
vp9 pickmode: Fix the shift on negative value.
Error only affected svc 1 pass mode, introduced in: https://chromium-review.googlesource.com/#/c/319609/ Change-Id: Ifc078c82d38b742966a81baaf5ad532f7dbc13a4
-rw-r--r--vp9/encoder/vp9_pickmode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index a9c52b154..755323dc6 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -117,8 +117,8 @@ static int mv_refs_rt(VP9_COMP *cpi, const VP9_COMMON *cm,
MV_REF *candidate =
&cm->prev_frame->mvs[(mi_col>>1) + (mi_row>>1) * (cm->mi_cols>>1)];
if (candidate->mv[0].as_int != INVALID_MV) {
- base_mv->as_mv.row = (candidate->mv[0].as_mv.row << 1);
- base_mv->as_mv.col = (candidate->mv[0].as_mv.col << 1);
+ base_mv->as_mv.row = (candidate->mv[0].as_mv.row * 2);
+ base_mv->as_mv.col = (candidate->mv[0].as_mv.col * 2);
clamp_mv_ref(&base_mv->as_mv, xd);
} else {
base_mv->as_int = INVALID_MV;