diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-07-11 07:22:47 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-11 18:47:05 +0200 |
| commit | 9879421f1ac1427efd5448772f7a58de1ae09872 (patch) | |
| tree | 8e24ed342b0d444e14df6a228bea404966ca6fbc | |
| parent | 9b8b804cfb37361a0fac49a6ce7052247d75a42e (diff) | |
| download | ffmpeg-9879421f1ac1427efd5448772f7a58de1ae09872.tar.gz | |
vf_psnr: always calculate MSE over full pixel range.
This makes the output compatible with that of pretty much any other
tool that calculates PSNR.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavfilter/vf_psnr.c | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index 0c2c9501f3..cc4546a164 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -260,33 +260,10 @@ static int config_input_ref(AVFilterLink *inlink) return AVERROR(EINVAL); } - switch (inlink->format) { - case AV_PIX_FMT_GRAY8: - case AV_PIX_FMT_GRAY16: - case AV_PIX_FMT_GBRP: - case AV_PIX_FMT_GBRP9: - case AV_PIX_FMT_GBRP10: - case AV_PIX_FMT_GBRP12: - case AV_PIX_FMT_GBRP14: - case AV_PIX_FMT_GBRP16: - case AV_PIX_FMT_GBRAP: - case AV_PIX_FMT_GBRAP16: - case AV_PIX_FMT_YUVJ411P: - case AV_PIX_FMT_YUVJ420P: - case AV_PIX_FMT_YUVJ422P: - case AV_PIX_FMT_YUVJ440P: - case AV_PIX_FMT_YUVJ444P: - s->max[0] = (1 << (desc->comp[0].depth_minus1 + 1)) - 1; - s->max[1] = (1 << (desc->comp[1].depth_minus1 + 1)) - 1; - s->max[2] = (1 << (desc->comp[2].depth_minus1 + 1)) - 1; - s->max[3] = (1 << (desc->comp[3].depth_minus1 + 1)) - 1; - break; - default: - s->max[0] = 235 * (1 << (desc->comp[0].depth_minus1 - 7)); - s->max[1] = 240 * (1 << (desc->comp[1].depth_minus1 - 7)); - s->max[2] = 240 * (1 << (desc->comp[2].depth_minus1 - 7)); - s->max[3] = (1 << (desc->comp[3].depth_minus1 + 1)) - 1; - } + s->max[0] = (1 << (desc->comp[0].depth_minus1 + 1)) - 1; + s->max[1] = (1 << (desc->comp[1].depth_minus1 + 1)) - 1; + s->max[2] = (1 << (desc->comp[2].depth_minus1 + 1)) - 1; + s->max[3] = (1 << (desc->comp[3].depth_minus1 + 1)) - 1; s->is_rgb = ff_fill_rgba_map(s->rgba_map, inlink->format) >= 0; s->comps[0] = s->is_rgb ? 'r' : 'y' ; |