Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
6e695da2
Commit
6e695da2
authored
Feb 21, 2016
by
Yaowu Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move psnrhvs function declaration to psnr.h
From "ssim.h" Change-Id: Ie53378794149ef8a844b4eb47ad4f08579de4b60
parent
f6a7b17a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
25 deletions
+23
-25
test/hbd_metrics_test.cc
test/hbd_metrics_test.cc
+2
-2
vp10/encoder/encoder.c
vp10/encoder/encoder.c
+1
-1
vp9/encoder/vp9_encoder.c
vp9/encoder/vp9_encoder.c
+1
-3
vpx_dsp/psnr.h
vpx_dsp/psnr.h
+5
-0
vpx_dsp/psnrhvs.c
vpx_dsp/psnrhvs.c
+14
-14
vpx_dsp/ssim.h
vpx_dsp/ssim.h
+0
-5
No files found.
test/hbd_metrics_test.cc
View file @
6e695da2
...
...
@@ -53,14 +53,14 @@ double compute_hbd_psnrhvs(const YV12_BUFFER_CONFIG *source,
uint32_t
in_bd
,
uint32_t
bd
)
{
double
tempy
,
tempu
,
tempv
;
return
vpx_psnrhvs
(
source
,
dest
,
&
tempy
,
&
tempu
,
&
tempv
,
bd
);
&
tempy
,
&
tempu
,
&
tempv
,
bd
,
in_
bd
);
}
double
compute_psnrhvs
(
const
YV12_BUFFER_CONFIG
*
source
,
const
YV12_BUFFER_CONFIG
*
dest
)
{
double
tempy
,
tempu
,
tempv
;
return
vpx_psnrhvs
(
source
,
dest
,
&
tempy
,
&
tempu
,
&
tempv
,
8
);
&
tempy
,
&
tempu
,
&
tempv
,
8
,
8
);
}
double
compute_hbd_fastssim
(
const
YV12_BUFFER_CONFIG
*
source
,
...
...
vp10/encoder/encoder.c
View file @
6e695da2
...
...
@@ -4006,7 +4006,7 @@ static void compute_internal_stats(VP10_COMP *cpi) {
frame_all
=
vpx_calc_fastssim
(
orig
,
recon
,
&
y
,
&
u
,
&
v
,
bit_depth
);
adjust_image_stat
(
y
,
u
,
v
,
frame_all
,
&
cpi
->
fastssim
);
frame_all
=
vpx_psnrhvs
(
orig
,
recon
,
&
y
,
&
u
,
&
v
,
bit_depth
);
frame_all
=
vpx_psnrhvs
(
orig
,
recon
,
&
y
,
&
u
,
&
v
,
bit_depth
,
in_
bit_depth
);
adjust_image_stat
(
y
,
u
,
v
,
frame_all
,
&
cpi
->
psnrhvs
);
}
}
...
...
vp9/encoder/vp9_encoder.c
View file @
6e695da2
...
...
@@ -4314,9 +4314,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
if
(
cm
->
show_frame
)
{
uint32_t
bit_depth
=
8
;
#if CONFIG_VP9_HIGHBITDEPTH
uint32_t
in_bit_depth
=
8
;
#endif
cpi
->
count
++
;
#if CONFIG_VP9_HIGHBITDEPTH
if
(
cm
->
use_highbitdepth
)
{
...
...
@@ -4460,7 +4458,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
{
double
y
,
u
,
v
,
frame_all
;
frame_all
=
vpx_psnrhvs
(
cpi
->
Source
,
cm
->
frame_to_show
,
&
y
,
&
u
,
&
v
,
bit_depth
);
bit_depth
,
in_
bit_depth
);
adjust_image_stat
(
y
,
u
,
v
,
frame_all
,
&
cpi
->
psnrhvs
);
}
}
...
...
vpx_dsp/psnr.h
View file @
6e695da2
...
...
@@ -56,6 +56,11 @@ void calc_psnr(const YV12_BUFFER_CONFIG *a,
const
YV12_BUFFER_CONFIG
*
b
,
PSNR_STATS
*
psnr
);
double
vpx_psnrhvs
(
const
YV12_BUFFER_CONFIG
*
source
,
const
YV12_BUFFER_CONFIG
*
dest
,
double
*
phvs_y
,
double
*
phvs_u
,
double
*
phvs_v
,
uint32_t
bd
,
uint32_t
in_bd
);
int64_t
highbd_get_sse
(
const
uint8_t
*
a
,
int
a_stride
,
const
uint8_t
*
b
,
int
b_stride
,
int
width
,
int
height
);
...
...
vpx_dsp/psnrhvs.c
View file @
6e695da2
...
...
@@ -248,27 +248,27 @@ static double calc_psnrhvs(const unsigned char *src, int _systride,
return
ret
;
}
double
vpx_psnrhvs
(
const
YV12_BUFFER_CONFIG
*
s
ou
rc
e
,
double
vpx_psnrhvs
(
const
YV12_BUFFER_CONFIG
*
src
,
const
YV12_BUFFER_CONFIG
*
dest
,
double
*
y_psnrhvs
,
double
*
u_psnrhvs
,
double
*
v_psnrhvs
,
uint32_t
bit_depth
)
{
double
*
u_psnrhvs
,
double
*
v_psnrhvs
,
uint32_t
bd
,
uint32_t
in_bd
)
{
double
psnrhvs
;
const
double
par
=
1
.
0
;
const
int
step
=
7
;
vpx_clear_system_state
();
assert
(
b
it_depth
==
8
||
b
it_depth
==
10
||
b
it_depth
==
12
);
assert
(
b
d
==
8
||
b
d
==
10
||
b
d
==
12
);
*
y_psnrhvs
=
calc_psnrhvs
(
source
->
y_buffer
,
source
->
y_stride
,
dest
->
y_buffer
,
dest
->
y_stride
,
par
,
source
->
y_crop_width
,
source
->
y_crop_height
,
step
,
csf_y
,
bit_depth
);
*
u_psnrhvs
=
calc_psnrhvs
(
source
->
u_buffer
,
source
->
uv_stride
,
dest
->
u_buffer
,
dest
->
uv_stride
,
par
,
source
->
uv_crop_width
,
source
->
uv_crop_height
,
step
,
csf_cb420
,
bit_depth
);
*
v_psnrhvs
=
calc_psnrhvs
(
source
->
v_buffer
,
source
->
uv_stride
,
dest
->
v_buffer
,
dest
->
uv_stride
,
par
,
source
->
uv_crop_width
,
source
->
uv_crop_height
,
step
,
csf_cr420
,
bit_depth
);
*
y_psnrhvs
=
calc_psnrhvs
(
src
->
y_buffer
,
src
->
y_stride
,
dest
->
y_buffer
,
dest
->
y_stride
,
par
,
src
->
y_crop_width
,
src
->
y_crop_height
,
step
,
csf_y
,
bd
);
*
u_psnrhvs
=
calc_psnrhvs
(
src
->
u_buffer
,
src
->
uv_stride
,
dest
->
u_buffer
,
dest
->
uv_stride
,
par
,
src
->
uv_crop_width
,
src
->
uv_crop_height
,
step
,
csf_cb420
,
bd
);
*
v_psnrhvs
=
calc_psnrhvs
(
src
->
v_buffer
,
src
->
uv_stride
,
dest
->
v_buffer
,
dest
->
uv_stride
,
par
,
src
->
uv_crop_width
,
src
->
uv_crop_height
,
step
,
csf_cr420
,
bd
);
psnrhvs
=
(
*
y_psnrhvs
)
*
.
8
+
.
1
*
((
*
u_psnrhvs
)
+
(
*
v_psnrhvs
));
return
convert_score_db
(
psnrhvs
,
1
.
0
,
b
it_depth
);
return
convert_score_db
(
psnrhvs
,
1
.
0
,
b
d
);
}
vpx_dsp/ssim.h
View file @
6e695da2
...
...
@@ -75,11 +75,6 @@ double vpx_calc_fastssim(const YV12_BUFFER_CONFIG *source,
double
*
ssim_y
,
double
*
ssim_u
,
double
*
ssim_v
,
uint32_t
bit_depth
);
double
vpx_psnrhvs
(
const
YV12_BUFFER_CONFIG
*
source
,
const
YV12_BUFFER_CONFIG
*
dest
,
double
*
phvs_y
,
double
*
phvs_u
,
double
*
phvs_v
,
uint32_t
bit_depth
);
#if CONFIG_VP9_HIGHBITDEPTH
double
vpx_highbd_calc_ssim
(
const
YV12_BUFFER_CONFIG
*
source
,
const
YV12_BUFFER_CONFIG
*
dest
,
...
...
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