From patchwork Sun May 5 13:40:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48528 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp885415pzb; Sun, 5 May 2024 06:42:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUe8apPyB99KoUVGFRwPZiPJllXv2HRVn2mG1FixWfwXa7uf6iiaEzHH48QW3t6ZD21+7uypy+sV1WAwmGA0S7mtubT6buDRQZyeA== X-Google-Smtp-Source: AGHT+IEM1oWSf+7ZUSGfKcZEYvMo/6tOBReCWc/tf3XS2rxHw/haJ4OrhmZRzCZWHvSSgeJtLNcK X-Received: by 2002:a17:906:6a08:b0:a59:c46b:c524 with SMTP id qw8-20020a1709066a0800b00a59c46bc524mr1209392ejc.0.1714916544159; Sun, 05 May 2024 06:42:24 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gu20-20020a170906f29400b00a59af0c5e1bsi1515714ejb.921.2024.05.05.06.42.23; Sun, 05 May 2024 06:42:24 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=pj9KFEme; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E708868D5EC; Sun, 5 May 2024 16:41:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2050.outbound.protection.outlook.com [40.92.75.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 809FB68D5D2 for ; Sun, 5 May 2024 16:41:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bpe2/6EwGGcgb+EwD0/3muK40YU6N1nWo0uqtH3+mOBqO13LnlBxSK9Pi0rBE7WGz+yYQk8L/KhcFbbguF+/CAa0Nc6Gcp04jDSUeq3AfmxsIB6D2Y253IMyxWIsWiv+8puYjEpbUXvynE5ug1qG0awo4dJjvDBmDJhSjlH0hUcRr6IZUnmsnkhMotDsGpu7PofT68i4XB519wgcAseeu6H5ayuaIvMoYGK1ScB2fJ8KzBf30RF73TZseFMDUGLgr6QI/x4B5QZCay13Fjunr3u1GfPQFsYCRkz1QqIHoIS3RME2UHf9jooy5wGwzWeOsCmeGurzbim/YNjYp1HS1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+Gt/vOw6wUmgCXaekD1qCCj+6dvKxffLDeeh7DLf7Pg=; b=Vt1TFBCxMci8dSsfUT74A2aY8R0+9d6lIvOiikoXg9z3UYqR3PFfBB5gPL4Yg++gY1KGL6IiLWd9uJbWyupFwFsu+GlJNys+effNK+q3dyfZRhjoZk1S/CGd7Pq+6lfifobSqrrK/r6/ufiCjzHRpC2XDM8jLAjvg6d3mlXkTtzoNZgATFM3J/guCb6WH/DS63D5fri91VjaMg/LuKI428nIe73Yw5t1O3Q5GEBdJ6Mlg1uIlE/xR/oS5rao7lPafyYT5OX2T2XvUq1dBog7+cknjgUOcpMi0W/t1XEChmJDkjA3GfN2aHQ3us+4f40u5FTp5LA3orMjjtspoYOt9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+Gt/vOw6wUmgCXaekD1qCCj+6dvKxffLDeeh7DLf7Pg=; b=pj9KFEme0P2NoINEr3inFDaewpsW0L0nNGrvV4cwbS0bPWvgDjBay/0tPSsYBzaO2OvTueHtE73pMyx0F9cy2pPV+JCE3rfT8vnFYjIii3se36Ekq/BPs/UlXazuYYWKVqmjp2VQ9Z+UIP7NBxSatHWNPdRsRLDEmmnvtffHQuABB7lQ5I5LfVLfilWC0CsEMLOTjYswhPBtwJYtvRwmCfQIeA2z/OqsrYtzmmnMZZg0m8nMFs6/IjEeIRXg+zkl2SX9QM5W9tFfa9+kGO6e0lS2ftL6C7iRO7B2oakPF04UXJSkkcc7mVpbBGQQnz1ako4DoaeHTX9JBbCtzQucRA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0478.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4a5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Sun, 5 May 2024 13:41:39 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7544.029; Sun, 5 May 2024 13:41:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 May 2024 15:40:50 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [13Rjz+sGoXOWcBO51wSKpVAzfXLfAHRKeKcLpsTplmg=] X-ClientProxiedBy: FR5P281CA0046.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f0::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240505134057.3740296-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0478:EE_ X-MS-Office365-Filtering-Correlation-Id: 99b2f408-9dc1-44cc-6068-08dc6d09173a X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: vdOhqs0Pz5483gTHBzh4ylXrQKaE/EjSmbRsF+c0g7D2z2lg7TvqsCxms1XOcwSFxi7wApawwmyu/7Dm2XRIzRByxM4S2bIHVwjDfMJvmE8Pg9gFNwv6qjkY4MsGBxBcSD6sgBrPpl2OIVSVfkgwfhalQ8DCv+XijAo5n/dO+FLUOFunU+0VJnhF4FirA55d/03BXuiBxbuEFHqloi/xI3/+DrcZnQtO14+/AKN81igwaAPLYGC+smGzCASHmpOhQdQ9R7n1JHr5luwEY2blu9nEUk30WQ05B58yAqsazlFK81ve0SvVffid5hdwQT4SB3HPwdD47IDXmAI8nig22cO9j6v0eTnt2ymMH9zw+lLUgxpBmIdEkrAO8cEvGbHW6shWQPW49qOCsgAUkIyBPPhXKthGaR0Ygxg5040Oe0V6B8J3KPa59bsu3ifoShF8apFW9zVfSB3fDcTVIwbqg5q018udsUOXxzrJWwnlL8KYmg8huMuo6/1GTyfRpq7ZaURFHigxnHP1xsYQAkOJf6bqHDhaR38XF+rbfRzZ4PLCqPqo4bNCsNNn1AjzpTNvsHnk6xUQtp7OMW2OCUplS57igTVN73ADiKhbr/Pkpx+Kht5JWobwwwuzAO6KTTKE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Mkin7rdCxcbrjcTfBd0YWP+VtjjrG+z9hczGqvWeGuOdepfZvfHhmDCdyBS94BCV2odgnYFpm/LTw2Hlvtc5kMQQuHmUyc/oleTQDsc1hRF52ojG+gQ5ubrnlv7iDaZknsKSVo5A0oJFS33wfaocnWh1Q08jdQMo3Qxe/8YqIHarqGzJ2qH15dwy8hF9Ms6FKwpo/ATXMv47LyDJir+UeOHXMedzcpGrxfePqDuuZWq3XKTRrY47/R5rpLCR1CwXe7GFk+56kwpinF06b+ZIHzv/HDOh8poO2n+bfDFLQrwO2/i9H/QdPbsQqdoyvWYv2BRZwD24l9xk4ijlHaVzbrV77JlXMOjj1/i2yktss4nGeEM9H6crPqRhWwqmLJAp6CdyY53dpuiXYvpFc6qZbBZ+VFiUuHDm//1P5kxI4GrlY4F0SOxyRGHAZj5kBvUVVRF422/J2YI0qgWM9/4vx6q4aOgXT9ZdAUIKsTpdmKTAoCXCdLk2dCHys4Mm2CTU7FqmQmm0RxkHbEbcvZkFT5gb68jY81itvbwMS2TF9R/MoOOPWUs58zAZucYL8Aza5jPFhkEKxBe0FgmoLPjxGIx9uwlJkgbyMpJZ9IY2ZSNnX4kbrcgBZej6M3dgVprRMr2/Btmlr5ml812NzCTMiFoU7DMSOfpNMA3b2XS5/YYB4tjGqC65S1DFb8DDlRtJyeUJWG77nBuMe/TrCCEWsNmYwHFhqfAYYjfYR/Eo23vXj2W4SErCFEq1Gslpc20LR9LQz/pWGJ3YeurY/Wvx3SqMb/8koPYh0oJx6Viq5Vo/W3hbx3CqoCUZNm9UJSkDZtDNJi1JJ6WPdZMiYJUy2MWkXcwQXbXr0/3R5cRcGC/3ZcGbAktqUVWiGRHoD5PmBhIdiWMXA/CrDs/AwlClKvffqKtsdcjgwTuT2lO3m7wrAGZvx0xrnCHmbGiC4Wc++ZflOBAvmPUbdkYlJX/M7xEu9JVJ4ymHuQR8R2lCX1S1IFJQNvKMC0HbHBHD/NQWhL+pYkYOa4rterJVDmo1gcKMfnouXt+qqItrtv4Z6nB1ye1KmXJv0LtnlmoA0+NTtp9eQuQEVpgT3ZfEMomNlhlfbbdpF419YTkbK/BH18WmJVSNZCOytbjKXtqDlymKM0d7rROY2EbIEhkFQxm/BghBhGO9S1WK3rl5K9Q0CuVHr8z3TiScSbG+KuTcgiwlH3Stel3rNurXyPncIvmaYiMSpsw/ypy8WiqimIVXmHPdRQNuPx31fDyH9yEhOatf1AX+opmcj4u160z2F7tm8g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99b2f408-9dc1-44cc-6068-08dc6d09173a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2024 13:41:39.3550 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1P250MB0478 Subject: [FFmpeg-devel] [PATCH 17/24] avfilter/vf_convolution: Fix compilation with sobel disabled X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: UCKhyJXDFxKW Signed-off-by: Andreas Rheinhardt --- libavfilter/convolution.h | 2 +- libavfilter/vf_convolution.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavfilter/convolution.h b/libavfilter/convolution.h index ee7477ef89..1196c1fcdf 100644 --- a/libavfilter/convolution.h +++ b/libavfilter/convolution.h @@ -119,7 +119,7 @@ static void filter16_sobel(uint8_t *dstp, int width, } } -static av_unused void ff_sobel_init(ConvolutionContext *s, int depth, int nb_planes) +static inline void ff_sobel_init(ConvolutionContext *s, int depth, int nb_planes) { for (int i = 0; i < 4; i++) { s->filter[i] = filter_sobel; diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index d516db3717..bb78e33d80 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -761,8 +761,10 @@ static int param_init(AVFilterContext *ctx) s->rdiv[i] = s->scale; s->bias[i] = s->delta; } +#if CONFIG_SOBEL_FILTER } else if (!strcmp(ctx->filter->name, "sobel")) { ff_sobel_init(s, s->depth, s->nb_planes); +#endif } else if (!strcmp(ctx->filter->name, "kirsch")) { for (i = 0; i < 4; i++) { s->filter[i] = filter_kirsch;