commit 505f00685d9a2893e42f6246541a8c24f3681ec1
author Fergus Simpson <afergs@google.com> Tue Jun 27 11:23:34 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Sat Jul 08 07:21:17 2017 -0700
tree f51b39c8c63021ce9c8dad385a17474bb7fd3864
parent 158361456af3cfd36849e4826bf3163dc7c7eeca

Fix frame scaling prediction

Use higher precision offsets for more accurate predictor
generation when references are at a different scale from
the coded frame.

Change-Id: I4c2c0ec67fa4824273cb3bd072211f41ac7802e8

av1/common/resize.c

diff --git a/av1/common/resize.c b/av1/common/resize.c
index d0bdfc8..8ddca0a 100644
--- a/av1/common/resize.c
+++ b/av1/common/resize.c
@@ -1055,8 +1055,13 @@
 }
 
 void av1_calculate_scaled_size(int *width, int *height, int num) {
-  *width = *width * num / SCALE_DENOMINATOR;
-  *height = *height * num / SCALE_DENOMINATOR;
+  if (num != SCALE_DENOMINATOR) {
+    *width = *width * num / SCALE_DENOMINATOR;
+    *height = *height * num / SCALE_DENOMINATOR;
+    // Make width and height even
+    *width += *width & 1;
+    *height += *height & 1;
+  }
 }
 
 #if CONFIG_FRAME_SUPERRES