har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_psnr: Fix rounding error in average_max

Browse Source 
The intermediate was rounded to an integer

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-07-21 02:04:03 +02:00
parent 541731488e
commit 9264bb7e79
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/vf_psnr.c
View File

@ -241,6 +241,7 @@ static int config_input_ref(AVFilterLink *inlink)
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
PSNRContext *s = ctx->priv; PSNRContext *s = ctx->priv;
double average_max;
unsigned sum; unsigned sum;
int j; int j;
@ -273,10 +274,12 @@ static int config_input_ref(AVFilterLink *inlink)
sum = 0; sum = 0;
for (j = 0; j < s->nb_components; j++) for (j = 0; j < s->nb_components; j++)
sum += s->planeheight[j] * s->planewidth[j]; sum += s->planeheight[j] * s->planewidth[j];
average_max = 0;
for (j = 0; j < s->nb_components; j++) { for (j = 0; j < s->nb_components; j++) {
s->planeweight[j] = (double) s->planeheight[j] * s->planewidth[j] / sum; s->planeweight[j] = (double) s->planeheight[j] * s->planewidth[j] / sum;
s->average_max += s->max[j] * s->planeweight[j]; average_max += s->max[j] * s->planeweight[j];
} }
s->average_max = lrint(average_max);
s->dsp.sse_line = desc->comp[0].depth > 8 ? sse_line_16bit : sse_line_8bit; s->dsp.sse_line = desc->comp[0].depth > 8 ? sse_line_16bit : sse_line_8bit;
if (ARCH_X86) if (ARCH_X86)