From patchwork Sat Jun 22 06:23:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 50064 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp937578vqz; Fri, 21 Jun 2024 23:32:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW3CLJlXGHbfh/WAyF+kzhzSq7TiqGy7VA6M7pG1WTIMZl1p43AInFdB93giCGxIHPAWh2aF73mT/qUiKGB8VkcNf0PKSyoVDOx8Q== X-Google-Smtp-Source: AGHT+IHeeo5WaFyXS57XJvzKGgnfuYJiq7mhNqWfY1UuyzO3GRy3Hw0H9dWr5Wk7+ZKsuzm5KiYC X-Received: by 2002:a50:d012:0:b0:57c:73a7:da08 with SMTP id 4fb4d7f45d1cf-57d07e6b7a3mr6505984a12.21.1719037972932; Fri, 21 Jun 2024 23:32:52 -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 4fb4d7f45d1cf-57d3063285bsi1450694a12.80.2024.06.21.23.32.52; Fri, 21 Jun 2024 23:32:52 -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="VIq673/J"; 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 3216B68D8CD; Sat, 22 Jun 2024 09:24:46 +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 17A6568D83F 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=mglhcF8DAyGHwpvJOTudu/cS0fGa9FNedRIZXnCRQW89ZR7gJCITZcpAZzefkFLgpHBdvWZA2hr0fMyZaFZbqjt3jBJvi3X7gx1flIUhL+XZqvWnPSV32Onw9N81mPP8taDZ/mWYgY0bVaxnLDwQxj79D7LX+GJJnytbZz7mWZYCAhhCGx2LqF+StN/K1N8zoJpHCvZjquhndp6fO0PRBuoyuMMFnXlU9vELZW6/qUJy5ILhdzIiihHFj3MhEzFVazG6TsRCMdw0F8WWabpaenurxTm9R2BoJCKKfxfVluCJbAivHEG3pbnkMONmJVVEBCZxE4vSh0/bWzHM1UIRBw== 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=9HB6J1vOmLMq7TereSVlK1epcHqu0C9hWWmLgpP83hU=; b=kGdnV0wU7rRFLBEHab2sA6DNIzfgpaCExMkgzUosE1Xs5ebotAZvDAP/kjo5HC9ASc97r/CpuNtyc6awla6p7AbXVd2OXaXw28KqvNKnPSGCe7VdlzoVAKpnw8vKILFdMv0HmLcacuuggDUpyaX8VzpSiuFQIGBkjZEQzf3bQJM1WoFNjFe2xm1xDiFUsR9E6pvSBlfoZ1YlvwAYi76vE1E5RGnjbRmrpxm/StKg3F1/vjmFrpFZR8emuF1lX+vfA5YuDQKYr9xOW0z7jfeH0U1HJVaNQlrv1l/riU5HeUxSU/uteNO+RfIIRdbamfFlaVL5/65cvaWx0RCJAa0K3g== 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=9HB6J1vOmLMq7TereSVlK1epcHqu0C9hWWmLgpP83hU=; b=VIq673/J+deF2FiK9ZMJt8aYlSlsjnrzJZHEnq1PwWSHSdsaeIcidOkehSGl4IB4PD+5pll2KEajv9B8uUUNWSivWoqVJsteYv3OCX+4ZXKVyXG6pSB+IkJInUNvuk1UeLGb+N5KuW5YQuGrlgTs+9Orpj439dFt8o8yJC6IA27R2LeiKBhhRmJixLOygYWn/7aM7eCRvAyAyrYWOEOQveMQboepBQP4UUBVA9uOEqHypNC9ZGZYFQ6G2yk6JKP9JKKeDaAOH+NDl82enSJS9dL+VqN5FxSJciP2+Nj0ETWE0B9hvmxa5G9im+1nLyeCzuCwsKaXo0puIPpkdWjH9Q== 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:55 +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: [109XkbbZuY2eC63pn16Ygp3ssh1XceBC] 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-8-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: 8c7708fb-b7d7-4345-548d-08dc9283f338 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|440099025|3412199022|1710799023; X-Microsoft-Antispam-Message-Info: j6yrv7GCSFQusVHZaVW+f0D3WQeGj1RAf/P4+84pD/Wr9Dl2CxIaU50m72tXP6vntSLjgIYCbEWTGMKWM5/yvI1HWibRC/Wx28Qw02uDuHp4pe8rUG+qIPkwE5xD7YxLqXdPWYjRXBzjB9hFyaObjg6EVM1JZKh2I9sTMVhxBGwThj9XXKDO/1Q7EvIjc2emf257a7PExeqJr86Y3ZEEp/6UTkq8bLeObY21IDMDv9ajdw6cmKdJlE07g+ewhf5/fHQiGuYq0rkeNHPo4r9TphHhOEiGHhsm9SH712Nu7tFCYZamA2VTI8y8/xQkKIxAGVMKrGXswlxTRW0rrTFPnXK0KCBhagEmqGgzOdZWjikJ8n+gK26maYSz1QCpWgkjHFM0v4iMI9SZ3phCGsT7UCLDH0k6/faCSK7QWpyZN4oSOJ20X7me20y8faz9vXhmS3FwFR/UyYsYK1RmP6w9jEq4ze86UL/ZV97xWQLflGgxbpp8QRaFVV0hFpVIAD5Cl5JgCHvw4jrRW9MiLaBWuice2lrAOsZG53Ww3wc7sQ05wShnqFWPMB9upMiPUYx3yzHoEuuw9BmETdG1e7qSKdr3jtoYs5DD1SQWyyVB0yDFVqAV61dDwD5QXaQ1JB6H X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YyaXwXeNBfXDnENqmOv49T7ufOuL+sJszh1UMZgU9RaLxm1RVH9v33UnvU9p/HpglHmwvLMFkoE4b9wF8m/erZLqHa/RRQDk3UNCDDoIo5jZxGhLh/82NY/zalRXc6HBBKBS8Qf15OX/MsgjmQeCzMRNWP3n5q+/aZKuypgVm9HdEzYLppJhDMxvoedAAyN7muAatLgBv+qZgcRT1xu/Qoq+viXnVT6AZfXhh+Mmi+9YHFwD5bwP9mAyd9B+ZFbW7Zpt9J9j2h6G7aU336vHBiGVZK+aWJNxGHscMY8lMDNFQTnN6qeMhW4OsWsQrdtSyT/ewp2fFYVIsefElYmYZfuWJXwmDR0BueVaCxxBAcWL2yQRPgV1180rL2nogQdafMf09mzvJZBnvxyO1pjnpDqytKbvuDcBvladmb3pbPPWRvt9FFxv26oaHaNrP+H3/gj4SbKFCJ3X6AOWq5j0OvOmmYOE8p5rMUIXIyApjD6Wt7qNiQymq0vT4KC5c20fc11Sjz6AueyWWXrfZaoZ+8EwufyVlCNJDubDesXS6Y7SuHp8m41w/76q0F5qaD97TBmAacxAg+IpCmkrbtSu33Mxy+Q/yyxAF4OfbOyvaFlGfej2NBo8H+PH9RgOrn00ddIeM5pvCtEy1zw4fBg0/MsfdcfxdAz+iJCkGKTU55F6UJ//kFRaeO1Zqt8ST01dTfBbCRB4uIHU4zATwQkvOQRMAJ9N9kKc+HZru0ccpnK1do1n/XT9IXCk4MaxsLeBI4lFd8YsSX53RGeJuwLpELjTqML1Se38P1GLxl1OTRvVulGT+WyJTZFhrBGUBy3o+pP1fgG7ct9b038RDpTKGM21kLIj2rfazQvpq5RrE5UCc71Jo3hRlEopR+jl0chvb2WEXFXtZhvSV2o9+XEVoX3JosbnBgzx8Puabriy2AsAKOqT8s4qv1LAbx5ES3saNB1S88lnUvd/XdkDHzGUO4w6MLLwpJc7ynVXUbxGhiOxzBO6t06RRJm3BddnSWML23Fsledh4esl3wUWqQ/DrJq07tnWqncCDrDIH+GURvwN34A+uXXuOVW6muJHszgv5K1/shWGFlAcOiNQo9RgGbKFp0MD3y7KHDDdN+DwwyDvIP+LtnhoLjFrjlxAfTRHpvFYw+1YsAlxCk/sG2qLOvE9agtAbhTDXFsNIR5WbiAZRgwx1N355x45ZvuazvIt42tzcbr5cbBAm9laS5QcEVVveAlyuMWVcVxZZaVuR/T1Wq8fZg51DtxE5CzCOkkGaoD1vPmCyfAOB1dCDhQ1Gw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c7708fb-b7d7-4345-548d-08dc9283f338 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.0470 (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 08/18] avcodec/vvcdec: refact out sao_extends_edges 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: 9YM3+J3Fpzym --- libavcodec/vvc/filter.c | 108 +++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 58 deletions(-) diff --git a/libavcodec/vvc/filter.c b/libavcodec/vvc/filter.c index 1326d2c82e..534ba57205 100644 --- a/libavcodec/vvc/filter.c +++ b/libavcodec/vvc/filter.c @@ -214,6 +214,52 @@ static void sao_get_edges(uint8_t vert_edge[2], uint8_t horiz_edge[2], uint8_t d diag_edge[3] = !sao_can_cross_slices(fc, rx, ry, -1, 1) || lf_edge[LEFT] || lf_edge[BOTTOM]; } +static void sao_copy_hor(uint8_t *dst, const ptrdiff_t dst_stride, + const uint8_t *src, const ptrdiff_t src_stride, const int width, const int edges[4], const int ps) +{ + const int left = 1 - edges[LEFT]; + const int right = 1 - edges[RIGHT]; + int pos = 0; + + src -= left << ps; + dst -= left << ps; + + if (left) { + copy_pixel(dst, src, ps); + pos += (1 << ps); + } + memcpy(dst + pos, src + pos, width << ps); + if (right) { + pos += width << ps; + copy_pixel(dst + pos, src + pos, ps); + } +} + +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 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 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; + + if (!edges[TOP]) + sao_copy_hor(dst - dst_stride, dst_stride, sao_h + (((2 * ry - 1) * w + x) << ps), src_stride, width, edges, ps); + + if (!edges[BOTTOM]) + sao_copy_hor(dst + height * dst_stride, dst_stride, sao_h + (((2 * ry + 2) * w + x) << ps), src_stride, width, edges, ps); + + if (!edges[LEFT]) + copy_vert(dst - (1 << ps), sao_v + (((2 * rx - 1) * h + y) << ps), ps, height, dst_stride, 1 << ps); + + if (!edges[RIGHT]) + copy_vert(dst + (width << ps), sao_v + (((2 * rx + 2) * h + y) << ps), ps, height, dst_stride, 1 << ps); + + copy_ctb(dst, src, width << ps, height, dst_stride, src_stride); +} + void ff_vvc_sao_filter(VVCLocalContext *lc, int x, int y) { VVCFrameContext *fc = lc->fc; @@ -241,8 +287,6 @@ void ff_vvc_sao_filter(VVCLocalContext *lc, int x, int y) int height = FFMIN(ctb_size_v, (fc->ps.pps->height >> fc->ps.sps->vshift[c_idx]) - y0); int tab = sao_tab[(FFALIGN(width, 8) >> 3) - 1]; uint8_t *src = POS(c_idx, x, y); - ptrdiff_t dst_stride; - uint8_t *dst; switch (sao->type_idx[c_idx]) { case SAO_BAND: @@ -251,63 +295,11 @@ void ff_vvc_sao_filter(VVCLocalContext *lc, int x, int y) break; case SAO_EDGE: { - 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 sh = fc->ps.sps->pixel_shift; - - dst_stride = 2*MAX_PB_SIZE + AV_INPUT_BUFFER_PADDING_SIZE; - dst = lc->sao_buffer + dst_stride + AV_INPUT_BUFFER_PADDING_SIZE; - - if (!edges[TOP]) { - const int left = 1 - edges[LEFT]; - const int right = 1 - edges[RIGHT]; - const uint8_t *src1; - uint8_t *dst1; - int pos = 0; - - dst1 = dst - dst_stride - (left << sh); - src1 = fc->tab.sao_pixel_buffer_h[c_idx] + (((2 * ry - 1) * w + x0 - left) << sh); - if (left) { - copy_pixel(dst1, src1, sh); - pos += (1 << sh); - } - memcpy(dst1 + pos, src1 + pos, width << sh); - if (right) { - pos += width << sh; - copy_pixel(dst1 + pos, src1 + pos, sh); - } - } - if (!edges[BOTTOM]) { - const int left = 1 - edges[LEFT]; - const int right = 1 - edges[RIGHT]; - const uint8_t *src1; - uint8_t *dst1; - int pos = 0; - - dst1 = dst + height * dst_stride - (left << sh); - src1 = fc->tab.sao_pixel_buffer_h[c_idx] + (((2 * ry + 2) * w + x0 - left) << sh); - if (left) { - copy_pixel(dst1, src1, sh); - pos += (1 << sh); - } - memcpy(dst1 + pos, src1 + pos, width << sh); - if (right) { - pos += width << sh; - copy_pixel(dst1 + pos, src1 + pos, sh); - } - } - if (!edges[LEFT]) { - copy_vert(dst - (1 << sh), - fc->tab.sao_pixel_buffer_v[c_idx] + (((2 * rx - 1) * h + y0) << sh), - sh, height, dst_stride, 1 << sh); - } - if (!edges[RIGHT]) { - copy_vert(dst + (width << sh), - fc->tab.sao_pixel_buffer_v[c_idx] + (((2 * rx + 2) * h + y0) << sh), - sh, height, dst_stride, 1 << sh); - } + 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); - copy_ctb(dst, src, width << sh, height, dst_stride, src_stride); 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,