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 303AB46864 for ; Thu, 18 Jan 2024 14:24:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 90A8068CB0D; Thu, 18 Jan 2024 16:24:38 +0200 (EET) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (unknown [40.92.98.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D46A168D041 for ; Thu, 18 Jan 2024 16:24:31 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZnJjOpe4GSo9OSvdAfQ57M9h7uUbVfrt9XVXgw5bQKXblNF7uzW2KejdPVnRaOKGy1NdbTr3DIsZ+Pv+k3Z1igEmX4Ldr4yKOMPxYOXFiYMI7kG468IzMXDSc5IQHNuefkoXDNO25cdvhlEl45BaSUXyJqpW8/fRkVVmPgD1EmshZHgf+zNUAAY8Bsyb3TTyEOo7bYZ1+fMVZSSn+ESzl1R7hvuB5IJiJS0Y5XEeMHbA6qR90AZrpK0eWaIvrzD//CinTq99GsNY7TYWajs7MUndMbrd9o0nnODV8xfsz62Le/ajIcz19aTHGE33Fjli3kL2G/QmXiUeZQzix/QdKw== 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=S/q5ZBK/L2WGUFEOaOuDpihRwXHEyrTa1LLrlhUaUeU=; b=BV5mX9oC+mGElmxNtkrzBtL2uKJHRqpmSLOyd+s8tpKcLSdWtYZtAUhFe1gUo1w5oLLFs+7itE60fZJiYs2Ef0rMViVS39UhhKXRDCJr/r3gvFC+CK6St+7G7felI9zaP2225ht0GimiI9kHH+HCP4ryFHJh3G8Q/8u43RKWDnHZvOZllDi4LGNc2wyF8I7Sdg/oqNhbk2bS23Ga1BrBwh8Vx+q3XMmejsjkWuqUCeaDCssT6xpiKCbCNpncdUUReyWhWGIHEhvxmmwGzz0VFKLwEv607L3EpWNJYcwVYUrmZVd0UlyJaUnKpqdHNWVxFAUsqCa5b6SoT3WJ649C4Q== 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=S/q5ZBK/L2WGUFEOaOuDpihRwXHEyrTa1LLrlhUaUeU=; b=BY4P78SRqnv3EJHp/9d9a5ny1IChWam4+ank1j5IEE6cNC49Wlt7On8hFu/W0qAcnuLye34+nkHnyklj7GOU2JXwnB5ZtxQ+m+wPriQV6iopj9IxtyBeMIHue9DQy07GfTrG7r3Q4tXL7otRYyOnquB65G/tM2Y718Q/CIsqtqT3FK8khB8z29pw1gU1XFVsKgH8MvWXLX3dPfgRWUAtFnNlC6uJz22E1Gt5oACtFhZ69Db3+8TTme9apVyZ4ssBybhtaMk3p2H8Chbe8SIBpyAQVUKCObJjr6gb5N/mrc+Ll5fhkZ1SfAJvz0CdY18OLLDaAImXjjHgbAS67U5YlA== Received: from OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:186::5) by TYCP286MB2622.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:241::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Thu, 18 Jan 2024 14:24:20 +0000 Received: from OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM ([fe80::1bbf:406b:216:f56e]) by OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM ([fe80::1bbf:406b:216:f56e%7]) with mapi id 15.20.7202.024; Thu, 18 Jan 2024 14:24:20 +0000 From: toqsxw@outlook.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jan 2024 22:24:00 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240118142404.68192-1-toqsxw@outlook.com> References: <20240118142404.68192-1-toqsxw@outlook.com> X-TMN: [AkqME1eos3ifo2ICtkQKAMNYgKqu2uGk] X-ClientProxiedBy: SI1PR02CA0009.apcprd02.prod.outlook.com (2603:1096:4:1f7::10) To OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:186::5) X-Microsoft-Original-Message-ID: <20240118142404.68192-4-toqsxw@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OSZP286MB2173:EE_|TYCP286MB2622:EE_ X-MS-Office365-Filtering-Correlation-Id: 679ea482-414e-4c24-a4f2-08dc18312938 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N2/JKsoWe5GS6b9mYoivZYXHqWfVkWLkUUuuUCned3EQJJxj/Epk2HVrL3fq+pItsdBM6DGJp67LjZwVvQRTXnjOSoqV+viRxgqyfGTliyyfskryJYNcZv3LHoS8mf9WEg/M1XNXyS8LLfONgXeK6X+zUonvvgvzBMtKPsHzTTt01DJK9QKMqrB/M8xfWpo4cGpmzNBSTJCbihskvZH6eoLmejJlGxr0giTG2oal6vd7+OLUXQv/2cIB+SDumclhlH8wppIFOMeu8daCiBGRyK5TIDCFMy5AZu23p8f/3l9AlPoRFJz4G629WM/6cY/7Ju4amA7W7Q2Nj6mQivmFcpY5+L8XdtLE7JC5JRklBKt1D+Smi9+Jks+t36FhKY0g3uPMon7A2UFkUMPRCYJqieVlHh2AaNuhVweaVpSAspQ66MRUP9RgwcFZ5PcpGRASMvV0Jr/1pywFBg6KRIey1LLBNhR6aUBaA4jNH9WU39/RM9mPrnK4xTf02Dl2TFlGh9zv2IxJdwIlhBBYkc8PMfahB5VaPxeyI2isKpkyGVO2fAhmn2NYTlZFqRNqGDfmWUYLnZlvx9R5FPL1ZFl8P915RPIntW7kqakUP8WEFUmjAQbPd85WHPY4wzyOBGY0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gtco5w763PJm583vAK4zcVXXXPaOkcDU1ZAFuqR6DnZ9tgz4N+dhl2Dp6zWU?= =?us-ascii?Q?0FoiZMfLzJ7b+ZReK+ISuLgAzskb0Fj3QBYHmxOAej6STq+T8bwMylBQb2KD?= =?us-ascii?Q?8J/yUhRNmoKpKmRhj49N93xDkq5LflXVC46vLLcf/tgSUb7pPTo1QjD7S/OX?= =?us-ascii?Q?x9XqBYXJsbPqFWAXzK/N+FqnbjRY6riTbkJrvhpKNYKaJCE19q9EJmO3nb6+?= =?us-ascii?Q?NaneACBPmQqI9hTJugHuhRDxZ3FoissLCHr1VxpVTnUaeRMHw0pOScWPWJXt?= =?us-ascii?Q?3nTDHUVGcVRarRklfeaFirPqOZMsmZZBYU+k+MKmWh0o3UcPrIA+FlFe/VCN?= =?us-ascii?Q?O6ctvSJf29WnaTfuUKdia1+vZN2VX3SgL0QpwHFhsjANyqQJzmNycLNFmjm2?= =?us-ascii?Q?sy5V1XbCgtdIkaCRq2czSLJHaoSBkX0kfKosduAtLZBl6mP8D6IfgQvYzaYQ?= =?us-ascii?Q?pejdM82vYcFUw4leYERbz+brJeBMzz3nBHrPKln5HUzoHw8gs2H1jWrQAeE4?= =?us-ascii?Q?kv/ERFo7osjoa2k/rfgvhKXPRa084aVZOkuFt3aa3w9xiwWr37mVHC1Kzjoy?= =?us-ascii?Q?6LWoeM/ZuSn17SPbUrlS5s6L0MLeq7dEnG+GWELqtUMeaMj7DUP/zcdRM6k0?= =?us-ascii?Q?r336FIRsqHhhuw7AvjuS3Qw811ghgGDShSNZeJF4P4Cbbu1xfuLKm7S9ojkl?= =?us-ascii?Q?htlV2KWqHrHaO3JM93tBjt983tkot4mHaiLUzInw8Q9IwJuvFdR6BAOREFXn?= =?us-ascii?Q?BOCmIVejXtDLGtIaDQZMShvOfgx94s+BX8kO9AHtYTQsrheNYuc6xp1sntGb?= =?us-ascii?Q?qN8T2CnlHP5+8nCAMNCa6dglgEv0tR7g2VfN/oOHNmxDOPXb160v6bgLgA49?= =?us-ascii?Q?0egXknVkxeXe7X/UQW8FhMkLZ/bhQUKS2jn0zdVGkgTm2EvyZY/qfhfTn3VQ?= =?us-ascii?Q?E2BAyXSaNe/3YRlKTHxOT08naqmKO+1stcil0VMmI0v61s9FeschiqYlQjN0?= =?us-ascii?Q?6SYDHjs3nr4WCd9FTxbL2Jh4Gr6YSC4RhLsfP3GrNpOGwgsX29rp2YQVn+zi?= =?us-ascii?Q?OS2huq0NydgaCAaJ9HHdlm/N/dL05fMnGB+b0lHR3xj/3LpitH7gVKxAKnJl?= =?us-ascii?Q?72ZsyapfKvMpTUU65KmFqpOLtZDcqGZJBkHCydwUVhyUI6AXoKPx9Om29ySB?= =?us-ascii?Q?cDFLwsOdWn4vXAdXYe6VnRKn+CC+OB+bPGz1eD4gzXdOKVfpeXr5VR3aSQQ?= =?us-ascii?Q?=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 679ea482-414e-4c24-a4f2-08dc18312938 X-MS-Exchange-CrossTenant-AuthSource: OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2024 14:24:20.6859 (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: TYCP286MB2622 Subject: [FFmpeg-devel] [PATCH 4/8] avcodec/x86/h26x/h2656_inter: add dststride to put 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 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: From: Wu Jianhua Signed-off-by: Wu Jianhua --- libavcodec/x86/h26x/h2656_inter.asm | 32 ++++++++++++++--------------- libavcodec/x86/h26x/h2656dsp.c | 4 ++-- libavcodec/x86/h26x/h2656dsp.h | 2 +- libavcodec/x86/hevcdsp_init.c | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/libavcodec/x86/h26x/h2656_inter.asm b/libavcodec/x86/h26x/h2656_inter.asm index 4316c8ae3d..68f88832a6 100644 --- a/libavcodec/x86/h26x/h2656_inter.asm +++ b/libavcodec/x86/h26x/h2656_inter.asm @@ -22,8 +22,6 @@ ; */ %include "libavutil/x86/x86util.asm" -%define MAX_PB_SIZE 64 - SECTION_RODATA 32 cextern pw_255 cextern pw_512 @@ -332,7 +330,7 @@ SECTION .text %endmacro %macro LOOP_END 3 - add %1q, 2*MAX_PB_SIZE ; dst += dststride + add %1q, dststrideq ; dst += dststride add %2q, %3q ; src += srcstride dec heightd ; cmp height jnz .loop ; height loop @@ -529,7 +527,7 @@ SECTION .text ; ****************************** -; void %1_put_pixels(int16_t *dst, const uint8_t *_src, ptrdiff_t srcstride, +; void %1_put_pixels(int16_t *dst, ptrdiff_t dststride, const uint8_t *_src, ptrdiff_t srcstride, ; int height, const int8_t *hf, const int8_t *vf, int width) ; ****************************** @@ -539,7 +537,7 @@ SECTION .text %endmacro %macro MC_PIXELS 3 -cglobal %1_put_pixels%2_%3, 4, 4, 3, dst, src, srcstride, height +cglobal %1_put_pixels%2_%3, 5, 5, 3, dst, dststride, src, srcstride, height pxor m2, m2 .loop: SIMPLE_LOAD %2, %3, srcq, m0 @@ -569,10 +567,10 @@ cglobal %1_put_uni_pixels%2_%3, 5, 5, 2, dst, dststride, src, srcstride, height %endif ; ****************************** -; void %1_put_4tap_hX(int16_t *dst, +; void %1_put_4tap_hX(int16_t *dst, ptrdiff_t dststride, ; const uint8_t *_src, ptrdiff_t _srcstride, int height, int8_t *hf, int8_t *vf, int width); ; ****************************** -cglobal %1_put_4tap_h%2_%3, 5, 5, XMM_REGS, dst, src, srcstride, height, hf +cglobal %1_put_4tap_h%2_%3, 6, 6, XMM_REGS, dst, dststride, src, srcstride, height, hf %assign %%stride ((%3 + 7)/8) MC_4TAP_FILTER %3, hf, m4, m5 .loop: @@ -602,10 +600,10 @@ cglobal %1_put_uni_4tap_h%2_%3, 6, 7, XMM_REGS, dst, dststride, src, srcstride, RET ; ****************************** -; void %1_put_4tap_v(int16_t *dst, +; void %1_put_4tap_v(int16_t *dst, ptrdiff_t dststride, ; const uint8_t *_src, ptrdiff_t _srcstride, int height, int8_t *hf, int8_t *vf, int width) ; ****************************** -cglobal %1_put_4tap_v%2_%3, 6, 6, XMM_REGS, dst, src, srcstride, height, r3src, vf +cglobal %1_put_4tap_v%2_%3, 7, 7, XMM_REGS, dst, dststride, src, srcstride, height, r3src, vf sub srcq, srcstrideq MC_4TAP_FILTER %3, vf, m4, m5 lea r3srcq, [srcstrideq*3] @@ -639,10 +637,10 @@ cglobal %1_put_uni_4tap_v%2_%3, 7, 7, XMM_REGS, dst, dststride, src, srcstride, %macro PUT_4TAP_HV 3 ; ****************************** -; void put_4tap_hv(int16_t *dst, +; void put_4tap_hv(int16_t *dst, ptrdiff_t dststride, ; const uint8_t *_src, ptrdiff_t _srcstride, int height, int8_t *hf, int8_t *vf, int width) ; ****************************** -cglobal %1_put_4tap_hv%2_%3, 6, 7, 16 , dst, src, srcstride, height, hf, vf, r3src +cglobal %1_put_4tap_hv%2_%3, 7, 8, 16 , dst, dststride, src, srcstride, height, hf, vf, r3src %assign %%stride ((%3 + 7)/8) sub srcq, srcstrideq MC_4TAP_HV_FILTER %3 @@ -774,12 +772,12 @@ cglobal %1_put_uni_4tap_hv%2_%3, 7, 8, 16 , dst, dststride, src, srcstride, heig %endmacro ; ****************************** -; void put_8tap_hX_X_X(int16_t *dst, const uint8_t *_src, ptrdiff_t srcstride, +; void put_8tap_hX_X_X(int16_t *dst, ptrdiff_t dststride, const uint8_t *_src, ptrdiff_t srcstride, ; int height, const int8_t *hf, const int8_t *vf, int width) ; ****************************** %macro PUT_8TAP 3 -cglobal %1_put_8tap_h%2_%3, 5, 5, 16, dst, src, srcstride, height, hf +cglobal %1_put_8tap_h%2_%3, 6, 6, 16, dst, dststride, src, srcstride, height, hf MC_8TAP_FILTER %3, hf .loop: MC_8TAP_H_LOAD %3, srcq, %2, 10 @@ -814,10 +812,10 @@ cglobal %1_put_uni_8tap_h%2_%3, 6, 7, 16 , dst, dststride, src, srcstride, heigh ; ****************************** -; void put_8tap_vX_X_X(int16_t *dst, const uint8_t *_src, ptrdiff_t srcstride, +; void put_8tap_vX_X_X(int16_t *dst, ptrdiff_t dststride, const uint8_t *_src, ptrdiff_t srcstride, ; int height, const int8_t *hf, const int8_t *vf, int width) ; ****************************** -cglobal %1_put_8tap_v%2_%3, 6, 8, 16, dst, src, srcstride, height, r3src, vf +cglobal %1_put_8tap_v%2_%3, 7, 8, 16, dst, dststride, src, srcstride, height, r3src, vf MC_8TAP_FILTER %3, vf lea r3srcq, [srcstrideq*3] .loop: @@ -856,11 +854,11 @@ cglobal %1_put_uni_8tap_v%2_%3, 7, 9, 16, dst, dststride, src, srcstride, height ; ****************************** -; void put_8tap_hvX_X(int16_t *dst, const uint8_t *_src, ptrdiff_t srcstride, +; void put_8tap_hvX_X(int16_t *dst, ptrdiff_t dststride, const uint8_t *_src, ptrdiff_t srcstride, ; int height, const int8_t *hf, const int8_t *vf, int width) ; ****************************** %macro PUT_8TAP_HV 3 -cglobal %1_put_8tap_hv%2_%3, 6, 7, 16, 0 - mmsize*16, dst, src, srcstride, height, hf, vf, r3src +cglobal %1_put_8tap_hv%2_%3, 7, 8, 16, 0 - mmsize*16, dst, dststride, src, srcstride, height, hf, vf, r3src MC_8TAP_FILTER %3, hf, 0 lea hfq, [rsp] MC_8TAP_FILTER %3, vf, 8*mmsize diff --git a/libavcodec/x86/h26x/h2656dsp.c b/libavcodec/x86/h26x/h2656dsp.c index 27769f9c55..7ef1234936 100644 --- a/libavcodec/x86/h26x/h2656dsp.c +++ b/libavcodec/x86/h26x/h2656dsp.c @@ -24,7 +24,7 @@ #include "h2656dsp.h" #define mc_rep_func(name, bitd, step, W, opt) \ -void ff_h2656_put_##name##W##_##bitd##_##opt(int16_t *_dst, \ +void ff_h2656_put_##name##W##_##bitd##_##opt(int16_t *_dst, ptrdiff_t dststride, \ const uint8_t *_src, ptrdiff_t _srcstride, int height, const int8_t *hf, const int8_t *vf, int width) \ { \ int i; \ @@ -32,7 +32,7 @@ void ff_h2656_put_##name##W##_##bitd##_##opt(int16_t *_dst, for (i = 0; i < W; i += step) { \ const uint8_t *src = _src + (i * ((bitd + 7) / 8)); \ dst = _dst + i; \ - ff_h2656_put_##name##step##_##bitd##_##opt(dst, src, _srcstride, height, hf, vf, width); \ + ff_h2656_put_##name##step##_##bitd##_##opt(dst, dststride, src, _srcstride, height, hf, vf, width); \ } \ } diff --git a/libavcodec/x86/h26x/h2656dsp.h b/libavcodec/x86/h26x/h2656dsp.h index d030b399eb..ae5ade9cd1 100644 --- a/libavcodec/x86/h26x/h2656dsp.h +++ b/libavcodec/x86/h26x/h2656dsp.h @@ -30,7 +30,7 @@ #include #define H2656_PEL_PROTOTYPE(name, D, opt) \ -void ff_h2656_put_ ## name ## _ ## D ## _##opt(int16_t *dst, const uint8_t *_src, ptrdiff_t _srcstride, int height, const int8_t *hf, const int8_t *vf, int width); \ +void ff_h2656_put_ ## name ## _ ## D ## _##opt(int16_t *dst, ptrdiff_t dststride, const uint8_t *_src, ptrdiff_t _srcstride, int height, const int8_t *hf, const int8_t *vf, int width); \ void ff_h2656_put_uni_ ## name ## _ ## D ## _##opt(uint8_t *_dst, ptrdiff_t _dststride, const uint8_t *_src, ptrdiff_t _srcstride, int height, const int8_t *hf, const int8_t *vf, int width); \ #define H2656_MC_8TAP_PROTOTYPES(fname, bitd, opt) \ diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c index 5c19330e19..e0dc82eef0 100644 --- a/libavcodec/x86/hevcdsp_init.c +++ b/libavcodec/x86/hevcdsp_init.c @@ -96,7 +96,7 @@ void ff_hevc_put_hevc_ ## a ## _ ## depth ## _##opt(int16_t *dst, const uint8_t int height, intptr_t mx, intptr_t my,int width) \ { \ DECL_HV_FILTER(p) \ - ff_h2656_put_ ## b ## _ ## depth ## _##opt(dst, src, srcstride, height, hf, vf, width); \ + ff_h2656_put_ ## b ## _ ## depth ## _##opt(dst, 2 * MAX_PB_SIZE, src, srcstride, height, hf, vf, width); \ } #define FW_PUT_UNI(p, a, b, depth, opt) \ -- 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".