From patchwork Sat Jun 22 06:23:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 50057 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp935457vqz; Fri, 21 Jun 2024 23:24:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXTNBs8ubUa0MhzDtVWKlrcC7bhdiUY399+hfDIKjbIMDEIYSCHN5levaJ+9kAXNjndmZg6KmGp/JEpUj7GA9LNLdakRXckNHmI/w== X-Google-Smtp-Source: AGHT+IHJK1bRtdRycN7Q4EFt/GO3fiji8UnJximfs5MyqNJe8Vyfbv07XaREYqxIPrxlEp829kPT X-Received: by 2002:a2e:8004:0:b0:2ec:5518:9550 with SMTP id 38308e7fff4ca-2ec551896b8mr6477311fa.10.1719037474337; Fri, 21 Jun 2024 23:24:34 -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 38308e7fff4ca-2ec4d60179bsi8190031fa.37.2024.06.21.23.24.33; Fri, 21 Jun 2024 23:24:34 -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=gWQljkOk; 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 15EE868D3F8; Sat, 22 Jun 2024 09:24:30 +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-psaapc01olkn2062.outbound.protection.outlook.com [40.92.52.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1139768D3F8 for ; Sat, 22 Jun 2024 09:24:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ayiuGQRotfvuWkVtlQkEGtpbOKOByp+LdRYsH16wxnw4DJYxynXmBWnrXdiBawzJvhTn7m4TGdhfwYCsqOK3iwyAkSRV4Dpo9MMFlvxXkW6Qv4rCrTkYDP5j3apr2esumbHVDAclvHjkG8U7zfSZbTVfG54rGVf7k0XSWuVunUlY++VkiiIPO9mmXRjUaatQJYn8KMoVuHt0b3UQF4UrKjdCZ9tpnwaleg6CVaE0HPwk9+c5ZW1kZ+mQVuRgM/dysVPVfhT7mNYYLB9wS+bOT+RaAJPl50EpVeY8re4L4Ni+bk6z5z6Hv+Cr5VY0Jq78NjbVB0kkqwiKggNKIglKxA== 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=sV7FRSaTV21KavUyMSbGX7TK8HY2jV7jiT9Ce7zsIuA=; b=HTl6U5p4PI6s0A/viQa1P3R1N2Ldr0UW/hJZTYPlmDBeqxMBLrrGAVR6WIW/oDVrn0WguRUQQiyLKg8T+3YIhzokfoywQwZhPgPSYdY+kNa4/TYCmkWJP1lX/eaGJXjg934VeiR5CL62ivVcrtwDYtOoG3c0j3ugM2I4c5d98fxF2nE8gSoEBgKiParM5ZC3+h2uGIKnfTJcbScVDV9ftpXKG0Q7bf15lhRTBExmm25pqWnsTfejuqnH4j7lj+flSqNd5Ip2uNpgv0S3x5u2AQdMwDk8rS/RZDnHFpgfGN44AsojGCc0dZJYL95NUcgYNSmtfTLdYZOsIZZEgv99gg== 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=sV7FRSaTV21KavUyMSbGX7TK8HY2jV7jiT9Ce7zsIuA=; b=gWQljkOk9GFlhhHOB7yE6D5G+1jf5uuB+LqllB2Eivi8XKG7Sh2oegRwPAeq3oJyUsTxvqsxQ6QyOlGC9rf2VPqNpIkOrCpbwZ1QW2O+PKSgrs18WJh+ejRiP80Lctg+5FjHxW5WUxko1uEXixOsrqTK0vFe2opt00KLvQH+TQZbtOB2FUr2hKr0rs16nJNYGIycF3LsgJibSno/p92vKbf6UoLULDYycQGkJU+O41o0tqb9pZbs4sO8Y4fuW9K3tG+3LaJUo9ujcNt/YSrD5d8pV2TDLKabg+ou50LJfJx2JD4x98Z8IIYpnF3ivIvLxw5t45wU2q5B3cxaLb+jFA== 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:17 +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:17 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 14:23:48 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [eR5/67ZnLtcVvRYzcL8EsMYkNfnfC3h2] 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-1-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: ffe4e51f-ca10-425f-2379-08dc9283f074 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|440099025|3412199022|1710799023; X-Microsoft-Antispam-Message-Info: 9NlXe8A0Y+aYV9KoHC4sKCTYFuXWvYhoDmq2jsevFcVwntiQbGpf0z6km4DOuqerlLcbixL0oO3D5m6LCW/R/f0yMEypVhEWRulR79AhyesjRxz0vzpcvLtlsGguG9FYNMuz5ChHExrxVEOaPBj4bt97fguYIqh8doAtBnsKJZN6zmFLgqrbnEnqXHHujKdIgXHfLIOUceB9dIMiAicaoqcSW5a5n4JTNl6yyX45dPBRgMcYfjMgP5+IrWBca1KRV+iGgCj8rlsB4YlWiV7efmhNWsgy1ToOL7S1Uy3T7IIc2cyhmI1jyt1Oe0njCcbObFk7kQgVYgkuEGAnHYdYL2Tg2cfpPiaQbYBCwLrPFMAUgK8tK5gOHJ/OMH/4TZ/omV50iALBT6kwEUGsaBF2Pb5s+lJBdptfAMWnHcaz+qZh5frnT2tw649ypQNFQJ+Qgdo6IscE3gRyHbenCGP53EtvomQELe6VL0Ix01nbG2Q5cRy3Z9SV83Ng3C6a+kuj0q0CKXNMxgiylCb86mNVAVAqKioEWTpCQKSyVjTQXpDpXOdT0Bx4HiDmYLEqBZVwjW8kqotPvCtUcw1/dASXPLqTAz0z86AAulbdQZx433eqrGBdbg7wWa9d4a1/GaDQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?iucDm4aBdyxTlCKFva2XsoGQKjm3?= =?utf-8?q?UBySa56bjCBBFFOkvgOOS6uIWIjD24xj1plX3xc7wsNYUIdI/urM9FYpfCwPRgiFx?= =?utf-8?q?vE7gPkJzQk8wesEwI028ktHBC6ayRXZNPdMsOFXO4PvNfvKzL3JpMRHeIMJGHWTPJ?= =?utf-8?q?rdM5YDn+qsMczdXeUkcZv1w78UHA/pibPxOApkvhzqPMzJsLTey3qwRXOn1f+Psf3?= =?utf-8?q?sDQ9w5LcBiwZm1jq7qti8vFneUN21dvs/ihzhraWyzrEiPtXVCYfb1MaclKD8mgxO?= =?utf-8?q?17Z8jam4AZ83yjLb2u1g95MmQj3IQurPdB2TH5SzyOl9vy3cYc2pKtEJ+d0J4c9jz?= =?utf-8?q?Uu4+YyLzIlWXCtkC52r/4Pj9y/Itv3uE7bVz5Rf0Gg3Z2w6AaQs01zBbNVkulz3uO?= =?utf-8?q?doD697SRu20tYlCzaASx5yxxNeOCHuR+T8jO32zw6ju6KSLN9DgUCgehP2gcFxw3w?= =?utf-8?q?fsiSsbWhQ9yBQu528C+i0hmeUp7Gz6J9NDyNq/i/gyhkZxQB3vIH6+qYbCr6FDbbe?= =?utf-8?q?Q4fOuM7zuY8fmvYXJ1GxVAwNEPX965Rv/Oy3HA/MOpbQCMtbTonZkmFl6N8wHQJIo?= =?utf-8?q?WluSilio9BivQtsyyoAINYbgwqVmRn+wO/W0i1u1w7YyexnblyzAjV7kWye0PGaq0?= =?utf-8?q?c3kPX9bTHe/tllEfo9al417WfwXYsW3CyxvSV12YJ1iGSZjQSjZY2LT6yWNGpjBxx?= =?utf-8?q?zvFfZfPqJntPta6pt5u89LKsn/ZIQCdRMvhoJBx9HbJGzqGWu6WM2Puo1XF1xG/MU?= =?utf-8?q?aEN73r58LV5fGPIkO3dDuOwj6Cy4QijCuv/K9Mz4ZAwm407JcHOXVJo7PH1ecHivw?= =?utf-8?q?vTeHxBGtULnKNPPPw5reHqjeYwTVGib0yW6l7nSK7VZWZV5SFH4Rw5jCHw4T+0Ybo?= =?utf-8?q?fDK5AR9rG6eWOI9vHv9WV7PB7ANEmlU6lENBWAKA3NlFj5KCy8nS7gG9pCUk6rNXj?= =?utf-8?q?pQUKXuzPJW6Ch553j6w9OOIEIbm2hESd/pqbZgB4jWhNsOSS3SJHp+H1LMMWhRxbY?= =?utf-8?q?i1M0x/rGbtD8GXw4t5jUrqYKrIQch0VC7nWDu8okJWd1zxCTVW/wMzqBjA5Dv3AZq?= =?utf-8?q?21xS2Q6Q2d9/vqFgggIq1dLC93g777Ne7/lNLSnEE38VFd6S6Dg18IZ59NyNPmP1+?= =?utf-8?q?THNHQWOHBOvsa+AVBNIkeaAo/K2LONh3V4AiMHXc3b2X7lO4dSdHQea5ZLw+lJbHg?= =?utf-8?q?0/kRLNreY5E9HQvqM/bm372Bf/hDKwNnyKOPxJQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffe4e51f-ca10-425f-2379-08dc9283f074 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:15.4726 (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 01/18] avcodec/vvcdec: refact, unify vvc_deblock_subblock_bs_{horizontal, vertical} 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: lqdFRBc1vkqx --- libavcodec/vvc/filter.c | 93 ++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 61 deletions(-) diff --git a/libavcodec/vvc/filter.c b/libavcodec/vvc/filter.c index 7844d34eac..d4c09b69f3 100644 --- a/libavcodec/vvc/filter.c +++ b/libavcodec/vvc/filter.c @@ -406,30 +406,43 @@ static void derive_max_filter_length_luma(const VVCFrameContext *fc, const int q *max_len_p = FFMIN(5, *max_len_p); } -static void vvc_deblock_subblock_bs_vertical(const VVCLocalContext *lc, - const int cb_x, const int cb_y, const int x0, const int y0, const int width, const int height) +static void vvc_deblock_subblock_bs(const VVCLocalContext *lc, + const int cb, int x0, int y0, int width, int height, const int vertical) { const VVCFrameContext *fc = lc->fc; const MvField *tab_mvf = fc->tab.mvf; const RefPicList *rpl = lc->sc->rpl; - const int min_pu_width = fc->ps.pps->min_pu_width; + 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) { + FFSWAP(int, x0, y0); + FFSWAP(int, width, height); + FFSWAP(int, stridea, strideb); + } + // bs for TU internal vertical PU boundaries - for (int j = 0; j < height; j += 4) { - const int y_pu = (y0 + j) >> log2_min_pu_size; - - for (int i = 8 - ((x0 - cb_x) % 8); i < width; i += 8) { - const int xp_pu = (x0 + i - 1) >> log2_min_pu_size; - const int xq_pu = (x0 + i) >> log2_min_pu_size; - const MvField *left = &tab_mvf[y_pu * min_pu_width + xp_pu]; - const MvField *curr = &tab_mvf[y_pu * min_pu_width + xq_pu]; - const int x = x0 + i; - const int y = y0 + j; - const int bs = boundary_strength(lc, curr, left, rpl); + for (int i = 8 - ((x0 - cb) % 8); i < width; i += 8) { + const int xp_pu = (x0 + i - 1) >> log2_min_pu_size; + const int xq_pu = (x0 + i) >> log2_min_pu_size; + + for (int j = 0; j < height; j += 4) { + const int y_pu = (y0 + j) >> log2_min_pu_size; + const MvField *mvf_p = &tab_mvf[y_pu * stridea + xp_pu * strideb]; + const MvField *mvf_q = &tab_mvf[y_pu * stridea + xq_pu * strideb]; + const int bs = boundary_strength(lc, mvf_q, mvf_p, rpl); + int x = x0 + i; + int y = y0 + j; uint8_t max_len_p = 0, max_len_q = 0; - TAB_BS(fc->tab.vertical_bs[LUMA], x, y) = bs; + if (!vertical) + FFSWAP(int, x, y); + + TAB_BS(tab_bs, x, y) = bs; if (i == 4 || i == width - 4) max_len_p = max_len_q = 1; @@ -438,48 +451,8 @@ static void vvc_deblock_subblock_bs_vertical(const VVCLocalContext *lc, else max_len_p = max_len_q = 3; - TAB_MAX_LEN(fc->tab.vertical_p, x, y) = max_len_p; - TAB_MAX_LEN(fc->tab.vertical_q, x, y) = max_len_q; - } - } -} - -static void vvc_deblock_subblock_bs_horizontal(const VVCLocalContext *lc, - const int cb_x, const int cb_y, const int x0, const int y0, const int width, const int height) -{ - const VVCFrameContext *fc = lc->fc; - const MvField* tab_mvf = fc->tab.mvf; - const RefPicList* rpl = lc->sc->rpl; - const int min_pu_width = fc->ps.pps->min_pu_width; - const int log2_min_pu_size = MIN_PU_LOG2; - - // bs for TU internal horizontal PU boundaries - for (int j = 8 - ((y0 - cb_y) % 8); j < height; j += 8) { - int yp_pu = (y0 + j - 1) >> log2_min_pu_size; - int yq_pu = (y0 + j) >> log2_min_pu_size; - - for (int i = 0; i < width; i += 4) { - const int x_pu = (x0 + i) >> log2_min_pu_size; - const MvField *top = &tab_mvf[yp_pu * min_pu_width + x_pu]; - const MvField *curr = &tab_mvf[yq_pu * min_pu_width + x_pu]; - const int x = x0 + i; - const int y = y0 + j; - const int bs = boundary_strength(lc, curr, top, rpl); - uint8_t max_len_p = 0, max_len_q = 0; - - TAB_BS(fc->tab.horizontal_bs[LUMA], x, y) = bs; - - //fixme: - //edgeTbFlags[ x − sbW ][ y ] is equal to 1 - //edgeTbFlags[ x + sbW ][ y ] is equal to 1 - if (j == 4 || j == height - 4) - max_len_p = max_len_q = 1; - else if (j == 8 || j == height - 8) - max_len_p = max_len_q = 2; - else - max_len_p = max_len_q = 3; - TAB_MAX_LEN(fc->tab.horizontal_p, x, y) = max_len_p; - TAB_MAX_LEN(fc->tab.horizontal_q, x, y) = 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; } } } @@ -581,7 +554,6 @@ static void vvc_deblock_bs_luma_vertical(const VVCLocalContext *lc, const int off_q = (y0 >> min_cb_log2) * min_cb_width + (x0 >> min_cb_log2); const int cb_x = fc->tab.cb_pos_x[LUMA][off_q]; - const int cb_y = fc->tab.cb_pos_y[LUMA][off_q]; const int cb_width = fc->tab.cb_width[LUMA][off_q]; const int off_x = cb_x - x0; @@ -610,7 +582,7 @@ static void vvc_deblock_bs_luma_vertical(const VVCLocalContext *lc, if (!is_intra) { if (fc->tab.msf[off_q] || fc->tab.iaf[off_q]) - vvc_deblock_subblock_bs_vertical(lc, cb_x, cb_y, x0, y0, width, height); + vvc_deblock_subblock_bs(lc, cb_x, x0, y0, width, height, 1); } } @@ -629,7 +601,6 @@ static void vvc_deblock_bs_luma_horizontal(const VVCLocalContext *lc, int has_horizontal_sb = 0; const int off_q = (y0 >> min_cb_log2) * min_cb_width + (x0 >> min_cb_log2); - const int cb_x = fc->tab.cb_pos_x[LUMA][off_q]; const int cb_y = fc->tab.cb_pos_y[LUMA][off_q]; const int cb_height = fc->tab.cb_height[LUMA][off_q]; const int off_y = y0 - cb_y; @@ -659,7 +630,7 @@ static void vvc_deblock_bs_luma_horizontal(const VVCLocalContext *lc, if (!is_intra) { if (fc->tab.msf[off_q] || fc->tab.iaf[off_q]) - vvc_deblock_subblock_bs_horizontal(lc, cb_x, cb_y, x0, y0, width, height); + vvc_deblock_subblock_bs(lc, cb_y, x0, y0, width, height, 0); } }