Commit 5572486e authored by Sarah Parker's avatar Sarah Parker Committed by Gerrit Code Review
Browse files

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

parents 470efbcf ae51dd82
...@@ -4137,7 +4137,7 @@ static int get_gmbitcost(const Global_Motion_Params *gm, ...@@ -4137,7 +4137,7 @@ static int get_gmbitcost(const Global_Motion_Params *gm,
bits = bits =
(gm->motion_params.wmmat[0].as_int ? ((GM_ABS_TRANS_BITS + 1) * 2) : 0); (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) \ #define GLOBAL_MOTION_RATE(ref) \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment