From patchwork Fri Aug 26 19:10:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Cooper X-Patchwork-Id: 310 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp543990vsd; Fri, 26 Aug 2016 12:10:48 -0700 (PDT) X-Received: by 10.28.209.193 with SMTP id i184mr328959wmg.35.1472238648630; Fri, 26 Aug 2016 12:10:48 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s70si379647wme.140.2016.08.26.12.10.44; Fri, 26 Aug 2016 12:10:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A5EC7689B5D; Fri, 26 Aug 2016 22:10:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7378689A46 for ; Fri, 26 Aug 2016 22:10:26 +0300 (EEST) Received: by mail-pa0-f49.google.com with SMTP id fi15so29749426pac.1 for ; Fri, 26 Aug 2016 12:10:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MFKUA7GqE9NFbzoz3zgSb/qWTmPkGdJ3FYQPO7k/O/E=; b=Ivxgl3jrnXQoBYARiEZfdXOjB+BRoZWggrBc993R13s/ukgYrFu9650tzsGxVnQI4Q 0c9g8zKfI1cE0X+TYlc8nHS8ReNFl5R1tMrMMn4jjetyeD+OVGgGwrAjuuIx86Zb6m19 I3tJqJCz0SwtVeUVoyekGgwhgVrQ6ffien6urbUXNKEsKUfsaH9qMFe+mI+0q3RE6/or x4EzFrzblR1qehIj5yCDzLcCbYkB+/n4b2KxNpkfIV//ge0iQZL3L6Hvf9e/Ov6Mg1Rq RpOEyctPXtIwIe3V6lBcnZz2CwSozXQ2aFjdJ3DeAVM+mUofwAMxso+2hVPhuWAFPyKN AAPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MFKUA7GqE9NFbzoz3zgSb/qWTmPkGdJ3FYQPO7k/O/E=; b=AxwyOH4PW/jaST2dvOTra+ZF2ph1qmA6ofpd433KAXIpRJ61G/xqEVPiFLN3QD6BJp DXkRzdl/9rg3bTu35UpC2u/nWIGNZ72Ifz1AMHZ8ehof/8B65hoS55sJYoadC/HWCXGm bc2Mv/7Wv4gmAvAfbswniplPheXB6kmQIdyB1CkNQdv9gFIJCsnoOgau2ylcl6jUDCVB P1zlhqU8YlFRkSNXgI/FQFQ6gVkYeASTCq4rZ/ldTGXJc2xUj6vhF6lrIRnScfLCG3ZB L6xUG6TKhrW92Q0DqmdvFyOimOHUCUPqzQGEzB49VXqzvqQlog5WTEUFp5H8NYqHz/ff YPPA== X-Gm-Message-State: AE9vXwMFy0bAesxvi219uuplL2dmLwlovrRh4m+ML1vZabLTmvA33XKUWHXrpNTLZOA0T4nj X-Received: by 10.66.181.139 with SMTP id dw11mr8915623pac.2.1472238628383; Fri, 26 Aug 2016 12:10:28 -0700 (PDT) Received: from pinkiepie.mtv.corp.google.com ([172.27.82.120]) by smtp.gmail.com with ESMTPSA id p67sm30605861pfg.22.2016.08.26.12.10.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Aug 2016 12:10:27 -0700 (PDT) From: Lucas Cooper To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Aug 2016 12:10:17 -0700 Message-Id: <1472238617-16213-1-git-send-email-bobobo@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <20160817160943.GZ5460@nb4> References: <20160817160943.GZ5460@nb4> Subject: [FFmpeg-devel] [PATCH] Add max value output option to psnr stats log. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Lucas Cooper MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This allows retroactive calculation/aggregation of PSNR from the stats log. --- libavfilter/vf_psnr.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index 3bec747..9ad1423 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -45,6 +45,7 @@ typedef struct PSNRContext { char *stats_file_str; int stats_version; int stats_header_written; + int stats_add_max; int max[4], average_max; int is_rgb; uint8_t rgba_map[4]; @@ -63,6 +64,7 @@ static const AVOption psnr_options[] = { {"stats_file", "Set file where to store per-frame difference information", OFFSET(stats_file_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, {"f", "Set file where to store per-frame difference information", OFFSET(stats_file_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, {"stats_version", "Set the format version for the stats file.", OFFSET(stats_version), AV_OPT_TYPE_INT, {.i64=1}, 1, 2, FLAGS }, + {"output_max", "Add raw stats (max values) to the output log.", OFFSET(stats_add_max), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS}, { NULL } }; @@ -182,6 +184,12 @@ static AVFrame *do_psnr(AVFilterContext *ctx, AVFrame *main, for (j = 0; j < s->nb_components; j++) { fprintf(s->stats_file, ",psnr_%c", s->comps[j]); } + if (s->stats_add_max) { + fprintf(s->stats_file, ",max_avg"); + for (j = 0; j < s->nb_components; j++) { + fprintf(s->stats_file, ",max_%c", s->comps[j]); + } + } fprintf(s->stats_file, "\n"); s->stats_header_written = 1; } @@ -196,6 +204,13 @@ static AVFrame *do_psnr(AVFilterContext *ctx, AVFrame *main, fprintf(s->stats_file, "psnr_%c:%0.2f ", s->comps[j], get_psnr(comp_mse[c], 1, s->max[c])); } + if (s->stats_version == 2 && s->stats_add_max) { + fprintf(s->stats_file, "max_avg:%d ", s->average_max); + for (j = 0; j < s->nb_components; j++) { + c = s->is_rgb ? s->rgba_map[j] : j; + fprintf(s->stats_file, "max_%c:%d ", s->comps[j], s->max[c]); + } + } fprintf(s->stats_file, "\n"); }