commit ae51dd820dd3004b8b234fa9a72c8d91bba5ab72
author Sarah Parker <sarahparker@google.com> Tue Oct 18 16:18:23 2016 -0700
committer Sarah Parker <sarahparker@google.com> Tue Oct 18 16:18:23 2016 -0700
tree ea2f5e331c2dac6065080cb038bffe395a82666f
parent 40f1d487adde872b080a6bea52b917fc916cf7ac

Adjust gm costing so GLOBAL_ZERO is treated as regular zeromv

Change-Id: I1b41146ae844c985566f5f9fdaeb5d4a4a5927b6

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index bd5ae7e..39af0f2 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4137,7 +4137,7 @@
     bits =
         (gm->motion_params.wmmat[0].as_int ? ((GM_ABS_TRANS_BITS + 1) * 2) : 0);
   }
-  return (bits << AV1_PROB_COST_SHIFT) + gmtype_cost[gm->gmtype];
+  return bits ? (bits << AV1_PROB_COST_SHIFT) + gmtype_cost[gm->gmtype] : 0;
 }
 
 #define GLOBAL_MOTION_RATE(ref)                            \