From patchwork Sat Jun 22 06:23:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 50070 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp940159vqz; Fri, 21 Jun 2024 23:42:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU5Bi/fwQbhhy4cFsSku8KBfTH89Qc9Nr4p6CRQ1iLvOvgoQATI0APELHMJ2GxbSoNPqcP29v/IGURROreu0gQd62gZuBqUdBWWRA== X-Google-Smtp-Source: AGHT+IGHHk7evBmEcrha8tSMpudr6js/PYNCoDyvuqjElV8fYExy8EFQg7t1PwxAK+ud1+haYqqC X-Received: by 2002:a05:6512:b98:b0:52b:bee0:54b0 with SMTP id 2adb3069b0e04-52ccaa91d73mr7554788e87.54.1719038568470; Fri, 21 Jun 2024 23:42:48 -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-52cd63bc71dsi886397e87.152.2024.06.21.23.42.48; Fri, 21 Jun 2024 23:42:48 -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=M24MxhyQ; 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 9A26168D866; Sat, 22 Jun 2024 09:24:39 +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-psaapc01olkn2027.outbound.protection.outlook.com [40.92.52.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BFE8B68D7C4 for ; Sat, 22 Jun 2024 09:24:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IKlhtFD17UbpLU6ucFho89mBblVJmhiQ7NBLnLirFdWAYEBsNgASVeqRwPn4B/aTGcGzDKpY0be0IqLfHNDrKYz1JWGerXEgcLKEiJj4xINQ/lDNNaqS8u+0Ez2FRn1Di1Kk1w8+yaLHg4zu61IOnSfGbfwF7kPX7z2UpzphkSa5PSuuFHt36NxJWhj8Mnpse+RhY0SadhnU14Gn0rwp7unHm3V+bV2zpH5aHT1R1xk66o5Q0xhvrYoQmTjEXux3pcXibMe5qYhwodq47K0zjZl6eHdoO/tw1uIA9kMmEibzix7Ro0lH0rZWvGwsAzOWWoIvGUGpjCUAgQMFDoMTyQ== 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=rSM35eoKbtaumohcYGR6BBuVFC++N/XXhzUD4rEmBUU=; b=BdUr4dAUZH2S81RLupNtvkOm5CfcN/RhtFwe+rzEAsc7W+ONvoejz+65l9iW8zS6aeI+l9WPDMWtFnZ+d+LQFPxc+GGLNuQ0vgzFyBLDApTzfHRBxmFZISEBpZupYI9CfzDnIh9ZhmYjzr/2mbOKjLJLQo/9yRd0OS1d0LR7Vrdr34eO0qDZDl7wn4oPad7LpYbLal/t+dp4571PbFAFOXAlkMnjxgUqpDABN6s6T1+oFwu1vw/f92NmxzrPAsuk3owVdTG7j02NwETSNOkUbkvxNylM9NFBFDYDS7jL4td1+ZvwtGLEDDmOmFUiF+hBm9sq3GEXkO3Ihl77hKmXsA== 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=rSM35eoKbtaumohcYGR6BBuVFC++N/XXhzUD4rEmBUU=; b=M24MxhyQ4gqLyXiaBajadz4R6zpcY2Kg1cJYTfqxX8IrCHAL2BQjuKkO+7bJbIQ/dX4o4F+/ae3N63P/1qnzngdurKZoMoFz1GeTU6jWOhXM9A0ol8478aOGWePgpgxF+QZqvlWa7A7iVhoS3Z1Dhwqyw7WDjGs1BzsI7ZSh1kVeXoPkKoB5A7j5rQhJRsDIwOa+iwSSjc+UH7+OQHszteOslBKiKyDNJ6sRTb/I7L1vR1q2d7M8RK7D8Y0giSF0Uqnb61BIazVtG3+MlqZbG6inNTJJFPZoPe+BQSmHbWxaw6hcLNzmUUnwJGqe5Q2kqLSMYB5M9PG+EMq6h2j81A== 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:18 +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:18 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 14:23:51 +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: [ufqBIYrrcHs/DwI5VuRkrR4CjDR3OMEz] 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-4-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: 855918cf-4222-47cf-ee1b-08dc9283f1a6 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|440099025|3412199022|1710799023; X-Microsoft-Antispam-Message-Info: +s57kq5p2YWixlMC3tz/tb8KBsUeJrGSCK39oj/OVr8VdyYrMh0FEk6tpPk6R96FNOBTT1vayBR04gzEfGB8obNZm3kovcohTpykpmr+OjvZgfnry5jc2V6mPhfJ9UomjFf/CnOcr6bWNohATeeo9J7/G/7rDdT5aZjidl36rcKgkRgTqzei5FWYLz7C4QsoGvkPIBvWLD8jByyM9kmGriq4wPP/acvfGhJe7HMMqn7H0KQv0kt5MzfnsS+lUfYHzLeVD0vVejE4Vvq8iH1Nm+C1S64D9P2IQXT8DB/gaWkdFPt0RHzHUf3eUOK6AldytQQdKPTl/uMh9OFm9BXhNkPI0EJbEUdbTH6znfXWWBn9T5XVMXnk0HPx49/ho73eWtmV51NG2G2jvaQBVjgXg/86rOzqtY6dsTxRPqNnq12tbdPVOZzIyATZNkgkZjcVz8IIgsvpzCSO0w1qlMs33rxRsxa3xcx8zS9c9vctAWGOn1qB9AM6DV2LH8CqlCVeiw/nRoM+dee1LV5FAyF5L/YiG7RwvhEaAf3/8+ILUenCPcpLdIBm/0JHhwr+kxkiKkh90yXkO76+/JPnoEyn2NsmvxH6m2O8i9TernfwF0Sei36epzckMRniXhLkv5jl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: a1x7xzi/ZXpU6IkKdjc6doeeYGUNnKQe4qA1c2LVSewaUC2SFMpi9Ed0b7DlHdruhphdTG+CcNY/yanTyiCr84T/LXMHnbgykqP2MuPBbSzgjz10kfYOZ3BJVJqNarrH+d9sbUQw7eOHHR7UPpZba7/BXe8lIzzr6vxhLoMZT3LP94a/4LhLVho8pDHmxGbUf3HKGZdjLd6Neo7oPsjrXBi6x+HNFVuJl1cQh0vrdlkFCzu8q/qfRRps4vABIrJmIRTt2/Hd3btxqW6VpUDeOLSmRISBY3o2GL8bn3r2amlJneWNIJTgsQhfpSHJa0URNRPRJ8vhodEkWh7rnXBIwVVT4J0xUQCF6ZLUN0LZrzxyAfyy6jhi4F/lvB73mfZkdsX4XkhfqgQjIi3daFvceebeNy2QUTSO+cOc/23avAs4fkrHBmAV1T3B5DNytPsDzIRMSUCRrR30r1IJNWHj/8uWQDcE1DmzcDh+V9go/3AFFzqeJ7/aNIgjIb3kL34mDmWfDM469skja0LciBJoom+wiRr2wm0tgoHiLzov5kosGFpsjLcdTqouC++Wz5AFYDD3E3CIbLTbi8gxmkfZnONXubjaDnh43s1ZCsrvgkh2QWTChNF6ZS7L8BStZyPvp17q/QktIbwszkJe5ztEokzmMEOvcv97HU4Fy38KJGVwSbGT3Q/ARpKiswG8HEcpk4HlYf1+3D9+xCRm3B27Ih0OSLSd7+uozjaWpMdos8tMkbW2gSS3cE6pyHrx7V7nBQUPLHuhfIbbi9vWbL4Y+XjY7zt0waA6hR4vm1WfrvqBbiorLjJmkPjklokkOQsKWpqZ2FszjQvbxFGQhmkrwor4EyhNiPENpvTr59jLh8yY1k6ongtbYjJYpWHXqNN0fKebAq/rGrZ5DN1qgTf3TKwTFcIS6A6nZAZqwg0c3UUVT1WOMp3cylZMW/EW9Q8Dl0FKRCahhMmEvjGz9vBGJPBYwSzehV2RdtGG0eMQfhpvqgrBAbUp1C1WXmHofBiuQUF+OTUUBGkXXbf/VCM9unFkQuANu5AovP1QeyeYu9A+9Vr2y9aKkRZohnA6tz4tU/i6VwA6SU01G+v5RuXUJZ6p83Qn0NxAGnmR6W+tNeYih5T2Ecb3TuU4hwDPVl4u42JuYpZWYf+Kq6BM30jalezF59tvXOdMMZUmjk0wgq1AAhpU/5src/KMGpR99JTHpqocF4JLSZwHjbAwke87KKgivWXq3Y0pMEjj8Ykyg2q7zZHqPjomwos7F220pbbuW3dOGvXMS9Fotu60rW/DFA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 855918cf-4222-47cf-ee1b-08dc9283f1a6 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:17.4136 (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 04/18] avcodec/vvcdec: refact, unify {horizontal, vertical}_bs, {horizontal, vertical}_p, {horizontal, vertical}_q 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: 0rXdP4vJYKBh --- libavcodec/vvc/dec.c | 14 +++++++------- libavcodec/vvc/dec.h | 9 +++------ libavcodec/vvc/filter.c | 32 +++++++++++--------------------- 3 files changed, 21 insertions(+), 34 deletions(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index f5603306f3..356ed58e37 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -191,14 +191,14 @@ static void bs_tl_init(TabList *l, VVCFrameContext *fc) tl_init(l, 1, changed); - for (int i = 0; i < VVC_MAX_SAMPLE_ARRAYS; i++) { - TL_ADD(horizontal_bs[i], bs_count); - TL_ADD(vertical_bs[i], bs_count); + for (int i = 0; i < 2; i++) { + for (int j = 0; j < VVC_MAX_SAMPLE_ARRAYS; j++) { + TL_ADD(bs[i][j], bs_count); + TL_ADD(bs[i][j], bs_count); + } + TL_ADD(max_len_p[i], bs_count); + TL_ADD(max_len_q[i], bs_count); } - TL_ADD(horizontal_q, bs_count); - TL_ADD(horizontal_p, bs_count); - TL_ADD(vertical_p, bs_count); - TL_ADD(vertical_q, bs_count); } static void pixel_buffer_nz_tl_init(TabList *l, VVCFrameContext *fc) diff --git a/libavcodec/vvc/dec.h b/libavcodec/vvc/dec.h index 1e0b76f283..a8492f1398 100644 --- a/libavcodec/vvc/dec.h +++ b/libavcodec/vvc/dec.h @@ -178,12 +178,9 @@ typedef struct VVCFrameContext { uint8_t *tb_height[2]; uint8_t *pcmf[2]; - uint8_t *horizontal_bs[VVC_MAX_SAMPLE_ARRAYS]; - uint8_t *vertical_bs[VVC_MAX_SAMPLE_ARRAYS]; - uint8_t *horizontal_p; ///< horizontal maxFilterLengthPs for luma - uint8_t *horizontal_q; ///< horizontal maxFilterLengthQs for luma - uint8_t *vertical_p; ///< vertical maxFilterLengthPs for luma - uint8_t *vertical_q; ///< vertical maxFilterLengthQs for luma + uint8_t *bs[2][VVC_MAX_SAMPLE_ARRAYS]; ///< horizontal, vertical boundary filtering strength + uint8_t *max_len_p[2]; ///< horizontal, vertical maxFilterLengthPs for luma + uint8_t *max_len_q[2]; ///< horizontal, vertical maxFilterLengthQs for luma uint8_t *sao_pixel_buffer_h[VVC_MAX_SAMPLE_ARRAYS]; uint8_t *sao_pixel_buffer_v[VVC_MAX_SAMPLE_ARRAYS]; diff --git a/libavcodec/vvc/filter.c b/libavcodec/vvc/filter.c index 06e1717b13..7ae36b2344 100644 --- a/libavcodec/vvc/filter.c +++ b/libavcodec/vvc/filter.c @@ -414,9 +414,6 @@ static void vvc_deblock_subblock_bs(const VVCLocalContext *lc, const RefPicList *rpl = lc->sc->rpl; int stridea = fc->ps.pps->min_pu_width; int strideb = 1; - uint8_t *tab_bs = vertical ? fc->tab.vertical_bs[LUMA] : fc->tab.horizontal_bs[LUMA]; - uint8_t *tab_max_len_p = vertical ? fc->tab.vertical_p : fc->tab.horizontal_p; - uint8_t *tab_max_len_q = vertical ? fc->tab.vertical_q : fc->tab.horizontal_q; const int log2_min_pu_size = MIN_PU_LOG2; if (!vertical) { @@ -442,7 +439,7 @@ static void vvc_deblock_subblock_bs(const VVCLocalContext *lc, if (!vertical) FFSWAP(int, x, y); - TAB_BS(tab_bs, x, y) = bs; + TAB_BS(fc->tab.bs[vertical][LUMA], x, y) = bs; if (i == 4 || i == width - 4) max_len_p = max_len_q = 1; @@ -451,8 +448,8 @@ static void vvc_deblock_subblock_bs(const VVCLocalContext *lc, else max_len_p = max_len_q = 3; - TAB_MAX_LEN(tab_max_len_p, x, y) = max_len_p; - TAB_MAX_LEN(tab_max_len_q, x, y) = max_len_q; + TAB_MAX_LEN(fc->tab.max_len_p[vertical], x, y) = max_len_p; + TAB_MAX_LEN(fc->tab.max_len_q[vertical], x, y) = max_len_q; } } } @@ -562,9 +559,6 @@ static void vvc_deblock_bs_luma(const VVCLocalContext *lc, const int flag = vertical ? BOUNDARY_LEFT_SLICE : BOUNDARY_UPPER_SLICE; const RefPicList *rpl_p = (lc->boundary_flags & flag) ? ff_vvc_get_ref_list(fc, fc->ref, x0 - vertical, y0 - !vertical) : lc->sc->rpl; - uint8_t *tab_bs = vertical ? fc->tab.vertical_bs[LUMA] : fc->tab.horizontal_bs[LUMA]; - uint8_t *tab_max_len_p = vertical ? fc->tab.vertical_p : fc->tab.horizontal_p; - uint8_t *tab_max_len_q = vertical ? fc->tab.vertical_q : fc->tab.horizontal_q; for (int i = 0; i < size; i += 4) { const int x = x0 + i * !vertical; @@ -572,11 +566,11 @@ static void vvc_deblock_bs_luma(const VVCLocalContext *lc, uint8_t max_len_p, max_len_q; const int bs = deblock_bs(lc, x - vertical, y - !vertical, x, y, rpl_p, LUMA, off, has_sb); - TAB_BS(tab_bs, x, y) = bs; + TAB_BS(fc->tab.bs[vertical][LUMA], x, y) = bs; derive_max_filter_length_luma(fc, x, y, is_intra, has_sb, vertical, &max_len_p, &max_len_q); - TAB_MAX_LEN(tab_max_len_p, x, y) = max_len_p; - TAB_MAX_LEN(tab_max_len_q, x, y) = max_len_q; + TAB_MAX_LEN(fc->tab.max_len_p[vertical], x, y) = max_len_p; + TAB_MAX_LEN(fc->tab.max_len_q[vertical], x, y) = max_len_q; } } @@ -598,14 +592,12 @@ static void vvc_deblock_bs_chroma(const VVCLocalContext *lc, const int size = vertical ? height : width; for (int c_idx = CB; c_idx <= CR; c_idx++) { - uint8_t *tab_bs = (vertical ? fc->tab.vertical_bs : fc->tab.horizontal_bs)[c_idx]; - for (int i = 0; i < size; i += 2) { const int x = x0 + i * !vertical; const int y = y0 + i * vertical; const int bs = deblock_bs(lc, x - vertical, y - !vertical, x, y, NULL, c_idx, 0, 0); - TAB_BS(tab_bs, x, y) = bs; + TAB_BS(fc->tab.bs[vertical][c_idx], x, y) = bs; } } } @@ -645,10 +637,8 @@ static void vvc_deblock_bs(const VVCLocalContext *lc, const int x0, const int y0 static void max_filter_length_luma(const VVCFrameContext *fc, const int qx, const int qy, const int vertical, uint8_t *max_len_p, uint8_t *max_len_q) { - const uint8_t *tab_len_p = vertical ? fc->tab.vertical_p : fc->tab.horizontal_p; - const uint8_t *tab_len_q = vertical ? fc->tab.vertical_q : fc->tab.horizontal_q; - *max_len_p = TAB_MAX_LEN(tab_len_p, qx, qy); - *max_len_q = TAB_MAX_LEN(tab_len_q, qx, qy); + *max_len_p = TAB_MAX_LEN(fc->tab.max_len_p[vertical], qx, qy); + *max_len_q = TAB_MAX_LEN(fc->tab.max_len_q[vertical], qx, qy); } //part of 8.8.3.3 Derivation process of transform block boundary @@ -758,7 +748,7 @@ void ff_vvc_deblock_vertical(const VVCLocalContext *lc, const int x0, const int for (int i = 0; i < DEBLOCK_STEP >> (2 - vs); i++) { const int dy = i << 2; - bs[i] = (y + dy < y_end) ? TAB_BS(fc->tab.vertical_bs[c_idx], x, y + dy) : 0; + bs[i] = (y + dy < y_end) ? TAB_BS(fc->tab.bs[1][c_idx], x, y + dy) : 0; if (bs[i]) { src = &fc->frame->data[c_idx][((y + dy) >> vs) * fc->frame->linesize[c_idx] + ((x >> hs) << fc->ps.sps->pixel_shift)]; qp = get_qp(fc, src, x, y + dy, c_idx, 1); @@ -831,7 +821,7 @@ void ff_vvc_deblock_horizontal(const VVCLocalContext *lc, const int x0, const in for (int i = 0; i < DEBLOCK_STEP >> (2 - hs); i++) { const int dx = i << 2; - bs[i] = (x + dx < x_end) ? TAB_BS(fc->tab.horizontal_bs[c_idx], x + dx, y) : 0; + bs[i] = (x + dx < x_end) ? TAB_BS(fc->tab.bs[0][c_idx], x + dx, y) : 0; if (bs[i]) { src = &fc->frame->data[c_idx][(y >> vs) * fc->frame->linesize[c_idx] + (((x + dx)>> hs) << fc->ps.sps->pixel_shift)]; qp = get_qp(fc, src, x + dx, y, c_idx, 0);