From dd33637c18629c3e554ebb146bbeb45c9745a5cf Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 14 Oct 2013 21:10:08 +0200 Subject: tiny_psnr: switch f32 handling to floating point Also add support for f64. --- tests/tiny_psnr.c | 114 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 84 insertions(+), 30 deletions(-) (limited to 'tests/tiny_psnr.c') diff --git a/tests/tiny_psnr.c b/tests/tiny_psnr.c index b1bcc16693..66eaf82895 100644 --- a/tests/tiny_psnr.c +++ b/tests/tiny_psnr.c @@ -23,8 +23,11 @@ #include #include #include +#include +#include #include "libavutil/intfloat.h" +#include "libavutil/intreadwrite.h" #define FFMIN(a, b) ((a) > (b) ? (b) : (a)) #define F 100 @@ -107,21 +110,26 @@ static float get_f32l(uint8_t *p) return v.f; } +static double get_f64l(uint8_t *p) +{ + return av_int2double(AV_RL64(p)); +} + int main(int argc, char *argv[]) { int i, j; uint64_t sse = 0; - uint64_t dev; + double sse_d = 0.0; FILE *f[2]; uint8_t buf[2][SIZE]; - uint64_t psnr; int len = 1; int64_t max; int shift = argc < 5 ? 0 : atoi(argv[4]); int skip_bytes = argc < 6 ? 0 : atoi(argv[5]); int size0 = 0; int size1 = 0; - int maxdist = 0; + uint64_t maxdist = 0; + double maxdist_d = 0.0; if (argc < 3) { printf("tiny_psnr [ [ []]]\n"); @@ -136,6 +144,8 @@ int main(int argc, char *argv[]) len = 2; } else if (!strcmp(argv[3], "f32")) { len = 4; + } else if (!strcmp(argv[3], "f64")) { + len = 8; } else { char *end; len = strtol(argv[3], &end, 0); @@ -184,23 +194,42 @@ int main(int argc, char *argv[]) int s1 = fread(buf[1], 1, SIZE, f[1]); for (j = 0; j < FFMIN(s0, s1); j += len) { - int64_t a = buf[0][j]; - int64_t b = buf[1][j]; - int dist; - if (len == 2) { - a = get_s16l(buf[0] + j); - b = get_s16l(buf[1] + j); - } else if (len == 4) { - a = get_f32l(buf[0] + j) * (1 << 24); - b = get_f32l(buf[1] + j) * (1 << 24); - } else { - a = buf[0][j]; - b = buf[1][j]; + switch (len) { + case 1: + case 2: { + int64_t a = buf[0][j]; + int64_t b = buf[1][j]; + int dist; + if (len == 2) { + a = get_s16l(buf[0] + j); + b = get_s16l(buf[1] + j); + } else { + a = buf[0][j]; + b = buf[1][j]; + } + sse += (a - b) * (a - b); + dist = abs(a - b); + if (dist > maxdist) + maxdist = dist; + break; + } + case 4: + case 8: { + double dist, a, b; + if (len == 8) { + a = get_f64l(buf[0] + j); + b = get_f64l(buf[1] + j); + } else { + a = get_f32l(buf[0] + j); + b = get_f32l(buf[1] + j); + } + dist = fabs(a - b); + sse_d += (a - b) * (a - b); + if (dist > maxdist_d) + maxdist_d = dist; + break; + } } - sse += (a - b) * (a - b); - dist = abs(a - b); - if (dist > maxdist) - maxdist = dist; } size0 += s0; size1 += s1; @@ -211,16 +240,41 @@ int main(int argc, char *argv[]) i = FFMIN(size0, size1) / len; if (!i) i = 1; - dev = int_sqrt(((sse / i) * F * F) + (((sse % i) * F * F) + i / 2) / i); - if (sse) - psnr = ((2 * log16(max << 16) + log16(i) - log16(sse)) * - 284619LL * F + (1LL << 31)) / (1LL << 32); - else - psnr = 1000 * F - 1; // floating point free infinity :) - - printf("stddev:%5d.%02d PSNR:%3d.%02d MAXDIFF:%5d bytes:%9d/%9d\n", - (int)(dev / F), (int)(dev % F), - (int)(psnr / F), (int)(psnr % F), - maxdist, size0, size1); + switch (len) { + case 1: + case 2: { + uint64_t psnr; + uint64_t dev = int_sqrt(((sse / i) * F * F) + (((sse % i) * F * F) + i / 2) / i); + if (sse) + psnr = ((2 * log16(max << 16) + log16(i) - log16(sse)) * + 284619LL * F + (1LL << 31)) / (1LL << 32); + else + psnr = 1000 * F - 1; // floating point free infinity :) + + printf("stddev:%5d.%02d PSNR:%3d.%02d MAXDIFF:%5"PRIu64" bytes:%9d/%9d\n", + (int)(dev / F), (int)(dev % F), + (int)(psnr / F), (int)(psnr % F), + maxdist, size0, size1); + break; + } + case 4: + case 8: { + char psnr_str[64]; + double dev = sqrt(sse_d / i); + uint64_t scale = (len == 4) ? (1ULL << 24) : (1ULL << 32); + + if (sse_d) { + double psnr = 2 * log(DBL_MAX) - log(i / sse_d); + snprintf(psnr_str, sizeof(psnr_str), "%5.02f", psnr); + } else + snprintf(psnr_str, sizeof(psnr_str), "inf"); + + maxdist = maxdist_d * scale; + + printf("stddev:%10.2f PSNR:%s MAXDIFF:%10"PRIu64" bytes:%9d/%9d\n", + dev * scale, psnr_str, maxdist, size0, size1); + break; + } + } return 0; } -- cgit v1.2.3