summaryrefslogtreecommitdiff
path: root/vp9/encoder
diff options
context:
space:
mode:
authorPaul Wilkins <paulwilkins@google.com>2013-02-05 10:28:26 +0000
committerPaul Wilkins <paulwilkins@google.com>2013-02-05 17:03:25 +0000
commit81043e8d625efbafe0668b6b04f3dc812b65c4a4 (patch)
tree8dc41d5f25597477cb7c2b04a680e318760d9ba7 /vp9/encoder
parentfb4b533da9ebf03b443ec4e8f310e0b31ec49c31 (diff)
downloadlibvpx-81043e8d625efbafe0668b6b04f3dc812b65c4a4.tar
libvpx-81043e8d625efbafe0668b6b04f3dc812b65c4a4.tar.gz
libvpx-81043e8d625efbafe0668b6b04f3dc812b65c4a4.tar.bz2
libvpx-81043e8d625efbafe0668b6b04f3dc812b65c4a4.zip
Change definition of NearestMV.
This commit makes the NearestMV match the chosen best reference MV. It can be a 0,0 or non zero vector which means the the compound nearest mv mode can combine a 0,0 and a non zero vector. Change-Id: I2213d09996ae2916e53e6458d7d110350dcffd7a
Diffstat (limited to 'vp9/encoder')
-rw-r--r--vp9/encoder/vp9_rdopt.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 2e9bbcfc1..110e07057 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3301,13 +3301,8 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
96, xd->allow_high_precision_mv);
}
break;
- case NEARESTMV:
case NEARMV:
- // Do not bother proceeding if the vector (from newmv, nearest or
- // near) is 0,0 as this should then be coded using the zeromv mode.
- for (i = 0; i < num_refs; ++i)
- if (frame_mv[this_mode][refs[i]].as_int == 0)
- return INT64_MAX;
+ case NEARESTMV:
case ZEROMV:
default:
break;