commit 36bad477a58ca62b095061b0efb60aef7becaab7
author Yaowu Xu <yaowu@google.com> Tue May 16 18:29:53 2017 -0700
committer Yaowu Xu <yaowu@google.com> Wed May 17 16:31:47 2017 +0000
tree c0c2830a0c8188d8aca571f57235a8838edcb444
parent d438dba10cbe5c751e88a0b8e485f77e94e6a81b

Rewrite an operation to avoid integer out-of-range

Fix ubsan warning of the left shift operation.

Change-Id: Ib01b6ecd4a4e142948b53792a2d34153cc85784a

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index e53a135..38e65e4 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9933,7 +9933,7 @@
   if (sf->adaptive_mode_search) {
     if (cm->show_frame && !cpi->rc.is_src_frame_alt_ref &&
         cpi->rc.frames_since_golden >= 3)
-      if (x->pred_mv_sad[GOLDEN_FRAME] > (x->pred_mv_sad[LAST_FRAME] << 1))
+      if ((x->pred_mv_sad[GOLDEN_FRAME] >> 1) > x->pred_mv_sad[LAST_FRAME])
         mode_skip_mask[GOLDEN_FRAME] |= INTER_ALL;
   }