diff --git a/vp8/common/variance_c.c b/vp8/common/variance_c.c index da08affb81a2237254ff4fb9a7d08903ff0273a1..773b655efc518128e9ac38c71a025f78ef21e842 100644 --- a/vp8/common/variance_c.c +++ b/vp8/common/variance_c.c @@ -75,7 +75,7 @@ unsigned int vp8_variance16x16_c( variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 16, &var, &avg); *sse = var; - return (var - ((unsigned int)(avg * avg) >> 8)); + return (var - (((unsigned int)avg * avg) >> 8)); } unsigned int vp8_variance8x16_c( @@ -91,7 +91,7 @@ unsigned int vp8_variance8x16_c( variance(src_ptr, source_stride, ref_ptr, recon_stride, 8, 16, &var, &avg); *sse = var; - return (var - ((unsigned int)(avg * avg) >> 7)); + return (var - (((unsigned int)avg * avg) >> 7)); } unsigned int vp8_variance16x8_c( @@ -107,7 +107,7 @@ unsigned int vp8_variance16x8_c( variance(src_ptr, source_stride, ref_ptr, recon_stride, 16, 8, &var, &avg); *sse = var; - return (var - ((unsigned int)(avg * avg) >> 7)); + return (var - (((unsigned int)avg * avg) >> 7)); } @@ -124,7 +124,7 @@ unsigned int vp8_variance8x8_c( variance(src_ptr, source_stride, ref_ptr, recon_stride, 8, 8, &var, &avg); *sse = var; - return (var - ((unsigned int)(avg * avg) >> 6)); + return (var - (((unsigned int)avg * avg) >> 6)); } unsigned int vp8_variance4x4_c( @@ -140,7 +140,7 @@ unsigned int vp8_variance4x4_c( variance(src_ptr, source_stride, ref_ptr, recon_stride, 4, 4, &var, &avg); *sse = var; - return (var - ((unsigned int)(avg * avg) >> 4)); + return (var - (((unsigned int)avg * avg) >> 4)); } diff --git a/vp8/common/x86/variance_mmx.c b/vp8/common/x86/variance_mmx.c index 0c4dd4a981e021f555d7d7079284366d4a73e34a..36995db9aa7b1d450338e22cba6fe55e8b107bc0 100644 --- a/vp8/common/x86/variance_mmx.c +++ b/vp8/common/x86/variance_mmx.c @@ -91,7 +91,7 @@ unsigned int vp8_variance4x4_mmx( vp8_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ; *sse = var; - return (var - ((unsigned int)(avg * avg) >> 4)); + return (var - (((unsigned int)avg * avg) >> 4)); } @@ -108,7 +108,7 @@ unsigned int vp8_variance8x8_mmx( vp8_get8x8var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ; *sse = var; - return (var - ((unsigned int)(avg * avg) >> 6)); + return (var - (((unsigned int)avg * avg) >> 6)); } @@ -153,7 +153,7 @@ unsigned int vp8_variance16x16_mmx( var = sse0 + sse1 + sse2 + sse3; avg = sum0 + sum1 + sum2 + sum3; *sse = var; - return (var - ((unsigned int)(avg * avg) >> 8)); + return (var - (((unsigned int)avg * avg) >> 8)); } unsigned int vp8_variance16x8_mmx( @@ -172,7 +172,7 @@ unsigned int vp8_variance16x8_mmx( var = sse0 + sse1; avg = sum0 + sum1; *sse = var; - return (var - ((unsigned int)(avg * avg) >> 7)); + return (var - (((unsigned int)avg * avg) >> 7)); } @@ -194,7 +194,7 @@ unsigned int vp8_variance8x16_mmx( avg = sum0 + sum1; *sse = var; - return (var - ((unsigned int)(avg * avg) >> 7)); + return (var - (((unsigned int)avg * avg) >> 7)); } @@ -219,7 +219,7 @@ unsigned int vp8_sub_pixel_variance4x4_mmx &xsum, &xxsum ); *sse = xxsum; - return (xxsum - ((unsigned int)(xsum * xsum) >> 4)); + return (xxsum - (((unsigned int)xsum * xsum) >> 4)); } @@ -244,7 +244,7 @@ unsigned int vp8_sub_pixel_variance8x8_mmx &xsum, &xxsum ); *sse = xxsum; - return (xxsum - ((unsigned int)(xsum * xsum) >> 6)); + return (xxsum - (((unsigned int)xsum * xsum) >> 6)); } unsigned int vp8_sub_pixel_variance16x16_mmx @@ -282,7 +282,7 @@ unsigned int vp8_sub_pixel_variance16x16_mmx xxsum0 += xxsum1; *sse = xxsum0; - return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8)); } @@ -335,7 +335,7 @@ unsigned int vp8_sub_pixel_variance16x8_mmx xxsum0 += xxsum1; *sse = xxsum0; - return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 7)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 7)); } unsigned int vp8_sub_pixel_variance8x16_mmx @@ -358,7 +358,7 @@ unsigned int vp8_sub_pixel_variance8x16_mmx &xsum, &xxsum ); *sse = xxsum; - return (xxsum - ((unsigned int)(xsum * xsum) >> 7)); + return (xxsum - (((unsigned int)xsum * xsum) >> 7)); } diff --git a/vp8/common/x86/variance_sse2.c b/vp8/common/x86/variance_sse2.c index afd642915d235d8258ebd818088c10629116c994..7fa5f53dcbf605e835e4874249aa465d63547fd0 100644 --- a/vp8/common/x86/variance_sse2.c +++ b/vp8/common/x86/variance_sse2.c @@ -148,7 +148,7 @@ unsigned int vp8_variance4x4_wmt( vp8_get4x4var_mmx(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ; *sse = var; - return (var - ((unsigned int)(avg * avg) >> 4)); + return (var - (((unsigned int)avg * avg) >> 4)); } @@ -165,7 +165,7 @@ unsigned int vp8_variance8x8_wmt vp8_get8x8var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &var, &avg) ; *sse = var; - return (var - ((unsigned int)(avg * avg) >> 6)); + return (var - (((unsigned int)avg * avg) >> 6)); } @@ -184,7 +184,7 @@ unsigned int vp8_variance16x16_wmt vp8_get16x16var_sse2(src_ptr, source_stride, ref_ptr, recon_stride, &sse0, &sum0) ; *sse = sse0; - return (sse0 - ((unsigned int)(sum0 * sum0) >> 8)); + return (sse0 - (((unsigned int)sum0 * sum0) >> 8)); } unsigned int vp8_mse16x16_wmt( const unsigned char *src_ptr, @@ -220,7 +220,7 @@ unsigned int vp8_variance16x8_wmt var = sse0 + sse1; avg = sum0 + sum1; *sse = var; - return (var - ((unsigned int)(avg * avg) >> 7)); + return (var - (((unsigned int)avg * avg) >> 7)); } @@ -241,7 +241,7 @@ unsigned int vp8_variance8x16_wmt var = sse0 + sse1; avg = sum0 + sum1; *sse = var; - return (var - ((unsigned int)(avg * avg) >> 7)); + return (var - (((unsigned int)avg * avg) >> 7)); } @@ -265,7 +265,7 @@ unsigned int vp8_sub_pixel_variance4x4_wmt &xsum, &xxsum ); *sse = xxsum; - return (xxsum - ((unsigned int)(xsum * xsum) >> 4)); + return (xxsum - (((unsigned int)xsum * xsum) >> 4)); } @@ -314,7 +314,7 @@ unsigned int vp8_sub_pixel_variance8x8_wmt } *sse = xxsum; - return (xxsum - ((unsigned int)(xsum * xsum) >> 6)); + return (xxsum - (((unsigned int)xsum * xsum) >> 6)); } unsigned int vp8_sub_pixel_variance16x16_wmt @@ -376,7 +376,7 @@ unsigned int vp8_sub_pixel_variance16x16_wmt } *sse = xxsum0; - return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8)); } unsigned int vp8_sub_pixel_mse16x16_wmt( @@ -447,7 +447,7 @@ unsigned int vp8_sub_pixel_variance16x8_wmt } *sse = xxsum0; - return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 7)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 7)); } unsigned int vp8_sub_pixel_variance8x16_wmt @@ -495,7 +495,7 @@ unsigned int vp8_sub_pixel_variance8x16_wmt } *sse = xxsum; - return (xxsum - ((unsigned int)(xsum * xsum) >> 7)); + return (xxsum - (((unsigned int)xsum * xsum) >> 7)); } @@ -515,7 +515,7 @@ unsigned int vp8_variance_halfpixvar16x16_h_wmt( &xsum0, &xxsum0); *sse = xxsum0; - return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8)); } @@ -534,7 +534,7 @@ unsigned int vp8_variance_halfpixvar16x16_v_wmt( &xsum0, &xxsum0); *sse = xxsum0; - return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8)); } @@ -554,5 +554,5 @@ unsigned int vp8_variance_halfpixvar16x16_hv_wmt( &xsum0, &xxsum0); *sse = xxsum0; - return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8)); } diff --git a/vp8/common/x86/variance_ssse3.c b/vp8/common/x86/variance_ssse3.c index ba2055cc90455e181da4c8373a4e9aa15be0ecbf..f90f8117c4dbdb0c1051af196c06d98b44ad94f9 100644 --- a/vp8/common/x86/variance_ssse3.c +++ b/vp8/common/x86/variance_ssse3.c @@ -113,7 +113,7 @@ unsigned int vp8_sub_pixel_variance16x16_ssse3 } *sse = xxsum0; - return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 8)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 8)); } unsigned int vp8_sub_pixel_variance16x8_ssse3 @@ -162,5 +162,5 @@ unsigned int vp8_sub_pixel_variance16x8_ssse3 } *sse = xxsum0; - return (xxsum0 - ((unsigned int)(xsum0 * xsum0) >> 7)); + return (xxsum0 - (((unsigned int)xsum0 * xsum0) >> 7)); }