From patchwork Thu Nov 28 14:34:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16474 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D08A744A918 for ; Thu, 28 Nov 2019 16:34:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B77DA68B136; Thu, 28 Nov 2019 16:34:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2DAE68ACBF for ; Thu, 28 Nov 2019 16:34:51 +0200 (EET) Received: by mail-pf1-f196.google.com with SMTP id n13so13259657pff.1 for ; Thu, 28 Nov 2019 06:34:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=s4X7RXMf8hbb2vId3sv7AqWC9QywvHikMtOgjPoSeVo=; b=ase5vrdmjqIhpKcJqpIQa/+vS+sC6pFpkjqt/7PEznP8oZMnRc+aVGetM6cPUaX9ci YPB1ppWhuLJi0jT5fOJ7EzLLyksypCb4ug7ayM3PFIExgLJ1Cd+jyJDigcSoiSPrhBd4 PybjU2IPjckqRE6djYN96u5WTgS1wZcpWygvu8IHriSGeEBirMLI1MSKD9gfbZoZXqfn V6Tn9E94bMwJQO9XqpycLxONQHm4B8NvohOxCzFZIApYu9lHwpwe/pQHMjOwQFzCwjBZ un0WzbhxFoaVBTfHJw3yFe51n0ZSZAaIHUaEUARK7zz9lP5JqJOR99RiPbJvxPPBgo3q iFhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=s4X7RXMf8hbb2vId3sv7AqWC9QywvHikMtOgjPoSeVo=; b=KV3CZCqJP4FdyX6d7Eo9KqNO6v6YA/bvA36pyNDQD2h27TQqukGS1/hBbs++jkk9Z5 bFcvH6e4ybaHjaxm4uRnpmf6es9gOFh5zVOTZsBnq2MKq4TFcuwKwwbYSnsKUeTKIIzs 4Ek5YDyj2PUqhYwudQPF2b6/sWD798Jeh/Ao38AkrBIFCrv8m5i3G0GJB3gfY0khwMmR hrK9NKJMrigmv53T8LLicetLPOrodF2k/eFslzQR+DH05/xjfcP4pm2HeEZOqGXX7zkI pv8GL8/a9Hpbtt8iHQ7LqctODss7JBEk3kCZohl67ca5V3Y4ZZJHcAthHF6BCPrIsrF3 HFhw== X-Gm-Message-State: APjAAAX5ykPXGc0roT8w7Rx0TMfuG4twRAbPoJmYWFjeHdq5uPQ4UdO1 qSffZzqWyS8SxfArYWBWOXWFyLZr X-Google-Smtp-Source: APXvYqwoJMHcSXlOhWXBkzCcoSx9IM7A41msv9wJmO7SZrZM5g0KMsLSl62B8ZH0mVEX7rK6LwbxjA== X-Received: by 2002:aa7:8d8b:: with SMTP id i11mr52791176pfr.45.1574951689789; Thu, 28 Nov 2019 06:34:49 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j126sm21845774pfg.4.2019.11.28.06.34.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Nov 2019 06:34:49 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Nov 2019 22:34:41 +0800 Message-Id: <20191128143441.12443-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191121112927.13425-1-lance.lmwang@gmail.com> References: <20191121112927.13425-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] avfilter/vf_showinfo: Fix erroneous results for mean and stdev with pixel bits >8 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang The following is one of the testing results, you can observe the result of 16bit isn't correct. 1, yuv420p ./ffmpeg -f lavfi -i color=black:duration=1:r=1:size=1280x720,format=yuv420p,showinfo Master: mean:[16 128 128] stdev:[0.0 0.0 0.0] After applied the patch: mean:[16 128 128] stdev:[0.0 0.0 0.0] 2, yuv420p10 ./ffmpeg -f lavfi -i color=black:duration=1:r=1:size=1280x720,format=yuv420p10,showinfo Master: mean:[32 1 1] stdev:[32.0 1.0 1.0] After applied the patch: mean:[64 512 512] stdev:[0.0 0.0 0.0] Signed-off-by: Limin Wang --- libavfilter/vf_showinfo.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 31f6b32..96f7c59 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -202,7 +202,7 @@ static void dump_color_property(AVFilterContext *ctx, AVFrame *frame) av_log(ctx, AV_LOG_INFO, "\n"); } -static void update_sample_stats(const uint8_t *src, int len, int64_t *sum, int64_t *sum2) +static void update_sample_stats_8(const uint8_t *src, int len, int64_t *sum, int64_t *sum2) { int i; @@ -212,6 +212,25 @@ static void update_sample_stats(const uint8_t *src, int len, int64_t *sum, int64 } } +static void update_sample_stats_16(const uint8_t *src, int len, int64_t *sum, int64_t *sum2) +{ + const uint16_t *src1 = (const uint16_t *)src; + int i; + + for (i = 0; i < len/2; i++) { + *sum += src1[i]; + *sum2 += src1[i] * src1[i]; + } +} + +static void update_sample_stats(int depth, const uint8_t *src, int len, int64_t *sum, int64_t *sum2) +{ + if (depth <= 8) + update_sample_stats_8(src, len, sum, sum2); + else + update_sample_stats_16(src, len, sum, sum2); +} + static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; @@ -220,12 +239,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) uint32_t plane_checksum[4] = {0}, checksum = 0; int64_t sum[4] = {0}, sum2[4] = {0}; int32_t pixelcount[4] = {0}; + int bitdepth = desc->comp[0].depth; int i, plane, vsub = desc->log2_chroma_h; for (plane = 0; plane < 4 && s->calculate_checksums && frame->data[plane] && frame->linesize[plane]; plane++) { uint8_t *data = frame->data[plane]; int h = plane == 1 || plane == 2 ? AV_CEIL_RSHIFT(inlink->h, vsub) : inlink->h; int linesize = av_image_get_linesize(frame->format, frame->width, plane); + int width = linesize >> (bitdepth > 8); if (linesize < 0) return linesize; @@ -234,8 +255,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) plane_checksum[plane] = av_adler32_update(plane_checksum[plane], data, linesize); checksum = av_adler32_update(checksum, data, linesize); - update_sample_stats(data, linesize, sum+plane, sum2+plane); - pixelcount[plane] += linesize; + update_sample_stats(bitdepth, data, linesize, sum+plane, sum2+plane); + pixelcount[plane] += width; data += frame->linesize[plane]; } }