From patchwork Wed Oct 30 13:20:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16039 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 090EF44ABA8 for ; Wed, 30 Oct 2019 15:21:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E7F8168B373; Wed, 30 Oct 2019 15:21:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2DB068B31B for ; Wed, 30 Oct 2019 15:21:12 +0200 (EET) Received: by mail-pl1-f196.google.com with SMTP id p13so991259pll.4 for ; Wed, 30 Oct 2019 06:21:12 -0700 (PDT) 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=NqwdybcxMdkpqlBaY64mjMZHA/djXUF67ahwrOk/Lyg=; b=lNeqGSjZbFHI1UFxIe+96fY9JuQBcKzWD7jnyyp4VZtPqecoYlvgHGEAMCEOG3Uwhq VWNnToYEZvZQG1CQnAwA1moFg3BIZVzfMwq9M8mRDUsACxXGXb6pu440C0Vah95PHnmY l5Uy0qIUql632hw8LEUSELY5tlPR3JKuorW/CUjNXjWy4jpqFWzDH7IClDKFGkxAO7xS O8nbvmGkXypsj/G5W+harW9EwG35IhS+GVSbraCADd13eUqxEImn6b6qUQP5QtdzRCu4 m1TVTD4c7kxXlT5G0YLfNA5Kv9kQxwhfnrJFvmRHyJ0haRThCnU5twh88lBtbT5TgNLh Mc6g== 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=NqwdybcxMdkpqlBaY64mjMZHA/djXUF67ahwrOk/Lyg=; b=HLLMeIpA1AeKmYl4TvMMM2luNyW7KVsiX4LQF0/ssiBq+TS6WbNDMWSycmKIHTxRGK ufGXU5yPtdpCy1vJkeB3p12gzXabJ+mpUbE0b2SKo1xU1ME4/yJCbX9k0hAM5FWppCME YnUxJQnorQvr3jCWt/APUTvXYDqShjrCLGgEngldawVysoJier+Jb1DBAWrrbILlU4jg YF2xKKGye7t53n3O8zSYbzFWkk7x6So0lEr7vLUhKjAoF5/vwRFEMrAcl3oVg3xIXd62 pT9Rz2ghO/oqbkKNxDFEFGgtU/4XETV1XbrwEnmwchgskwhtGXvxuRNxbEiq50kQ2UAv ALAA== X-Gm-Message-State: APjAAAV2JcNVbpEv9Fw/t/YjMVu8olOfawBBoMHMZeeTC0lQAVI1wT7T FfZJ9uq7uOQPdKYhw12Dq7CLs1lSdTk= X-Google-Smtp-Source: APXvYqxFQKb+1eZ83wR/+3HWbfkgnH5UoxfDZNEpR9lhh53VDpd4hbG9aCAadkrcQK1JTmOGuXFk2A== X-Received: by 2002:a17:902:d895:: with SMTP id b21mr4403939plz.337.1572441670984; Wed, 30 Oct 2019 06:21:10 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id 127sm3067149pfy.56.2019.10.30.06.21.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Oct 2019 06:21:10 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 Oct 2019 21:20:55 +0800 Message-Id: <20191030132056.21150-4-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191030132056.21150-1-lance.lmwang@gmail.com> References: <20191030132056.21150-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 4/5] avfilter/vf_lut3d: simplify code 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_lut3d.c | 54 +++++------------------------------------- 1 file changed, 6 insertions(+), 48 deletions(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index cd0aba1f69..9e820a17c9 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -711,34 +711,13 @@ static int query_formats(AVFilterContext *ctx) static int config_input(AVFilterLink *inlink) { - int depth, is16bit = 0, planar = 0; + int depth, is16bit, planar; LUT3DContext *lut3d = inlink->dst->priv; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); depth = desc->comp[0].depth; - - switch (inlink->format) { - case AV_PIX_FMT_RGB48: - case AV_PIX_FMT_BGR48: - case AV_PIX_FMT_RGBA64: - case AV_PIX_FMT_BGRA64: - is16bit = 1; - break; - case AV_PIX_FMT_GBRP9: - case AV_PIX_FMT_GBRP10: - case AV_PIX_FMT_GBRP12: - case AV_PIX_FMT_GBRP14: - case AV_PIX_FMT_GBRP16: - case AV_PIX_FMT_GBRAP10: - case AV_PIX_FMT_GBRAP12: - case AV_PIX_FMT_GBRAP16: - is16bit = 1; - case AV_PIX_FMT_GBRP: - case AV_PIX_FMT_GBRAP: - planar = 1; - break; - } - + is16bit = desc->comp[0].depth > 8; + planar = desc->flags & AV_PIX_FMT_FLAG_PLANAR; ff_fill_rgba_map(lut3d->rgba_map, inlink->format); lut3d->step = av_get_padded_bits_per_pixel(desc) >> (3 + is16bit); @@ -1558,34 +1537,13 @@ DEFINE_INTERP_FUNC_1D(spline, 16) static int config_input_1d(AVFilterLink *inlink) { - int depth, is16bit = 0, planar = 0; + int depth, is16bit, planar; LUT1DContext *lut1d = inlink->dst->priv; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); depth = desc->comp[0].depth; - - switch (inlink->format) { - case AV_PIX_FMT_RGB48: - case AV_PIX_FMT_BGR48: - case AV_PIX_FMT_RGBA64: - case AV_PIX_FMT_BGRA64: - is16bit = 1; - break; - case AV_PIX_FMT_GBRP9: - case AV_PIX_FMT_GBRP10: - case AV_PIX_FMT_GBRP12: - case AV_PIX_FMT_GBRP14: - case AV_PIX_FMT_GBRP16: - case AV_PIX_FMT_GBRAP10: - case AV_PIX_FMT_GBRAP12: - case AV_PIX_FMT_GBRAP16: - is16bit = 1; - case AV_PIX_FMT_GBRP: - case AV_PIX_FMT_GBRAP: - planar = 1; - break; - } - + is16bit = desc->comp[0].depth > 8; + planar = desc->flags & AV_PIX_FMT_FLAG_PLANAR; ff_fill_rgba_map(lut1d->rgba_map, inlink->format); lut1d->step = av_get_padded_bits_per_pixel(desc) >> (3 + is16bit);