Commit ad43a738 authored by Alex Converse's avatar Alex Converse

Fix a signed overflow in vp9 motion cost.

Change-Id: I5975e3aede62202d8ee6ced33889350c0a56554a
parent 0a3593a5
......@@ -86,7 +86,9 @@ static int mv_err_cost(const MV *mv, const MV *ref,
if (mvcost) {
const MV diff = { mv->row - ref->row,
mv->col - ref->col };
return ROUND_POWER_OF_TWO(mv_cost(&diff, mvjcost, mvcost) *
// TODO(aconverse): See if this shift needs to be tied to
// VP9_PROB_COST_SHIFT.
return ROUND_POWER_OF_TWO((unsigned)mv_cost(&diff, mvjcost, mvcost) *
error_per_bit, 13);
}
return 0;
......@@ -96,8 +98,9 @@ static int mvsad_err_cost(const MACROBLOCK *x, const MV *mv, const MV *ref,
int error_per_bit) {
const MV diff = { mv->row - ref->row,
mv->col - ref->col };
return ROUND_POWER_OF_TWO(mv_cost(&diff, x->nmvjointsadcost,
x->nmvsadcost) * error_per_bit, 8);
// TODO(aconverse): See if this shift needs to be tied to VP9_PROB_COST_SHIFT.
return ROUND_POWER_OF_TWO((unsigned)mv_cost(&diff, x->nmvjointsadcost,
x->nmvsadcost) * error_per_bit, 8);
}
void vp9_init_dsmotion_compensation(search_site_config *cfg, int stride) {
......
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