From patchwork Sun Dec 31 08:18:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 45418 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp5659752pzh; Sun, 31 Dec 2023 00:21:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IEpIM+L0dseqgpk2S76u6iT+p23FAgl7VTcMuAE4mv4SX+3uo0gw2SzWW4c1m2FXPhCHUa1 X-Received: by 2002:a50:cd95:0:b0:551:da9f:38c2 with SMTP id p21-20020a50cd95000000b00551da9f38c2mr9256623edi.71.1704010894476; Sun, 31 Dec 2023 00:21:34 -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 gk2-20020a17090790c200b00a273e16b657si3559780ejb.82.2023.12.31.00.21.34; Sun, 31 Dec 2023 00:21:34 -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=tz8ZoJPz; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2CB6668CDE3; Sun, 31 Dec 2023 10:20:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01olkn2078.outbound.protection.outlook.com [40.92.52.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70E7568CCC9 for ; Sun, 31 Dec 2023 10:20:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i7PiU3uZVBk9F4NA9DGSPj1nOLecb88A1UPRt9X8f9Owk72EpggVOEVdRQxbl2hjD5xAPYoqHBKPjHJhKvkVlQzJQLfPT0yzzOpTgwvdEYmCjirS4Q2xxowMZe5jUqKz38PD3CW1PBYxd9o3J+hbmSYpoxuEo57MaXk8lPc9GN3+1XtAFtOYI83665XU2kpV780izAE96WJbobJYn5QbxyAQJkdGIWMBYjeCHgDXUPxYiWCk54VIlHduJ0BdWoZEJ5ew0dEV/0jktngY1RB8Ijo1tmVNvGHbjzyrs3OX8oC801tC3b1BA8owXTuIIr3ucWc/ORf0WLJ7Jd2EBv3XUg== 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=sFh2d6PfQbUxj7rgdQV1cIy4Hw347w+nEGhDkI4BqN0=; b=aLzVrWxwTpAFfTV8JB3iDh6rWUjgddqH5Yic19XncU9S8tSNu80F8hGhYUKT2/dGbsXT+cTI0QM4dRJypbFNPKAiMHoQVYJE61IgLjYOZoaM8KVnXjz/wh/W1kFt+BcG4bwKFTlkqpFU1xd9DtWj0pEzEJH3xcqfRMTGiGve7KCt7zFIa270wEGoRVb2vmIwh8fixGXgx5F71EvgZwiM/b05d/el9e4yDBw8/VcYcZWXKwSyJrsYvvyBcYCXAjmxw4DjzfriLBV88JLrkR0k6ff700AENCyp1DSbt85w7UDmOhJF7kfJMd2U9UOjONwrKRMSC8we3PfZUyuhmL0Jpg== 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=sFh2d6PfQbUxj7rgdQV1cIy4Hw347w+nEGhDkI4BqN0=; b=tz8ZoJPzFD7251xvnTYYEA5LIWq5SfRq1XIhgZXUnQJRzR3vHxslc1T5w2Jxm/UDmr2tBxS2G7cNaPQCUnPvF1xV4FlUTGjJxlB6vYhTKvL6vABIln+ximsWbVsH8OU0zCTf2EnuISralO3wrEfUsxcb+dzYDmy+iW6oxT4bpXekW1oTYWZfarG30P8AaTiEZaGKjkikQHzPFVhnUFgIEq7qr9cVPDs32sXtyPRFCRdOABrfwSF9oktLeQTMtx39qb+P7cCXvl9YhHM/uNkZBcjp+P+55fnBxlasNEJ7OnmJ34ssnOiZhLxpug5Fkw1ok04n2on7U6pNuN8QVYOqoA== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by JH0PR06MB6367.apcprd06.prod.outlook.com (2603:1096:990:c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.21; Sun, 31 Dec 2023 08:19:53 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::e139:fd7a:1b66:a3f7]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::e139:fd7a:1b66:a3f7%6]) with mapi id 15.20.7135.023; Sun, 31 Dec 2023 08:19:52 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Dec 2023 16:18:55 +0800 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231231081858.1704-1-nuomi2021@gmail.com> References: <20231231081858.1704-1-nuomi2021@gmail.com> X-TMN: [wtQim76/1gEdFPfzLKTbPkMQQ2TyUvT2] X-ClientProxiedBy: SI2PR02CA0039.apcprd02.prod.outlook.com (2603:1096:4:196::9) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20231231081858.1704-11-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|JH0PR06MB6367:EE_ X-MS-Office365-Filtering-Correlation-Id: ade27962-21b2-4dba-751c-08dc09d94394 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OWOnEBx4TDbT89xpEBiBdsF9wi+Kz/+IchVZAyGA+i/fPJambLGxINGyj1FiCUXtcULGdtVBv/eviLjxL4YNUW1v23r47gHA4C+YryqPie0KxyWKZ1jtdyJrEA7lOp9D6BuxRYhXvCfie/9r3JQA49y0UZMAkQnRftiCYbARbAXmho8rzAH+wa45O6ffkdoh5jrf1g0U/j6ZAY9Dfw92eoZMTwMF7fkzMGSsYDyu3MPisJ1sXGE7DylM25iO4QNzqxPUgnGMbzalUIpX8FRMGHbJCGgCzmLGZETU8bstbydFYSW7gRurFuUUFXTrLSs8WPrAEOxvzA7EmGqtiXE8HhX4TZI25k0rIu6mmerEHtzFFc5bDByYREMmZCNqaxDKVQ5AwCNElVoRzpVmO8mE5/Pw+FFbZ6V7ui6xKSuKXPKFGnx2nZBLM+T7hTr2JUURc6d2A73/pEijmrvb7O9tD14w7NwpS/gOsBE/PBVr79IECM/nKwzhszGvH7GZMgFMoM+xy64Tp722tnGsaBGpB6JTV0v++unNpheJAbxCWY7oy2ddGzFzUN0TKUvekrpWikTzY8Uo3eFW2n93cf2+YxR3YC9DUbWT0hJNo5E/sxknkge+NPzWz1RZI+KzvEjE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AzhHiGLALE8Tor1ZgEUdyFamGHZ15CGJkfTsEK9qE8W/bx5NiHMHNtb5UYrTJp9agf6ljbXjJmayRm9tU9GRV5twqcoKhAVqoF/+bwbLY6tnCh1ywElXX/Y+Z667npw7kPXWNyMi2jZJvzrBeaeUlma84Y+T7DU1u2k4QT9OR2p29s/YEDW2PhtFqhAxFhiHpfH4HKJW9qBlo+tIj9uXvrLRi8PCIXKa/ZFYbjLH/xvM3Sn8AN2227Ipz8ed9eaer1DReeDAvfvGeGgPamqOBEizvgxolWc5tVT52CB9pvJxzb34HfbwKai9xq0hLSVJreWiVnYnk61pYk0Duxpn8FpwzIHwmAHI/cttOkG9aFC8Y9Ho7zIL6JERzTGbSNXSLmXywGwhZu/O7XPDwrtO/tqzK6jyGb/BVe5gITqODSyG2Qf7jG55ZtLGZy130saabHt3erDcc1m5mSoN5A+kF+RY0ebvzmJ1kXIMAy1TiEdtLGZ5T1T/gRwfX3RWnGkOfZMtvdyuRswCo61R+JASTHbeie+lncSJccNPW0jcENYZ+h1xlOuiLbalY9mmcS83AOEA3eOtgOfTRbmOHS+ADY1Qpxy6Igxsbi6iylrNhJ32yTPj9Sr19h8irSGGk2e0nzczoySxWNkV/41qpx9TlRQYV+XRBMEr1ZsLzm40eBFVpgUEe26eCXjWCod9sSk2oCeXVSzljKaK6Wm7EYluEjkRYO+5VbQawLDSTeAkycQdGMQ4HstNEvljR5GVYU8hO41PuddNleGKZLXkRaNzEA0w0q/S4ZACu9v/m35XojaloTXphVbo174+Fi1KwOOYfK1yT0X4cEpDNUgHAPsbIsumLY1WcAu2gqo7yJHV6t22HAcnsFiMOjWzAdgdzVWWS1BKJgnWvEISIWpapUXLe0w9guK2ZoGgE2ylbledNiC9s2l+NoHIunp1SL+C2lydMQYkqJYOWLUrLanI5MoHbHNd7wNAVJPYTYkF83GHIuOlIFqMQlCGUjoNoTk6qRlWwsZLikBql/qgIZJ9+wJnP+CqVlAUSzL9pvq5b8jvPBj45ak/aGNSHl/qpY3lXHFqg3LBUHdRJbffYJ9NM7N/9NF45cuDpdjnI++WUwxr1oeMMKzLYoMhpv1IUeRmG5/GgHBuGwph+bVn1ptf0URK+6j5TDwmAP1wWsAOD1N1FrTPagXXxSy79NxEX1PX+pshyFFIIWb0h5n6L53ERzaHlDhV/OonjCmYsfmGpk9rHXJcWinvUzbt1Xq+rSTFCj4k X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ade27962-21b2-4dba-751c-08dc09d94394 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Dec 2023 08:19:52.8575 (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: JH0PR06MB6367 Subject: [FFmpeg-devel] [PATCH v8 10/13] vvcdec: add dsp init and inv transform 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: Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: j0IwKjKCdSPE --- libavcodec/vvc/Makefile | 3 +- libavcodec/vvc/vvcdsp.c | 141 +++++++++++++++++++++++++++++++ libavcodec/vvc/vvcdsp_template.c | 120 ++++++++++++++++++++++++++ 3 files changed, 263 insertions(+), 1 deletion(-) create mode 100644 libavcodec/vvc/vvcdsp.c create mode 100644 libavcodec/vvc/vvcdsp_template.c diff --git a/libavcodec/vvc/Makefile b/libavcodec/vvc/Makefile index 906bec058f..c002448fbb 100644 --- a/libavcodec/vvc/Makefile +++ b/libavcodec/vvc/Makefile @@ -1,6 +1,7 @@ clean:: $(RM) $(CLEANSUFFIXES:%=libavcodec/vvc/%) -OBJS-$(CONFIG_VVC_DECODER) += vvc/vvc_cabac.o \ +OBJS-$(CONFIG_VVC_DECODER) += vvc/vvcdsp.o \ + vvc/vvc_cabac.o \ vvc/vvc_ctu.o \ vvc/vvc_data.o \ vvc/vvc_filter.o \ diff --git a/libavcodec/vvc/vvcdsp.c b/libavcodec/vvc/vvcdsp.c new file mode 100644 index 0000000000..c82ea7be30 --- /dev/null +++ b/libavcodec/vvc/vvcdsp.c @@ -0,0 +1,141 @@ +/* + * VVC DSP + * + * Copyright (C) 2021 Nuo Mi + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "vvcdsp.h" +#include "vvc_ctu.h" +#include "vvc_itx_1d.h" + +#define VVC_SIGN(v) (v < 0 ? -1 : !!v) + +static void av_always_inline pad_int16(int16_t *_dst, const ptrdiff_t dst_stride, const int width, const int height) +{ + const int padded_width = width + 2; + int16_t *dst; + for (int y = 0; y < height; y++) { + dst = _dst + y * dst_stride; + for (int x = 0; x < width; x++) { + dst[-1] = dst[0]; + dst[width] = dst[width - 1]; + } + } + + _dst--; + //top + memcpy(_dst - dst_stride, _dst, padded_width * sizeof(int16_t)); + //bottom + _dst += dst_stride * height; + memcpy(_dst, _dst - dst_stride, padded_width * sizeof(int16_t)); +} + +static int vvc_sad(const int16_t *src0, const int16_t *src1, int dx, int dy, + const int block_w, const int block_h) +{ + int sad = 0; + dx -= 2; + dy -= 2; + src0 += (2 + dy) * MAX_PB_SIZE + 2 + dx; + src1 += (2 - dy) * MAX_PB_SIZE + 2 - dx; + for (int y = 0; y < block_h; y += 2) { + for (int x = 0; x < block_w; x++) { + sad += FFABS(src0[x] - src1[x]); + } + src0 += 2 * MAX_PB_SIZE; + src1 += 2 * MAX_PB_SIZE; + } + return sad; +} + +#define itx_fn(type, s) \ +static void itx_##type##_##s(int *coeffs, ptrdiff_t step, size_t nz) \ +{ \ + ff_vvc_inv_##type##_##s(coeffs, step, nz); \ +} + +#define itx_fn_common(type) \ + itx_fn(type, 4); \ + itx_fn(type, 8); \ + itx_fn(type, 16); \ + itx_fn(type, 32); \ + +itx_fn_common(dct2); +itx_fn_common(dst7); +itx_fn_common(dct8); +itx_fn(dct2, 2); +itx_fn(dct2, 64); + +typedef struct IntraEdgeParams { + uint8_t* top; + uint8_t* left; + int filter_flag; + + uint16_t left_array[3 * MAX_TB_SIZE + 3]; + uint16_t filtered_left_array[3 * MAX_TB_SIZE + 3]; + uint16_t top_array[3 * MAX_TB_SIZE + 3]; + uint16_t filtered_top_array[3 * MAX_TB_SIZE + 3]; +} IntraEdgeParams; + +#define PROF_BORDER_EXT 1 +#define PROF_BLOCK_SIZE (AFFINE_MIN_BLOCK_SIZE + PROF_BORDER_EXT * 2) +#define BDOF_BORDER_EXT 1 + +#define BDOF_PADDED_SIZE (16 + BDOF_BORDER_EXT * 2) +#define BDOF_BLOCK_SIZE 4 +#define BDOF_GRADIENT_SIZE (BDOF_BLOCK_SIZE + BDOF_BORDER_EXT * 2) + +#define BIT_DEPTH 8 +#include "vvcdsp_template.c" +#undef BIT_DEPTH + +#define BIT_DEPTH 10 +#include "vvcdsp_template.c" +#undef BIT_DEPTH + +#define BIT_DEPTH 12 +#include "vvcdsp_template.c" +#undef BIT_DEPTH + +void ff_vvc_dsp_init(VVCDSPContext *vvcdsp, int bit_depth) +{ +#undef FUNC +#define FUNC(a, depth) a ## _ ## depth + +#define VVC_DSP(depth) \ + FUNC(ff_vvc_inter_dsp_init, depth)(&vvcdsp->inter); \ + FUNC(ff_vvc_intra_dsp_init, depth)(&vvcdsp->intra); \ + FUNC(ff_vvc_itx_dsp_init, depth)(&vvcdsp->itx); \ + FUNC(ff_vvc_lmcs_dsp_init, depth)(&vvcdsp->lmcs); \ + FUNC(ff_vvc_lf_dsp_init, depth)(&vvcdsp->lf); \ + FUNC(ff_vvc_sao_dsp_init, depth)(&vvcdsp->sao); \ + FUNC(ff_vvc_alf_dsp_init, depth)(&vvcdsp->alf); \ + + switch (bit_depth) { + case 12: + VVC_DSP(12); + break; + case 10: + VVC_DSP(10); + break; + default: + VVC_DSP(8); + break; + } +} diff --git a/libavcodec/vvc/vvcdsp_template.c b/libavcodec/vvc/vvcdsp_template.c new file mode 100644 index 0000000000..f92c266478 --- /dev/null +++ b/libavcodec/vvc/vvcdsp_template.c @@ -0,0 +1,120 @@ +/* + * VVC transform and residual DSP + * + * Copyright (C) 2021 Nuo Mi + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "libavutil/frame.h" +#include "libavcodec/bit_depth_template.c" + +#include "vvcdec.h" +#include "vvc_data.h" + +#include "vvc_inter_template.c" +#include "vvc_intra_template.c" +#include "vvc_filter_template.c" + +static void FUNC(add_residual)(uint8_t *_dst, const int *res, + const int w, const int h, const ptrdiff_t _stride) +{ + pixel *dst = (pixel *)_dst; + + const int stride = _stride / sizeof(pixel); + + for (int y = 0; y < h; y++) { + for (int x = 0; x < w; x++) { + dst[x] = av_clip_pixel(dst[x] + *res); + res++; + } + dst += stride; + } +} + +static void FUNC(add_residual_joint)(uint8_t *_dst, const int *res, + const int w, const int h, const ptrdiff_t _stride, const int c_sign, const int shift) +{ + pixel *dst = (pixel *)_dst; + + const int stride = _stride / sizeof(pixel); + + for (int y = 0; y < h; y++) { + for (int x = 0; x < w; x++) { + const int r = ((*res) * c_sign) >> shift; + dst[x] = av_clip_pixel(dst[x] + r); + res++; + } + dst += stride; + } +} + +static void FUNC(pred_residual_joint)(int *buf, const int w, const int h, + const int c_sign, const int shift) +{ + for (int y = 0; y < h; y++) { + for (int x = 0; x < w; x++) { + *buf = ((*buf) * c_sign) >> shift; + buf++; + } + } +} + +static void FUNC(transform_bdpcm)(int *coeffs, const int width, const int height, + const int vertical, const int log2_transform_range) +{ + int x, y; + + if (vertical) { + coeffs += width; + for (y = 0; y < height - 1; y++) { + for (x = 0; x < width; x++) + coeffs[x] = av_clip_intp2(coeffs[x] + coeffs[x - width], log2_transform_range); + coeffs += width; + } + } else { + for (y = 0; y < height; y++) { + for (x = 1; x < width; x++) + coeffs[x] = av_clip_intp2(coeffs[x] + coeffs[x - 1], log2_transform_range); + coeffs += width; + } + } +} + +static void FUNC(ff_vvc_itx_dsp_init)(VVCItxDSPContext *const itx) +{ +#define VVC_ITX(TYPE, type, s) \ + itx->itx[TYPE][TX_SIZE_##s] = itx_##type##_##s; \ + +#define VVC_ITX_COMMON(TYPE, type) \ + VVC_ITX(TYPE, type, 4); \ + VVC_ITX(TYPE, type, 8); \ + VVC_ITX(TYPE, type, 16); \ + VVC_ITX(TYPE, type, 32); + + itx->add_residual = FUNC(add_residual); + itx->add_residual_joint = FUNC(add_residual_joint); + itx->pred_residual_joint = FUNC(pred_residual_joint); + itx->transform_bdpcm = FUNC(transform_bdpcm); + VVC_ITX(DCT2, dct2, 2) + VVC_ITX(DCT2, dct2, 64) + VVC_ITX_COMMON(DCT2, dct2) + VVC_ITX_COMMON(DCT8, dct8) + VVC_ITX_COMMON(DST7, dst7) + +#undef VVC_ITX +#undef VVC_ITX_COMMON +}