From patchwork Mon Jan 22 15:25: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: 45708 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp44687pzf; Mon, 22 Jan 2024 07:26:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IH3s1ALAlXm7yo/ECU1TORAj3OtzQCKo4N3CKwhTj5KhHbUnagukS5+PhQiB3Nbpc1MWPR7 X-Received: by 2002:a17:906:32da:b0:a2f:bb33:6680 with SMTP id k26-20020a17090632da00b00a2fbb336680mr2169676ejk.46.1705937196448; Mon, 22 Jan 2024 07:26:36 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d24-20020a170906345800b00a2cd124f60asi9503769ejb.988.2024.01.22.07.26.36; Mon, 22 Jan 2024 07:26:36 -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=QEG07COL; 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 79C6B68D0B7; Mon, 22 Jan 2024 17:26:05 +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-tycjpn01olkn2102.outbound.protection.outlook.com [40.92.99.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 238F668D09A for ; Mon, 22 Jan 2024 17:25:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hy+LCS4aX2dEO7PXZKnXgM3aVO6qvFMlrBnnHNqsYdBt8VLPb6MtXXVtw1WKfkuISEDZ9Cuv5huXqTx166iHMwymVU4xgZSVZOMeOcmU0XI1OlNQC0BM1WYcZUP8c9yvNw3fBwez97x2jvbKRb+TCB8Lw7iAxfXIAIpjviO/2Cle6Itm/Sxji521bVimFhmz/aTkW6Valk4IR2Gg8jc3Kvw5/taoYUbum59MVkvxG+y4NCibBcCJxigdzMjspKSA/nA1bM5GETUHrM+whsu2+EC/ti2qCZmieVOxNUFqQJ4nAK9nD6oNXR9sOhc4fdUzTFi0XqU0C8EUNg2jfG5bNg== 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=3YWCPE3QJL1q8pUPyPgguKhxWpexD9mZ6X8ITP8r0ec=; b=HSwj7HpD/L2pwnjapZbnuRoJ1ZEjGqNpwgjvk065Vl6nhN5/ZKX7mvHsTe/kZVxI0bVN1dxKo8Vz34U/Qv+DO05k3oCJQzI7x+k8BuVBqGbal52im+vCAiD+YUXLQKw0hPPOE961Efyk4Hu3wvjTPyVaIp5IiW400ERIt4V3ynsa1DHm6gTXL7XM/kH5WrqJY8bZ6G61N/x22DEP1fS7VDqektOtmRzV/iO2kDBbTS2/UQECddxiqvX5NNShbMLWqsOdzgALZfIDcr/TZWsAQmdwShEUV7rG1sTQpfjB8ryvfngcmhWdCHEbnz0aWN25hy9C05nYuD2SQ25+45xcWA== 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=3YWCPE3QJL1q8pUPyPgguKhxWpexD9mZ6X8ITP8r0ec=; b=QEG07COLMXFbb9BMZyr9jPXBqPz0DnN+5ONp6ElPVkuEaD3Zl0gnMYJbomap2rgf/LdOmK9XLHIrKZE5epj5Tvy0t8NLe0AcT5VZHsn1EY2rf5YxN6uTnSRbLUQgrTFOpPQfiZEx83EnIsgJQoFXOKOpt+JakvbY7dovqil0WRYfBN2tF3/E67AKkWTwuiOX7h+1uQIANQG5L7LZCrv1kJxB2O3uz4zieCd0zlRgyVZLlvB6RVDyjCVDCFMmRioXZzttydh8M3L7phn/4CPeJrNosRSaxLMinVwGAOEjjDaMtoQw6+8oPe2GLOAANqNt5Ym28a64qpPmpCFrJw3Baw== Received: from OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:186::5) by TYCP286MB1682.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:184::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.36; Mon, 22 Jan 2024 15:25:46 +0000 Received: from OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM ([fe80::86fc:6255:f4c1:a076]) by OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM ([fe80::86fc:6255:f4c1:a076%3]) with mapi id 15.20.7202.035; Mon, 22 Jan 2024 15:25:46 +0000 From: toqsxw@outlook.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jan 2024 23:25:23 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240122152527.601122-1-toqsxw@outlook.com> References: <20240122152527.601122-1-toqsxw@outlook.com> X-TMN: [2QzzhgIrwNBgXty54I8w7SeAVDe61Z2c] X-ClientProxiedBy: SI1PR02CA0022.apcprd02.prod.outlook.com (2603:1096:4:1f4::16) To OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:186::5) X-Microsoft-Original-Message-ID: <20240122152527.601122-4-toqsxw@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OSZP286MB2173:EE_|TYCP286MB1682:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a6eedd5-d36a-4abf-9482-08dc1b5e67da X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kqFLayyiIsQGAK4fcLF6duGW+Lj/pD+SwGqO36IlGzo8lkEteGoV/Fv0mQUBg0kCgg28Ao2sf5BlUdZxUn9fxYIMo/lRl1+gYR1EgFFRaL/ekjvw8UCiVzAfk+GhvJqTkHTFWu1vmPcPgFpnAZmJKishS8Ggq+9sDdFIWGvAvU1JEGDExgaHlBBhNgf9lx9jDTHtkdjM/YR1+kn/T5DVj1vW1RxqAgSqR1iOnyNpoAgy6BFuxqnU9mAsc9zdtQmuCZzEYXDVygAIHQLLjWo0WpkcRgaOnQstIwKaDl015oZqtWvHVoLlKra8zj53j+cYfyNkQ0p2LfpL7oK+eNhdlrBK3NMVZ8t3pDsF14O0jMFgE+2Q2yg3ohxykgfXtq7jvwLa0/mRIhTESWx1ltAlAjb4o3Mztb9rmrTBfuMwgJY1hp1CQUSVlT1TbjjPpkafnGdW3EnteYtp3D7cMMNqWsESTfCo3LHptvZLNWmiYWfGSuvgCHIPXn+40+bezpRlA1mk0MZUarXgSCH/bNeMNA3s2MgZ/7eDyk5GGx7/vzeF4KN6oGuYSg9p5Xsj4JJpdrV9v1OyobX618DApGi5jZPZd2jaYt4n4R+pgv9iADFkYsp1OsQRBHMEK2/9EXag X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iElw0QkOLQZ15NQfmxMqF1X45pEvG4vxQeBCilvA1J3QQQ/OlY5vJL8mfhr7ekFb4dxhOoYPmZCDWPozXWYHivxDutspTC4tLVFf1Rf0mJiAJez0RAaXTY5+DDHhvZeLjgGGZbtK1ZFvE9DaXxNefxLJ/daiL4r+tLVFLF/ra8LuSNYMy8TyvHKzFVK37Rww0KjszxWuywsqiF5XlY+tMJyMUs97jUcBRSfh4dutYy1GD9vnjm5SLc0CghIg2HWPrQXBOLvMANNIlteHFim6HyOH+TxCGmDQjC1k7tMzNaX+w4wEzZ55WJxTuUZxqxrlSN4vfSYwLxOTRHTMKI9ABmGgVEUpC0WrDlV9yOImDRFMwLfofQvfdz/C7z/952mGayCjuGtXizL/3dGjUyQ2ljKnoDJysBSN8dPGvCLDc2LFjnqB9gwrHIP9hoD2fF2ByV65ji8/9mqQoVxEIoHFCqM7v/4Eo85v5/A4Kthj+DMIHIIbrHhZwQHKi7izrm8jj2hqMpxNgRXjdD57kdzO9mM38s3VgiOmLBKFA8id7AMatupnGju4YurPMbp4WJsYkOuW78SmfUfVZ1DwZhWpR2kNWdq5uzqPicQjsJc/orVSKk4Kw6WRLtutr+lC3i7jN1IHJSKRNS0R2pmYYbiFNhi1d7Zpexn5rsLTlbCeYVXdx+sKt5boTM+irQY1Rgt+s0gXO/wJFrKFlDpN7CpsYQMv27ajTVWsH1qg5WhU+sWOTfPwgOINtGluJPr7H2ys1zSw5Lr9MJOeDnfvk8Tho4UdxSrWIO7VUpQ1WHJpoLyHHhBQnyKQTSMCaPTpsa/4W10KD3aci3yy80dUivgr9TB6Og07UqwTLv0iZf4rWYiDB7QM4W28jKcC4UUJnhU1pbjksog4nDfigQTNOr+I1A9/4KRWb112H6msOTboilvvX00b2wAR41dZ/xvBiIGe4IEA4RRQdbfw6QWneh2VvZXCMt0iHTFSrFMY1l7+E/SgkkVBEB8gkXN08en0uE1pOQcnU/t+/fOpeB09OnRScVmay1OWg4U0acpra78bljJ9QesgpxyM3myfh90FLWc9Jqdc5SYLEdWhbMx2/wetCqA6ZM6/mgiNs83Q34KF7Jc+azzXQY7A5+pP/6YGjvfJJDDmx5jTUMgha0Km3vS7fNBSB+LjNG1KpvloI+tIaEn3pRlgJIq4pT234mt/gmoQtyqY7HROMiQ4tOCP564aigs+7OxKSxc9GtpE8gpmGlg= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a6eedd5-d36a-4abf-9482-08dc1b5e67da X-MS-Exchange-CrossTenant-AuthSource: OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2024 15:25:46.5613 (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: TYCP286MB1682 Subject: [FFmpeg-devel] [PATCH v3 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rUNSnfXA68aP 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 aa296d549c..cbba0c1ea5 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 @@ -342,7 +340,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 @@ -539,7 +537,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) ; ****************************** @@ -549,7 +547,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 @@ -579,10 +577,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: @@ -612,10 +610,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] @@ -649,10 +647,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 @@ -784,12 +782,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 @@ -824,10 +822,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: @@ -866,11 +864,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 8a2ab13607..e31aae6b0d 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) \