commit 17bc92cdd011e1231f131f6401dfd0dcf0eef3e5
author Yaowu Xu <yaowu@google.com> Thu Apr 05 09:36:43 2018 -0700
committer Yaowu Xu <yaowu@google.com> Thu Apr 05 21:36:21 2018 +0000
tree ec0ebb96749b403b91771527147a64c750e61cc8
parent f13772b6c5a0ef4415218e41f5c5ee17361e1425

Reorder operations to avoid uint32_t overflow

Change-Id: I4af6f70f85621b3bd747352621aa7478649ec2fb

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index f70f8ce..1d78ae8 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -6231,10 +6231,10 @@
                           pred1 + bh / 2 * stride1 + bw / 2, stride0,
                           &esq[1][3]);
 
-  tl = (int64_t)(esq[0][0] + esq[0][1] + esq[0][2]) -
-       (int64_t)(esq[1][0] + esq[1][1] + esq[1][2]);
-  br = (int64_t)(esq[1][3] + esq[1][1] + esq[1][2]) -
-       (int64_t)(esq[0][3] + esq[0][1] + esq[0][2]);
+  tl = ((int64_t)esq[0][0] + esq[0][1] + esq[0][2]) -
+       ((int64_t)esq[1][0] + esq[1][1] + esq[1][2]);
+  br = ((int64_t)esq[1][3] + esq[1][1] + esq[1][2]) -
+       ((int64_t)esq[0][3] + esq[0][1] + esq[0][2]);
   return (tl + br > 0);
 }