commit 5a9e82e31721f9670802a589c6f7fa6c50c7878b
author Debargha Mukherjee <debargha@google.com> Thu Sep 07 11:40:02 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Thu Sep 07 20:58:32 2017 +0000
tree b13cabb45c90b23065cbbd25d16f8849e90541a6
parent 8af64ae58b054caf34b1a4ef9e523ce33f873673

Fix scaling parameter in non-normative warping

Use macro SCALE_SUBPEL_BITS rather than hard-coded 4 for old
warping code that is used for non-affine global models.

Change-Id: I10ee7b29101cd79e77a4d29e69d67497fda4e967

av1/common/warped_motion.c

diff --git a/av1/common/warped_motion.c b/av1/common/warped_motion.c
index 4d345bb..34374af 100644
--- a/av1/common/warped_motion.c
+++ b/av1/common/warped_motion.c
@@ -912,8 +912,8 @@
       in[0] = j;
       in[1] = i;
       projectpoints(wm->wmmat, in, out, 1, 2, 2, subsampling_x, subsampling_y);
-      out[0] = ROUND_POWER_OF_TWO_SIGNED(out[0] * x_scale, 4);
-      out[1] = ROUND_POWER_OF_TWO_SIGNED(out[1] * y_scale, 4);
+      out[0] = ROUND_POWER_OF_TWO_SIGNED(out[0] * x_scale, SCALE_SUBPEL_BITS);
+      out[1] = ROUND_POWER_OF_TWO_SIGNED(out[1] * y_scale, SCALE_SUBPEL_BITS);
       if (conv_params->do_average)
         pred[(j - p_col) + (i - p_row) * p_stride] = ROUND_POWER_OF_TWO(
             pred[(j - p_col) + (i - p_row) * p_stride] +
@@ -1169,8 +1169,8 @@
       in[0] = j;
       in[1] = i;
       projectpoints(wm->wmmat, in, out, 1, 2, 2, subsampling_x, subsampling_y);
-      out[0] = ROUND_POWER_OF_TWO_SIGNED(out[0] * x_scale, 4);
-      out[1] = ROUND_POWER_OF_TWO_SIGNED(out[1] * y_scale, 4);
+      out[0] = ROUND_POWER_OF_TWO_SIGNED(out[0] * x_scale, SCALE_SUBPEL_BITS);
+      out[1] = ROUND_POWER_OF_TWO_SIGNED(out[1] * y_scale, SCALE_SUBPEL_BITS);
       if (conv_params->do_average)
         pred[(j - p_col) + (i - p_row) * p_stride] = ROUND_POWER_OF_TWO(
             pred[(j - p_col) + (i - p_row) * p_stride] +