From patchwork Thu Mar 28 23:10:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47618 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1667516pzb; Thu, 28 Mar 2024 16:11:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXbPaccNKuGz5YzFbrbjXa32IVDXqh+CS8cQ2UgiB0anZoftVDelAYte/uPKIQYCKek8xhD3XEYl9exi9eIZcWaCAcKmXoh2aVpGQ== X-Google-Smtp-Source: AGHT+IG4HVB3FwA5lUNBlkDhxiOJAw9HvXNc9ImpCv9ZPSrAU5ETHaO3y4gLQNVpSGzs2ffvmkf2 X-Received: by 2002:a2e:86d4:0:b0:2d4:a232:757 with SMTP id n20-20020a2e86d4000000b002d4a2320757mr287795ljj.7.1711667513299; Thu, 28 Mar 2024 16:11:53 -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 19-20020a508753000000b0056c0cc477ecsi1159103edv.146.2024.03.28.16.11.45; Thu, 28 Mar 2024 16:11:53 -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=Sw3zH58f; 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 ED98368D766; Fri, 29 Mar 2024 01:11:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2063.outbound.protection.outlook.com [40.92.90.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4902268D750 for ; Fri, 29 Mar 2024 01:11:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dLsrtM0PY7o7nQgtwKicxB7d1OCH9bip2q+DaMTRo4SgUCTtUMjiHE1jQuUjobZhyuxle6UY7kZcYqv+hVN/dV/KcAhik98xEtzNVaDnTDE4MCo4bS2W3u9KcUoS7VLSQJDLBc0C3Ds1W0f4Xek7W/LFq7qErB8hL9P1imeNI0wlw+QPv5KuI9R0ucAB09hDiE8vcuVojRYLVhvQFy1/3po7YY0XemZfEjZOk7+PEvei3eFOXbX044GpmdHDJMQX3Z77mlodUizlFkY4eNNa6dwuPfxUUGRFVqe1jvWuX+flEwEHS0TpmnH5GL47871VgQZYcvMvzP6a5OoLw5I+9g== 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=Jyj473iDdNTQndFW5Siaw/KbVzN5SNIR4WqgPQN62Ro=; b=dCliWJ6DkTP/RhQ29844HXxewcTsuwoXrQzX1jGOumcv3HANbOtmQHmRIE4pM2r/HOtXLEQeh/qwuk/HH4FenPWn5KRUUrXnikhzjOz5Adwc8BOvuAqDIz5WlUDQZEpJwiSGOrW/kPRXLK6mAKKJYlPB7/0Xq0YsFkK7ZrsR6drhvq11+GDjWlWklpFswi+DveLwpubkQIqvzEydCdZDnMcTI4NUJVYKIaP1FTfduTqnFDdBtfeYewqKGPdSQ19Gk0sqKQGPjx5CEVqbmv22/D3x/ugRBNMgVKgimAEhX90CIvtMPAPJVaTBBJROS5p5FO4Tca0eQ0d1IDpvSOc2Bw== 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=Jyj473iDdNTQndFW5Siaw/KbVzN5SNIR4WqgPQN62Ro=; b=Sw3zH58fJ9Rj1y0V91f0GTpaYoMBsQkunwM5F0G9istOzvUqo+SHSedTW/UYAhFYWYJuznna+OqjAHj1qr6PAwrmZkxTMnIDeF+vL/DCDMsSQJoEPemcJwBgO3XuFPdXvgGNdBpVdmBxsX8+4PhKhbmTYAR48jyq6DqJ61Y5GxY4D94Z0XV8z78/aOxqMR1EKNo5RUaIQrViJw4nTKrmvbop58gtZUTsS5o0UNEdDtIn0foIUDJsmpOF7jWHgBW1Te1YggA6yTRCa6Y6dqVXY9ixOdQ9FPSKU30T046SRXEwjnTpsa/mEZryk9f9Wz8uikaVxITB1fQNxINCnROShA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0553.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Thu, 28 Mar 2024 23:11:12 +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.7409.039; Thu, 28 Mar 2024 23:11:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 00:10:35 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [5RIOhOs/s/2fiaflHjBpfmQs/ykdQOupFY749MOtlfo=] X-ClientProxiedBy: ZR0P278CA0093.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240328231047.2202386-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0553:EE_ X-MS-Office365-Filtering-Correlation-Id: deb540a4-c0f3-4971-b588-08dc4f7c5c6c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1tySaEaPY7C3/JEyBFB+YByJUcW+GXFscwTmtBYaiVWyfYvjOi46tUH8w6EcN5c4s3FReks+Xqj9KIt6l3QWSuAB11BKAlPBJELLmtyCcy2g753dd7pYXk7aBZYix38GnU7VRZRfwpU+kc323M+uWYCp+FliS5g6hFheA5xhRnNbmTFhqlFgEnA9mIhq5kDybCjCoXBveVF4Ibwj9ELLM72CY3mxErarejxkIpfqDLzeWZYXesUUYvkxkmAxpmIE52TbiI+6u2Cb9oOcnPnxACNdAPRMQ7X8KMUc/F7txRZ+cVLwm2zNuZL4ifa/bhb2SK3p1UOt4OoI8yNeJ5zJIRZsaZdCsaYFLzWvzKXmyV1e8uEoSUj3TT3EKW/pMVu5zGE552fHptiUcsbEaYlJeu0cqvSLs1BYpMBzVMYd3vlLW7ztSrFycU40d43n4VlGOW5QwyWCwSjEMJDtbXvp4lQUslvhGq1gFP9u4N9sfMPauWe5OtbzEjxws9Rah+oHRcxn46RX+jIM57Z2pHeqfwd0TDXwRpTBVGuB9mX8/K/j7OQh9uCCVGNQoO9Thtnb0xjQrrlZhOw6s/Qk+QIQCAr/AkVAgFYcA4hiSSEExjRhwGupdsn8lz/NXUP+szR0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i3j09nwDlrxDiVEqfJQCVxg13MiDTehHY2dVkOEebumGaIlEitPLjs1XqDhkMLWxNwlBYEgTRq6wFo4t5ur7izECPKpb3PweZViIKAxLJHAaV798CTdlCuMESwAJ1b0Ub9CgFghnNs9gX+tuCoHGSlIYcW8KCbtvT/D5iiyHQJSY9/whe3eeozIb7wi2/hR/3ZHC4xdgC+yJ7C01C2l95DgARi6VAX8CZ0IWoAqRlZKlINgMZRrFC8Um1yJeTzREsYWbCNpC1nvBKgUjtN+lMEMJ4UgqYZl4SVyoCn35OUSwTBQbr6XkZ/KxFXrVO22ZZHHERlI2c/acHBCyOMdpmoaNRNlsPZujK+KFBbS60PynNEHXBNivdNg8wzuzojGhkU4daEHkSDKz7AT7+xxPjoSioMF1jyRT63a69iiZqxPCkCQMydMnCYv3fntENqiM8yQmBvPsiFA8QATgqU0p9t4AdWNSzOitdYIlBvNRdQ4ORnjpYZkTFaM1ITtjzA9H0xEn28gsOpCztNBZT5Bc1GXHIh7Qx/V+CZl7w2H6eMIniKdF7Pe0rOaXdEK+18Ad+io+XBb896jVacwTZhsehuAk0o0IAg/Pl1PWqSN0uhAMbbxH2gmLmFwmjoRTjFOriOaT5vmj8CpopRqwKa/jHxbWEpsayOPDxiG3XXYynEI/DO/2cCF+JUH5bBfr9f7WySHYpmCus41xkej9GdRFtEKe3hvD9J9toWkEROFYM4ImzANVmARf0NC5bZOeGn4WED3UnPIWHcXiEQz8iGbuSDtBCoz0jB7wTU5kQ5glot/Cw1rFIrfv/m5TCdRMvoxZXfPywsWjFfcVDyW4cyKcIyb7qIw0XrCPAdJnBeV/CPYf0gErAii+6kqJ0/5rU6tsvNXOnYA+lYqTCpQkycPCVToj01Krvw8oyGT0vPD1ELiX62LjwsnPg0TJUsNpOcLwBoSTPEc/dyBoLc9cmi9ryiMHAdaYV/Jjq872CtHhXvThhqJtlhSXtCVIOojrsrX6tyOK6eK8QOQvmTu89momZpSgj4ExXnUUBLSRvohJXJumxQpAe1aUCd2oh3jucYBrnB6wL0WrK7gQcfEsIThjnFDYdh9b0o8Ubg/rM1YWuQ4RzdPor+JQRbaFg+Ya1s61P2VP5dC5oSVS92gQq453i4FItntvEioX/pNzp2+yX0uxF0HNskFWbrp/crvIHa/5FY4ByRwYN/xaaZQnL4rQzNAwJ4v3WMExj0YseBddr9MONEfsPLAThc8vqFof26JeWEETcu4dhZ3cxLRukmzpCw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: deb540a4-c0f3-4971-b588-08dc4f7c5c6c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2024 23:11:12.6620 (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: AS1P250MB0553 Subject: [FFmpeg-devel] [PATCH 06/18] postproc/postprocess: Don't generally include arch-specific headers 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: 9be/E+CxLb/K Signed-off-by: Andreas Rheinhardt --- libpostproc/postprocess.c | 3 ++- libpostproc/postprocess_template.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index 0586e458b4..8f4de8b1e1 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -88,7 +88,6 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks #include "postprocess.h" #include "postprocess_internal.h" #include "libavutil/avstring.h" -#include "libavutil/ppc/util_altivec.h" #define GET_MODE_BUFFER_SIZE 500 #define OPTIONS_ARRAY_SIZE 10 @@ -499,6 +498,8 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step, #include "postprocess_template.c" #if HAVE_ALTIVEC +#include "libavutil/ppc/util_altivec.h" + # define TEMPLATE_PP_ALTIVEC 1 # include "postprocess_altivec_template.c" # include "postprocess_template.c" diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c index ade1d6ce2b..d56b45d3b4 100644 --- a/libpostproc/postprocess_template.c +++ b/libpostproc/postprocess_template.c @@ -22,9 +22,12 @@ * @file * mmx/mmx2/sse2 postprocess code. */ +#include "config.h" #include "libavutil/mem_internal.h" +#if ARCH_X86 #include "libavutil/x86/asm.h" +#endif /* A single TEMPLATE_PP_* should be defined (to 1) when this template is * included. The following macros will define its dependencies to 1 as well @@ -830,7 +833,7 @@ static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext #if !TEMPLATE_PP_ALTIVEC static inline void RENAME(dering)(uint8_t src[], int stride, PPContext *c) { -#if HAVE_7REGS && TEMPLATE_PP_MMXEXT +#if TEMPLATE_PP_MMXEXT && HAVE_7REGS DECLARE_ALIGNED(8, uint64_t, tmp)[3]; __asm__ volatile( "pxor %%mm6, %%mm6 \n\t"