From patchwork Sun Jan 12 19:48:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 17307 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 E37CC44B0B1 for ; Sun, 12 Jan 2020 21:49:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CBF5068B081; Sun, 12 Jan 2020 21:49:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 018B868B06B for ; Sun, 12 Jan 2020 21:48:58 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id q6so6513530wro.9 for ; Sun, 12 Jan 2020 11:48:58 -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=hicFCjS9oAWXyLos3ylEjidZ/9Kc69svecGtuB/DrF4=; b=CMCwugvtBXC829PZYCNggH7cS3d4wjqtZ6D7DLDim5/Id0lNzxo8KjWXrAVoJOjhZm Y0AmwgjEcsnifxADaMsYM+wCeJVq0Lfl8cmNnTAymDDINPmIb2IgeT1CXBDjiWbz9k57 Ti3hvTkf0zgZBL9QmFTLnOYqkMYkLafv6IQN9c1iBUJOekl6RwB73XM0JnPw+mAradZ3 CDd0BK3CKMuIiJaoah39nLXifISfpqUxP/qh/ImB7Q3bFmCtR7mOd2mbRa22BRX7lRUA S4SSwyKrscZYwyFu8BWGZNXUHB0I9/dWRtgk2kln+t5cQbz0VwrmTVUANc/B/gybaBcr KrAg== 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=hicFCjS9oAWXyLos3ylEjidZ/9Kc69svecGtuB/DrF4=; b=NtQAxEUJWP7XhFDwkybZychCz37PPL/lRkGK28aTqsf2MmeFnrn4n6YwBJ5Bw0yzIn u7mIlryS3ZKQnpCCWVR/FO0Ft3fQzPCtNv+y89OIaRkHO42hpbTE/eGJsSC/HjN04Mav eTIuc4W+HWcN0OQcnEZmqOeAtgcb7j16BAxJTmz5D6PrDsscvQ5YZk4xmDqp8Lc7jfgk pOT+ckl6wkWD0i6th4bGAqMziKwA0mK8+Xj0tyM6g3Ga3xO9T+bGlT2RtG+cap5CwdLo 2CQ14hzRFI7FgcqkHQiVoVzvPUnhLazZ+luotrEJVgTbKftYcpehDansFV/jHx7GXmQU bZdg== X-Gm-Message-State: APjAAAXAZK78Ad42A6/HI3THXMZ/plbaC1GOT8rx3GAHqf3L1kZt5KA4 kG5MF3BoVwcI8gRp93xjNUIuSfRkVzU= X-Google-Smtp-Source: APXvYqxX1d1ajtey90422EbrmDIsVBSAmKHuHKhHSO23w5QbdN0D9H3ZAcV1xatAfhPlvgLeq64CtQ== X-Received: by 2002:adf:cf0a:: with SMTP id o10mr14074461wrj.325.1578858538184; Sun, 12 Jan 2020 11:48:58 -0800 (PST) Received: from localhost.localdomain ([109.227.51.81]) by smtp.gmail.com with ESMTPSA id r62sm11930484wma.32.2020.01.12.11.48.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jan 2020 11:48:57 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jan 2020 20:48:46 +0100 Message-Id: <20200112194847.15750-3-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200112194847.15750-1-onemda@gmail.com> References: <20200112194847.15750-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/vf_normalize: add support for planar rgb 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_normalize.c | 51 +++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_normalize.c b/libavfilter/vf_normalize.c index d353d8b75a..6a8a7631bc 100644 --- a/libavfilter/vf_normalize.c +++ b/libavfilter/vf_normalize.c @@ -166,6 +166,47 @@ static void process(NormalizeContext *s, AVFrame *in, AVFrame *out) } } +static void find_min_max_planar(NormalizeContext *s, AVFrame *in, NormalizeLocal min[3], NormalizeLocal max[3]) +{ + min[0].in = max[0].in = in->data[2][0]; + min[1].in = max[1].in = in->data[0][0]; + min[2].in = max[2].in = in->data[1][0]; + for (int y = 0; y < in->height; y++) { + uint8_t *inrp = in->data[2] + y * in->linesize[2]; + uint8_t *ingp = in->data[0] + y * in->linesize[0]; + uint8_t *inbp = in->data[1] + y * in->linesize[1]; + for (int x = 0; x < in->width; x++) { + min[0].in = FFMIN(min[0].in, inrp[x]); + max[0].in = FFMAX(max[0].in, inrp[x]); + min[1].in = FFMIN(min[1].in, ingp[x]); + max[1].in = FFMAX(max[1].in, ingp[x]); + min[2].in = FFMIN(min[2].in, inbp[x]); + max[2].in = FFMAX(max[2].in, inbp[x]); + } + } +} + +static void process_planar(NormalizeContext *s, AVFrame *in, AVFrame *out) +{ + for (int y = 0; y < in->height; y++) { + uint8_t *inrp = in->data[2] + y * in->linesize[2]; + uint8_t *ingp = in->data[0] + y * in->linesize[0]; + uint8_t *inbp = in->data[1] + y * in->linesize[1]; + uint8_t *inap = in->data[3] + y * in->linesize[3]; + uint8_t *outrp = out->data[2] + y * out->linesize[2]; + uint8_t *outgp = out->data[0] + y * out->linesize[0]; + uint8_t *outbp = out->data[1] + y * out->linesize[1]; + uint8_t *outap = out->data[3] + y * out->linesize[3]; + for (int x = 0; x < in->width; x++) { + outrp[x] = s->lut[0][inrp[x]]; + outgp[x] = s->lut[1][ingp[x]]; + outbp[x] = s->lut[2][inbp[x]]; + if (s->num_components == 4) + outap[x] = inap[x]; + } + } +} + // This function is the main guts of the filter. Normalizes the input frame // into the output frame. The frames are known to have the same dimensions // and pixel format. @@ -283,6 +324,8 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_RGB0, AV_PIX_FMT_0BGR, AV_PIX_FMT_BGR0, + AV_PIX_FMT_GBRAP, + AV_PIX_FMT_GBRP, AV_PIX_FMT_NONE }; // According to filter_design.txt, using ff_set_common_formats() this way @@ -302,7 +345,7 @@ static int config_input(AVFilterLink *inlink) NormalizeContext *s = inlink->dst->priv; // Store offsets to R,G,B,A bytes respectively in each pixel const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); - int c; + int c, planar; ff_fill_rgba_map(s->co, inlink->format); s->num_components = desc->nb_components; @@ -325,8 +368,10 @@ static int config_input(AVFilterLink *inlink) s->max[c].history = s->history_mem + (c*2+1) * s->history_len; } - s->find_min_max = find_min_max; - s->process = process; + planar = desc->flags & AV_PIX_FMT_FLAG_PLANAR; + + s->find_min_max = planar ? find_min_max_planar : find_min_max; + s->process = planar? process_planar : process; return 0; }