Skip to content

GitLab

Commit c1f911a2 authored by Alex Converse's avatar Alex Converse
Browse files

psnrhvs: Add missing consts and static consts. 

Change-Id: I63932edaef4c4d4d0a57e6f7d3e4aa42651a5c47
parent c65e79d2
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 55 deletions
vpx_dsp/psnrhvs.c
View file @ c1f911a2
......@@ -23,7 +23,8 @@
#endif
#include <string.h>
void od_bin_fdct8x8(tran_low_t *y, int ystride, const int16_t *x, int xstride) {
static void od_bin_fdct8x8(tran_low_t *y, int ystride, const int16_t *x,
int xstride) {
(void) xstride;
vpx_fdct8x8(x, y, ystride);
}
......@@ -31,56 +32,57 @@ void od_bin_fdct8x8(tran_low_t *y, int ystride, const int16_t *x, int xstride) {
/* Normalized inverse quantization matrix for 8x8 DCT at the point of
* transparency. This is not the JPEG based matrix from the paper,
this one gives a slightly higher MOS agreement.*/
float csf_y[8][8] = {{1.6193873005, 2.2901594831, 2.08509755623, 1.48366094411,
1.00227514334, 0.678296995242, 0.466224900598, 0.3265091542}, {2.2901594831,
1.94321815382, 2.04793073064, 1.68731108984, 1.2305666963, 0.868920337363,
0.61280991668, 0.436405793551}, {2.08509755623, 2.04793073064,
1.34329019223, 1.09205635862, 0.875748795257, 0.670882927016,
0.501731932449, 0.372504254596}, {1.48366094411, 1.68731108984,
1.09205635862, 0.772819797575, 0.605636379554, 0.48309405692,
0.380429446972, 0.295774038565}, {1.00227514334, 1.2305666963,
0.875748795257, 0.605636379554, 0.448996256676, 0.352889268808,
0.283006984131, 0.226951348204}, {0.678296995242, 0.868920337363,
0.670882927016, 0.48309405692, 0.352889268808, 0.27032073436,
0.215017739696, 0.17408067321}, {0.466224900598, 0.61280991668,
0.501731932449, 0.380429446972, 0.283006984131, 0.215017739696,
0.168869545842, 0.136153931001}, {0.3265091542, 0.436405793551,
0.372504254596, 0.295774038565, 0.226951348204, 0.17408067321,
0.136153931001, 0.109083846276}};
float csf_cb420[8][8] = {
static const float csf_y[8][8] = {
{1.6193873005, 2.2901594831, 2.08509755623, 1.48366094411, 1.00227514334,
0.678296995242, 0.466224900598, 0.3265091542},
{2.2901594831, 1.94321815382, 2.04793073064, 1.68731108984, 1.2305666963,
0.868920337363, 0.61280991668, 0.436405793551},
{2.08509755623, 2.04793073064, 1.34329019223, 1.09205635862, 0.875748795257,
0.670882927016, 0.501731932449, 0.372504254596},
{1.48366094411, 1.68731108984, 1.09205635862, 0.772819797575,
0.605636379554, 0.48309405692, 0.380429446972, 0.295774038565},
{1.00227514334, 1.2305666963, 0.875748795257, 0.605636379554,
0.448996256676, 0.352889268808, 0.283006984131, 0.226951348204},
{0.678296995242, 0.868920337363, 0.670882927016, 0.48309405692,
0.352889268808, 0.27032073436, 0.215017739696, 0.17408067321},
{0.466224900598, 0.61280991668, 0.501731932449, 0.380429446972,
0.283006984131, 0.215017739696, 0.168869545842, 0.136153931001},
{0.3265091542, 0.436405793551, 0.372504254596, 0.295774038565,
0.226951348204, 0.17408067321, 0.136153931001, 0.109083846276}};
static const float csf_cb420[8][8] = {
{1.91113096927, 2.46074210438, 1.18284184739, 1.14982565193, 1.05017074788,
0.898018824055, 0.74725392039, 0.615105596242}, {2.46074210438,
1.58529308355, 1.21363250036, 1.38190029285, 1.33100189972,
1.17428548929, 0.996404342439, 0.830890433625}, {1.18284184739,
1.21363250036, 0.978712413627, 1.02624506078, 1.03145147362,
0.960060382087, 0.849823426169, 0.731221236837}, {1.14982565193,
1.38190029285, 1.02624506078, 0.861317501629, 0.801821139099,
0.751437590932, 0.685398513368, 0.608694761374}, {1.05017074788,
1.33100189972, 1.03145147362, 0.801821139099, 0.676555426187,
0.605503172737, 0.55002013668, 0.495804539034}, {0.898018824055,
1.17428548929, 0.960060382087, 0.751437590932, 0.605503172737,
0.514674450957, 0.454353482512, 0.407050308965}, {0.74725392039,
0.996404342439, 0.849823426169, 0.685398513368, 0.55002013668,
0.454353482512, 0.389234902883, 0.342353999733}, {0.615105596242,
0.830890433625, 0.731221236837, 0.608694761374, 0.495804539034,
0.407050308965, 0.342353999733, 0.295530605237}};
float csf_cr420[8][8] = {
0.898018824055, 0.74725392039, 0.615105596242},
{2.46074210438, 1.58529308355, 1.21363250036, 1.38190029285, 1.33100189972,
1.17428548929, 0.996404342439, 0.830890433625},
{1.18284184739, 1.21363250036, 0.978712413627, 1.02624506078, 1.03145147362,
0.960060382087, 0.849823426169, 0.731221236837},
{1.14982565193, 1.38190029285, 1.02624506078, 0.861317501629,
0.801821139099, 0.751437590932, 0.685398513368, 0.608694761374},
{1.05017074788, 1.33100189972, 1.03145147362, 0.801821139099,
0.676555426187, 0.605503172737, 0.55002013668, 0.495804539034},
{0.898018824055, 1.17428548929, 0.960060382087, 0.751437590932,
0.605503172737, 0.514674450957, 0.454353482512, 0.407050308965},
{0.74725392039, 0.996404342439, 0.849823426169, 0.685398513368,
0.55002013668, 0.454353482512, 0.389234902883, 0.342353999733},
{0.615105596242, 0.830890433625, 0.731221236837, 0.608694761374,
0.495804539034, 0.407050308965, 0.342353999733, 0.295530605237}};
static const float csf_cr420[8][8] = {
{2.03871978502, 2.62502345193, 1.26180942886, 1.11019789803, 1.01397751469,
0.867069376285, 0.721500455585, 0.593906509971}, {2.62502345193,
1.69112867013, 1.17180569821, 1.3342742857, 1.28513006198,
1.13381474809, 0.962064122248, 0.802254508198}, {1.26180942886,
1.17180569821, 0.944981930573, 0.990876405848, 0.995903384143,
0.926972725286, 0.820534991409, 0.706020324706}, {1.11019789803,
1.3342742857, 0.990876405848, 0.831632933426, 0.77418706195,
0.725539939514, 0.661776842059, 0.587716619023}, {1.01397751469,
1.28513006198, 0.995903384143, 0.77418706195, 0.653238524286,
0.584635025748, 0.531064164893, 0.478717061273}, {0.867069376285,
1.13381474809, 0.926972725286, 0.725539939514, 0.584635025748,
0.496936637883, 0.438694579826, 0.393021669543}, {0.721500455585,
0.962064122248, 0.820534991409, 0.661776842059, 0.531064164893,
0.438694579826, 0.375820256136, 0.330555063063}, {0.593906509971,
0.802254508198, 0.706020324706, 0.587716619023, 0.478717061273,
0.393021669543, 0.330555063063, 0.285345396658}};
0.867069376285, 0.721500455585, 0.593906509971},
{2.62502345193, 1.69112867013, 1.17180569821, 1.3342742857, 1.28513006198,
1.13381474809, 0.962064122248, 0.802254508198},
{1.26180942886, 1.17180569821, 0.944981930573, 0.990876405848,
0.995903384143, 0.926972725286, 0.820534991409, 0.706020324706},
{1.11019789803, 1.3342742857, 0.990876405848, 0.831632933426, 0.77418706195,
0.725539939514, 0.661776842059, 0.587716619023},
{1.01397751469, 1.28513006198, 0.995903384143, 0.77418706195,
0.653238524286, 0.584635025748, 0.531064164893, 0.478717061273},
{0.867069376285, 1.13381474809, 0.926972725286, 0.725539939514,
0.584635025748, 0.496936637883, 0.438694579826, 0.393021669543},
{0.721500455585, 0.962064122248, 0.820534991409, 0.661776842059,
0.531064164893, 0.438694579826, 0.375820256136, 0.330555063063},
{0.593906509971, 0.802254508198, 0.706020324706, 0.587716619023,
0.478717061273, 0.393021669543, 0.330555063063, 0.285345396658}};
static double convert_score_db(double _score, double _weight) {
return 10 * (log10(255 * 255) - log10(_weight * _score));
......@@ -89,7 +91,7 @@ static double convert_score_db(double _score, double _weight) {
static double calc_psnrhvs(const unsigned char *_src, int _systride,
const unsigned char *_dst, int _dystride,
double _par, int _w, int _h, int _step,
float _csf[8][8]) {
const float _csf[8][8]) {
float ret;
int16_t dct_s[8 * 8], dct_d[8 * 8];
tran_low_t dct_s_coef[8 * 8], dct_d_coef[8 * 8];
......@@ -200,11 +202,12 @@ static double calc_psnrhvs(const unsigned char *_src, int _systride,
ret /= pixels;
return ret;
}
double vpx_psnrhvs(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest,
double *y_psnrhvs, double *u_psnrhvs, double *v_psnrhvs) {
double vpx_psnrhvs(const YV12_BUFFER_CONFIG *source,
const YV12_BUFFER_CONFIG *dest, double *y_psnrhvs,
double *u_psnrhvs, double *v_psnrhvs) {
double psnrhvs;
double par = 1.0;
int step = 7;
const double par = 1.0;
const int step = 7;
vpx_clear_system_state();
*y_psnrhvs = calc_psnrhvs(source->y_buffer, source->y_stride, dest->y_buffer,
dest->y_stride, par, source->y_crop_width,
......
vpx_dsp/ssim.h
View file @ c1f911a2
......@@ -81,7 +81,8 @@ double vpx_calc_ssimg(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest,
double vpx_calc_fastssim(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest,
double *ssim_y, double *ssim_u, double *ssim_v);
double vpx_psnrhvs(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest,
double vpx_psnrhvs(const YV12_BUFFER_CONFIG *source,
const YV12_BUFFER_CONFIG *dest,
double *ssim_y, double *ssim_u, double *ssim_v);
#if CONFIG_VP9_HIGHBITDEPTH
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment