From patchwork Sat Jun 22 06:24:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 50062 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp935987vqz; Fri, 21 Jun 2024 23:26:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWSZqEqWq2TdLe8m5TJCzzeICxO9Ux7bTJZnljUBOmto72VE2SIdLgZ+Ps2maM//Amnwm/HsmPy74pdsHZTZC4dIYYioaADTMJrMQ== X-Google-Smtp-Source: AGHT+IFpdfSJ7urO9FCTxMmM5xrXOqC2KBHDsA8nlyGOr95xOAaeSRT/hgEf2xuJ2jdfbrIxnxOT X-Received: by 2002:a2e:6e17:0:b0:2ec:55f3:40d with SMTP id 38308e7fff4ca-2ec55f30b96mr3571401fa.30.1719037616387; Fri, 21 Jun 2024 23:26:56 -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-2ec4d78864bsi8006611fa.535.2024.06.21.23.26.56; Fri, 21 Jun 2024 23:26:56 -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="XmV/1EGS"; 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 4FD7D68D8FA; Sat, 22 Jun 2024 09:24:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01olkn2034.outbound.protection.outlook.com [40.92.53.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C733468D88D for ; Sat, 22 Jun 2024 09:24:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TDbYxyVuLNCaxjFJtrB+3rcKp1R6ZiEl+4D02vf+MXDgdzYAKqJnBqbRO84jbsy+S1OdkWMlXfmeKstpIFPEb2hbOevZxB4Yh6G6YxW5ZS8QETKoyI+B1Tm0GbSGpZm6ltJZDTs/uaRPDV8P5FG/Y2QGBhAd2a6OpgakdQWwZIcl29qkycnGr5f+AZ9blhIBn5btWSQZEzDZ4nCWPXAs6YNHP1sVmN7cXxjMy+5Ko2lfZiEUjCJZqU+TheljJuT8IxZZPUAjrfDOHg5yVo6yZoHypmUOTD8FhDaqtCbDSklZWRanf1LXGqF9NKWgAlgvUCocomjRAFdMP78M/1HnAg== 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=BkcWvHmCj6TXqrjHdWEA0JyUjwk4WzG1Qt/DW7lwN8E=; b=dK48+Dhf9VTJqmVN6J1pFkm8VX1qzCvq5f1vKM2rna5+7z58cW+wYr/EfT9ev0oEFnq4fdCW/+U6+B1IwPQMLTA2IOtiOIUg4PmGPZ5LE4xUoVMdXuwmkhPbmnwFllX6/CvFukREaY8GiR1ZnNDJaf4jUiMME9H2kv/vB0pQOfFl/+gg8V715IEbMKSTknBAD/w7cQaRXbzu3vbb7njT1PK7ChJmgjBsUKos8TmOjUSQ3a28PChAiwX1Lu5EmiFrolNHr+TWakENwBZihJj4TQz1q98UkQyvq3hCGxuSbupoBfsFwIncFnLiAAAnIVoBU3aR+jazE77L7lqgRA4kEQ== 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=BkcWvHmCj6TXqrjHdWEA0JyUjwk4WzG1Qt/DW7lwN8E=; b=XmV/1EGSJkIQmJqvAPSKbW32RslwXmSLT/Ml/USCLjnEiy2SQqnZfGZtu8X/JOixW+HMxD7pgjM+yYRQenKeClBnwTVkLdBU3SCPC2A9Ecc4bKZzWLgREYyKHb18JJiyxxu0L6udnUmby4Ns4rkd93YgbljN9o8tZ3+LSy80gUnm5SBRpaEAGwydsPdhKJgQmDjYVj/lda0dybr9gGjr3Pk7PX4XP42hjEqvF+T9d9h/ruWsaNtoetK1S3dZXfQ+b+W6kV0dM3wVsF99jjqazgPVNR+VwecrALPlv4vjN1/oy4rMdy1/5iOQqPIQOpdO3YpavwqfACrkYQTtFBcg0g== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by KL1PR06MB6258.apcprd06.prod.outlook.com (2603:1096:820:d8::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.25; Sat, 22 Jun 2024 06:24:26 +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:26 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 14:24:04 +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: [rPIRUzrcWNjpaDQXWKA/q3dyh12+z0fV] 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-17-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|KL1PR06MB6258:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e1c976f-48eb-4f6b-9796-08dc9283f6b5 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|440099025|3412199022|1710799023; X-Microsoft-Antispam-Message-Info: us1Dc1TQeY4V0g/DZeGNTTFZ9aaTXp4sRbm/qnsF9PLFGNlQmnHXdeJlqUXcMF5DmjtOTBE68WOp6syi4jPCZlQRNBdezgYrvH7zwvaqzHzkCsC/mvepPfwNIkHuThc1DucgSgy80Be96zFtYNOt/stf4Ly9npSNGtfV9uRi+4pwUX/ELjSFkw91yNxo9JC1w1txI6PsBgig1xoZmhLnA2telos8N+yHB0FGiSPQYD0ALNr9+QZLS4BxiN5Efd/0jtJfzBiuuq8+AhKvFb4Au0emmm1u5cItfyUJpZQvMeoFE5IUmKY4hmGjxZsfGTcGvu2QSluZ4gKL+8aLCICKu4ZBxDr4Fthe4Wdt2UpwEL5d3YgW8qL8SUkynHssTplODqYCP7sIb3myLZCK3y4WhdXlQnjzHN+Se5xcaWDKkfPV9T4xvo6VjE3HAMviGqAMH6OpzPbusW1CTZwE6nU382Ply/j+Ki6wSnRZYeG4QQSoTwnPWzOkNOfml2MdsQj8qlcl0ZXOmrwuz1Fag5NKVNA+LDAl/md2Gqig/k+kHXL6ZvO0UQyY/4ovb8W29Pz7X0D+y0um7KvkzyGx5fJmacrBE0sV7NqwE1WZBODz+Wgq9U/jCh+kH6G+0/wtOyfG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g+mWTNbYXg+yOTFZYcvm6uO06lbZwer25urybEiQgptYUNp7n97Y0ZIBsJP5J3g1eRVI9QifFayCn4ZyD9ixipHRpbdajeI25sXLEFrt6KJMGML0IpVKNV4ZMLamq4JEw+YKW0hYY3JeuFMGtRusELs+fUMbByz9ADYdUYrKWjff8TS74UnTgRq9L1J95HWdZH4fpJCKr4+Yh7Oey24eNU3JYwGpgwICBwAGhYAMi4h1vje+8F4m2fLy5NGjHkh7sh4B5yP3t4OOWLVvMfmvwLUux7YwjJdpkZ1kP9e/yOOhhzbernczySt0hKEkzJ4yd9AexKVoNo0AesVCRVgRjRErwqYCNu8w822NOi+AtTlIXvBx8yxvqZCmGjuSs/mRIUwOjBJDWSIsLXjoZoaBC8ViiLmI8ylZNlJu7YBztUK2BSCvklbWde48wzRXckfhTJC0OBl0Et9SiY+BUtn9GVeZoOxB+6kN4HRWWCJse5b75zDdcHzl5hGNisw1PS4M0Mpq/DVYBeVftBLd3dla6bGL3KyXnFkyJzYMOG5a8g1Lw/KEaSkYrkL3jBsxN8XG3QqFL7nVJ5HC2oqpimHk4g/N9ldYOhHG1BlKoiEXE6gBFL+wNdML7YYUocGfRWg5e34HIkp/Za3dxnkuNuZgtubsUQpyNbDsC0/j6Kk9d+vD3W73ti6w1oyCGUa9IGdiqmsJraJLpCfMVTeoXaBYxxMV31rdB4VOLB2j50dxw9lnLHOmoKitX7Uf3VYDvub69RC4WrZR7HwBOqYb+H8zZbVoGqm3QcYm9Dkm2+NrXy/GA/nvUqMbmdvRne14b8iu5BFqse7LP1cFYUQHHOEn3zFK6y8B3jXz0580/WsuQ2PgsH0SDk33CELVX3FSK6ALOJTt2I42bGttslDbSdA2Uxlyb95lHfLeIBOzbho2v+fMS1NCo/RKxUjUcSozXQVMEH125DQRVhG8J/mYd70+Sg81S2o5jhP7FWJIsAdmtWuhYuMorIze6WnVje5yDPFJhuW5h9sbK4zggSNj+FZifSrVOkHjq/FglWVBCLderZZRuRuLzH9l+X8PVbAopPhEra9LZq6KHgMjr1arrggn5oXYCKkN5p60FkdkZxoZRSapx8MyewGlKgAQBzaugIR1MYFdBMBtwbbej4XFPrdQnAbKNxKsBZYs+4QlShm9Yx0glG2Yj15glQ6nl88Uv4Jt0EzlmWFerbkx2TTCaxQEb4xrC3MMq3jWFai5cKl0SVVXPJ+SaP+mfJdf47mNkj/WR162oGAZQBuGdJQvXESpfw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e1c976f-48eb-4f6b-9796-08dc9283f6b5 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:25.8916 (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: KL1PR06MB6258 Subject: [FFmpeg-devel] [PATCH 17/18] avcodec/vvcdec: sao, support virtual boundaries 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: stkfdp1OiiXf --- libavcodec/vvc/filter.c | 46 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/libavcodec/vvc/filter.c b/libavcodec/vvc/filter.c index 69d67cb7f6..44dd895d7d 100644 --- a/libavcodec/vvc/filter.c +++ b/libavcodec/vvc/filter.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "libavutil/frame.h" +#include "libavutil/imgutils.h" #include "ctu.h" #include "data.h" @@ -198,7 +199,7 @@ static void sao_get_edges(uint8_t vert_edge[2], uint8_t horiz_edge[2], uint8_t d const uint8_t no_subpic_filter = rsps->sps_num_subpics_minus1 && !rsps->sps_loop_filter_across_subpic_enabled_flag[subpic_idx]; uint8_t lf_edge[] = { 0, 0, 0, 0 }; - *restore = no_subpic_filter || no_tile_filter || !lfase; + *restore = no_subpic_filter || no_tile_filter || !lfase || rsps->sps_virtual_boundaries_enabled_flag; if (!*restore) return; @@ -206,21 +207,25 @@ static void sao_get_edges(uint8_t vert_edge[2], uint8_t horiz_edge[2], uint8_t d if (!edges[LEFT]) { lf_edge[LEFT] = no_tile_filter && pps->ctb_to_col_bd[rx] == rx; lf_edge[LEFT] |= no_subpic_filter && rsps->sps_subpic_ctu_top_left_x[subpic_idx] == rx; + lf_edge[LEFT] |= is_virtual_boundary(fc, rx << sps->ctb_log2_size_y, 1); vert_edge[0] = !sao_can_cross_slices(fc, rx, ry, -1, 0) || lf_edge[LEFT]; } if (!edges[RIGHT]) { lf_edge[RIGHT] = no_tile_filter && pps->ctb_to_col_bd[rx] != pps->ctb_to_col_bd[rx + 1]; lf_edge[RIGHT] |= no_subpic_filter && rsps->sps_subpic_ctu_top_left_x[subpic_idx] + rsps->sps_subpic_width_minus1[subpic_idx] == rx; + lf_edge[RIGHT] |= is_virtual_boundary(fc, (rx + 1) << sps->ctb_log2_size_y, 1); vert_edge[1] = !sao_can_cross_slices(fc, rx, ry, 1, 0) || lf_edge[RIGHT]; } if (!edges[TOP]) { lf_edge[TOP] = no_tile_filter && pps->ctb_to_row_bd[ry] == ry; lf_edge[TOP] |= no_subpic_filter && rsps->sps_subpic_ctu_top_left_y[subpic_idx] == ry; + lf_edge[TOP] |= is_virtual_boundary(fc, ry << sps->ctb_log2_size_y, 0); horiz_edge[0] = !sao_can_cross_slices(fc, rx, ry, 0, -1) || lf_edge[TOP]; } if (!edges[BOTTOM]) { lf_edge[BOTTOM] = no_tile_filter && pps->ctb_to_row_bd[ry] != pps->ctb_to_row_bd[ry + 1]; lf_edge[BOTTOM] |= no_subpic_filter && rsps->sps_subpic_ctu_top_left_y[subpic_idx] + rsps->sps_subpic_height_minus1[subpic_idx] == ry; + lf_edge[BOTTOM] |= is_virtual_boundary(fc, (ry + 1) << sps->ctb_log2_size_y, 0); horiz_edge[1] = !sao_can_cross_slices(fc, rx, ry, 0, 1) || lf_edge[BOTTOM]; } @@ -285,6 +290,24 @@ static void sao_extends_edges(uint8_t *dst, const ptrdiff_t dst_stride, copy_ctb(dst, src, width << ps, height, dst_stride, src_stride); } +static void sao_restore_vb(uint8_t *dst, ptrdiff_t dst_stride, const uint8_t *src, ptrdiff_t src_stride, + const int width, const int height, const int vb_pos, const int ps, const int vertical) +{ + int w = 2; + int h = (vertical ? height : width); + int dx = vb_pos - 1; + int dy = 0; + + if (!vertical) { + FFSWAP(int, w, h); + FFSWAP(int, dx, dy); + } + dst += dy * dst_stride +(dx << ps); + src += dy * src_stride +(dx << ps); + + av_image_copy_plane(dst, dst_stride, src, src_stride, w << ps, h); +} + void ff_vvc_sao_filter(VVCLocalContext *lc, int x0, int y0) { VVCFrameContext *fc = lc->fc; @@ -297,7 +320,12 @@ void ff_vvc_sao_filter(VVCLocalContext *lc, int x0, int y0) uint8_t vert_edge[] = { 0, 0 }; uint8_t horiz_edge[] = { 0, 0 }; uint8_t diag_edge[] = { 0, 0, 0, 0 }; - int restore; + int restore, vb_x = 0, vb_y = 0;; + + if (sps->r->sps_virtual_boundaries_enabled_flag) { + vb_x = get_virtual_boundary(fc, rx, 1); + vb_y = get_virtual_boundary(fc, ry, 0); + } sao_get_edges(vert_edge, horiz_edge, diag_edge, &restore, lc, edges, rx, ry); @@ -305,9 +333,13 @@ void ff_vvc_sao_filter(VVCLocalContext *lc, int x0, int y0) static const uint8_t sao_tab[16] = { 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8 }; const ptrdiff_t src_stride = fc->frame->linesize[c_idx]; uint8_t *src = POS(c_idx, x0, 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]; + const int hs = sps->hshift[c_idx]; + const int vs = sps->vshift[c_idx]; + const int ps = sps->pixel_shift; + const int width = FFMIN(sps->ctb_size_y, fc->ps.pps->width - x0) >> hs; + const int height = FFMIN(sps->ctb_size_y, fc->ps.pps->height - y0) >> vs; const int tab = sao_tab[(FFALIGN(width, 8) >> 3) - 1]; + const int sao_eo_class = sao->eo_class[c_idx]; switch (sao->type_idx[c_idx]) { case SAO_BAND: @@ -325,6 +357,12 @@ void ff_vvc_sao_filter(VVCLocalContext *lc, int x0, int y0) sao->eo_class[c_idx], width, height); fc->vvcdsp.sao.edge_restore[restore](src, dst, src_stride, dst_stride, sao, edges, width, height, c_idx, vert_edge, horiz_edge, diag_edge); + + if (vb_x > x0 && sao_eo_class != SAO_EO_VERT) + sao_restore_vb(src, src_stride, dst, dst_stride, width, height, (vb_x - x0) >> hs, ps, 1); + if (vb_y > y0 && sao_eo_class != SAO_EO_HORIZ) + sao_restore_vb(src, src_stride, dst, dst_stride, width, height, (vb_y - y0) >> vs, ps, 0); + break; } }