Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
libvpx
Commits
e4ef8508
Commit
e4ef8508
authored
Feb 22, 2013
by
James Zern
Committed by
Gerrit Code Review
Feb 22, 2013
Browse files
Merge "Fix variance (signed integer) overflow"
parents
c21226b6
cc894a18
Changes
4
Hide whitespace changes
Inline
Side-by-side
vp8/common/variance_c.c
View file @
e4ef8508
...
...
@@ -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
));
}
...
...
vp8/common/x86/variance_mmx.c
View file @
e4ef8508
...
...
@@ -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
));
}
...
...
vp8/common/x86/variance_sse2.c
View file @
e4ef8508
...
...
@@ -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
));
}
vp8/common/x86/variance_ssse3.c
View file @
e4ef8508
...
...
@@ -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
));
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment