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
Guillaume Martres
aom-rav1e
Commits
b0dcc582
Commit
b0dcc582
authored
Jan 21, 2016
by
Yaowu Xu
Browse files
Remove postproc left over in --enable-internal-stats
parent
27fb0383
Changes
1
Show whitespace changes
Inline
Side-by-side
vp10/encoder/encoder.c
View file @
b0dcc582
...
@@ -4067,7 +4067,6 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags,
...
@@ -4067,7 +4067,6 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags,
if
(
cpi
->
b_calculate_psnr
)
{
if
(
cpi
->
b_calculate_psnr
)
{
YV12_BUFFER_CONFIG
*
orig
=
cpi
->
Source
;
YV12_BUFFER_CONFIG
*
orig
=
cpi
->
Source
;
YV12_BUFFER_CONFIG
*
recon
=
cpi
->
common
.
frame_to_show
;
YV12_BUFFER_CONFIG
*
recon
=
cpi
->
common
.
frame_to_show
;
YV12_BUFFER_CONFIG
*
pp
=
&
cm
->
post_proc_buffer
;
PSNR_STATS
psnr
;
PSNR_STATS
psnr
;
#if CONFIG_VPX_HIGHBITDEPTH
#if CONFIG_VPX_HIGHBITDEPTH
calc_highbd_psnr
(
orig
,
recon
,
&
psnr
,
cpi
->
td
.
mb
.
e_mbd
.
bd
,
calc_highbd_psnr
(
orig
,
recon
,
&
psnr
,
cpi
->
td
.
mb
.
e_mbd
.
bd
,
...
@@ -4083,22 +4082,9 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags,
...
@@ -4083,22 +4082,9 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags,
samples
=
psnr
.
samples
[
0
];
samples
=
psnr
.
samples
[
0
];
{
{
PSNR_STATS
psnr2
;
double
frame_ssim2
=
0
,
weight
=
0
;
double
frame_ssim2
=
0
,
weight
=
0
;
vpx_clear_system_state
();
vpx_clear_system_state
();
#if CONFIG_VPX_HIGHBITDEPTH
calc_highbd_psnr
(
orig
,
pp
,
&
psnr2
,
cpi
->
td
.
mb
.
e_mbd
.
bd
,
cpi
->
oxcf
.
input_bit_depth
);
#else
calc_psnr
(
orig
,
pp
,
&
psnr2
);
#endif // CONFIG_VPX_HIGHBITDEPTH
cpi
->
totalp_sq_error
+=
psnr2
.
sse
[
0
];
cpi
->
totalp_samples
+=
psnr2
.
samples
[
0
];
adjust_image_stat
(
psnr2
.
psnr
[
1
],
psnr2
.
psnr
[
2
],
psnr2
.
psnr
[
3
],
psnr2
.
psnr
[
0
],
&
cpi
->
psnrp
);
#if CONFIG_VPX_HIGHBITDEPTH
#if CONFIG_VPX_HIGHBITDEPTH
if
(
cm
->
use_highbitdepth
)
{
if
(
cm
->
use_highbitdepth
)
{
frame_ssim2
=
vpx_highbd_calc_ssim
(
orig
,
recon
,
&
weight
,
frame_ssim2
=
vpx_highbd_calc_ssim
(
orig
,
recon
,
&
weight
,
...
@@ -4114,17 +4100,6 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags,
...
@@ -4114,17 +4100,6 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags,
cpi
->
summed_quality
+=
frame_ssim2
*
weight
;
cpi
->
summed_quality
+=
frame_ssim2
*
weight
;
cpi
->
summed_weights
+=
weight
;
cpi
->
summed_weights
+=
weight
;
#if CONFIG_VPX_HIGHBITDEPTH
if
(
cm
->
use_highbitdepth
)
{
frame_ssim2
=
vpx_highbd_calc_ssim
(
orig
,
&
cm
->
post_proc_buffer
,
&
weight
,
(
int
)
cm
->
bit_depth
);
}
else
{
frame_ssim2
=
vpx_calc_ssim
(
orig
,
&
cm
->
post_proc_buffer
,
&
weight
);
}
#else
frame_ssim2
=
vpx_calc_ssim
(
orig
,
&
cm
->
post_proc_buffer
,
&
weight
);
#endif // CONFIG_VPX_HIGHBITDEPTH
cpi
->
summedp_quality
+=
frame_ssim2
*
weight
;
cpi
->
summedp_quality
+=
frame_ssim2
*
weight
;
cpi
->
summedp_weights
+=
weight
;
cpi
->
summedp_weights
+=
weight
;
#if 0
#if 0
...
...
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