diff options
Diffstat (limited to 'vp9/encoder/x86')
-rw-r--r-- | vp9/encoder/x86/variance_mmx.c | 20 | ||||
-rw-r--r-- | vp9/encoder/x86/variance_sse2.c | 26 | ||||
-rw-r--r-- | vp9/encoder/x86/variance_ssse3.c | 4 |
3 files changed, 25 insertions, 25 deletions
diff --git a/vp9/encoder/x86/variance_mmx.c b/vp9/encoder/x86/variance_mmx.c index 3fedc6b5c..3b5f2a1b9 100644 --- a/vp9/encoder/x86/variance_mmx.c +++ b/vp9/encoder/x86/variance_mmx.c @@ -89,7 +89,7 @@ unsigned int vp9_variance4x4_mmx( vp9_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg); *sse = var; - return (var - ((avg * avg) >> 4)); + return (var - (((unsigned int)avg * avg) >> 4)); } @@ -105,7 +105,7 @@ unsigned int vp9_variance8x8_mmx( vp9_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg); *sse = var; - return (var - ((avg * avg) >> 6)); + return (var - (((unsigned int)avg * avg) >> 6)); } @@ -148,7 +148,7 @@ unsigned int vp9_variance16x16_mmx( var = sse0 + sse1 + sse2 + sse3; avg = sum0 + sum1 + sum2 + sum3; *sse = var; - return (var - ((avg * avg) >> 8)); + return (var - (((unsigned int)avg * avg) >> 8)); } unsigned int vp9_variance16x8_mmx( @@ -166,7 +166,7 @@ unsigned int vp9_variance16x8_mmx( var = sse0 + sse1; avg = sum0 + sum1; *sse = var; - return (var - ((avg * avg) >> 7)); + return (var - (((unsigned int)avg * avg) >> 7)); } @@ -187,7 +187,7 @@ unsigned int vp9_variance8x16_mmx( avg = sum0 + sum1; *sse = var; - return (var - ((avg * avg) >> 7)); + return (var - (((unsigned int)avg * avg) >> 7)); } @@ -237,7 +237,7 @@ unsigned int vp9_sub_pixel_variance4x4_mmx &xsum, &xxsum ); *sse = xxsum; - return (xxsum - ((xsum * xsum) >> 4)); + return (xxsum - (((unsigned int)xsum * xsum) >> 4)); } @@ -261,7 +261,7 @@ unsigned int vp9_sub_pixel_variance8x8_mmx &xsum, &xxsum ); *sse = xxsum; - return (xxsum - ((xsum * xsum) >> 6)); + return (xxsum - (((unsigned int)xsum * xsum) >> 6)); } unsigned int vp9_sub_pixel_variance16x16_mmx @@ -296,7 +296,7 @@ unsigned int vp9_sub_pixel_variance16x16_mmx xxsum0 += xxsum1; *sse = xxsum0; - return (xxsum0 - ((xsum0 * xsum0) >> 8)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8)); } @@ -347,7 +347,7 @@ unsigned int vp9_sub_pixel_variance16x8_mmx xxsum0 += xxsum1; *sse = xxsum0; - return (xxsum0 - ((xsum0 * xsum0) >> 7)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 7)); } unsigned int vp9_sub_pixel_variance8x16_mmx @@ -369,7 +369,7 @@ unsigned int vp9_sub_pixel_variance8x16_mmx &xsum, &xxsum ); *sse = xxsum; - return (xxsum - ((xsum * xsum) >> 7)); + return (xxsum - (((unsigned int)xsum * xsum) >> 7)); } diff --git a/vp9/encoder/x86/variance_sse2.c b/vp9/encoder/x86/variance_sse2.c index e63c53a53..9f897da51 100644 --- a/vp9/encoder/x86/variance_sse2.c +++ b/vp9/encoder/x86/variance_sse2.c @@ -150,7 +150,7 @@ unsigned int vp9_variance4x4_wmt( vp9_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg); *sse = var; - return (var - ((avg * avg) >> 4)); + return (var - (((unsigned int)avg * avg) >> 4)); } @@ -166,7 +166,7 @@ unsigned int vp9_variance8x8_wmt vp9_get8x8var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg); *sse = var; - return (var - ((avg * avg) >> 6)); + return (var - (((unsigned int)avg * avg) >> 6)); } @@ -184,7 +184,7 @@ unsigned int vp9_variance16x16_wmt vp9_get16x16var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0); *sse = sse0; - return (sse0 - ((sum0 * sum0) >> 8)); + return (sse0 - (((unsigned int)sum0 * sum0) >> 8)); } unsigned int vp9_mse16x16_wmt( const unsigned char *src_ptr, @@ -218,7 +218,7 @@ unsigned int vp9_variance16x8_wmt var = sse0 + sse1; avg = sum0 + sum1; *sse = var; - return (var - ((avg * avg) >> 7)); + return (var - (((unsigned int)avg * avg) >> 7)); } @@ -238,7 +238,7 @@ unsigned int vp9_variance8x16_wmt var = sse0 + sse1; avg = sum0 + sum1; *sse = var; - return (var - ((avg * avg) >> 7)); + return (var - (((unsigned int)avg * avg) >> 7)); } @@ -261,7 +261,7 @@ unsigned int vp9_sub_pixel_variance4x4_wmt &xsum, &xxsum ); *sse = xxsum; - return (xxsum - ((xsum * xsum) >> 4)); + return (xxsum - (((unsigned int)xsum * xsum) >> 4)); } @@ -302,7 +302,7 @@ unsigned int vp9_sub_pixel_variance8x8_wmt } *sse = xxsum; - return (xxsum - ((xsum * xsum) >> 6)); + return (xxsum - (((unsigned int)xsum * xsum) >> 6)); } unsigned int vp9_sub_pixel_variance16x16_wmt @@ -355,7 +355,7 @@ unsigned int vp9_sub_pixel_variance16x16_wmt } *sse = xxsum0; - return (xxsum0 - ((xsum0 * xsum0) >> 8)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8)); } unsigned int vp9_sub_pixel_mse16x16_wmt( @@ -417,7 +417,7 @@ unsigned int vp9_sub_pixel_variance16x8_wmt } *sse = xxsum0; - return (xxsum0 - ((xsum0 * xsum0) >> 7)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 7)); } unsigned int vp9_sub_pixel_variance8x16_wmt @@ -457,7 +457,7 @@ unsigned int vp9_sub_pixel_variance8x16_wmt } *sse = xxsum; - return (xxsum - ((xsum * xsum) >> 7)); + return (xxsum - (((unsigned int)xsum * xsum) >> 7)); } @@ -476,7 +476,7 @@ unsigned int vp9_variance_halfpixvar16x16_h_wmt( &xsum0, &xxsum0); *sse = xxsum0; - return (xxsum0 - ((xsum0 * xsum0) >> 8)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8)); } @@ -494,7 +494,7 @@ unsigned int vp9_variance_halfpixvar16x16_v_wmt( &xsum0, &xxsum0); *sse = xxsum0; - return (xxsum0 - ((xsum0 * xsum0) >> 8)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8)); } @@ -513,5 +513,5 @@ unsigned int vp9_variance_halfpixvar16x16_hv_wmt( &xsum0, &xxsum0); *sse = xxsum0; - return (xxsum0 - ((xsum0 * xsum0) >> 8)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8)); } diff --git a/vp9/encoder/x86/variance_ssse3.c b/vp9/encoder/x86/variance_ssse3.c index f37abb881..81b06d117 100644 --- a/vp9/encoder/x86/variance_ssse3.c +++ b/vp9/encoder/x86/variance_ssse3.c @@ -106,7 +106,7 @@ unsigned int vp9_sub_pixel_variance16x16_ssse3 } *sse = xxsum0; - return (xxsum0 - ((xsum0 * xsum0) >> 8)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8)); } unsigned int vp9_sub_pixel_variance16x8_ssse3 @@ -147,5 +147,5 @@ unsigned int vp9_sub_pixel_variance16x8_ssse3 } *sse = xxsum0; - return (xxsum0 - ((xsum0 * xsum0) >> 7)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 7)); } |