From patchwork Mon Dec 30 11:09:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 17058 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 B99AC44B230 for ; Mon, 30 Dec 2019 13:10:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D64868AA15; Mon, 30 Dec 2019 13:10:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2594C689AB4 for ; Mon, 30 Dec 2019 13:10:10 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id k3so17840898pgc.3 for ; Mon, 30 Dec 2019 03:10:10 -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=qQ6uxBeXroq2pp73+NcmoDTI/SAPYqH8YoJ9PC0KsGU=; b=LjDBfWluZ2rkALYhb1QLRg/dwqKxmG/2Oi4goeDUlS1/yO3LPW+nlr4FI3kDUZFzmT BmoYjcIIIgttmTPjQrRFuZNTbiUoAtklZuic9/5OdeKZzLnktc7r4fmta9honoprYXen AC2rqQ7TIrd+kTfy55XpneYV69y8rfH9cYu0fGJJ0ZlDvQUcWv1Fw6DAbyZj56ySLOlu uJeY5NHdEqxUAmp7Qr5UQ6myehKTMZ6HNtjlQ5uLE9Lqwu3c0vaq10jqTM/JWXLc6A8w 9m4X+SiWe+MknBFM/OrAnG41TBCMnewp176QqkjbmlElzY2n+069msMHB1TduK4Y2Oqd qf7Q== 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=qQ6uxBeXroq2pp73+NcmoDTI/SAPYqH8YoJ9PC0KsGU=; b=TuGDCEL1tXumhy6vXX2Md5x02DJQNoiFwveECFj9r5JayHqla052+XGHND2le6dx8V CMK2q6R5X/4fn+abnmTruaXaUCU2lM8wpEbFHq9ijJd+evFk/32uNqAhki/lNKe0ch/N 0rVuh1eK+aYLbrjSq6rQTxLF7+rTF1zwwTnR90htd4076XKZpwYokVceCiR86MEt6xuT V38PTSz5/hZR+7nocS/Bb59c6brwhjq3Lhs5DYqmNGAwiBjx9mibVH4r1nfAVyCgu+1d gRW1Yi15EkLJzskwKMu/bd5ijkY02j/wCVS/z0Lgq8UN/PCPxJB8WOWYBXw1YSVAUl64 XLHw== X-Gm-Message-State: APjAAAWYIYjhjPibeKlbDgCxdv9ws3LyfQO1aP7xIPSdRKGJ6elRvXbi IYE0OZYrnqGt/9ihfySqZ38GSJaw X-Google-Smtp-Source: APXvYqxsrIavs3CiC7gUtpB2xuSJu+3lSyp2SX9xx/HLYdytSgceXWWLtuf14I7Uq4crELHk097twA== X-Received: by 2002:a63:fb05:: with SMTP id o5mr72093104pgh.355.1577704208296; Mon, 30 Dec 2019 03:10:08 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id m3sm46908334pgp.32.2019.12.30.03.10.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Dec 2019 03:10:07 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Dec 2019 19:09:56 +0800 Message-Id: <20191230110958.6188-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191230110958.6188-1-lance.lmwang@gmail.com> References: <20191230110958.6188-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 3/5] avfilter/vf_signalstats: add SignalstatsContext.maxsize variable 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 Signed-off-by: Limin Wang --- libavfilter/vf_signalstats.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libavfilter/vf_signalstats.c b/libavfilter/vf_signalstats.c index cba14e4fa7..7dadff45b3 100644 --- a/libavfilter/vf_signalstats.c +++ b/libavfilter/vf_signalstats.c @@ -50,6 +50,7 @@ typedef struct SignalstatsContext { int nb_jobs; int *jobs_rets; + int maxsize; // history stats array size int *histy, *histu, *histv, *histsat; AVFrame *frame_sat; @@ -166,11 +167,12 @@ static int config_output(AVFilterLink *outlink) s->hsub = desc->log2_chroma_w; s->vsub = desc->log2_chroma_h; s->depth = desc->comp[0].depth; + s->maxsize = 1 << s->depth; if (s->depth > 8) { - s->histy = av_malloc_array(1 << s->depth, sizeof(*s->histy)); - s->histu = av_malloc_array(1 << s->depth, sizeof(*s->histu)); - s->histv = av_malloc_array(1 << s->depth, sizeof(*s->histv)); - s->histsat = av_malloc_array(1 << s->depth, sizeof(*s->histsat)); + s->histy = av_malloc_array(s->maxsize, sizeof(*s->histy)); + s->histu = av_malloc_array(s->maxsize, sizeof(*s->histu)); + s->histv = av_malloc_array(s->maxsize, sizeof(*s->histv)); + s->histsat = av_malloc_array(s->maxsize, sizeof(*s->histsat)); if (!s->histy || !s->histu || !s->histv || !s->histsat) return AVERROR(ENOMEM); @@ -823,7 +825,7 @@ static int filter_frame16(AVFilterLink *link, AVFrame *in) NULL, FFMIN(s->chromah, ff_filter_get_nb_threads(ctx))); // Calculate luma histogram and difference with previous frame or field. - memset(s->histy, 0, (1 << s->depth) * sizeof(*s->histy)); + memset(s->histy, 0, s->maxsize * sizeof(*s->histy)); for (j = 0; j < link->h; j++) { for (i = 0; i < link->w; i++) { const int yuv = AV_RN16(in->data[0] + w + i * 2); @@ -837,9 +839,9 @@ static int filter_frame16(AVFilterLink *link, AVFrame *in) } // Calculate chroma histogram and difference with previous frame or field. - memset(s->histu, 0, (1 << s->depth) * sizeof(*s->histu)); - memset(s->histv, 0, (1 << s->depth) * sizeof(*s->histv)); - memset(s->histsat, 0, (1 << s->depth) * sizeof(*s->histsat)); + memset(s->histu, 0, s->maxsize * sizeof(*s->histu)); + memset(s->histv, 0, s->maxsize * sizeof(*s->histv)); + memset(s->histsat, 0, s->maxsize * sizeof(*s->histsat)); for (j = 0; j < s->chromah; j++) { for (i = 0; i < s->chromaw; i++) { const int yuvu = AV_RN16(in->data[1] + cw + i * 2); @@ -884,7 +886,7 @@ static int filter_frame16(AVFilterLink *link, AVFrame *in) chighp = lrint(s->cfs * 90 / 100.); accy = accu = accv = accsat = 0; - for (fil = 0; fil < 1 << s->depth; fil++) { + for (fil = 0; fil < s->maxsize; fil++) { if (miny < 0 && histy[fil]) miny = fil; if (minu < 0 && histu[fil]) minu = fil; if (minv < 0 && histv[fil]) minv = fil;