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 661AA49686 for ; Sat, 17 Feb 2024 00:11:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC34E68D2D8; Sat, 17 Feb 2024 02:11:04 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2083.outbound.protection.outlook.com [40.92.73.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A24968D1DA for ; Sat, 17 Feb 2024 02:10:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LxmiVURrKT4x6nr+S3LDyHfdDaJC94xHdrR+goAFb+aOevZkkR0WQjsZK8Vsu4djzT4JjjedcPzabTZ6Jg8FNQKhZh5iUAsxdBpiRGJlqcvvwSpXAqs02pkjADg0ZWepX2wX+0Bq63Kl6Xn6OfDcrPV0hVTCK/h26Ma+TJHM8dcKer9vQORhFdBQBq3CHw84QUYKj7/0ITJOji5mXTHbbv5oAyRZWLDX7wMNdNmdWEj+iyxd6iNySR3qL+loFNQyBrhOtM3Np3APowebAD9eSSPNczmdbxCNrvXdZJtF2DRXNQfPuAkSSaz1fyim3BfVFidofvcYM1D9uhjK5VujsA== 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=HhoWciNn0KWSMa71bU7qjOkCISMl6JpWVX4COZcq0ZA=; b=SjdmgU63KIgia5YqsvavS4mSzTrZQl9MkPPT0wJR/pWVa4L1LItpeUCNyrQWdNj/fkpi4+pEP/84tgKRHktcC7Kz3NZBx9p84Vm6/qLJ962z3SEOwq8WwiWb7p8pNrEah9K5Hgq55gbnSXlOym3+udLWWxb/j6MZAC/0A59IYzs4W7k7Lv4nEaMJ/NIoM+5chYlD+ds7hDILoFOacCIabfXrbBY5sMtn0Wuo2PyZh8BvDlsBtmmsqprqUtZwawY+CW01BtOGXALsdp2yZGhioev+6LP1g1np9yFg5j6qQFGkvEjb7noQTuidMOcs2dnW4hGI5sRBJBMJ9q1GYoBBaw== 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=HhoWciNn0KWSMa71bU7qjOkCISMl6JpWVX4COZcq0ZA=; b=Py3smk1dl7uuxgaHubzZOCbHFcespeiNoOPQI2e4frs3BSBqaC/JKpKH3w04/ir/XdGtDauF3QsIUqdbnI5y/zbHi5vyxz+1cMzEOgRgHfYLDd2kybo1J5AJXGQunZCvXl8PrfbJs/ozerJd8LqmzS2wVF7MvI4rNXLPHQoVpNHm3+t5Awe6SQB/DZ+gZDb3VFJq4LJUlvqQmShorc3nMVBLTTrpDfG/rbYkoq09PmiBfuD1xywfad1hd4Is6APpvLZE7iXeOeBB72ygs8Lc2zwBWURVz6WXN33OoymH3IZ+Phwxw65QFM6cTCNqJG86fO44BxJeggW5R+S99QI9lg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0324.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.31; Sat, 17 Feb 2024 00:10:51 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7270.036; Sat, 17 Feb 2024 00:10:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Feb 2024 01:12:39 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [U7mlWeGyJ4VIqRrBaMVMWHw6X/k3xrkVpkkCSS9Jzz8=] X-ClientProxiedBy: ZR2P278CA0084.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240217001239.2225331-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0324:EE_ X-MS-Office365-Filtering-Correlation-Id: 98e24ca4-c6db-4157-b44e-08dc2f4ce6d8 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicDk7xT2Lt/4dZMOx2L6DYpWmvGszox4eGvIwsxjiNm2qjjl4ScVCa8yTFHpMvMnk6scceyDO7zEIP7m9SaYu+fQZgCmm5f3jcHSkXacHMEi1GRbHijIVXYJ6sOYac4j/s1hqSCexdpQJqei1i8lvmxtB4ooFfkkvDgu56qom9MuMOE4f+O2rf+Pl2BjOsOZKy0UWgVpcx4wrlPhAb8y7kpzfKfSE6ZJjxxP7c4b1ptInAocr8tPw2C5QJkXkciOlrg1TmJJSheYoa4L7B6cfdP7lfhl2slqXJYjc5LUNW2VW3xr/HajBNZ1S/ieeZv8ELZholggVEFbSZMhbRFDwJ1iPv2M4O4aFFBDtOqWtyHdDv/H3sqVU0yoSk3D4ifGcOxPqTGsCPOoH91T3wpXdbgHz7xECCyZQEjfj8M32wkvsQcRRv86aqynFVaU29w4S9xV0egMD2fMP8bIepVDEzOnxqo92zfjqJarXJ/+N7ItoTreh57ulRmvWxDAewphlcScvG+U50tsKtiOAZJXb0QfQL3VbmqR4HWvjEdBKU6/v+r/SRB0Mq5H+BCROpeMwsJRnwjmdBnMGU8Qafby+BYAbVXoCPCOlUtvMsB6AAq+a+Dr6Qhy9ImGe6z86jBrsSiRHY+OUbaA8jqyP2z7C6NQljnmBzZM68uY2mm7Cykx+fwE5XIZJI+PvVWKyevB8sP3E6Y+5C/6ewCgA04MXhgfethavbp5KHknCmiN/X0CLA== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fJk659w/8FGOL/N8eR9un4v0pxPJfPnTM5nrjURaMeh4ts+8K4ANrMP+5FXT1b3FbyL70h9GBj8HV+ohF7GS7ZqXUr3N31yfBXz+v+D4XqbCKDAItMxRUpjrJTDI/naYNQuePGIU87FeEK0+Q5364GJ79wR/1B7CVTKcy+FeqoP0eAudRBah5EojSUuU9T0EJwoz4EvM/Ex4vvmXw4vLFmrq6bq6ukKOX11zA8W8sVIwnojB4oLpUWmG+lKAUtwg/58YYhyVarU63ej8CO5g+sSO5ozp+601k++ErWtgTlyL2rIdqERrU8fJGPNB9460N89hY+PWHeXR7pdUOyZRo97kFEaXapSyFKd1BS4bFkv01a7s6i5bg9Nimp9WbhUMUtLX/FceRBTpxG8cNGb/rZMyOIXJn5qcPfSaEDtW+uqWlORAmkQ/tZHOmsr/VfMcNaKl54ZzWcOpQO5tAjhTtceNk4nfaV3zXMlADTFhw/LkZxDQa6gRQDarBskxSajfHMLQy7WDF5fGgPNdACmtbSKm5LAaozwosOZYiA087sTHlya5C44U5QANrgGPZydiUvJlnyXeZqew9eYUICKElC5HYWmqb/otq+EzsvwcbG0ZrYT8byF2BobCnSkNbmPR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6tQ9h1VRuRFzJlYzkrEbX/VYBqXgp3eTwazyDOhWx0soCjtqTpx/82pdwN9g?= =?us-ascii?Q?DydiBUaVe5j5XWyfNpHR4S1P0/FOtBCHt8b6C1jSAL1WMHnqt/xn1Rc6eQli?= =?us-ascii?Q?HGp3t8jCx5YXa9hCtVGPL/FT3a50/pp9G8uxC+SFL7CQ5n3aPieCfZE8iJIM?= =?us-ascii?Q?hbZCydVT0Pr9xSTcmIqUtN9yli2TzImgLMu9CrotGpsCYOBFzsKlyM1Gp/Us?= =?us-ascii?Q?iitOar5anvVLINa7yLLQiLE8JAuAWERXIX74tcxIbEb5GgtXYIk69HrsSUMr?= =?us-ascii?Q?fmo1Z83bzU/wzBbVCHjAGG72Y3QLCEzOdk6muVtnZ1Y63+M+GNqayWH9/BF0?= =?us-ascii?Q?EHkit6cMM5sOpD1kFhwZIh44ce+F3kJYr+sdX97KKR1xp+93tihkirLz/765?= =?us-ascii?Q?dKL1yBVyAuDNU4R+ZsYrRlq3bppnCHS9eO9P/+H6JFfeuY6Jy9Y5DhuKTmyp?= =?us-ascii?Q?zhgUNdXE4AVtVR/FAor1wt1jFCs6vOdCt7eDijXBGFr6SpJ7X4F7eYTh4Cmx?= =?us-ascii?Q?w8LcK9wemDPvlOEAsyfTURsrYdRj8hbLpTxg3z1Jk5gK14A/kw6z2xRbq7Gc?= =?us-ascii?Q?tByuaui01f5jQQPqavQTyu8XDczoL7Y8qAD1R22z86OZ6Ygp+vGilj+miqy7?= =?us-ascii?Q?+8U4ZHp5176HcfeBYLoNqVu7Snr4o5xvd1sLUbkJRCRAFLkM7LU3J3cj836D?= =?us-ascii?Q?1Y5HplMMKcqAquR13rrPEoTfqV7KP+jdPxk9yn6oAX43TfKl48uUroXNFw55?= =?us-ascii?Q?h7ofxXoJjdhD0EyEKn3cMCoyO7Y7cPtfv4rXyB0ZbJHJ1mJsFO8SZ5Pc4wHN?= =?us-ascii?Q?oXUFaYkr1gLJAFCu85zLCnrpYyDNutdUeWpW7R2TezUVKYS/CcKOc1N2m1uj?= =?us-ascii?Q?giO0K6vJDDTRut0U7ggGZRETM0hG1SnQEld2io6unvyh3PKh/7mCM5fRBeGI?= =?us-ascii?Q?Efhw19BrmvpCcKUpUv4teZUnKMh+dkmwb1C9g7jDixUdfD3YUmk8BZdVUTq9?= =?us-ascii?Q?vzmokcvb48F5qpVjUvJ2Y4t+N+BCusmUSldLeXFxlYTtCnJsT554O8m5T7Zi?= =?us-ascii?Q?Fb9lijdZJqB+cFA7j/LOnDqXWmC6b21FRxbYoh2EXthE/zZIQjbqzTV6McHr?= =?us-ascii?Q?BcUMgseoSwbKVPe+PL6i1P9VUmzi2LwYFikgH8tp3c9QbIWshZI4MalPP5zX?= =?us-ascii?Q?gz7VO6zEXgw8AG2g0/eUYMZErY98XV0yTvi147Ru4y5MqlVRfUw0+nGWzIo/?= =?us-ascii?Q?320Pu0nVeLNBdxTF2JD4ywkEz/eOHA1mD4qqMuR06A=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98e24ca4-c6db-4157-b44e-08dc2f4ce6d8 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2024 00:10:51.8320 (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: PR3P250MB0324 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/x86/h264_qpel: Remove put_h264_qpel[48]_mmxext 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: These functions are not faster than the C versions. Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/fpel.asm | 1 - libavcodec/x86/fpel.h | 2 -- libavcodec/x86/h264_qpel.c | 32 +++++++++++++++++++++----------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/libavcodec/x86/fpel.asm b/libavcodec/x86/fpel.asm index ecaca3c080..278d1410fc 100644 --- a/libavcodec/x86/fpel.asm +++ b/libavcodec/x86/fpel.asm @@ -89,7 +89,6 @@ cglobal %1_pixels%2, 4,5,4 %endmacro INIT_MMX mmx -OP_PIXELS put, 4 OP_PIXELS put, 8 OP_PIXELS put, 16 diff --git a/libavcodec/x86/fpel.h b/libavcodec/x86/fpel.h index c533ca40b2..47ffc8eec7 100644 --- a/libavcodec/x86/fpel.h +++ b/libavcodec/x86/fpel.h @@ -30,8 +30,6 @@ void ff_avg_pixels16_mmxext(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); void ff_avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); -void ff_put_pixels4_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); void ff_put_pixels8_mmx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); void ff_put_pixels16_mmx(uint8_t *block, const uint8_t *pixels, diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index 2df4c11f82..d69ccda89c 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -47,8 +47,8 @@ void ff_avg_pixels16_l2_mmxext(uint8_t *dst, const uint8_t *src1, const uint8_t #define ff_put_pixels16_l2_sse2 ff_put_pixels16_l2_mmxext #define ff_avg_pixels16_l2_sse2 ff_avg_pixels16_l2_mmxext #define ff_put_pixels16_mmxext ff_put_pixels16_mmx -#define ff_put_pixels8_mmxext ff_put_pixels8_mmx -#define ff_put_pixels4_mmxext ff_put_pixels4_mmx +#define ff_put_pixels8_mmxext(...) +#define ff_put_pixels4_mmxext(...) #define DEF_QPEL(OPNAME)\ void ff_ ## OPNAME ## _h264_qpel4_h_lowpass_mmxext(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride);\ @@ -217,11 +217,10 @@ static void avg_h264_qpel16_mc00_sse2 (uint8_t *dst, const uint8_t *src, { ff_avg_pixels16_sse2(dst, src, stride, 16); } -#define put_h264_qpel8_mc00_sse2 put_h264_qpel8_mc00_mmxext #define avg_h264_qpel8_mc00_sse2 avg_h264_qpel8_mc00_mmxext #define H264_MC_C(OPNAME, SIZE, MMX, ALIGN) \ -static void OPNAME ## h264_qpel ## SIZE ## _mc00_ ## MMX (uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ +static void av_unused OPNAME ## h264_qpel ## SIZE ## _mc00_ ## MMX (uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ {\ ff_ ## OPNAME ## pixels ## SIZE ## _ ## MMX(dst, src, stride, SIZE);\ }\ @@ -424,16 +423,20 @@ LUMA_MC_816(10, mc33, sse2) #endif /* HAVE_X86ASM */ -#define SET_QPEL_FUNCS0123(PFX, IDX, SIZE, CPU, PREFIX) \ +#define SET_QPEL_FUNCS123(PFX, IDX, SIZE, CPU, PREFIX) \ do { \ - c->PFX ## _pixels_tab[IDX][ 0] = PREFIX ## PFX ## SIZE ## _mc00_ ## CPU; \ c->PFX ## _pixels_tab[IDX][ 1] = PREFIX ## PFX ## SIZE ## _mc10_ ## CPU; \ c->PFX ## _pixels_tab[IDX][ 2] = PREFIX ## PFX ## SIZE ## _mc20_ ## CPU; \ c->PFX ## _pixels_tab[IDX][ 3] = PREFIX ## PFX ## SIZE ## _mc30_ ## CPU; \ } while (0) -#define SET_QPEL_FUNCS(PFX, IDX, SIZE, CPU, PREFIX) \ +#define SET_QPEL_FUNCS0123(PFX, IDX, SIZE, CPU, PREFIX) \ do { \ - SET_QPEL_FUNCS0123(PFX, IDX, SIZE, CPU, PREFIX); \ + c->PFX ## _pixels_tab[IDX][ 0] = PREFIX ## PFX ## SIZE ## _mc00_ ## CPU; \ + SET_QPEL_FUNCS123(PFX, IDX, SIZE, CPU, PREFIX); \ + } while (0) +#define SET_QPEL_FUNCS_1PP(PFX, IDX, SIZE, CPU, PREFIX) \ + do { \ + SET_QPEL_FUNCS123(PFX, IDX, SIZE, CPU, PREFIX); \ c->PFX ## _pixels_tab[IDX][ 4] = PREFIX ## PFX ## SIZE ## _mc01_ ## CPU; \ c->PFX ## _pixels_tab[IDX][ 5] = PREFIX ## PFX ## SIZE ## _mc11_ ## CPU; \ c->PFX ## _pixels_tab[IDX][ 6] = PREFIX ## PFX ## SIZE ## _mc21_ ## CPU; \ @@ -447,6 +450,11 @@ LUMA_MC_816(10, mc33, sse2) c->PFX ## _pixels_tab[IDX][14] = PREFIX ## PFX ## SIZE ## _mc23_ ## CPU; \ c->PFX ## _pixels_tab[IDX][15] = PREFIX ## PFX ## SIZE ## _mc33_ ## CPU; \ } while (0) +#define SET_QPEL_FUNCS(PFX, IDX, SIZE, CPU, PREFIX) \ + do { \ + c->PFX ## _pixels_tab[IDX][ 0] = PREFIX ## PFX ## SIZE ## _mc00_ ## CPU; \ + SET_QPEL_FUNCS_1PP(PFX, IDX, SIZE, CPU, PREFIX); \ + } while (0) #define H264_QPEL_FUNCS(x, y, CPU) \ do { \ @@ -473,8 +481,8 @@ av_cold void ff_h264qpel_init_x86(H264QpelContext *c, int bit_depth) if (EXTERNAL_MMXEXT(cpu_flags)) { if (!high_bit_depth) { SET_QPEL_FUNCS0123(put_h264_qpel, 0, 16, mmxext, ); - SET_QPEL_FUNCS0123(put_h264_qpel, 1, 8, mmxext, ); - SET_QPEL_FUNCS(put_h264_qpel, 2, 4, mmxext, ); + SET_QPEL_FUNCS123 (put_h264_qpel, 1, 8, mmxext, ); + SET_QPEL_FUNCS_1PP(put_h264_qpel, 2, 4, mmxext, ); SET_QPEL_FUNCS0123(avg_h264_qpel, 0, 16, mmxext, ); SET_QPEL_FUNCS0123(avg_h264_qpel, 1, 8, mmxext, ); SET_QPEL_FUNCS(avg_h264_qpel, 2, 4, mmxext, ); @@ -513,7 +521,9 @@ av_cold void ff_h264qpel_init_x86(H264QpelContext *c, int bit_depth) if (EXTERNAL_SSE2_FAST(cpu_flags)) { if (!high_bit_depth) { - H264_QPEL_FUNCS(0, 0, sse2); + c->put_h264_qpel_pixels_tab[0][0] = put_h264_qpel16_mc00_sse2; + c->avg_h264_qpel_pixels_tab[0][0] = avg_h264_qpel16_mc00_sse2; + c->avg_h264_qpel_pixels_tab[1][0] = avg_h264_qpel8_mc00_sse2; } } -- 2.34.1 _______________________________________________ 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".