From patchwork Mon Feb 5 11:59:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 46039 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp698656pzh; Mon, 5 Feb 2024 04:00:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IG8Fuc2SnzQ2KD7DWZNRAwpkeNTfm95IIDb8FW7P6/LYWwCoXbLTzR8H65VnoVmxtZPz3Kk X-Received: by 2002:a17:907:111b:b0:a36:2da9:987e with SMTP id qu27-20020a170907111b00b00a362da9987emr8969354ejb.5.1707134411482; Mon, 05 Feb 2024 04:00:11 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUuY/ho1onH/AN11DOap52GalzGn6c46zGETqkIR0t4jXof50snvFHlVMLCt8t3CP+HOfUx9W/iXPq1YcSXL0uKaWVnv+poWu7PnRc1qN3PSizlfyamKudq6FFWgaD2SZHoYcPSibUwQDoMICP55v1LmfW2HTcWdA+GJdeLplpzrxP2by3uzy+IwX0SsXRPGITap4HSddrvqxjev+DUg2MWovalPpKU41h8Q1ZbnyINZcETXMmzJe0DziUxoQrBDpqyNbVcsacBcrPcfP6SSJAL3TrPTj3J525i/og3HVfPjq/VazIjYqVg/UxnP9EIma+azipBrfn/l6JMLKxN6KmhYF+z5/rVSTljfUVm7FnGg+lPgFkn6s76AU6ofTb8tmADgeB/SHPtA0jJCaT+b93oboQvYjQX6Gm46UlL5mHiPY7XQsPjSCrisgVu/WPG0lPWYbXCVbLSb7epLl5/SRwpCJl0jhfi+lkPGKr7A8KR3rWJgg2+9LTrcp3ATolnogu4do9bU2qIoHiBdLuK2JGSnRVPNJsNxaiCG4zYSxWROB1peiVZUcG0piuTG2ByiKpYxPYD0PN3jxQ77f/hXVbsOQVekVmklJ7YdK8QKOB/eD+uwPkP0bugP+b9NLw9jGwrgI0g9RPFTJaB80zIlsBElC6DqSMl+TVjByjQj+i4yFxLocW129Sq2iKgEJyp5wSTpB8qLFwpJ/WP2YaXEaFIMf0uf1mvEcG7LNBvgtF4rU49pnwyGDWe4I9CHb/VxIlk0/R2yRJ8a/pzJxUurhUt0kkCoMIHvvz1T+TmZylIzRNTyaCP9qF0u1ezp7pjizE4C0cT6FP4M0hMlVnYSYNdFgCdDn0XRbh8tRNFhUBqJ2E5EBX1zbuHxBYsOWUWxt1fBttrwTmoi5zFvGv2ySbBqCLR072ReSZO9FtwU3qXLGuAr4oqxtQhXSCv+Q353pgl4F K7iUWcEwXBv+ad+XFPqBrJbLo4te0Q0Z8m4xoWxGplLjhp5ELTbdhPyKGgyi8ftRnSP/EyquIBbpykwHrkhdFHZlKSCxbfZwNe53Vnsg6DHCFX6RRZXjlfPB5uvOpkATabYD1Lsfb80PniJKATlY/umY1btd6QMv0ufRX5wv3BS0iujplJ7yGt+a4Jd3yR9IR54jnoXnvmAtI16Nw2We1/RkPWlEIUvkoigjDOrVIrtwHCZDji3ipRdjPEzcVXm5o9b6q0ZDgmjTYKSqsDAX7xB8OgXcTKo89h9TiKA2YcK8UAs672K4OMmlceEmOZbe/o1fMPaDia+hLJkmtyDzWfqouyf2fVYYY9YXORtXdPc8FOeZG79xDl3YVZJ0O+UVmZrDLD7YP9w2dkFoBOs3b9Mnn/APj49EogqqML088z7x6uv4p0aywZ03XQykl1hoUY0PZUYVDddOy8HgKYMIcSpbG3oxyK7xhZ6wHpu2QwgQOcUoZ0cfUqi2wlcVXXT7weCPsXrMZXpU8enOPaTpAqFhwb0LwI5wFZXMl+CGB8c+XjCd1KUC4+3bTKC2gmPl/Qoji7fB+fi+2XMGjecEOFGLMYkETjuXcjz/lDCAuLXev+JdQcVaRp+SNTfVghJ0nN0RlqHgqZ Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u26-20020a1709060b1a00b00a37bd02d371si915886ejg.410.2024.02.05.04.00.11; Mon, 05 Feb 2024 04:00:11 -0800 (PST) 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=Hv2oftMb; 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 F032168D14E; Mon, 5 Feb 2024 14:00:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01olkn2096.outbound.protection.outlook.com [40.92.99.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97A5B68CE0F for ; Mon, 5 Feb 2024 14:00:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W3aoxxkfrAG3GGIRt1qpiEVW8LbrBy5m1xd0wTD56oQ16Sm6TOVYWlnhnAXCRMaCAY1TL8hGYB0xPH7DsYMCA1Q21/ZgpjnbBanyvatyfxgPqNmCnOcM2WBRvTwLjpxuaj7ia7NfVbBgMuEn0WedSMM0L47av8X+LAE6XSrcQGIAn7QXWYZu6y6UHJtsLKSFG+o6Qh3LZJJP0lcIRTMumC87jSj817wciKQKBRyjksPJtmOomUXC9zc7RHJniwXqONzb7aikhvbCERukHXt9+dNTW0fShcaaEmzgtaIIpeOv5DImEHtkyZcoVX9wgg0Pxj06w1Ipdn1dE6V5Xfu51g== 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=nNvg8/QDEzeneu/8cBRKxyjAkgspdrXlie25khwxhLk=; b=k2ICSdlnHPTLtVZm6omAixbuQjnn4Jm+1CjCsICs1h/8meDB4b7ESOMxAk8DJWgb48gtBc/GuMT5WE/Wrd1nVgW9ACoBLIS1z545i8NuJmjU2ZtDAmXN0T31+ByhkZwnpR8hld3ymbpJ3MyTYyTrZBK5fjxk1+UvbsltYL0x2rfR2J9Xz84Ztrn1wDdT7Zf/m+FcTj0LgpSX0N3CS43kPVpb5e5+GuzzRttYqAQBlCmq1yY4xHpWoFJyNURZXLq+fnUQseJLg+Do9nn1Y71UWUe8MtczRgTpkVx24mAPP6rslUQXzyYzQ/FJOHD1ktOfX3edG1E58VCAM1j/AInsug== 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=nNvg8/QDEzeneu/8cBRKxyjAkgspdrXlie25khwxhLk=; b=Hv2oftMbcBmzWJBEgBH6HwWNkO2ggKfWWxcAo+blyaRbAXXZnBaWB8JsZKaFkEJztyPNAdIVQTOu4ofJEeF+9mMKzxrUe58peh5HxJLzDKqmf/dVSLWhPWyCo4Pd2TGLVT/06NBgs6vLacT1Mvq2LY6I1anGLE9X9C1l9eyMiSAPzvsSZKCDPvWNE9GshuWC/89/zM+XEJGEWcTY098G+CmRU1vh+U9FPZMcQUtlpFGseIi2nPE3RSZD7w4g131+EnQ0iSCCXaFcfB4BGpFk4X9jmBr0wwVcEacWkT6zSWIR1IZM5vcWIIK63mGH0dzniJeZwGxqC4r2airhlXBwaQ== Received: from OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:186::5) by OSZP286MB1773.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:1b9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 11:59:57 +0000 Received: from OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM ([fe80::d093:3e:d08c:ffe6]) by OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM ([fe80::d093:3e:d08c:ffe6%7]) with mapi id 15.20.7249.032; Mon, 5 Feb 2024 11:59:57 +0000 From: toqsxw@outlook.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Feb 2024 19:59:23 +0800 Message-ID: X-Mailer: git-send-email 2.43.0.windows.1 X-TMN: [Ixoqd6pSxq/PJn+mPwh9+kmtaDYGEsgi] X-ClientProxiedBy: SG2PR02CA0024.apcprd02.prod.outlook.com (2603:1096:3:17::36) To OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:186::5) X-Microsoft-Original-Message-ID: <20240205115923.343-1-toqsxw@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OSZP286MB2173:EE_|OSZP286MB1773:EE_ X-MS-Office365-Filtering-Correlation-Id: 786c045d-4fa4-4358-14c5-08dc2641f8ea X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vrLV17hyy/GdpfeiRRGznnbJAzeGA3ac3HOc6NtTDsQ0ooGBgUqw5R/QGFgm53VjbgBGj4Ann3mUPz6IadEgE/cunsfHxlLdGEsJGWM67QKvg+ymQ53a9iUzPEeaJbdNAjkdASnxVGrorZmFshXoVftpjcUjvkJRKWlaRwmxU7mvP9g+Zc6cjfO6LyqwOT9Gd5+HeyAGbDHI8JPpi+UVw0CK0YcizQ54TO2nPV91tc/0IkfPon784CSMHwRz0eUIwMjg6msfgC/CnlgVVKU56S21cVczKdxQ+iDS9QLm0QrAVFbBfdRJT5KhNcOGvgTCV8qsJk3rbyh5iTvJK6vS4TwXewLuSZfqL9Ckt4eKjNMUOZ6trnwodhJYrVey6cMqaYfIyOncXc2YQWSmJd/ZpvycoJ9vMNLybH6D3mIzogQcU1k4+5qjyutMe4f9TyzEjRYwC2P/IEZve6TswC9+2fYKO4BN2abVxJEkP5f6Xt4V45zsP5o7XJKA4hxscA0GrczaeOv/rBZTaayNwS5UC00/Z1LC9Fh4qeq5LriQc+VxDnRCFs9z0SByrrIRrfYjfvyZLhOK0L2JrweY4bzT9pVUlPPIF+EETGpXeUuebOzPCJ4yOdPJZobJlVhTrlWq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9LLRpQr+C666IOeTMCmu/fzVFsM6QTjIroy+O5Fpr5CnQvUrbOnG138Tm2bPxBEKt/qdTMQJTUm9V6xLAp2wQN9mq5R6EZ+6X/SRuyHxK5yy/feVkWRT78eUktvG9lY19LMfmWssRvoz9IvQ4GwbGSUmJ2iCaCt+sGaB1LLrc20xYCWhKJRqNURPVAmlAyr57Bfmr1v4hwg68Gmc5+PpHSZjX33CmK+WzpXt9yrncsd+4NecCuxnp5anDVvC1bx90jbJmQSJlAhVJ+1xLGL66Ybixd38FqS97bGOr7sEqt+PnRtyQ1MZzIpPMevcUSifelRtf45O7dGUDpz4PVQ+GV8PKhhVWYTdvMpdJBU6hes0xBNjpvCNaQEpli2DjtD4Mm6EqTpRpgno4ht9O/pdgbUQ4kge286DzYEPh4aEbR6IsZC1z0Yd85LiH8K5NaAdTyA1J2G6o98XTsARBkExDvhT55ms6JKsaeC/GZsJy2iXG3q21Kg/87yUQPoMZdN0y4aGVMHegiI+LZm43qS4cByb7WCkbrNqVtbFBGP8n5IYcv5dKUn2zxtIUFYP0fC2TRJG2ofaj+ZuxZOxEk75fx9naESvTfMm5+YYJC10r19XbJ93aEYBHsvrD/Wpk4xY+aoM/GiWW+gWa/CjU8MjUJaX3Vi7Ytu1lod7HmWtjBjAqfEWtUrZQ1l+sgySQjn1w3kjBP8/N2dAeE1sbP7D+LCLbMLfP0ri7qasl/fNDW738OMdutQPooeY4TR17owbjXwVlJzem4AvmRB919oDMDq5BaZQlnPuZ4crdO1yET0+/a5PyCrZ5BXraf0Nr0LTxUd1YdbLoSScqRq5RXMzecGQ7SzWe5v15kQ0GuyEKRsnEC0AFUDNV3OKAEXBfiyhFH0NYsp4cvJ83URr4PORqn9HraHwziwpqsGr8ap7ULGvvaKDgaXuM9W9syCqnZpvhZDjeYfzd/QQJWEoPe6S3LwOPQp3Ia2fYQNlu4XGjIg0icLtvo3Tzx79vwxIWtvKxBky/wlOui57v1V0Hq2F5Gn6jKfY5QdAL/Oh5fx5jPn3rUyu4SomqOnrUeE2ca+xp7vgJbF/gVFNjTesKgFxgZDwHDNK5PwT/FlcA1ejYab9Uk3CDN3ByIxXsgBTzOpMZjNPXR2mVnGbsLpjLziuKoPZ+SqllTWH+Vll267d52Yd7hLHte89Kzm67jMN0VK4u7f5Rv15KSKVLRiFoudVMtt5TmoDhAFvw/e2sYponx8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 786c045d-4fa4-4358-14c5-08dc2641f8ea X-MS-Exchange-CrossTenant-AuthSource: OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 11:59:57.2899 (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: OSZP286MB1773 Subject: [FFmpeg-devel] [PATCH] avcodec/x86/vvc/vvcdsp_init: fix unresolved external symbol on ARCH_X86_32 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: Wu Jianhua Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PXNV3gxcOgv3 From: Wu Jianhua Signed-off-by: Wu Jianhua --- libavcodec/x86/vvc/vvcdsp_init.c | 78 ++++++++++++++++---------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/libavcodec/x86/vvc/vvcdsp_init.c b/libavcodec/x86/vvc/vvcdsp_init.c index 909ef9f56b..8ee4074350 100644 --- a/libavcodec/x86/vvc/vvcdsp_init.c +++ b/libavcodec/x86/vvc/vvcdsp_init.c @@ -31,6 +31,7 @@ #include "libavcodec/vvc/vvcdsp.h" #include "libavcodec/x86/h26x/h2656dsp.h" +#if ARCH_X86_64 #define FW_PUT(name, depth, opt) \ static void ff_vvc_put_ ## name ## _ ## depth ## _##opt(int16_t *dst, const uint8_t *src, ptrdiff_t srcstride, \ int height, const int8_t *hf, const int8_t *vf, int width) \ @@ -204,51 +205,52 @@ AVG_FUNCS(16, 12, avx2) c->inter.avg = bf(avg, bd, opt); \ c->inter.w_avg = bf(w_avg, bd, opt); \ } while (0) +#endif void ff_vvc_dsp_init_x86(VVCDSPContext *const c, const int bd) { +#if ARCH_X86_64 const int cpu_flags = av_get_cpu_flags(); - if (ARCH_X86_64) { - if (bd == 8) { - if (EXTERNAL_SSE4(cpu_flags)) { - MC_LINK_SSE4(8); - } - if (EXTERNAL_AVX2_FAST(cpu_flags)) { - MC_LINKS_AVX2(8); - } - } else if (bd == 10) { - if (EXTERNAL_SSE4(cpu_flags)) { - MC_LINK_SSE4(10); - } - if (EXTERNAL_AVX2_FAST(cpu_flags)) { - MC_LINKS_AVX2(10); - MC_LINKS_16BPC_AVX2(10); - } - } else if (bd == 12) { - if (EXTERNAL_SSE4(cpu_flags)) { - MC_LINK_SSE4(12); - } - if (EXTERNAL_AVX2_FAST(cpu_flags)) { - MC_LINKS_AVX2(12); - MC_LINKS_16BPC_AVX2(12); - } + if (bd == 8) { + if (EXTERNAL_SSE4(cpu_flags)) { + MC_LINK_SSE4(8); } + if (EXTERNAL_AVX2_FAST(cpu_flags)) { + MC_LINKS_AVX2(8); + } + } else if (bd == 10) { + if (EXTERNAL_SSE4(cpu_flags)) { + MC_LINK_SSE4(10); + } + if (EXTERNAL_AVX2_FAST(cpu_flags)) { + MC_LINKS_AVX2(10); + MC_LINKS_16BPC_AVX2(10); + } + } else if (bd == 12) { + if (EXTERNAL_SSE4(cpu_flags)) { + MC_LINK_SSE4(12); + } + if (EXTERNAL_AVX2_FAST(cpu_flags)) { + MC_LINKS_AVX2(12); + MC_LINKS_16BPC_AVX2(12); + } + } - if (EXTERNAL_AVX2(cpu_flags)) { - switch (bd) { - case 8: - AVG_INIT(8, avx2); - break; - case 10: - AVG_INIT(10, avx2); - break; - case 12: - AVG_INIT(12, avx2); - break; - default: - break; - } + if (EXTERNAL_AVX2(cpu_flags)) { + switch (bd) { + case 8: + AVG_INIT(8, avx2); + break; + case 10: + AVG_INIT(10, avx2); + break; + case 12: + AVG_INIT(12, avx2); + break; + default: + break; } } +#endif }