From patchwork Sat Jun 22 06:23:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 50073 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp945546vqz; Sat, 22 Jun 2024 00:02:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWnbxeLLflasuVHEkHil+GVK+g8gPg2txg1yvrdWe3w/JZCqVsX3BxyYsqfbc4/aM12mrBVVTBfIdZEDMhOhpTrXJMIUldrJHzt6A== X-Google-Smtp-Source: AGHT+IHcDi2MYnJRug6uAhIra4bMAXI7yaHsCv7ACOWpSVA+pmN4oirrxMdHTbQua3ev7PHy5pCm X-Received: by 2002:a17:907:8e8d:b0:a6f:49bc:e857 with SMTP id a640c23a62f3a-a6fab60bb88mr707725466b.6.1719039767334; Sat, 22 Jun 2024 00:02:47 -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 a640c23a62f3a-a6fcf5653aesi161931866b.679.2024.06.22.00.02.46; Sat, 22 Jun 2024 00:02:47 -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=nnDmnbq0; 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 20B7068D804; Sat, 22 Jun 2024 09:24:35 +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 0D5E968D7CA for ; Sat, 22 Jun 2024 09:24:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sgphh6ajSRefAFe18UDQApSP56EBhvf6j4cDeOSAac/DdYRAx64DRZ7/zYs9vD6aOZhlPE3tlDZaz168VnqMscix+HCOlvvxPkTl0/ROvWyfaBLUkjZQJcVC9PkSf2fX5Ck8EKFqS7peg1XRcQRpR9P+YCHYOENwYxfMgesv2kZqwBzFxIn8p//z6kyUDUK7WpyKSZdNhncq7QpfzwbHrrj6FQD3gzprBwL6iQAlT/aDurdgeYvwJn6jct7mPqbLIsbyDo3+8CiHGXrX4/qnlBwd3tFpGFF1Bdw8PMkyeHhm3eEaTCIeQUo0/aoRwoQKBEdOjx4BHNwa2oGJlMLkRA== 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=4qVX+4c6tBYmmQe6y7oWC0Lg6sYXupA1g5S16NnGbNA=; b=QzgbTulPdTpxwBSnDNkZXhrBf47irvCKnTvhu4D/R0OP2XNM5SRfrarulCXgd9Bj2NoC5Y3dWswAxX7Rm24BJi1LiwUOcJ4YEXcjc/ZUs4glTfTBXHOz0cF9OImQdwJrZZlGFIc2F1Fr1Ecx68Bw0KW72PBBQLSiadbV+S9UIO4mz6aLxBM6RdjlYrqAzyld+sNs3yBku5Rm1XbyYX61VNJZrgBujuO+s/NuUoakOFyPxFV37yWil+SEzEDpYhDfZ7nKXEdLy9O+bFYi1qX4j7rukvgGNqph70zW0QJsDc5V++R6iUzHSlrGm6gLh1jQic2Cw791IVO+NJWOidoZmA== 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=4qVX+4c6tBYmmQe6y7oWC0Lg6sYXupA1g5S16NnGbNA=; b=nnDmnbq0uCslvgR6XXelH81nLEVnv31zNpyZIbW8F02rxGhaELasBASaVNMcYz+9nwVXfoxWxuHnbkQ3M91+OPccyXcakuFwjBbf91D8J4DPLYIgvwcVvPQ8WolvROyvnZOhieCWLil8JoduYVKHzXPRA26dY4ny0f4VQwyDfL4Osk6ccHp1V04wNQiMG3UNvn1kSjMRjJTuG/xFfNt/S595oUNWF42yMliFiz4stHpTb7+WSrkVFXM/mopFmpI2sF6WlK+rim/ktCokmVO1w5j2yevFBdd3/IUm5lV5B1SMDj5DFfrgB+QnRyW6Yyue/efWHzKJkSt50dvendT7Fw== 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:49 +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: [6sH4iqhiYk5xqanaEiMR3wzitWuXvKu9] 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-2-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: fbe3fcc1-4866-49ca-ba77-08dc9283f0e3 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|440099025|3412199022|1710799023; X-Microsoft-Antispam-Message-Info: F/n6E/czFLcdkgztA4b4qnk+cIEl+7GnXvUT1HE+2N+IQFS31P35AFknLWFT6gp31p6I/BLpv0sAsC1O1Zb/T4ecB3pRxtqk5KNrNEZa1Fj1/X9U03wPjVL8VjN9v8M/ewF2QNsRycYo3/bcqyI5X1qmUQBjiOzE3PnKomRGkpnvZYZ+6VRsQh1wFTCoAmzAthYKmTZBXaQcj7PD6ETdAeNqgbvIIU8NPza6jxKpx7RwoS2yosZFnNJ/+sqilkDrUQS63gtw4eTRzexDuTmFNXNlhRXC7/7AJS8HXKuQSOUmpyWPYQorTcZ5ULTALqTO85Udm3A1sxKSv4ACsocLER5fFSlrGUt79oevE1ZwTSFRZTSNI6uEu5P1PE0SP05lD4AVmM5FvdhTScfd0ZYfcTKns0NmI+6vj6QZc0RGaR54IAoGYpqaDSgTQs8fBVUQ2ykZtXKlkGj0++m88yljw8+FEr3E8i1IdZn1l13msUAsjlWo3jBo2nTkPZk43WsQDk0fm2U8xGIKbJGJpEkWSiGa5H4y1wcxhHBRm2Yc8ZoewiWL0oms/ng0LIulKoooJqGVUXmYTCBaXLSMwJH6Z89nrubRqaTHIE0RmSv++sE= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ity2A7Qql8gvfF8dJ/1UHEPGxJfnf4WPfrdns50dzu0RcYeoQlv0LidxRQO42MBF+2NNBJiW1qfLkMHBOoePWqClalfPoE7BVagxzHu6CY4BmwGyGJHCCDDG0GLV+veYG3cWX/DyVeIAcGl1PssthR8+r2iqP1Ve73ItTQKwGZhk6CMggyrtcidHeTSf+vCCDcb+w32i481FhzBz1Hb2ZW5h09NWeGXcwpjUA+t2//9+jvCY66gZKEUQkdKLdvyasbrTO+Ae9Nrnns0qJNmLqm/X71rgFBI2GCSxcSuRMaLFcYYUEVrq6yKVHLv1lRwni3V2f3cxo7xzMFabk/eOJEFeeuXALNb/n5oM2k65TrXuAJegbaWjXkpvI5ZGLIjYzjAlfDsa0mUoBndFYOrNUjnHh59TQ+YkEkSvVe0e6274PGW17mHVSexB9ACrDbPyNVNKkDr/Xc/mifnIaZYQY+fzsvQGds2S06SpsiIN0gyGYH4mFdGOsphj5um577IWNz2XB4NPYrqY7uCjPEEN1Ofd0Awn54FDGtYGGd/vDVE1avMV6/pccOnTJoWYaY6JJI/3SaxJCX1TYgG4XbzRbe14nNY6YCmz7ARYKWQf+DiqQwrDYUws/wl641WnwRTPk9esTEdUGl4pw3svAUxg3EsGdHhXcVqgQB9GC40UCW9zv8DSKFxkTCgkM6bOO1lKeNqs5JvhBZLEeDv7Z8gVTJWDa4yJt6hiPb3aK9XUMragiREdB5T74XcX62/Ng52nHBq/iKO3aEnjNWpBfSbjLe7ivaakToXZZeZdy5GNFq/u1nbVsmduOwRCYdBBFiCE1QjT4AGsNA5wMHp/y6Wg5yi0k9XkomyWEnDQFuDsgsFZMFITN6CFiw9kiWHIGt6hMn4UKIzHdkRjycICBzoQvbI6ZUuNWucX7rlmyibqzVHIqIlRuuq7H/xIvRd5D8eTTT3S06ZRGRcUjTqRPxKQZCfIU0UofsiU8Se1pHjh8Da2KgbgTNmgpihpU2QYXT91O1EbBft2/754y7UeYgEYFLXFULskeKNgj0qTPfEjMY34PLZpVp6qRoC4FkR66V4VxemKwOoIG5NPeZdlTGMwnbhuJlvgExmgk2totbAxoxmO0ZmFzw7b7LGeGPWweEk9ra1Y50nB94HsSkMwXgwwLy6FAWRMhdFT5LhABSWU/p1OHe7wVBnARZrxKQ1vTeJFb4chR33YmOCSTQniG6wUjV0gXWMUQkrnTR72Uu8AIE1NC2DsB/v2miyJQJfHFfUvl+w2cYUvfAbxCVBUoXQOTA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbe3fcc1-4866-49ca-ba77-08dc9283f0e3 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:16.1348 (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 02/18] avcodec/vvcdec: refact, unify vvc_deblock_bs_luma_{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: ZHO4eYVapSSy --- libavcodec/vvc/filter.c | 108 ++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 72 deletions(-) diff --git a/libavcodec/vvc/filter.c b/libavcodec/vvc/filter.c index d4c09b69f3..996e58dc3e 100644 --- a/libavcodec/vvc/filter.c +++ b/libavcodec/vvc/filter.c @@ -538,100 +538,64 @@ static int deblock_is_boundary(const VVCLocalContext *lc, const int boundary, return boundary; } -static void vvc_deblock_bs_luma_vertical(const VVCLocalContext *lc, - const int x0, const int y0, const int width, const int height, const int rs) +static void vvc_deblock_bs_luma(const VVCLocalContext *lc, + const int x0, const int y0, const int width, const int height, const int rs, const int vertical) { const VVCFrameContext *fc = lc->fc; const MvField *tab_mvf = fc->tab.mvf; + const int mask = LUMA_GRID - 1; const int log2_min_pu_size = MIN_PU_LOG2; const int min_pu_width = fc->ps.pps->min_pu_width; const int min_cb_log2 = fc->ps.sps->min_cb_log2_size_y; const int min_cb_width = fc->ps.pps->min_cb_width; - const int is_intra = tab_mvf[(y0 >> log2_min_pu_size) * min_pu_width + - (x0 >> log2_min_pu_size)].pred_flag == PF_INTRA; - int boundary_left; - int has_vertical_sb = 0; - + const int pos = vertical ? x0 : y0; 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_width = fc->tab.cb_width[LUMA][off_q]; - const int off_x = cb_x - x0; - - if (!is_intra) { - if (fc->tab.msf[off_q] || fc->tab.iaf[off_q]) - has_vertical_sb = cb_width > 8; - } - - // bs for vertical TU boundaries - boundary_left = deblock_is_boundary(lc, x0 > 0 && !(x0 & 3), x0, rs, 1); - - if (boundary_left) { - const RefPicList *rpl_left = - (lc->boundary_flags & BOUNDARY_LEFT_SLICE) ? ff_vvc_get_ref_list(fc, fc->ref, x0 - 1, y0) : lc->sc->rpl; - for (int i = 0; i < height; i += 4) { + const int cb = (vertical ? fc->tab.cb_pos_x : fc->tab.cb_pos_y )[LUMA][off_q]; + const int is_intra = tab_mvf[(y0 >> log2_min_pu_size) * min_pu_width + + (x0 >> log2_min_pu_size)].pred_flag == PF_INTRA; + + if (deblock_is_boundary(lc, pos > 0 && !(pos & mask), pos, rs, vertical)) { + const int size = vertical ? height : width; + const int off = cb - pos; + const int cb_size = (vertical ? fc->tab.cb_width : fc->tab.cb_height)[LUMA][off_q]; + const int has_sb = !is_intra && (fc->tab.msf[off_q] || fc->tab.iaf[off_q]) && cb_size > 8; + 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; + const int y = y0 + i * vertical; uint8_t max_len_p, max_len_q; - const int bs = deblock_bs(lc, x0 - 1, y0 + i, x0, y0 + i, rpl_left, 0, off_x, has_vertical_sb); + const int bs = deblock_bs(lc, x - vertical, y - !vertical, x, y, rpl_p, LUMA, off, has_sb); - TAB_BS(fc->tab.vertical_bs[LUMA], x0, (y0 + i)) = bs; + TAB_BS(tab_bs, x, y) = bs; - derive_max_filter_length_luma(fc, x0, y0 + i, is_intra, has_vertical_sb, 1, &max_len_p, &max_len_q); - TAB_MAX_LEN(fc->tab.vertical_p, x0, y0 + i) = max_len_p; - TAB_MAX_LEN(fc->tab.vertical_q, x0, y0 + i) = max_len_q; + 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; } } if (!is_intra) { if (fc->tab.msf[off_q] || fc->tab.iaf[off_q]) - vvc_deblock_subblock_bs(lc, cb_x, x0, y0, width, height, 1); + vvc_deblock_subblock_bs(lc, cb, x0, y0, width, height, vertical); } } -static void vvc_deblock_bs_luma_horizontal(const VVCLocalContext *lc, +static void vvc_deblock_bs_luma_vertical(const VVCLocalContext *lc, const int x0, const int y0, const int width, const int height, const int rs) { - const VVCFrameContext *fc = lc->fc; - const MvField *tab_mvf = fc->tab.mvf; - const int log2_min_pu_size = MIN_PU_LOG2; - const int min_pu_width = fc->ps.pps->min_pu_width; - const int min_cb_log2 = fc->ps.sps->min_cb_log2_size_y; - const int min_cb_width = fc->ps.pps->min_cb_width; - const int is_intra = tab_mvf[(y0 >> log2_min_pu_size) * min_pu_width + - (x0 >> log2_min_pu_size)].pred_flag == PF_INTRA; - int boundary_upper; - int has_horizontal_sb = 0; - - const int off_q = (y0 >> min_cb_log2) * min_cb_width + (x0 >> min_cb_log2); - 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; - - if (!is_intra) { - if (fc->tab.msf[off_q] || fc->tab.iaf[off_q]) - has_horizontal_sb = cb_height > 8; - } - - boundary_upper = deblock_is_boundary(lc, y0 > 0 && !(y0 & 3), y0, rs, 0); - - if (boundary_upper) { - const RefPicList *rpl_top = - (lc->boundary_flags & BOUNDARY_UPPER_SLICE) ? ff_vvc_get_ref_list(fc, fc->ref, x0, y0 - 1) : lc->sc->rpl; - - for (int i = 0; i < width; i += 4) { - uint8_t max_len_p, max_len_q; - const int bs = deblock_bs(lc, x0 + i, y0 - 1, x0 + i, y0, rpl_top, 0, off_y, has_horizontal_sb); - - TAB_BS(fc->tab.horizontal_bs[LUMA], x0 + i, y0) = bs; - - derive_max_filter_length_luma(fc, x0 + i, y0, is_intra, has_horizontal_sb, 0, &max_len_p, &max_len_q); - TAB_MAX_LEN(fc->tab.horizontal_p, x0 + i, y0) = max_len_p; - TAB_MAX_LEN(fc->tab.horizontal_q, x0 + i, y0) = max_len_q; - } - } + vvc_deblock_bs_luma(lc, x0, y0, width, height, rs, 1); +} - if (!is_intra) { - if (fc->tab.msf[off_q] || fc->tab.iaf[off_q]) - vvc_deblock_subblock_bs(lc, cb_y, x0, y0, width, height, 0); - } +static void vvc_deblock_bs_luma_horizontal(const VVCLocalContext *lc, + const int x0, const int y0, const int width, const int height, const int rs) +{ + vvc_deblock_bs_luma(lc, x0, y0, width, height, rs, 0); } static void vvc_deblock_bs_chroma_vertical(const VVCLocalContext *lc,