From patchwork Sat Jun 22 06:23:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 50065 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp937586vqz; Fri, 21 Jun 2024 23:32:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUYV7XMuHWeV5I68lCNPdiF19q7IlxKn4P9epQjuSgKQFfd7VKdii7hqkIJYvqJ2C2iZVOLA75yRLbGtljzkzpzeI9+Fgp1PO2IIA== X-Google-Smtp-Source: AGHT+IHzi/0mCfM95EFDP/yGzcxyBWzwYBw2/zsPl2Mw2LI2GZAbZYMXs8sJDrcvLGShol5beIp9 X-Received: by 2002:a05:6512:281d:b0:52c:de91:590c with SMTP id 2adb3069b0e04-52cde91595dmr387187e87.24.1719037974754; Fri, 21 Jun 2024 23:32:54 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-52cd643b83esi877157e87.439.2024.06.21.23.32.54; Fri, 21 Jun 2024 23:32:54 -0700 (PDT) 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=Lm4hF+Bh; 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 BCBB468D887; Sat, 22 Jun 2024 09:24:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01olkn2076.outbound.protection.outlook.com [40.92.52.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6397268D80F for ; Sat, 22 Jun 2024 09:24:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mwQM6LLSEYyvHBcJ3R5jJo1b6NJpEm/RjF6BpAJc3H630GjR5SLMp8uldyguUqLN+rl3d8DCkiMWLnr2/Tru3j8YPGPzeZjOBTsRRi8Z6qwSFES3AhLtBdsYu9g/xeEP/6mLAMh+gILgnZDwBshBQtZ3/zCfqmbmWvKAi0Ol15YHtj/YpgyTmEgA6ucPq3Bzf5GZgyB62NPTQdqFvDVMon+puNGUexzKBl+p2gzNGpFjvarMI+LRdZ2KtLC3qchJAKL1nYW7gMUaZeN0g7RLZ8dRMmsbQ6jaA9sFzz6jc1ersj4+jtB4MDe94yrbwIrJhs3UW156K1qNeo8VeJtiaQ== 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=McH/2sY4Tz8Q7nzLuJYB1hGd0L0riqnaxTQJjTbW8D8=; b=FOaP4yccNpPcip+hVNlhHLBIlb9rNjNAOdp410pUnfEXV8G/MINxGM6EYQYh4Q1AmxY5nrZ2TBvqm1bGoOIUrWTC713d+FB7rqYC1t48lThijweV4cYlUJUHakKaboQoIQZ9fX0EvZXSRucWnFbyy9fBYVOjNCVcYJTIU5hN7vHsPsa7kghOaPsaXTtcSBvo5tdbaWArStu0LrEM9GWoRw7aLJnPM6Urm41g5Qg7gPgJC+QvaJZUhVPsXLF8kD4pDPvEbRHrr8D7hOKPL6aybncP/0nkciioz2+nVCG/dipOTmwwa2SQ6iDxrbQ1cgeVg3ZnDSEjEihjzM9tum+fVw== 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=McH/2sY4Tz8Q7nzLuJYB1hGd0L0riqnaxTQJjTbW8D8=; b=Lm4hF+BhdyDydqEOx+Axu4YM9fl/JgBVz41qw7cbP5BjyUFFD7v68z2+uYGaF1oCCDamFwCnkfUXLYM87fUZ8lpJObsimKilBjRjCxaU1YKuXtDTI9tDtOwPpHPKx9HLtHsbUvIzXYyf0LrbJTVfBT2+ElJeGebzS7f29lQKPjXdM9KGxHklbEtTsHivI2NqhQuErMOVh8XtpyHcILtE1GjnTD4h/dDZg2NETV1m1qkY7hqBCvqgja1wosDYkFKcshb8vmgD8ylCdfAotHrvLK8pZJVQsPqDKPXzuj4Ub5BvTvpqUBVYrepXHXy4A75tfimZPS59iwXSu7K0XO3Uqg== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TYZPR06MB6045.apcprd06.prod.outlook.com (2603:1096:400:33c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.19; Sat, 22 Jun 2024 06:24:21 +0000 Received: from TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca]) by TYSPR06MB6433.apcprd06.prod.outlook.com ([fe80::81f7:9125:583a:1cca%3]) with mapi id 15.20.7698.017; Sat, 22 Jun 2024 06:24:21 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 14:23:57 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240622062405.285359-1-nuomi2021@gmail.com> References: <20240622062405.285359-1-nuomi2021@gmail.com> X-TMN: [TIS5ElUFx0fxyoKWnqR2BgfmK/kV0jZB] X-ClientProxiedBy: TY2PR04CA0023.apcprd04.prod.outlook.com (2603:1096:404:f6::35) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240622062405.285359-10-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TYZPR06MB6045:EE_ X-MS-Office365-Filtering-Correlation-Id: 674dafea-b479-41d4-34d8-08dc9283f400 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|440099025|3412199022|1710799023; X-Microsoft-Antispam-Message-Info: 3vORvCvCGCTXwAdIF36eQ76fl+GpdvkMHk6fteKK4C24GGA6Q1tT8eE9jGmFHk+oiEjQRSy76bPeD8TVXGugav05djB/qWXQ9HIvVQEuZclhDk2zTCD/JNvN9NDZ9M5/udBDKp5A6ZGd6urXkLREwZHDxecPgv4oWgY41rTFI5OKXDoiHUtPmIhIqDYEhQN/2UPCwe6wnt1IEM/1WDcM86IDfrme6Qp5N+Bq/kd/6X3EFrCvjhOPqp5oRyP5LloBO2d4TUUnaekoIHtjTrFsv1nsjn3LBLZvMiLxbm/JSsyHi9kNEiM/6gf2Zv8ZhrTE9IO6SeuMGd6TTQMunNt1HGvp+LRoK/xgEfszBMEw+yoVPoFD6v1xGZbqA8cinUd6ilnXFBxaFhA2MB9GqMoCJEprpjDcrrvrqmOvyn4WkCM9nd1cmLlHMtah1visjEMsb8tOHsmoa9/fBhI1Plu0WaW2QMHu4IigH2fSRsfQQwONow2jJNCDGM2EfOnYQ9e/Gxq6QKNxWG6cWSJHiLIC3jIqWQTAN738bWALyy/4LrtGxnvHXiizwsAxxzj6xBAwDLb0us4hkYUT+nnPnIm3rscVP/iWcTIuBSVJY325wZtQNi07RkzXq225fMeOsOAO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i9AYeqvn++s76+QmQSo4bVPCuu9cFKsgyjLAclzBGODI2xqIUWN395k/DnOqDLdqmj77s90QS58kPnwSwIFLBG2dJFToFV3ATkTuBqLS3uXMyMDLmn8NJa569NrnFOdvRgTEYyJaRAnV9SbEBGJccvi2b1A6yNawPyHjEzqpSgsmYceA0q9jcI1ZI4B9DX8dbXsM8mw9Z8Z0FmXVuLDldTrW3D+37KPU8zLb+XUY7ZQ65zGhPDoXJM7nYMss7zRARkZIGqPd2B/MAJTbzdLXb9O1lvsF54s5Jw4bZzMm0jd2m6UVUEgadwj2fn8lCSGVoOpjACj9+ZpRwuI9/oMSZHqYkB51l/0ss40SZtbjudMvJ+LKU8FEfewA1i6JXMsArz4c1WIM3Us/ck4IjJhJwdTuBMpe8CfqtOzfW+LQf6KeJFsrMj2lPJD4WJIEjKb8W6gEaX2k0s9CFc8MobgPTpjnzBDQVb2waO3kA3Zskks2cA6mjya/Jq/C3QRuUSvT48U5p1iqY+BquKNL3XIDVzg0mneLA6BWRi13wfmAs44QGq1EDZegSNo4jglI1nEwcLFHhc3RSPTdK4uNllqXh4WniFHu/JYiMk/ITom0ZjDqhfOetoX+OdvTV9Ijvvc+6aZG28J0LGk2dTf19bNxIp6E08LuJGryY2gmWyX0rqsUv631PqrPJIVt+KYACFz2aaZvSZ4bXE52R/NxiVhOLVR3q7btzpfZmf2siuLl8LixW6ruDqhGKhApEZdsVWm+XU61g52ghGUlHBtAPdTQjBzMpdIEkDfxUrDWlDZgAK1GXt7awQ7up7BnuCn/7ozuFGECpYsrfLnxX18tNWEtsWOTs+XLQwAGnH0Pbb2UvvoRfVU6vFUQ95hSTPsjrrC3wjF3qWQW6IzdCKZ5FAEpheqFzUraaeBv1qONs9rq7Whddzbxqq6MlROR7qm7N+6ax4TdpNZNEFpZfbM/IoeUyjW7intuB+UFwh0M4WYli5Q5FOG+oSKS1j349Dm/EtP41flkREtGNM71eFlGHTXhBsu+q+5PT8bqKvGyuNlxvThtqq7S3XrM3kIEdvYGA/Hn65jrl/Mw+StVtol0eDmwmULCgdLPKT4X8MUaI7/+rIi6CJqXLVHSrM1PerZ6qBXWGQgG93kcVqY+w5IGre4Zrf36X+qKt6Rflid+3z5YjjOZrBb7F2laYkT0QX0Met3iB4em9iQJKokoBHLErA2Q0qjyQfVRaMaRAERnguWlNThs2dewSJGB9bZEk29IfxVN63m9UG2L+TmpWJOINCY/fA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 674dafea-b479-41d4-34d8-08dc9283f400 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2024 06:24:21.3637 (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: TYZPR06MB6045 Subject: [FFmpeg-devel] [PATCH 10/18] avcodec/vvcdec: misc, reformat ff_vvc_sao_filter 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: JtcuRb4N6b5H --- libavcodec/vvc/filter.c | 52 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/libavcodec/vvc/filter.c b/libavcodec/vvc/filter.c index 10d11ce31f..3aa241ad90 100644 --- a/libavcodec/vvc/filter.c +++ b/libavcodec/vvc/filter.c @@ -266,44 +266,44 @@ void ff_vvc_sao_filter(VVCLocalContext *lc, int x0, int y0) { VVCFrameContext *fc = lc->fc; const VVCSPS *sps = fc->ps.sps; - static const uint8_t sao_tab[16] = { 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8 }; - int c_idx, restore; const int rx = x0 >> sps->ctb_log2_size_y; const int ry = y0 >> sps->ctb_log2_size_y; - int edges[4] = { !rx, !ry, rx == fc->ps.pps->ctb_width - 1, ry == fc->ps.pps->ctb_height - 1 }; + const int edges[4] = { !rx, !ry, rx == fc->ps.pps->ctb_width - 1, ry == fc->ps.pps->ctb_height - 1 }; const SAOParams *sao = &CTB(fc->tab.sao, rx, ry); // flags indicating unfilterable edges uint8_t vert_edge[] = { 0, 0 }; uint8_t horiz_edge[] = { 0, 0 }; uint8_t diag_edge[] = { 0, 0, 0, 0 }; + int restore; sao_get_edges(vert_edge, horiz_edge, diag_edge, &restore, lc, edges, rx, ry); - for (c_idx = 0; c_idx < (sps->r->sps_chroma_format_idc ? 3 : 1); c_idx++) { - ptrdiff_t src_stride = fc->frame->linesize[c_idx]; - const int width = FFMIN(sps->ctb_size_y, fc->ps.pps->width - x0) >> sps->hshift[c_idx]; - const int height = FFMIN(sps->ctb_size_y, fc->ps.pps->height - y0) >> sps->vshift[c_idx]; - int tab = sao_tab[(FFALIGN(width, 8) >> 3) - 1]; - uint8_t *src = POS(c_idx, x0, y0); + for (int c_idx = 0; c_idx < (sps->r->sps_chroma_format_idc ? 3 : 1); c_idx++) { + static const uint8_t sao_tab[16] = { 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8 }; + const ptrdiff_t src_stride = fc->frame->linesize[c_idx]; + uint8_t *src = POS(c_idx, x0, y0); + const int width = FFMIN(sps->ctb_size_y, fc->ps.pps->width - x0) >> sps->hshift[c_idx]; + const int height = FFMIN(sps->ctb_size_y, fc->ps.pps->height - y0) >> sps->vshift[c_idx]; + const int tab = sao_tab[(FFALIGN(width, 8) >> 3) - 1]; switch (sao->type_idx[c_idx]) { - case SAO_BAND: - fc->vvcdsp.sao.band_filter[tab](src, src, src_stride, src_stride, - sao->offset_val[c_idx], sao->band_position[c_idx], width, height); - break; - case SAO_EDGE: - { - const ptrdiff_t dst_stride = 2 * MAX_PB_SIZE + AV_INPUT_BUFFER_PADDING_SIZE; - uint8_t *dst = lc->sao_buffer + dst_stride + AV_INPUT_BUFFER_PADDING_SIZE; - - sao_extends_edges(dst, dst_stride, src, src_stride, width, height, fc, x0, y0, rx, ry, edges, c_idx); - - fc->vvcdsp.sao.edge_filter[tab](src, dst, src_stride, sao->offset_val[c_idx], - sao->eo_class[c_idx], width, height); - fc->vvcdsp.sao.edge_restore[restore](src, dst, src_stride, dst_stride, - sao, edges, width, height, c_idx, vert_edge, horiz_edge, diag_edge); - break; - } + case SAO_BAND: + fc->vvcdsp.sao.band_filter[tab](src, src, src_stride, src_stride, + sao->offset_val[c_idx], sao->band_position[c_idx], width, height); + break; + case SAO_EDGE: + { + const ptrdiff_t dst_stride = 2 * MAX_PB_SIZE + AV_INPUT_BUFFER_PADDING_SIZE; + uint8_t *dst = lc->sao_buffer + dst_stride + AV_INPUT_BUFFER_PADDING_SIZE; + + sao_extends_edges(dst, dst_stride, src, src_stride, width, height, fc, x0, y0, rx, ry, edges, c_idx); + + fc->vvcdsp.sao.edge_filter[tab](src, dst, src_stride, sao->offset_val[c_idx], + sao->eo_class[c_idx], width, height); + fc->vvcdsp.sao.edge_restore[restore](src, dst, src_stride, dst_stride, + sao, edges, width, height, c_idx, vert_edge, horiz_edge, diag_edge); + break; + } } } }