From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id CD49942F02 for ; Fri, 13 May 2022 09:44:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 77CC668B46B; Fri, 13 May 2022 12:44:32 +0300 (EEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10olkn2076.outbound.protection.outlook.com [40.92.40.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A40068B3E3 for ; Fri, 13 May 2022 12:44:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X1vGlFSPHjTUunifnMZ4+j5jXxIczxgPzoutbQdy745qYlEdEHtrn8J5kXFs6PDKfjcxVEQ7uf6FuoWkWjdVZS/EYXsftGIb5PLvE+GmpogbFMqTdIaKBvT5bP2UyVJzC03AKNhN/ameCSWWIrGHz0qiCsOtxc/giyUfuGdDsI3iwJtle7wV0f9plX0GUoX5UWGruaSZ+fFdQOhg7yVS0y8QGRlLYv0m11O+id5PvlK2MHt59JPcOtlki64p2o4NjkapLo0tpdULyO4fXRH3d85PSOBNl9l8fwH0sJOwkpM60uuSGGwlCcIzf+HA8tOjY/NMbb2gR1WdNHCyesp8EQ== 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=oci0rW9xIqxWe/lzf1dBgfIaPzIY80RQvEW8LKLzTLs=; b=LNKRVafI4lwxpJpYnolLJ06V15273Ghs+U/wR0EQlSDOsqcAYWg2GAzqQamSF9fkVLBrEs9Cy0CuBEGBFjfm/cPrDvuVHlVEwRGWFOY58xmHuH1Ji2qMfnSvHuKlvoBS9ivF8sgbjflwPQ1vvTX8YLyZT8m3tDLWVv9E5jXAKniHICbKqJ5AOCFIvfmn6Ap2pJy8Pkyj1WON/Bh7WXHVHhAqmbwLG/kFM7Row+St5wC7jVQVrTzyQhT4eqh4640ToXLn85FjunKNfZKEiygpLD0cQY+wxBxTutCfM7izIhW+yQpomjO3uwzJ8exdVh8pLilqsQ3U1pG3VfENbJMVsw== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oci0rW9xIqxWe/lzf1dBgfIaPzIY80RQvEW8LKLzTLs=; b=LCBRTjlzpiRZ7kTpQ/OJHBK/gZRQvvDRTSFbWPeW1bzvZhobrbC+skdomAOUS8zMwwL3+7NNQ/AZ+kfwgCWIoMrzDWNrFEggjXPADNoQKlCHERSFAdqSQJBVciM5ZvLwX2G1vJpomPjLvDhGgtUO8301bScMbwDMiq9T9tcZ/AJQkPEabioz5gsRkj0EavXYdz8FF32mrSRpScFydxb2rAGDEzJUcx+lpV/3A4r08L+lQ+qQuc3gOKk3O0oT9IBcosYQDfUJwtXS7JEdijjVH1zaX++MhHnPuS3mnnDE6HDL0gujRk9ouYhmSXDkJ+B8CeJ3fK9Y7a+qKnNv7pK2KQ== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM4P223MB0421.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:ab::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13; Fri, 13 May 2022 09:44:22 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::7472:6f83:eeb:45e3]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::7472:6f83:eeb:45e3%9]) with mapi id 15.20.5250.016; Fri, 13 May 2022 09:44:22 +0000 From: Soft Works To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH] avfilter, avcodec/*_init.h: Use #if to disable code Thread-Index: AQHYZqqd0lzjYr2oGESFeSnrthykn60cjmHQ Date: Fri, 13 May 2022 09:44:22 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [itrsfb7/9MdFmJSEf0Vuc6witl6CGf+Y] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: fb805ff9-c1bd-4d0d-211b-08da34c528e2 x-ms-exchange-slblob-mailprops: sTyj/kSftosB9bRjlmNyMBZIG2LeY0LGtms55bn5x6IpSON38titzh6oz9GmHh7FxW4tCV1xfe0GHHqmk4sIJT8JjLeWIzNNq2exRKqX3pGeVCVUwjsJ+jK0IXRov0cITjYir+LwKC2XymZ9dG/fkuFucvcLI3VlH4uD624LRUym0r3SJjdKq0jpe+enMMolZ8ToAC3H10YohKpsskQDHkIHHS7azk7vCWjoBi994q9uMNxrVrCtihAkBXN+JEwHNquaYFyymZx6VVwV0211Htj36bFu3EIR/sWqjelEc/lPEMbPuYNmweKhWN3E6LTLer8fCG8Aw2H2ilDKTLUgB9/6Ox180ijDa9jzJjVUaUotRZ4vmjMt/zcHxo22/lz265O6GsxGZK7BdWuo9FDPiXLQlVjHo7yXOQXCIsu8RdBiiKROvZepy7tVtmYrUOqMPY6FP+EMcY84rjt7/EkDwzcLN5qGVOvG8jZt+GXj8DUL6xBMi35B9I7EWGjtnlYzfY0sLnDsKyL8HUt/EQAszub6HS0/deKjO4tw1Erna95oooNaNi6Ly6nRjiq4oSt8lClKCUxmnQ/jDoLi6OKFNC2hRo5UQphiO2xLHOABzvE43ZLDcQ4DSjXjAUnBorA7s/QKbtCoOs6QIpNlmn3Zg+XoDmp4HlkWwzRnP7LNxkLhw/TmxcLjXEjfEW+RaFgGz0bZQIuWiqIwVLkGFokRUodiegxszZSEJE6l+8NnQSzL79E2//syGnVkMj3YgwIHLUZntLnMJqsqZL4qVeQIerOgwCQWhvI9MWxQD23kd0FmTeGVwf2I7KxpZN/Q+/Kn6Svm/gUxJK4VUN63D+xX5A== x-ms-traffictypediagnostic: DM4P223MB0421:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zPr1r0mErnd1A75PVXjXXH1SLhHVH7ZNsxNikAX4JBdChuYv+KBaKZwOeJl0vkBkr4PwJNBNfDM/XvTyq/k4NXDhGevsN3WeXRPCR9GYZ3Y+FH7jlZO8xz5DWVUrs4RbJsREs/2skeq350qAdIF07uHf7pSOKpmXhj5OmBHINPfX1JtEHiQiUCNwtzyIwDnAgWu5eSYXbvW2tzWPWN9IVwaBJXkgFDjA0nP3anJX9nPgsUyqFOJc0DIb+Cqi6moWATsAOB977+Lk2nPdZRTUXCgzFcVJbAbyjGUyk8MlLWRSB45VzjlaiF3kr33TcBh1rU6e2YjVdCuBxrOed0TFw+EsAcdLNzYu/o16+YvMGB8w/sPGCXEvdHySp0pSMM8ovqZiSukOs0jMrwY34WzVX58SYpfRgrex5IvswaoPjHfWI37PMg+vwEY8u6UMTagf4/ly6F3/kI5ZZu/do1Xl/4A+Ogsw7qMq+h8KmBSQpbdM96o4kxKiBj1cpOiRRPUQaIeS0UPLC1lQuVcAUwfuX3C6Yh7y8PmjAT+oDDJG3J3jMk3i+BpHN+yJ+UsOCH7HsDwFw6VNFiy1QVgKio/XHi9rTyfYNcfH2xXVHO0Jg067JqfU1/qXYBTLV3RMGO2B x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?U212eDBnTWQ2VTFmZDdjQnAyMDVpM1lxbGJTNnlVVGZ4d1pTNmdLemk5SnRO?= =?utf-8?B?Q3NwRTZYcm5RQUpNcWZ4cXpUS2ZKcWlmU0FObXdwcmYyR1diLy83Q2dSdWRE?= =?utf-8?B?SHNVampjUC9DYmlkYjZXVFZiRVgzRFBZdDljR1pNa2sySHZnY3FFZnNRazRW?= =?utf-8?B?VUpLcHMraDNwaDg2UjdmRSt4Ulh0bUFKaWNNOUdmSzVMNnJqN3hyMFN5NWk2?= =?utf-8?B?UlFkcnpTVkI4dTZyZ0pzVUszMEp2Z2srem9CcmFSSmRROERrdW1kdWwwVlBN?= =?utf-8?B?M3U5S2tqWjFwcm1pV1l2andmMWwxSjlTMXlCOGxvSlpxQ3ZYcjd2RDdJODB6?= =?utf-8?B?cnJQMGJhbzJVVmx3TTZSVnA2aERacTVjYlJ0dnFOLzdUVDJ2U0hnVzlERWx2?= =?utf-8?B?SGZqNitJMFVhcnUyTVVWZkFtZ1N2RTdzekJISzliR0pyVWdOdWJ2Y2ZDcFlr?= =?utf-8?B?MTE1b2RaZDJ5KzhpbW5pMU5BVjVxZnVublRQbTIxUmdxMUJtQys1UEc0NlRE?= =?utf-8?B?N0k2eW1nOUltVkpBa0laSUJMTktia1VNQ0Y4UmVZUUxiSG1IeFB0cGlMSU5k?= =?utf-8?B?bFV1NjdneGJyaWRsblNXTmJTTEtqMWNDR052NVBWWURIZ1M3SWJ3ZFQ2akhS?= =?utf-8?B?SWU5ZW1rNGw0SDN0OGxhR2x6SXFlMTZMZjhoN2hqZXhBelBPaXNzcXFhU2Rl?= =?utf-8?B?c2ZObFM2WW5hMXNaOGxseDRVMXhxZXc0eHFxZVZqM2w3TGRYQzBDWkxTTytL?= =?utf-8?B?WVU0TFdhQkVkZEdpeTdFalFWRDAzOEI3NnkzZ1QrREU4UlBkdzEzUHpkeHFF?= =?utf-8?B?ZjdMNUtuOGFINXNTd2laYUk3di9zZFpZRS9kaCtVeTVIcVRkUjNwMHJTRTky?= =?utf-8?B?c2VnYjEvc0xPU3JJaHJoOHVtN3dZbmhmOGRoUWV3QUFhdENmUXluNEJhektl?= =?utf-8?B?d2VNdmNrdS9GUmVFSFhPdXk0bDUxT1R5UHE1SnZiQ1JLM2NtSFZ6aU1MQnla?= =?utf-8?B?NEZQZHZYK0RaaXp1aU5GRTlqVVNKcXdYMEZ0dEsvay9WakF3SlNQVlVLYXhz?= =?utf-8?B?TEluQmx0R1hDYlk5Q1Z3RGJWS3hIc2tqQ0VsSFlUSkNRc3BVbm9rWUlqQy9o?= =?utf-8?B?elZMYlVrM0FDUU0wdjhnL0xsb2RsQjdQS3ZXdEl0TEN0Vkhuc1pRbUZHZUEv?= =?utf-8?B?Uy9nQzA5TDhIaVorUWJsU3dET1g4QWF0UzdYbWxqYWFDOURNTUtwblpXZklJ?= =?utf-8?B?c0c3UTJqOUZBRm9TMFk3MWFXZGgxQXcrNUZ5TkFRZGF2UTdhaWg1MXNUVWhM?= =?utf-8?B?Rzc4c2dZbXJBT3JFWFg0TVdVajdLL3luYUMvYjVkYUVENkxxYnU3SmFWS3l3?= =?utf-8?B?d3dkYlpUazdhQnpVbFZINHFueHNqcjlJanY4OFQyTWR0U09XQjU4Q3Vpbnpj?= =?utf-8?B?VmtLT1JnQ2ptWjVFbEp2b0Z5d0NDRWtGK0VXYy9WODZHNXJUTVVCeWE4UjJi?= =?utf-8?B?WEJlSGpVbHhmcDVRR2RNNWhsVCtzUEcxaWxHVUx1SFB6aEQxdi81UGZOSkRv?= =?utf-8?B?THdwOHBwWUpGLzY1THVmblZMdEEyRFMyQWtFaUJOMStNNldCaDMxMGhVQVlv?= =?utf-8?B?ZUcxNkFPNTVENGZMaVJtanM0eGY5U09HcmJYamJuU05HQzdSU25tVkpUUjJZ?= =?utf-8?B?M2JWQlNKeGFqVnNYOGFJZ0lrUERsaURnbjI2UjI3ZnhaMkxFQVJEem1nWUlO?= =?utf-8?B?cmJ0d29BNlAwa0FCUlJTMzZqRXU4Yk5UM0w5TjBkM2RualN3UldMd1RibWU5?= =?utf-8?B?VW9MYXZWbEFkVWxHSEh2ZTZ6NGZUS3R4d0Ewbi8rM1dQSm0vTG9oTmk2Ulg3?= =?utf-8?B?TU90RDBrNHVENC9aRTc1MFpVLytDRFFFUzFhVG9xSEFtNVI5RitVNnA5by9C?= =?utf-8?Q?vjQJxHtNcFQ=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: fb805ff9-c1bd-4d0d-211b-08da34c528e2 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 May 2022 09:44:22.4831 (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: DM4P223MB0421 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > -----Original Message----- > From: ffmpeg-devel On Behalf Of > Andreas Rheinhardt > Sent: Friday, May 13, 2022 11:19 AM > To: ffmpeg-devel@ffmpeg.org > Cc: Andreas Rheinhardt > Subject: [FFmpeg-devel] [PATCH] avfilter, avcodec/*_init.h: Use #if to > disable code > > 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 */ > -- LGTM. Tested and working fine. Thank you very much! softworkz _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".