Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
0d367474
Commit
0d367474
authored
Dec 05, 2014
by
Deb Mukherjee
Committed by
Gerrit Code Review
Dec 05, 2014
Browse files
Merge "Some internal-stats, vp9-highbitdepth bug fixes"
parents
bd6bfb93
37448d3e
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encoder.c
View file @
0d367474
...
...
@@ -3846,7 +3846,8 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
#if CONFIG_VP9_HIGHBITDEPTH
if
(
cm
->
use_highbitdepth
)
{
frame_ssim2
=
vp9_highbd_calc_ssim
(
orig
,
recon
,
&
weight
,
xd
->
bd
);
frame_ssim2
=
vp9_highbd_calc_ssim
(
orig
,
recon
,
&
weight
,
(
int
)
cm
->
bit_depth
);
}
else
{
frame_ssim2
=
vp9_calc_ssim
(
orig
,
recon
,
&
weight
);
}
...
...
@@ -3860,7 +3861,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
#if CONFIG_VP9_HIGHBITDEPTH
if
(
cm
->
use_highbitdepth
)
{
frame_ssim2
=
vp9_highbd_calc_ssim
(
orig
,
&
cm
->
post_proc_buffer
,
&
weight
,
xd
->
bd
);
orig
,
&
cm
->
post_proc_buffer
,
&
weight
,
(
int
)
cm
->
bit_depth
);
}
else
{
frame_ssim2
=
vp9_calc_ssim
(
orig
,
&
cm
->
post_proc_buffer
,
&
weight
);
}
...
...
@@ -3888,7 +3889,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
#if CONFIG_VP9_HIGHBITDEPTH
if
(
cm
->
use_highbitdepth
)
{
frame_all
=
vp9_highbd_calc_ssimg
(
cpi
->
Source
,
cm
->
frame_to_show
,
&
y
,
&
u
,
&
v
,
xd
->
bd
);
&
u
,
&
v
,
(
int
)
cm
->
bit_depth
);
}
else
{
frame_all
=
vp9_calc_ssimg
(
cpi
->
Source
,
cm
->
frame_to_show
,
&
y
,
&
u
,
&
v
);
...
...
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