X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_psnr.c;h=36bbab259fc31a79db762c36eebd646269ba1667;hb=0c7b44a01c1564ef681d51a5ed37d3908558143b;hp=bfb0711950fed2cf215b7e904e6deeaa42036a0e;hpb=866a4174dba066780c7be1ebdaa0152161cdf3e0;p=ffmpeg diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index bfb0711950f..36bbab259fc 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -193,17 +193,19 @@ static av_cold int init(AVFilterContext *ctx) s->min_mse = +INFINITY; s->max_mse = -INFINITY; - if (!strcmp(s->stats_file_str, "-")) { - s->stats_file = stdout; - } else if (s->stats_file_str) { - s->stats_file = fopen(s->stats_file_str, "w"); - if (!s->stats_file) { - int err = AVERROR(errno); - char buf[128]; - av_strerror(err, buf, sizeof(buf)); - av_log(ctx, AV_LOG_ERROR, "Could not open stats file %s: %s\n", - s->stats_file_str, buf); - return err; + if (s->stats_file_str) { + if (!strcmp(s->stats_file_str, "-")) { + s->stats_file = stdout; + } else { + s->stats_file = fopen(s->stats_file_str, "w"); + if (!s->stats_file) { + int err = AVERROR(errno); + char buf[128]; + av_strerror(err, buf, sizeof(buf)); + av_log(ctx, AV_LOG_ERROR, "Could not open stats file %s: %s\n", + s->stats_file_str, buf); + return err; + } } } @@ -324,10 +326,10 @@ static av_cold void uninit(AVFilterContext *ctx) buf[0] = 0; for (j = 0; j < s->nb_components; j++) { int c = s->is_rgb ? s->rgba_map[j] : j; - av_strlcatf(buf, sizeof(buf), " %c:%0.2f", s->comps[j], + av_strlcatf(buf, sizeof(buf), " %c:%f", s->comps[j], get_psnr(s->mse_comp[c], s->nb_frames, s->max[c])); } - av_log(ctx, AV_LOG_INFO, "PSNR%s average:%0.2f min:%0.2f max:%0.2f\n", + av_log(ctx, AV_LOG_INFO, "PSNR%s average:%f min:%f max:%f\n", buf, get_psnr(s->mse, s->nb_frames, s->average_max), get_psnr(s->max_mse, 1, s->average_max),