summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_pickmode.c
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2022-08-22 22:21:28 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-08-22 22:21:28 +0000
commit431ab4e626c73b3a95f4b9cc813968253e6317a2 (patch)
tree293220c458d3ea5acdfda62b2d1e21f737b5a706 /vp9/encoder/vp9_pickmode.c
parent249d93e147c1256ede084e9413994e4acbbca27d (diff)
parentc7358d801627ea7509a2a7c0d9fce9b72c14dfed (diff)
downloadlibvpx-431ab4e626c73b3a95f4b9cc813968253e6317a2.tar
libvpx-431ab4e626c73b3a95f4b9cc813968253e6317a2.tar.gz
libvpx-431ab4e626c73b3a95f4b9cc813968253e6317a2.tar.bz2
libvpx-431ab4e626c73b3a95f4b9cc813968253e6317a2.zip
Merge "vp9,search_new_mv: descale rather than scale sse" into main
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
-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 90dbc427e..711d611c1 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1627,9 +1627,9 @@ static int search_new_mv(VP9_COMP *cpi, MACROBLOCK *x,
return -1;
// Exit NEWMV search if base_mv_sse is large.
- if (sf->base_mv_aggressive && base_mv_sse > (best_sse_sofar << scale))
+ if (sf->base_mv_aggressive && (base_mv_sse >> scale) > best_sse_sofar)
return -1;
- if (base_mv_sse < (best_sse_sofar << 1)) {
+ if ((base_mv_sse >> 1) < best_sse_sofar) {
// Base layer mv is good.
// Exit NEWMV search if the base_mv is (0, 0) and sse is low, since
// (0, 0) mode is already tested.