From patchwork Sat Jun 22 06:23:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 50071 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp940170vqz; Fri, 21 Jun 2024 23:42:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXgn9+eGl/JbIr/WbdNbmPXwuMcOynb7mg4LIAK+ge3q7mc8ppJl3hC1TGQ08ioYee6UyOmGkUR6KWzczvJSTYaCrJ4ocT0E0Aidg== X-Google-Smtp-Source: AGHT+IE3sgkCVB1wol1KUWKHwLlcX47wZhKV7i9Sw7BcJgUTINEGpvQ8eQIs6VJMNBiM6yfnfgWN X-Received: by 2002:a17:906:454c:b0:a6f:2448:a274 with SMTP id a640c23a62f3a-a6fab7792f7mr621034066b.59.1719038571466; Fri, 21 Jun 2024 23:42:51 -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-a6fcf49650csi153290066b.242.2024.06.21.23.42.51; Fri, 21 Jun 2024 23:42:51 -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=XG418yqq; 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 B80B368D8A6; Sat, 22 Jun 2024 09:24:44 +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 F1DC568D80F for ; Sat, 22 Jun 2024 09:24:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nJc2gCn0CjiSLGtVC0FhVLQtwXadEsYrQQzEZrR8Rza6SosTjMkUTZkSwT4YC9WECtI+5qk2gL6bvbMPQPm4TPRtWLMcS/G+rxlBDLHfG+ghirD+mPvWI1dxfKANY8YQvIkycRGXJVrUwsxWgnO3JHzi8B2vHlywPGEhX+QTV1exqYZbUUjWOWiAVkbaovLBJj1uTfKb3WvF/xquxPySokcoXoErx9WgOqv46DOWsXdNHtxDBqhzxErc4kZ+4cZOp7KUbO+O293iyQw37GCFFUxfdt2lLEQQlJOuRQg36kCI6sVbLcxdxw8qk7zW29Pc2NeCpEi+l3AAjxXbd523qw== 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=1hLy95a19YpVJcp41yRUkq8qnAyM0z+iv3zmYLcwC3g=; b=FQvJnpoIW3pgn+UsCvfxc4ixqihPh7xTXr8uCVK02aLvnIHu7dhqMFh/Yg12yOjUZafEQUgGfYAlrdjOJQP2LoBdKpuw+M6CrZPmQNu351bNqKHCkTACgw7uQAC9Drq68ZC9LqJWj0Fg44yqPmYe0r/kWW5ofz7/RH3aQsq3ekPizsCbQ75f9tofUSOLiU4lh7MrSFZur1JQUyZqCaKE9RQqtYYBVGYeSELg0/sawRKeEvXNVvn2eCsEz6JcecuGmgDqigU6HAzC96Df5EPG96rGcpuhzrKMH4cLwmHjTTzbZeH1Z0kM+ql8PaXf6OQwvCgmK85DYnNfv+bziGyDFg== 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=1hLy95a19YpVJcp41yRUkq8qnAyM0z+iv3zmYLcwC3g=; b=XG418yqqNFj1iTL4V97b8yWQopeE+s0yMQ64NEs3QOeYWIorQQpOCSu82fFFmUo4/GlJI8ofdzrzWzuJukkt48VBgldAF/PWcRZYYtnzubpVk2TDpQBcaBcld5Z8khWU72OAL+ci9gAxNh1jLru90kRfI4j0Gy5v9StaPim2wem8kmGFUum/CmaXESntxMtjnUGDrxCXfFH86ohz/bqeYqSJTvGrs1+z4L9JN1H3hcl+nQJDzGMEYwCBGLsJ7pwCJJcLPIfcFXe6oGErFaYs5yBM5jw1OSk6nvmLuK2YAko8BWYnbuyVma1ioOK1/0/eMg7ejcmPRNeDq3V3POdZPA== 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:20 +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:20 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 14:23:56 +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: [ECnS2fw+J+7iRTV6Lylmgogd3G9RBf4+] 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-9-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: b4462c25-a7c7-4ee3-8928-08dc9283f39a X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|440099025|3412199022|1710799023; X-Microsoft-Antispam-Message-Info: SapgJBhHcapBhoQ+IpZbsVbp5axfssovdCUAFbJHfVNBhDDMsb3TyhTqAEm5kTd7AgxDh77nHdIcFN+WsgVhtvdLLw08n2PYIxTQM0dwzEbcyUnq1EDmmp6On9Y50sVhQ16qOl8oU9mVgLEtJ9Q8BZwCOEhSMZHhzo6s0xS+8t38Pn+IvGun0WIOT4rUu9PZi/PNOEs1F6uhdS6VaSOVtX4m7FPspIHv3AG1rjNxHM2zlpEJE1lO4WyrpoqAZxFKg6ZRHmlfK3TMS/f0BtijAv7WwlHH6NuNblZT67TRhvVplEODnpwRCFTnaG0lNm91lk6NMOQLS2KqHt/g0+g4sFiSN4wBghYQj1F2v2Lzoh3/X1KkglE7nthVr9sGua/KIOZBvpr1u74ssKYVeprgYtteKFhH6U3ruN8CnG79WwMLsrtOxa5+ZB0SV0O7gMEBfg+OFjw5vKTG6uAZGDMKR7dLS12T+0l1bX2pX9h6XcH/ew3dnSk6IBL+zIauifaQ3Ol3kVX+Tb16dJA/QruEm6AIzBFwyPTMqvzER0nnVAv4OO5s6cSIMWsWpBLJnU7my5LfxAdDpkQ802POh4kMXQGxtf3Z/2MddgcQ9QnHq1fUsjSSy6pH5g44s9LTSl13 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8b6oMo3OV0+Pim3gNYERFF/d6XB95FBSPOgz/gipdwPd+x3xfAzpsqfMy3tlUpPdBoic8RJfU3CsgXwWBj9G4O0t9eiV43Zscs3teQwT16ao8Jxy6YyRrCz0B98lNdFilh9rHWiWwJvLTInSUUcNt/wXyG53iOPz0ntqow6ew3uLhHptPU6G1yFVBwKpQUhYYYmYN2yjhpaDr22J/KIsfo+8wk09udQVacY0GARRa0AkKON1hJnusrPDTIyTVgWRCDLsABhbEr/YLPi+jvy9OVKFqTLHNHbeA04uOGfyyDtFUba8g32CNb1lhMcCDCgLdiyM4aIPAysrNCbX0ZbQkrWZhZhfS17/FvBR24f8FEemBSFUdihd1VWLzhqw8IqBYWRgy7asVuQr6HgI7TSoUvcNhRvXNocoZkINyrH6a31epTRv5tIs6iTo/3tt+oJL1i3FF40vIP+0Yokd5qFh38je2QSmDt2/5Nxvx5DAxCAqth/+vorKn1P/g+fpup3Kym8RHWDTEX1IJsAVUQ/njuAw61NkLMsNU6TUvkDo7I0mUGdCiFKMIlr11vvXmh5y+blnEDXztlpLZDDcQZkA9XmllqFciZhdDOR5xpt8edG70WJicuPUthwmIwxJOzceZ4WHuTQGUPbf5Ko5zdnfZArDDg9JnIj3fguaZHUQTNHyDhZTt4fQ2se+S1lrVmp8buySSZHJuqs/om+qEqqfAUco0DO0RZdoCLKsTtAZKX9ZC/tkgqovbCuOVLVq4NBoLlP9cZ4OeNb9KEsr8Oxn7ZE/oNkEgm8w4DJYQyZ2ofyyr18Rsb4et3PAMvXnGQwZnvryeqFjE6t3by5VrGfKXXa84BSmIki6Bd3ajxWW3wO7vd31aG1/gFucaTIcu0DsKdrIGrkeIBeuWouTnw+4xW4PvMdn5vm0810PC7LoG/7Miq/EcAQlrxCykCGezGRAQl1bIYlshiaLWsOM40LTf7w26r+LKvEZW0opIHQ+9y/J3y6IhV7cnC5S8pMkXIAiQ72BHNmIsYQV/PPMCQcGBvCaJHKq+7bMaTvvHAGAM64+UqJwf61mRe33Qu0qoBOMS+zmqtg8BBeBfiZ8Fy5O0wzW9z00sDohcCh5AqSFeNFtRJtgwBYmNoAiSTcCrRYNH02ookKM1UqXPIkivC0fZuQYXcac7lpeTzmDRgh6+OqA6n5MiuV/YEJQYSwwcup7wBH+ZWb9s2yknq3MXiKbvNQJgFBeKg//kpV+hH1WshvNsKoQOh5TyrEMVVcMEfSf8VGQ62M1A55Nrcm7nGVPeg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b4462c25-a7c7-4ee3-8928-08dc9283f39a 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:20.7049 (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 09/18] avcodec/vvcdec: refact, fix naming convention of x0, y0 for sao 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: AZYaIbfyl4Ic it's mismatched with the ff_vvc_sao_filter function declaration --- libavcodec/vvc/filter.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/libavcodec/vvc/filter.c b/libavcodec/vvc/filter.c index 534ba57205..10d11ce31f 100644 --- a/libavcodec/vvc/filter.c +++ b/libavcodec/vvc/filter.c @@ -237,10 +237,12 @@ static void sao_copy_hor(uint8_t *dst, const ptrdiff_t dst_stride, static void sao_extends_edges(uint8_t *dst, const ptrdiff_t dst_stride, const uint8_t *src, const ptrdiff_t src_stride, const int width, const int height, - const VVCFrameContext *fc, const int x, const int y, const int rx, const int ry, const int edges[4], const int c_idx) + const VVCFrameContext *fc, const int x0, const int y0, const int rx, const int ry, const int edges[4], const int c_idx) { const uint8_t *sao_h = fc->tab.sao_pixel_buffer_h[c_idx]; const uint8_t *sao_v = fc->tab.sao_pixel_buffer_v[c_idx]; + const int x = x0 >> fc->ps.sps->hshift[c_idx]; + const int y = y0 >> fc->ps.sps->vshift[c_idx]; const int w = fc->ps.pps->width >> fc->ps.sps->hshift[c_idx]; const int h = fc->ps.pps->height >> fc->ps.sps->vshift[c_idx]; const int ps = fc->ps.sps->pixel_shift; @@ -260,14 +262,14 @@ static void sao_extends_edges(uint8_t *dst, const ptrdiff_t dst_stride, copy_ctb(dst, src, width << ps, height, dst_stride, src_stride); } -void ff_vvc_sao_filter(VVCLocalContext *lc, int x, int y) +void ff_vvc_sao_filter(VVCLocalContext *lc, int x0, int y0) { VVCFrameContext *fc = lc->fc; - const int ctb_size_y = fc->ps.sps->ctb_size_y; + 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 = x >> fc->ps.sps->ctb_log2_size_y; - const int ry = y >> fc->ps.sps->ctb_log2_size_y; + 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 SAOParams *sao = &CTB(fc->tab.sao, rx, ry); // flags indicating unfilterable edges @@ -277,16 +279,12 @@ void ff_vvc_sao_filter(VVCLocalContext *lc, int x, int y) sao_get_edges(vert_edge, horiz_edge, diag_edge, &restore, lc, edges, rx, ry); - for (c_idx = 0; c_idx < (fc->ps.sps->r->sps_chroma_format_idc ? 3 : 1); c_idx++) { - int x0 = x >> fc->ps.sps->hshift[c_idx]; - int y0 = y >> fc->ps.sps->vshift[c_idx]; + 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]; - int ctb_size_h = ctb_size_y >> fc->ps.sps->hshift[c_idx]; - int ctb_size_v = ctb_size_y >> fc->ps.sps->vshift[c_idx]; - int width = FFMIN(ctb_size_h, (fc->ps.pps->width >> fc->ps.sps->hshift[c_idx]) - x0); - int height = FFMIN(ctb_size_v, (fc->ps.pps->height >> fc->ps.sps->vshift[c_idx]) - 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]; int tab = sao_tab[(FFALIGN(width, 8) >> 3) - 1]; - uint8_t *src = POS(c_idx, x, y); + uint8_t *src = POS(c_idx, x0, y0); switch (sao->type_idx[c_idx]) { case SAO_BAND: