From patchwork Mon Jan 4 00:28:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24775 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 C7D8844907C for ; Mon, 4 Jan 2021 02:29:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC1F068AA7B; Mon, 4 Jan 2021 02:29:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90ABB68A9D5 for ; Mon, 4 Jan 2021 02:28:57 +0200 (EET) Received: by mail-wm1-f54.google.com with SMTP id 3so17542627wmg.4 for ; Sun, 03 Jan 2021 16:28:57 -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:reply-to :mime-version:content-transfer-encoding; bh=sMEtFssiEiStgO6u+E9xxnW241dDc/A3P4iiFhMbPMs=; b=t9rk8AuaFjsV0aUUKMIQPg0kQGRSARkUl4Xn4w5uGd2V/FUYblLkuyzZIIkeK+dstC TIdcxAaoAC0Rh7QmAxz6ftSjixhbLogfM+nLINc/Tdwyde1QkBO/aXt5kRekxbwGaOpf /6DEK8EBxaTvi/lLkmVP2bgPpHbJorNugavcOvoHXboFG1lBTFpyDIPc/103/Jv3m2+o EzvBI6LC4bY0hXuMZ7zalPA893tdyVo8zl7yiHJ0MU7nZfkkoTXEYUCDq6VTcP+EjPUb WMjyceyNr9ARJ1/X8CnCvfsYwKKLmqZKNNqYBaGfBonfqaVUaLy4o/IokYwIfaWpTFJ+ 0eGQ== 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:reply-to:mime-version:content-transfer-encoding; bh=sMEtFssiEiStgO6u+E9xxnW241dDc/A3P4iiFhMbPMs=; b=W7tYa+TsLLfMtHI8Q63i/mkkDXIac3XddQaO/xo2BmfYfZfKn04/Enh2jpb8TEz3/g g8mSCZZkDYI3gECF635+qkTmTpd8SUMPMc8sD4k6KWuPrxULHRkkgYd4y4jqDTTfSEAv S26SXGv8J5Vf70FXVsWvXoupnGFDjTrK3K8ucZHE+3IiIOZq9rRtY7PDAGlskPdST2qW Wdcx6mSWcHL4p/H30YzRfyy/T+I0PHt84Rr6gAr7ugz1BhEyMfuRDX2vMM3ferhEqmIZ AIGMZ5llYqHThDbQD/FxnYmKBYn03YwY72gye2MAVoSF7Wzn+5dqfIE9HdqbQuB2mW27 hgTw== X-Gm-Message-State: AOAM531H1skUgwgiiU4ni4ChI+J97/BGGjOuNsydr0Re28OiYiQKBoS4 lCS/oBYMXjwk0V6rS+OtwyCB/qtn97Q= X-Google-Smtp-Source: ABdhPJz4Nu+n2jRrLsEHA7EFzcCATNhYPsPCVR8aOGc+WYNtEkSA4UyBVwH8+JNx8q5qci43+qO2jg== X-Received: by 2002:a05:600c:21d1:: with SMTP id x17mr24520411wmj.160.1609720136773; Sun, 03 Jan 2021 16:28:56 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u26sm30032046wmm.24.2021.01.03.16.28.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 16:28:56 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Jan 2021 01:28:10 +0100 Message-Id: <20210104002816.2321974-10-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210104002816.2321974-1-andreas.rheinhardt@gmail.com> References: <20210104002816.2321974-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/16] avfilter/vf_convolution: Deduplicate filter options 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- I wonder whether one should add an AVFILTER_DEFINE_CLASS2 macro that allows a custom options name. libavfilter/vf_convolution.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index 3674f5b590..0514c235a9 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -796,15 +796,18 @@ AVFilter ff_vf_convolution = { #endif /* CONFIG_CONVOLUTION_FILTER */ -#if CONFIG_PREWITT_FILTER +#if CONFIG_PREWITT_FILTER || CONFIG_ROBERTS_FILTER || CONFIG_SOBEL_FILTER -static const AVOption prewitt_options[] = { +static const AVOption prewitt_roberts_sobel_options[] = { { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=15}, 0, 15, FLAGS}, { "scale", "set scale", OFFSET(scale), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, 65535, FLAGS}, { "delta", "set delta", OFFSET(delta), AV_OPT_TYPE_FLOAT, {.dbl=0}, -65535, 65535, FLAGS}, { NULL } }; +#if CONFIG_PREWITT_FILTER + +#define prewitt_options prewitt_roberts_sobel_options AVFILTER_DEFINE_CLASS(prewitt); AVFilter ff_vf_prewitt = { @@ -824,13 +827,7 @@ AVFilter ff_vf_prewitt = { #if CONFIG_SOBEL_FILTER -static const AVOption sobel_options[] = { - { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=15}, 0, 15, FLAGS}, - { "scale", "set scale", OFFSET(scale), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, 65535, FLAGS}, - { "delta", "set delta", OFFSET(delta), AV_OPT_TYPE_FLOAT, {.dbl=0}, -65535, 65535, FLAGS}, - { NULL } -}; - +#define sobel_options prewitt_roberts_sobel_options AVFILTER_DEFINE_CLASS(sobel); AVFilter ff_vf_sobel = { @@ -850,13 +847,7 @@ AVFilter ff_vf_sobel = { #if CONFIG_ROBERTS_FILTER -static const AVOption roberts_options[] = { - { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=15}, 0, 15, FLAGS}, - { "scale", "set scale", OFFSET(scale), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, 65535, FLAGS}, - { "delta", "set delta", OFFSET(delta), AV_OPT_TYPE_FLOAT, {.dbl=0}, -65535, 65535, FLAGS}, - { NULL } -}; - +#define roberts_options prewitt_roberts_sobel_options AVFILTER_DEFINE_CLASS(roberts); AVFilter ff_vf_roberts = { @@ -873,3 +864,4 @@ AVFilter ff_vf_roberts = { }; #endif /* CONFIG_ROBERTS_FILTER */ +#endif /* CONFIG_PREWITT_FILTER || CONFIG_ROBERTS_FILTER || CONFIG_SOBEL_FILTER */