Merge "Adjust gm costing so GLOBAL_ZERO is treated as regular zeromv" into nextgenv2

5572486e · Sarah Parker · Gerrit Code Review · 470efbcf · ae51dd82 · 5572486e
Commit 5572486e authored Oct 19, 2016 by Sarah Parker Committed by Gerrit Code Review Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

av1/encoder/rdopt.c av1/encoder/rdopt.c +1 -1

No files found.
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4137,7 +4137,7 @@ static int get_gmbitcost(const Global_Motion_Params *gm,
    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)                            \