From patchwork Wed Oct 30 01:22:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16026 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 5F64944A27C for ; Wed, 30 Oct 2019 03:30:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 42C5768B09E; Wed, 30 Oct 2019 03:30:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F06F68B096 for ; Wed, 30 Oct 2019 03:30:27 +0200 (EET) Received: by mail-pg1-f195.google.com with SMTP id w3so320554pgt.5 for ; Tue, 29 Oct 2019 18:30:27 -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=Lv5bdX8qEg3en3pZ/IgCBwRM/yqncZ0vdk3vhCPhgzA=; b=aEW5ny00IULamCJ3sdSaoP3+S7SdgkmZYEtLl+WaA5BLoWWSgFtL+8WuAqYUesP2gf BDSgS7fKWt+HWQxdNId5+EZ9G0fLUKhyGZIU3+C4V8ALL1LM3PaY4JyEUF9DNxiFQZUm rWJARQz34RyrGrvah0/GBOh3fjkrlC6aKxAZvBo6o48f90WeR4Uy9FK6Bj3L3p8S8yOG bUuHQ4p/ZI3OCQTMrcWZTJBFyw6b2jTClkUI8BIeLtvKzmAxeQlk9fdyN4G77arvj+P9 2/9d/RDC5zIPSk6NN4NqOGpN+v+K4+DcqD7tO46nHeKaybcxyFVKUkO4lbWHcSdR3Skd 3Sow== 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=Lv5bdX8qEg3en3pZ/IgCBwRM/yqncZ0vdk3vhCPhgzA=; b=lKJYH7tFM5CjSPhKSeVACqfByp6MOaAjax/1RJPMNEmruz2P+p7WTV1lVz8ctTjhrG rCosMQ8Ow9yOuZkxQ0iT2qJXxGOnbVAzvWWIZEAQwr+DNzpuotnIdvteP+Y54TKieFNs muLMR+YCEdefvGa7ysPclIn0nMswp26/YyxG2dePbpcX6T/yJZBSQhxZhfeA2o2020pL E0o730A1L6GEBPMcVQRI9PL58plajtmyrFu9qWM/ZYhs4gvlcsd4JDSBkALWoB8s0LFj samd2g1WkfgtrVum6UL2UIhwo5M3qb1IkQ5So0zeD7OwJ2YPz6sB99yh6yKSDxo20v+z K8HQ== X-Gm-Message-State: APjAAAVvpSvar8EsmRrZ38lXlM20Ya3Ka93N52RoZWeWWb/Oq8FBdRns reWYOAPaDYUh8xH/Vx/wLCjgJcHnqGk= X-Google-Smtp-Source: APXvYqx3PBSDHHVJQ9ea67RxBTNWsW9oJX/F/xle16C5hogq3LdR1XXcvatxajoB0ocgJSpHFrE+kQ== X-Received: by 2002:a17:90a:fb81:: with SMTP id cp1mr10758971pjb.34.1572398595519; Tue, 29 Oct 2019 18:23:15 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j126sm340924pfb.186.2019.10.29.18.23.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Oct 2019 18:23:15 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 Oct 2019 09:22:53 +0800 Message-Id: <20191030012254.21976-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191030012254.21976-1-lance.lmwang@gmail.com> References: <20191030012254.21976-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/3] 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 | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index cd0aba1f69..ff030f0950 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);