Commit 16982342 authored by Johann's avatar Johann
Browse files

Missed some variance casts

Change-Id: I9fb510f9421fb3c317a8e32e3058cee977ddf9fa
parent 12d45f62
...@@ -219,7 +219,7 @@ unsigned int vp8_sub_pixel_variance4x4_mmx ...@@ -219,7 +219,7 @@ unsigned int vp8_sub_pixel_variance4x4_mmx
&xsum, &xxsum &xsum, &xxsum
); );
*sse = xxsum; *sse = xxsum;
return (xxsum - ((xsum * xsum) >> 4)); return (xxsum - ((unsigned int)(xsum * xsum) >> 4));
} }
...@@ -244,7 +244,7 @@ unsigned int vp8_sub_pixel_variance8x8_mmx ...@@ -244,7 +244,7 @@ unsigned int vp8_sub_pixel_variance8x8_mmx
&xsum, &xxsum &xsum, &xxsum
); );
*sse = xxsum; *sse = xxsum;
return (xxsum - ((xsum * xsum) >> 6)); return (xxsum - ((unsigned int)(xsum * xsum) >> 6));
} }
unsigned int vp8_sub_pixel_variance16x16_mmx unsigned int vp8_sub_pixel_variance16x16_mmx
...@@ -282,7 +282,7 @@ unsigned int vp8_sub_pixel_variance16x16_mmx ...@@ -282,7 +282,7 @@ unsigned int vp8_sub_pixel_variance16x16_mmx
xxsum0 += xxsum1; xxsum0 += xxsum1;
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((xsum0 * xsum0) >> 8)); return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8));
} }
...@@ -335,7 +335,7 @@ unsigned int vp8_sub_pixel_variance16x8_mmx ...@@ -335,7 +335,7 @@ unsigned int vp8_sub_pixel_variance16x8_mmx
xxsum0 += xxsum1; xxsum0 += xxsum1;
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((xsum0 * xsum0) >> 7)); return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 7));
} }
unsigned int vp8_sub_pixel_variance8x16_mmx unsigned int vp8_sub_pixel_variance8x16_mmx
...@@ -358,7 +358,7 @@ unsigned int vp8_sub_pixel_variance8x16_mmx ...@@ -358,7 +358,7 @@ unsigned int vp8_sub_pixel_variance8x16_mmx
&xsum, &xxsum &xsum, &xxsum
); );
*sse = xxsum; *sse = xxsum;
return (xxsum - ((xsum * xsum) >> 7)); return (xxsum - ((unsigned int)(xsum * xsum) >> 7));
} }
......
...@@ -184,7 +184,7 @@ unsigned int vp8_variance16x16_wmt ...@@ -184,7 +184,7 @@ unsigned int vp8_variance16x16_wmt
vp8_get16x16var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0) ; vp8_get16x16var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0) ;
*sse = sse0; *sse = sse0;
return (sse0 - ((sum0 * sum0) >> 8)); return (sse0 - ((unsigned int)(sum0 * sum0) >> 8));
} }
unsigned int vp8_mse16x16_wmt( unsigned int vp8_mse16x16_wmt(
const unsigned char *src_ptr, const unsigned char *src_ptr,
...@@ -265,7 +265,7 @@ unsigned int vp8_sub_pixel_variance4x4_wmt ...@@ -265,7 +265,7 @@ unsigned int vp8_sub_pixel_variance4x4_wmt
&xsum, &xxsum &xsum, &xxsum
); );
*sse = xxsum; *sse = xxsum;
return (xxsum - ((xsum * xsum) >> 4)); return (xxsum - ((unsigned int)(xsum * xsum) >> 4));
} }
...@@ -314,7 +314,7 @@ unsigned int vp8_sub_pixel_variance8x8_wmt ...@@ -314,7 +314,7 @@ unsigned int vp8_sub_pixel_variance8x8_wmt
} }
*sse = xxsum; *sse = xxsum;
return (xxsum - ((xsum * xsum) >> 6)); return (xxsum - ((unsigned int)(xsum * xsum) >> 6));
} }
unsigned int vp8_sub_pixel_variance16x16_wmt unsigned int vp8_sub_pixel_variance16x16_wmt
...@@ -375,7 +375,7 @@ unsigned int vp8_sub_pixel_variance16x16_wmt ...@@ -375,7 +375,7 @@ unsigned int vp8_sub_pixel_variance16x16_wmt
} }
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((xsum0 * xsum0) >> 8)); return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8));
} }
unsigned int vp8_sub_pixel_mse16x16_wmt( unsigned int vp8_sub_pixel_mse16x16_wmt(
...@@ -446,7 +446,7 @@ unsigned int vp8_sub_pixel_variance16x8_wmt ...@@ -446,7 +446,7 @@ unsigned int vp8_sub_pixel_variance16x8_wmt
} }
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((xsum0 * xsum0) >> 7)); return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 7));
} }
unsigned int vp8_sub_pixel_variance8x16_wmt unsigned int vp8_sub_pixel_variance8x16_wmt
...@@ -494,7 +494,7 @@ unsigned int vp8_sub_pixel_variance8x16_wmt ...@@ -494,7 +494,7 @@ unsigned int vp8_sub_pixel_variance8x16_wmt
} }
*sse = xxsum; *sse = xxsum;
return (xxsum - ((xsum * xsum) >> 7)); return (xxsum - ((unsigned int)(xsum * xsum) >> 7));
} }
...@@ -514,7 +514,7 @@ unsigned int vp8_variance_halfpixvar16x16_h_wmt( ...@@ -514,7 +514,7 @@ unsigned int vp8_variance_halfpixvar16x16_h_wmt(
&xsum0, &xxsum0); &xsum0, &xxsum0);
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((xsum0 * xsum0) >> 8)); return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8));
} }
...@@ -533,7 +533,7 @@ unsigned int vp8_variance_halfpixvar16x16_v_wmt( ...@@ -533,7 +533,7 @@ unsigned int vp8_variance_halfpixvar16x16_v_wmt(
&xsum0, &xxsum0); &xsum0, &xxsum0);
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((xsum0 * xsum0) >> 8)); return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8));
} }
...@@ -553,5 +553,5 @@ unsigned int vp8_variance_halfpixvar16x16_hv_wmt( ...@@ -553,5 +553,5 @@ unsigned int vp8_variance_halfpixvar16x16_hv_wmt(
&xsum0, &xxsum0); &xsum0, &xxsum0);
*sse = xxsum0; *sse = xxsum0;
return (xxsum0 - ((xsum0 * xsum0) >> 8)); return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8));
} }
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