Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
f9490ff5
Commit
f9490ff5
authored
Sep 09, 2016
by
Yaowu Xu
Committed by
Gerrit Code Review
Sep 09, 2016
Browse files
Merge "Convert "var" to uint64_t" into nextgenv2
parents
ca38a67a
aa8729c5
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/encoder/aq_variance.c
View file @
f9490ff5
...
...
@@ -170,7 +170,7 @@ static unsigned int block_variance(AV1_COMP *cpi, MACROBLOCK *x,
bw
,
bh
,
&
sse
,
&
avg
);
#endif // CONFIG_AOM_HIGHBITDEPTH
var
=
sse
-
(((
int64_t
)
avg
*
avg
)
/
(
bw
*
bh
));
return
(
256
*
var
)
/
(
bw
*
bh
);
return
(
(
uint64_t
)
var
*
256
)
/
(
bw
*
bh
);
}
else
{
#if CONFIG_AOM_HIGHBITDEPTH
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
...
...
@@ -185,7 +185,7 @@ static unsigned int block_variance(AV1_COMP *cpi, MACROBLOCK *x,
var
=
cpi
->
fn_ptr
[
bs
].
vf
(
x
->
plane
[
0
].
src
.
buf
,
x
->
plane
[
0
].
src
.
stride
,
av1_all_zeros
,
0
,
&
sse
);
#endif // CONFIG_AOM_HIGHBITDEPTH
return
(
256
*
var
)
>>
num_pels_log2_lookup
[
bs
];
return
(
(
uint64_t
)
var
*
256
)
>>
num_pels_log2_lookup
[
bs
];
}
}
...
...
Write
Preview
Supports
Markdown
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