commit cda2345787aede9b4c362b4ec4bfe044f4ef7ab8
author Sarah Parker <sarahparker@google.com> Wed Sep 07 03:28:06 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 07 03:28:07 2016 +0000
tree 104a4bc59e7b4e4712db819ccdcfd07cbdf67da1
parent 1d22837fbdd41645964faf791d600951c5a6a902
parent ca92da752b80d444b0c9d9db834330cf1cae55d0

Merge "Adjust types in hbd error computation to avoid overflow" into nextgenv2

av1/common/warped_motion.c

diff --git a/av1/common/warped_motion.c b/av1/common/warped_motion.c
index 2ff1fce..146a14d 100644
--- a/av1/common/warped_motion.c
+++ b/av1/common/warped_motion.c
@@ -477,7 +477,7 @@
   uint16_t *dst = CONVERT_TO_SHORTPTR(dst8);
   uint16_t *ref = CONVERT_TO_SHORTPTR(ref8);
   int gm_err = 0, no_gm_err = 0;
-  int gm_sumerr = 0, no_gm_sumerr = 0;
+  int64_t gm_sumerr = 0, no_gm_sumerr = 0;
   for (i = p_row; i < p_row + p_height; ++i) {
     for (j = p_col; j < p_col + p_width; ++j) {
       int in[2], out[2];
@@ -492,8 +492,8 @@
                                        stride, bd);
       no_gm_err = dst[(j - p_col) + (i - p_row) * p_stride] -
                   ref[(j - p_col) + (i - p_row) * stride];
-      gm_sumerr += gm_err * gm_err;
-      no_gm_sumerr += no_gm_err * no_gm_err;
+      gm_sumerr += (int64_t)gm_err * gm_err;
+      no_gm_sumerr += (int64_t)no_gm_err * no_gm_err;
     }
   }
   return (double)gm_sumerr / no_gm_sumerr;