From patchwork Fri May 13 09:19:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35754 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp202386pzb; Fri, 13 May 2022 02:19:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzALMCebJTcJ84FOdmpjtM3ZruLcpBE/jLRPQNf1DmF5e7MOTBgnlHEp1vo7t53R6NcKAU1 X-Received: by 2002:a05:6402:424d:b0:428:bf2b:b13e with SMTP id g13-20020a056402424d00b00428bf2bb13emr15866024edb.306.1652433583900; Fri, 13 May 2022 02:19:43 -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 hv18-20020a17090760d200b006f37ca2c868si1605672ejc.803.2022.05.13.02.19.43; Fri, 13 May 2022 02:19:43 -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=UVSJmcpH; 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 C73EF68B45D; Fri, 13 May 2022 12:19:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072084.outbound.protection.outlook.com [40.92.72.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB67468B410 for ; Fri, 13 May 2022 12:19:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ReS1D7kvTjUVxWGbwpiAb6eMH0I5UxMsD0nhS5qt3IA8yt3gHKtaOIBIbC2j/HBTHf+/DbMX3L2m/zAflk9Dt666RXIpyY0hfrYTzPTh32xQrj0ZCIccRIgOUA34Jk5wrTra2aDugrklgBfEM/mi+tDqVuR89ROzq2hS0jFCuGKmeUrCK4bn9p9L3olu8cKNrzwdqaBW8hT8W56rnEkLVDaIgNayiOQza1qtHCLPeCJjo5B9BPEnCzXY762Kme+uWki74RkBK179SYvZaiOqJXa7b9pQnSQdHIM/cmZOnErHUKFC8+RzMSZXFzNv5DhxNmFaTWmcflovHXV1fPhOjg== 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=Lx0PAlnWUVLxZyh3zAfZz777vP7G4L8vrLsLVMaoZT8=; b=GOgo5k26eNslu7Iivh9JDcg53khofLhxcpnKUVqQh/G1MBVqEzWQT/r8x4IhbrPOxVEsipkzSYMv1wEpz3G995w1DOPtY1hJOJ0XkLLKQXywPKIlcVXGRr0WckCuKnplGN/QXAvzfbBEP10WBCKoZ/79SdbvWNsZIMH4+kNzSu+VSoiyGWMfbqjauvD5IUTv4HxHIZM0uWxHmFrjBM1zLCnjgJkxFyJe+1bN4+1P81+evNNfeLXQL0C1QrC5H0Q68zTuWrZZz6x7ffYWZAwq+QII+AZYv2lHplIlZIn1ppeF/FzVIzpE7VPkRCCYlhHlBEII6g0NvrGMj/7vsnDRqw== 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=Lx0PAlnWUVLxZyh3zAfZz777vP7G4L8vrLsLVMaoZT8=; b=UVSJmcpHO4NDBcAb6F9Hb+vKbVezHqr/LSDg0ckCZIlqBEGv9WLm6WwM4iQC7K6Qb4QXhHs6Z2v3uiWfdO7Hsv2QDlzTPajvIgS/kHoEjYcWzeJjhmY/bKqT9WVAtZXuCQOMWhNtACKt912YWASaBdiOYosAeBi7zi1R23TIvIn5Zeg93YOCzGLw96Bu730J7IclP8uJvl1/YFV841Flt2W3dI55xLTQeScwooxAwNiSHFMvGDMzkKQOyPQHhafeEwKiNwGQxEuFsAwwHDQu8VEJhpqq1kEREQUxyPOu6QvzWsZlb06N6x7UsZ0+N71QEPBN49H7IcK4qSb2ghsuVQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM6PR0102MB3206.eurprd01.prod.exchangelabs.com (2603:10a6:209:6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.15; Fri, 13 May 2022 09:19:32 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%9]) with mapi id 15.20.5227.023; Fri, 13 May 2022 09:19:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 May 2022 11:19:24 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [j4rwTwQhcuhy5PzGkiRUp1TiNB8y5/Vr] X-ClientProxiedBy: AS9PR04CA0102.eurprd04.prod.outlook.com (2603:10a6:20b:50e::20) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220513091924.1256343-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 10006e2c-bb97-4658-2407-08da34c1b057 X-MS-Exchange-SLBlob-MailProps: ZTmCor6bjd8exrMxu4QrZxuKjSHMfUmq6uM+zylwPbn5uMuglDPKQF1c1S9ZaVAISSOIzWa2q/tN51MlcS+RqH/oGxHPQWxF8algYc3v5QwWkKBBg0zFSwDxhbcs7I0TgioXoz5ZniKxeRRQ1H5HqRdaNJZixS3WBW19054Fpr4wMAO9I7g28GPeAWOLrZnICp8msoALxyEE//XCyqli7meSVktobP/1maOFPEFxdnIbunvylqOgbSh0RnDB5Xdciq8KM6N7aLrT5yZH5e6wtBhI7A13QHOjgtl8DTksUqw6s6yb86p8e1EloiD8U7u5xdcViub3eVTb8l4IwY5nru+zCORnE9kBlxi1E4rSfEvwcpMWAMyGXsrtoeO4xkGlXUknHsyswloD7Uqpm0p7mbzwaniQR+d/uvLSYUG4jf4vGBoJ5ocGv1qDj6+z94NlhEGymkqL/+++CRzq48EOox9NNQLAowipAy1gTt4rE/zrvQMnn1n7TY7ODdPVC4V2my00XK98y5EybiHDtpSAXcdOGD2hfr0FhVdG4H5XgX5HEYAXKeELuHi03ABmPpVbl5BuPnK0lSOs6vpTNy57njPt79NokybbHKFJf8laP3iqnO4eCMi5Q0WwEGtKgYjIEcpq92WQ34ijusVDxcbxnfdEYCPDcQyxv+mN8T952/aKCUZ5Bugv2X5j2wLeBKoJXgHLoQ/99IL6Xrlqd91gvsuSEH4DuTZBxohEt/qMEd52fRaEIXv+PTc+pneUgYAhW79dkZrUaYqemMnHnwxOqdVDyoyP4ztZPsdpTRWTJj/jnSBEidHtFCN9bkN7X8WR X-MS-TrafficTypeDiagnostic: AM6PR0102MB3206:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eJSq0rnKf9sN4rZFz1cUmDcN/30CkBFwg6clshfhRL4tWnpjwd2jfeOnPHh/o4h9J8qaLXTmGN5nIUfgLLtwR60nDcEJoUgsxDXU75RtLvgqeqzb4PT+HLwNyupnvOCs6OfFJDGC2lOiQzE47WTOSVZSaYKiaNXDr6Aao52jPp/2EqeayH9rq6fgewiXFGuhrJbhMRxmjKzIcVuV41jp49WzYap5kXagNKsWIai0GuzD0t8pkbqm3CBXG7jKnX1OVW/c+InDSwr5+uRtQr7iJ2QgTxTiFHMWoIB/Ohzz4VRuG5LIJfzBhTxQ2KE2LWGAV68AI2MNbfuoKBVJXc1bLVUhRnz2xlbGLEYAM0Vb/rIkjuGCm1YA9PUUhCxvj4CRBKjWkYSZZAcPEOcpa2FcPVhc7HsbQHvzBtqb67tz9mawP4dQ76LOWnEODnvzj+5yVKadWihtuoZnXcXznqE4xaVbU0zuzIki0PDjwP3RVN5BnlZrY1jZhLgTFuEMCF8si/CWN2INDgujv8iAsrFLgHWqAVehbr/AjKhD/mU61fYIgGx6Sk8W+bGyzTyRdZNUAp2i40ZqjE/n0y6yKtNor20IvAUcMKD8dReblJHVIt9pEdZd96B16pr0q+DIOeMB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UTjEaRhSYsb9SrS9dVe336PDiG5g8mDsiwjE4SrD+s9ZzMJvTRiNSytDPtdb6hFAFP9gY9C35435/QzzJ5GPUhp5IJWZVDT5X5ARqppEerwKYviwVvQbjebfonmtJdMAZHeGTi1njGZ6cNLMifUJeRKUvnPP7EDlnxiN4NrISBbihBZFACX+Rdi+BRd6WGjVLL2QbddWMceuodPp/tSr9yr3vJy5Zr8Qn0TLgtq95GYQ6ZW1dbuAUqHCs9IeGyIJCvRQWl+pJ4gSiMHanfG2Ym8jXV5Q+Ljak0Pl188gpW087PthTbqpO1KoS+K/KwIm9GNPC9JIQ1b9WiIhBDe/HElmPRDdI+R6spf8I1sovOty+MTm493feUj43dGdNtEtVOmKkkK56b4KN/KT2XkWfsmPQcbtNhDB9Hp31g8fRvASPDlFBl7uTNCoEjjyynDEp9Xivoap7i+bTwwILD9nbW4uABr7iu7v0dVx26JubCJHCcuAa49sBKBuKABSmHftKoI2sJXrQ0dv88F78mgHbNVUONdQ0/DsRX2S+7qz3REiQUc7I+Wo2QZvLcTFQQlM0zOtmhRsJ69xMBCj3wmrNaHVo7KrDy8hcPK4jTuTsV3pTrklRhjZjk8ICTYcDDjd9J2R5Vy/MvNSjRRXVG3Uh9HZfiTV4LD77wUDOWfsSoj3RZssMIr4fuzm2JVXjxRo49ahuNTiPteD2Tc96moSJLmHkoGENIpJQ+900QcZxWSRyy2CxLtRZ4SsrDSDzDwIJhxyxsn8wayfbuJj38kAqVtc19Wvg1PD3DuHL8c9dNiyCvNgVg7gxdpSSo3tvXaLYIT+uVfJKwkdGb3xx+TopCGLR6siRw4MsgKJ9td/ftXhUt9wlFw2Q47p0I6Z6JZc90Frn/m0HrB4AoJghteauzmaz88hdw2ysT9qLtun7APLMzENtKP7umQ6peyA2L9znYqBiCAV/NPEIXvrHc2I4emQfeDTkZF9pizzC8Qb6U9GPigj7UBLeRDH5dIjBQBKTgyW7DdBrGA+eRCtcClE1xI/pMhlShXL863q/RCmuaUhyd6uIuXw34jtXenG87Pp9OXjHvfVlmJZfq2T9RFPrB250/sbRJF/hBfni+fCFr1YmEZSYrMwW8lXwWtMCaJouMIfwiFDvxHeaiT2bID5qNtnB7cA7A4rF2+uWc588FXHWmer+hi7cSyTjw9pDrieV5Y5crIDNPJz6p2RUxda+u//G0aa7DpyzlEoy5Zdo/tcC3oTN2Vt0RSfDyLJs8Kl35qACk7aK85WmAGz1rXyD9lupZsoi5O3LFtW4/sqhUo0Gv2HUny1GKtCXwDVNi3iqz3GqjLRgig3yebrkqs+id+WAXqy6W2oLBrpUb9FI8LaOXJjBJTqPpJOsSLkF4oXxOPBFD1Hzea8dfHNPCoS/KS+mvwDVUOZrZl3rxgIvRsJFqxgoSP8ZjJdG2pKWm6jG4HSibNGypzt3OUZ+f1PpA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10006e2c-bb97-4658-2407-08da34c1b057 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2022 09:19:32.1304 (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: AM6PR0102MB3206 Subject: [FFmpeg-devel] [PATCH] avfilter, avcodec/*_init.h: Use #if to disable code 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: aE3/rZZ58ilC Should fix the compilation issue reported in https://ffmpeg.org/pipermail/ffmpeg-devel/2022-May/296373.html and should also prevent such issues on arches other than X86. Signed-off-by: Andreas Rheinhardt --- libavcodec/v210dec_init.h | 3 ++- libavcodec/v210enc_init.h | 3 ++- libavfilter/af_afirdsp.h | 3 ++- libavfilter/vf_blend_init.h | 3 ++- libavfilter/vf_eq.h | 3 ++- libavfilter/vf_gblur_init.h | 3 ++- libavfilter/vf_hflip_init.h | 3 ++- libavfilter/vf_nlmeans_init.h | 6 +++--- libavfilter/vf_threshold_init.h | 3 ++- 9 files changed, 19 insertions(+), 11 deletions(-) diff --git a/libavcodec/v210dec_init.h b/libavcodec/v210dec_init.h index 305ab3911e..707c101ab0 100644 --- a/libavcodec/v210dec_init.h +++ b/libavcodec/v210dec_init.h @@ -54,8 +54,9 @@ static void v210_planar_unpack_c(const uint32_t *src, uint16_t *y, uint16_t *u, static av_unused av_cold void ff_v210dec_init(V210DecContext *s) { s->unpack_frame = v210_planar_unpack_c; - if (ARCH_X86) + #if ARCH_X86 ff_v210_x86_init(s); + #endif } #endif /* AVCODEC_V210DEC_INIT_H */ diff --git a/libavcodec/v210enc_init.h b/libavcodec/v210enc_init.h index 6d81cac319..09828d4a14 100644 --- a/libavcodec/v210enc_init.h +++ b/libavcodec/v210enc_init.h @@ -83,8 +83,9 @@ static av_cold av_unused void ff_v210enc_init(V210EncContext *s) s->sample_factor_8 = 2; s->sample_factor_10 = 1; - if (ARCH_X86) + #if ARCH_X86 ff_v210enc_init_x86(s); + #endif } #endif /* AVCODEC_V210ENC_INIT_H */ diff --git a/libavfilter/af_afirdsp.h b/libavfilter/af_afirdsp.h index 05182bebb4..8127194836 100644 --- a/libavfilter/af_afirdsp.h +++ b/libavfilter/af_afirdsp.h @@ -54,8 +54,9 @@ static av_unused void ff_afir_init(AudioFIRDSPContext *dsp) { dsp->fcmul_add = fcmul_add_c; - if (ARCH_X86) + #if ARCH_X86 ff_afir_init_x86(dsp); + #endif } #endif /* AVFILTER_AFIRDSP_H */ diff --git a/libavfilter/vf_blend_init.h b/libavfilter/vf_blend_init.h index 5fb2599490..b377219806 100644 --- a/libavfilter/vf_blend_init.h +++ b/libavfilter/vf_blend_init.h @@ -194,8 +194,9 @@ static av_unused void ff_blend_init(FilterParams *param, int depth) param->blend = depth > 8 ? depth > 16 ? blend_copybottom_32 : blend_copybottom_16 : blend_copybottom_8; } - if (ARCH_X86) + #if ARCH_X86 ff_blend_init_x86(param, depth); + #endif } #endif /* AVFILTER_BLEND_INIT_H */ diff --git a/libavfilter/vf_eq.h b/libavfilter/vf_eq.h index a5756977d2..d68fb7295e 100644 --- a/libavfilter/vf_eq.h +++ b/libavfilter/vf_eq.h @@ -123,8 +123,9 @@ void ff_eq_init_x86(EQContext *eq); static av_unused void ff_eq_init(EQContext *eq) { eq->process = process_c; - if (ARCH_X86) + #if ARCH_X86 ff_eq_init_x86(eq); + #endif } #endif /* AVFILTER_EQ_H */ diff --git a/libavfilter/vf_gblur_init.h b/libavfilter/vf_gblur_init.h index 0fee64bc98..9ff28c6f59 100644 --- a/libavfilter/vf_gblur_init.h +++ b/libavfilter/vf_gblur_init.h @@ -115,8 +115,9 @@ static av_unused void ff_gblur_init(GBlurContext *s) s->horiz_slice = horiz_slice_c; s->verti_slice = verti_slice_c; s->postscale_slice = postscale_c; - if (ARCH_X86) + #if ARCH_X86 ff_gblur_init_x86(s); + #endif } #endif /* AVFILTER_GBLUR_INIT_H */ diff --git a/libavfilter/vf_hflip_init.h b/libavfilter/vf_hflip_init.h index b58cfec901..63f9e3b92a 100644 --- a/libavfilter/vf_hflip_init.h +++ b/libavfilter/vf_hflip_init.h @@ -101,8 +101,9 @@ static av_unused int ff_hflip_init(FlipContext *s, int step[4], int nb_planes) return AVERROR_BUG; } } - if (ARCH_X86) + #if ARCH_X86 ff_hflip_init_x86(s, step, nb_planes); + #endif return 0; } diff --git a/libavfilter/vf_nlmeans_init.h b/libavfilter/vf_nlmeans_init.h index 04ad8801b6..87fca13b2e 100644 --- a/libavfilter/vf_nlmeans_init.h +++ b/libavfilter/vf_nlmeans_init.h @@ -129,11 +129,11 @@ static av_unused void ff_nlmeans_init(NLMeansDSPContext *dsp) dsp->compute_safe_ssd_integral_image = compute_safe_ssd_integral_image_c; dsp->compute_weights_line = compute_weights_line_c; - if (ARCH_AARCH64) + #if ARCH_AARCH64 ff_nlmeans_init_aarch64(dsp); - - if (ARCH_X86) + #elif ARCH_X86 ff_nlmeans_init_x86(dsp); + #endif } #endif /* AVFILTER_NLMEANS_INIT_H */ diff --git a/libavfilter/vf_threshold_init.h b/libavfilter/vf_threshold_init.h index e79d2bb63d..c86e9da7f2 100644 --- a/libavfilter/vf_threshold_init.h +++ b/libavfilter/vf_threshold_init.h @@ -84,8 +84,9 @@ static av_unused void ff_threshold_init(ThresholdContext *s) s->bpc = 2; } - if (ARCH_X86) + #if ARCH_X86 ff_threshold_init_x86(s); + #endif } #endif /* AVFILTER_THRESHOLD_INIT_H */