From patchwork Fri Nov 29 11:28:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16487 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 7014C44A177 for ; Fri, 29 Nov 2019 13:34:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4528068B396; Fri, 29 Nov 2019 13: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 E4BCD68A61E for ; Fri, 29 Nov 2019 13:34:49 +0200 (EET) Received: by mail-pf1-f196.google.com with SMTP id l22so2092192pff.9 for ; Fri, 29 Nov 2019 03:34:49 -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 :mime-version:content-transfer-encoding; bh=g+VXplMVTVEWKas2U7mJGwIcHSbXyNhbuLK+jFvJK7s=; b=jgF+xYPU5IqtiLcOAYPlzhAVPNLVU87RDCfB8WlOJMFPBEY1bB8rRMgW88yZLvRxw/ EvdQo0YZ570GU+lsRhnpt8ntUvop6TwEXvIyHN6pbqNImA8tycuYeZlPgilHdDMhm8dv jI8tiIvLIdI82jn3LnTgjLxoYDolAhwCEfhc9/VRxY+gphAW0UXRtbm/W/m24Vt0Y/+z 9kelv7Ju4kffWJV+RPQMMigmSqhVt4POsB7K7O+SrMB4zpr3auv4/nDXPN+sU15cJlBJ AIqvYU5CuYQcTAIFskQ+mqZnm+8OEWFzlzO5nKEg3YjWtDb9v1K2pKqrOC083dFel7jU mcvQ== 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:mime-version:content-transfer-encoding; bh=g+VXplMVTVEWKas2U7mJGwIcHSbXyNhbuLK+jFvJK7s=; b=KtUH1kdtF1G3NHxZ8SIrge+PwQ/Nfu7pe0H9fsV2eOnHinhX8McrA8vDh/CzS2oMTM RatcooGfNDRZ2gbH7+WBi1OdAvaKnGpcem56JuYl2kbpgvrAP+MKo8Pp8ne95yf9ZlKG S/bAJvGEKIrxGjPtt9EK+dyNm3Sh13fxAcIPRj6eMP5Gt8OSqLd06NjZ0itoQpONIdN/ kXPEIKN64WyiNymkvwMqnsQkA02Luumz0v/+5yZxw8LjAuhcNvvvyXT/QSjyslWD3x4I ssNx7ZCFOWEr73opXPItD53BQwEwgeD6jjBnQaMD3HB4zNKXQ7cO8LfDl2kSKCWY1E7m DG1w== X-Gm-Message-State: APjAAAWb4+Yiy6HoWxJCFnEXnOQ/yXksXTEpOgawLQdsFZgs99L7v5+w sSqxYdXzLQofahjKhSPm68yqjeII X-Google-Smtp-Source: APXvYqxHhndjXpzDzMbJGL90Ifen2s0n9rvojU9ZI38PVgflSeZcNDdF2oyAnYdd/3slYodAU1klvQ== X-Received: by 2002:aa7:96b7:: with SMTP id g23mr16953090pfk.108.1575026909331; Fri, 29 Nov 2019 03:28:29 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id b24sm23803786pfi.148.2019.11.29.03.28.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Nov 2019 03:28:28 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Nov 2019 19:28:23 +0800 Message-Id: <20191129112823.14439-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> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Have tested with be and le pixel format on be and le system for >8bit. System: lmwang@ubuntu:~/ffmpeg.git.mips$ grep HAVE_BIGENDIAN config.h #define HAVE_BIGENDIAN 1 ffmpeg.git git:(showinfo) ✗ grep HAVE_BIGENDIAN config.h #define HAVE_BIGENDIAN 0 Test result: 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, yuv420p10le ./ffmpeg -f lavfi -i color=black:duration=1:r=1:size=1280x720,format=yuv420p10le,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] 3, yuv420p10be ./ffmpeg -f lavfi -i color=black:duration=1:r=1:size=1280x720,format=yuv420p10be,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 | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 31f6b32aa4..5856722122 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -24,6 +24,7 @@ #include +#include "libavutil/bswap.h" #include "libavutil/adler32.h" #include "libavutil/display.h" #include "libavutil/imgutils.h" @@ -202,7 +203,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 +213,30 @@ static void update_sample_stats(const uint8_t *src, int len, int64_t *sum, int64 } } +static void update_sample_stats_16(int be, 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++) { + if ((HAVE_BIGENDIAN && !be) || (!HAVE_BIGENDIAN && be)) { + *sum += av_bswap16(src1[i]); + *sum2 += av_bswap16(src1[i]) * av_bswap16(src1[i]); + } else { + *sum += src1[i]; + *sum2 += src1[i] * src1[i]; + } + } +} + +static void update_sample_stats(int depth, int be, 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(be, src, len, sum, sum2); +} + static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; @@ -220,12 +245,15 @@ 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 be = desc->flags & AV_PIX_FMT_FLAG_BE; 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 +262,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, be, data, linesize, sum+plane, sum2+plane); + pixelcount[plane] += width; data += frame->linesize[plane]; } }