From patchwork Thu Dec 26 20:25:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 16987 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 9D84744A776 for ; Thu, 26 Dec 2019 22:25:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8933B68A943; Thu, 26 Dec 2019 22:25:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34667689243 for ; Thu, 26 Dec 2019 22:25:39 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id p9so6630611wmc.2 for ; Thu, 26 Dec 2019 12:25:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=PSXky1G5Au4EIyAyFuuWxoI+UdJiA0H16kn417jUS3I=; b=IDRBRUf6UGTkOtZVlhiFVLjakai8NP2bCkCo5qB0ZI3lZ5NOE0t0D8fkuEthg1EMiH IjF7eWHIj9uzFnYSF1DnqEhpCjHJzJOOlmKyRDRxS0IARNp/WTeRL9ptPoglADUEJuqa WqAkyV6DdaTvgDOJOWbQHRfasRvb1iUtuIYPRXkqc4im9lkxrXhX0bPeZsEHjFngBiUq CBGTwTOb8zUK9weJ4kinNoBVLPxiKs1GnRe4z6AEK93JFcuM7/JZhm0Fh4n6UXAAug3O fdMWeUfEebx3Z9USE1CisljCcx8G0qP+mj2xB94DbjD8jeA+SdBJyfYYvdm1WVoLQKAe DLWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=PSXky1G5Au4EIyAyFuuWxoI+UdJiA0H16kn417jUS3I=; b=WRGk9A+zORT3BW1YHdcoeYFZZ+aR4eQrXLZOfnFkU124RbglWhKwe+oRBOYg2BSXP8 2g9WdID9gmrZz0QFU4b6i/EBgngDfyYzZfuIPBWMYHCWGu7z/OlGjoePQgWE1w5+lXEo X0fg+46PWqMkx1O4MdIYi5P72LsgmN3jUpk7dMXEimdvFggzulcsvlyHPusC3dY7oFoW Sl0e17c0k0RNMj6buIFooHhU4fJoxyysOc+9f2gg9fh0W7F9HeGoM2uCnlLCSnBB1iAO 5QpCNU9VPdC6tSyGXdKFXLtwJ6D4Ki2KFxrPMJHTfDXCE0QJqtF0Zo/oItKn/TfqcY98 HggA== X-Gm-Message-State: APjAAAUlqZgOx5J1uzEG8Pt7Y/uv0ziZZP/YVHuqzsfJRJobvLUgfeZV 80EJ5oSQo/xDfmS5IeRnTQg3W6GF X-Google-Smtp-Source: APXvYqxWnv51Sk6u21k8epCYv4gbFVDiEgQGG0Vy7dn8eprlqRfN8Pg8F/Mot2m9AYFqCC/OGwx9SA== X-Received: by 2002:a1c:2786:: with SMTP id n128mr15894081wmn.47.1577391938387; Thu, 26 Dec 2019 12:25:38 -0800 (PST) Received: from localhost.localdomain ([94.250.180.106]) by smtp.gmail.com with ESMTPSA id c15sm32216851wrt.1.2019.12.26.12.25.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2019 12:25:37 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Dec 2019 21:25:27 +0100 Message-Id: <20191226202527.19829-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191226202527.19829-1-onemda@gmail.com> References: <20191226202527.19829-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_histogram: reindent after previous commit 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavfilter/vf_histogram.c | 110 ++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index 83e8925ea7..2381fe980c 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -255,8 +255,8 @@ static int config_output(AVFilterLink *outlink) outlink->w = s->width * FFMAX(ncomp * (s->display_mode == 1), 1); outlink->h = s->histogram_size * FFMAX(ncomp * (s->display_mode == 2), 1); } else { - outlink->w = s->histogram_size * FFMAX(ncomp * (s->display_mode == 1), 1); - outlink->h = (s->level_height + s->scale_height) * FFMAX(ncomp * (s->display_mode == 2), 1); + outlink->w = s->histogram_size * FFMAX(ncomp * (s->display_mode == 1), 1); + outlink->h = (s->level_height + s->scale_height) * FFMAX(ncomp * (s->display_mode == 2), 1); } s->odesc = av_pix_fmt_desc_get(outlink->format); @@ -275,34 +275,34 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) int i, j, k, l, m; if (!s->thistogram || !out) { - out = ff_get_video_buffer(outlink, outlink->w, outlink->h); - if (!out) { - av_frame_free(&in); - return AVERROR(ENOMEM); - } - s->out = out; + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + av_frame_free(&in); + return AVERROR(ENOMEM); + } + s->out = out; - for (k = 0; k < 4 && out->data[k]; k++) { - const int is_chroma = (k == 1 || k == 2); - const int dst_h = AV_CEIL_RSHIFT(outlink->h, (is_chroma ? s->odesc->log2_chroma_h : 0)); - const int dst_w = AV_CEIL_RSHIFT(outlink->w, (is_chroma ? s->odesc->log2_chroma_w : 0)); + for (k = 0; k < 4 && out->data[k]; k++) { + const int is_chroma = (k == 1 || k == 2); + const int dst_h = AV_CEIL_RSHIFT(outlink->h, (is_chroma ? s->odesc->log2_chroma_h : 0)); + const int dst_w = AV_CEIL_RSHIFT(outlink->w, (is_chroma ? s->odesc->log2_chroma_w : 0)); - if (s->histogram_size <= 256) { - for (i = 0; i < dst_h ; i++) - memset(out->data[s->odesc->comp[k].plane] + - i * out->linesize[s->odesc->comp[k].plane], - s->bg_color[k], dst_w); - } else { - const int mult = s->mult; + if (s->histogram_size <= 256) { + for (i = 0; i < dst_h ; i++) + memset(out->data[s->odesc->comp[k].plane] + + i * out->linesize[s->odesc->comp[k].plane], + s->bg_color[k], dst_w); + } else { + const int mult = s->mult; - for (i = 0; i < dst_h ; i++) - for (j = 0; j < dst_w; j++) - AV_WN16(out->data[s->odesc->comp[k].plane] + - i * out->linesize[s->odesc->comp[k].plane] + j * 2, - s->bg_color[k] * mult); + for (i = 0; i < dst_h ; i++) + for (j = 0; j < dst_w; j++) + AV_WN16(out->data[s->odesc->comp[k].plane] + + i * out->linesize[s->odesc->comp[k].plane] + j * 2, + s->bg_color[k] * mult); + } } } - } for (m = 0, k = 0; k < s->ncomp; k++) { const int p = s->desc->comp[k].plane; @@ -319,8 +319,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) starty = m * s->histogram_size * (s->display_mode == 2); startx = m++ * s->width * (s->display_mode == 1); } else { - startx = m * s->histogram_size * (s->display_mode == 1); - starty = m++ * (s->level_height + s->scale_height) * (s->display_mode == 2); + startx = m * s->histogram_size * (s->display_mode == 1); + starty = m++ * (s->level_height + s->scale_height) * (s->display_mode == 2); } if (s->histogram_size <= 256) { @@ -358,41 +358,41 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } } } else { - for (i = 0; i < s->histogram_size; i++) { - int col_height; + for (i = 0; i < s->histogram_size; i++) { + int col_height; - if (s->levels_mode) - col_height = lrint(s->level_height * (1. - (log2(s->histogram[i] + 1) / max_hval_log))); - else - col_height = s->level_height - (s->histogram[i] * (int64_t)s->level_height + max_hval - 1) / max_hval; + if (s->levels_mode) + col_height = lrint(s->level_height * (1. - (log2(s->histogram[i] + 1) / max_hval_log))); + else + col_height = s->level_height - (s->histogram[i] * (int64_t)s->level_height + max_hval - 1) / max_hval; - if (s->histogram_size <= 256) { - for (j = s->level_height - 1; j >= col_height; j--) { - if (s->display_mode) { - for (l = 0; l < s->dncomp; l++) - out->data[l][(j + starty) * out->linesize[l] + startx + i] = s->fg_color[l]; - } else { - out->data[p][(j + starty) * out->linesize[p] + startx + i] = 255; + if (s->histogram_size <= 256) { + for (j = s->level_height - 1; j >= col_height; j--) { + if (s->display_mode) { + for (l = 0; l < s->dncomp; l++) + out->data[l][(j + starty) * out->linesize[l] + startx + i] = s->fg_color[l]; + } else { + out->data[p][(j + starty) * out->linesize[p] + startx + i] = 255; + } } - } - for (j = s->level_height + s->scale_height - 1; j >= s->level_height; j--) - out->data[p][(j + starty) * out->linesize[p] + startx + i] = i; - } else { - const int mult = s->mult; - - for (j = s->level_height - 1; j >= col_height; j--) { - if (s->display_mode) { - for (l = 0; l < s->dncomp; l++) - AV_WN16(out->data[l] + (j + starty) * out->linesize[l] + startx * 2 + i * 2, s->fg_color[l] * mult); - } else { - AV_WN16(out->data[p] + (j + starty) * out->linesize[p] + startx * 2 + i * 2, 255 * mult); + for (j = s->level_height + s->scale_height - 1; j >= s->level_height; j--) + out->data[p][(j + starty) * out->linesize[p] + startx + i] = i; + } else { + const int mult = s->mult; + + for (j = s->level_height - 1; j >= col_height; j--) { + if (s->display_mode) { + for (l = 0; l < s->dncomp; l++) + AV_WN16(out->data[l] + (j + starty) * out->linesize[l] + startx * 2 + i * 2, s->fg_color[l] * mult); + } else { + AV_WN16(out->data[p] + (j + starty) * out->linesize[p] + startx * 2 + i * 2, 255 * mult); + } } + for (j = s->level_height + s->scale_height - 1; j >= s->level_height; j--) + AV_WN16(out->data[p] + (j + starty) * out->linesize[p] + startx * 2 + i * 2, i); } - for (j = s->level_height + s->scale_height - 1; j >= s->level_height; j--) - AV_WN16(out->data[p] + (j + starty) * out->linesize[p] + startx * 2 + i * 2, i); } } - } memset(s->histogram, 0, s->histogram_size * sizeof(unsigned)); }