From patchwork Sat Jun 22 04:21:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 50056 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp917632vqz; Fri, 21 Jun 2024 22:12:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUWJv63wMu4iMfXo+lkpJjnEnA2607Tboatazbb7AIrX7RLvG4fJqd1oI6F+FBejjKYbrVOAsq4/rv9CsYqH9PDA2VTZ3Di7p3KMQ== X-Google-Smtp-Source: AGHT+IH32CHaGbIHAT6S4HLm9wdWQ9i81cNX+zCoin23TOLzrsa/RHoDtE241nTTyk3gzcFJ6jr+ X-Received: by 2002:a17:906:308b:b0:a6f:8314:56a2 with SMTP id a640c23a62f3a-a6fe0d2f901mr56998066b.6.1719033168788; Fri, 21 Jun 2024 22:12:48 -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-a6fe0f54bdasi45836266b.644.2024.06.21.22.12.48; Fri, 21 Jun 2024 22:12:48 -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="bjB/xBKG"; 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 00F7068BB61; Sat, 22 Jun 2024 07:36:38 +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-sgaapc01olkn2100.outbound.protection.outlook.com [40.92.53.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5B9068BB61 for ; Sat, 22 Jun 2024 07:36:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ns4FCdz65hgzoQ49wRGema9K/qH3zqOyScQpXF/MlMJh1dcgyilLa1TR3XRsqAPhI0uonkjbkB+LLGs360Le1advSEOmn2fJnMD+Bj5cNSV8gBtNP1e+tNY3JdntlhqyiTpCLbcs0q2JwaTHyNUYjNCcjFW+sCw4Pj1nqrsqARMgDqQndFtkOeI5jU6Cj0p1mhdOdr63Qw7Rc2cwJ/6JHQZX7s2ZgQFDkFoqzt/ERk5ZYejBHfvkFNwsmQG0vOpltiu94+SEd5KhJP9tg0wXPopTkpi1nOoPrMUTrC/h/nwZAKYc4iOJVDZ0UbTdH3w5rVRS9SiUstRppSFo2j4/vw== 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=AutIlooVRQLvZB9zdy2Co9HfuBUBptx/9iYTgY0kzoU=; b=OTfgfJ/MkPPMZQ0EDyH6/OyxIcm3zHJQ1ul5BWG7c5+uhXHrus/JhM0+uTAAHyu38WuAOULRpVCp0SJvZyH27FitOyQ+h5FZfBnmKBw2sv6MgSJaMz7elqy2Jc3wNvXGIjFM6QwRSd0VFlCuOv/8Xg28wns3BZd9iYsYIDSAeFgAATLDrHtsjCNMcP6nWAe8CHyE1Iq26wEncAF4g3waw7A0THc7ZqNjfatSIltrY9JhiIVJCM74c7i8E6O1IDFt3t6ZeyL6D5i1CdvBk+VQa/t22Tk6xBfHtyIRnnFj9vnFBftJx2fEAqFgriu51vDDijsGCD9f6/CaSgP8DubeeQ== 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=AutIlooVRQLvZB9zdy2Co9HfuBUBptx/9iYTgY0kzoU=; b=bjB/xBKGnbrGq3e8w0NtN5TaJulMxDvWYDD4mcmnBEKoqI+JZ1VDOc592lkio4qRQJ5Dty8G4i8sg7CqB+VvX2ZE0etGgvTO678ZJqiLZJhuOiAnPBcM9jzI/OP3ulMFIy2R17EOEzoN2sJeL3V6q2+wvvXvWUZcpIPZqZWMkSqf0yM5EXiuTJ1Ft6pN2ulncVgMccIL2nyI9CiO3zf76zli8mksCZXKFPG57DaH+j3Eq5xUZnM6adY9yK3ZBpJQVrbJTLOGL60r0WduoaoWPPz7mfT7+wmXrAN3+KRmuMUssLrzWhwqHbaR5FtMJeu9GFLJY/HhhFvlcm5ubCd99A== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TY0PR06MB5494.apcprd06.prod.outlook.com (2603:1096:400:265::7) 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 04:21:27 +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 04:21:27 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:21:11 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [4KfJ85kYsywGuFR0xlie/cFJRy0fr93I] X-ClientProxiedBy: SG2P153CA0008.APCP153.PROD.OUTLOOK.COM (2603:1096::18) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240622042114.92873-1-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TY0PR06MB5494:EE_ X-MS-Office365-Filtering-Correlation-Id: 34cce9db-ecf1-4b58-d1c8-08dc9272c845 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|3412199022|440099025|1710799023; X-Microsoft-Antispam-Message-Info: 4+8+76L5Vf/gA3LKc1TqZpE7UFraYjQVc+2y8fnIe4yL3LUB4DBL/9mwqUDqvDAhzChve7lasAgy8HnEGJlE4iWucpavWghxxKAXiWZHtt1kkr/h4dEfw4CnIrQ/dxKcOH/uGoMAgmx5MSiaOIFgZRFt61zvuODA4OTxsxv2b4CRtpQ25Z99f/H+GXhd0WxFoWLqm8gJ0WsqyS4OdnFA/GvSk79UDGSiLRRZ5TP/zPdtOifYzf9CcQQjoEL3jb9nZwZZXyHKfS9sEgY2y2zB0r2zwDgF96AopVOBw1pUnDs0YILqMLqSIScAn4O/CZoPxE79ii/8VO8PGUMDxhY6p5EdS41shjp9YpUrG8O2wfYmreXpJKfXy4iw6gYxdSlZhf04LsDECbtbuKZNpkUFUMwB4cyW1v+YeW/V6hvEsLvdzy0eU9/1L+gxwlE/n5QALqcbnfCYwICSdrzfm7E47w6kCniJTkoszK3bx0XcPN14mm0SxJ2Fb1jWQ5QK5kgw08YNKY9SXvgB/gqyhIoIBnPwklC72K0RQgJE1fvSa7+8+NJWb82KHklogU+2q6mTXh1O4bRU6t2wYfrh8HGFqXbQTxKN+5eqwsx0ry9d6/AC8HjnXhgdDjU0ggqCHiBl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: F2kQITaFBgEVfC0ruFftO08xMOj9Wn+9Bajqr00mDVXEMAHJ7g3yvcbxpt3Odv8gWJP5wt2oLgGAD5d2t3jbDlult/azdbeNONL1YLW8maxbviamqRhhi1TMJqaUHaiNvK9Hx2BeEMndaMcR9IEzdnMCo/pg8B5Im06zEBjW+D7aRX0FDr32MeidwvYe9Hkjz4cuHfROhTSchh2/bjApty1TQ+W33Gyqucnsfm/KY/AMK/dZA0P8gIhwpN6GWTH6qWwPx3I/lclPQlK4VD16hhBiK07EqDx9RVelAxnKXcoNaMaGQpxtU0JCgWh5LcykWHg7gUaZeZwJqkl+lrytInX+NianRMt4uC3P7UHxKppFMGiqVvtVVt5g2JwAsl+MhUa6Fd87KZlPAfef0jRVKm9tk5GViYz9XYtVpntu7ORZlOjmfZjQ2GrGM8gReeS258Be0Q55t46//rJ0v2gd6oUstcO1zxDj4wHP7V3lvHiUljDiiSWNEob7mR0H7aDBsLSW4e4HLOc0W1YlGUvJGwbA6MyMklljY2kzAZHrpUFIUUUUJSLu9+3FSJKuKtWiAUjRx9vRTc+4lOVLfs4JEvxPZ6Uew6X8StkW7Q7p7ocW37+C3+FKBg4+etd8NQBqf6VPZj57peE45lH6Png43i+TakZ8mn9ELHJvV7ivl+AoAHCQl8zXOBJNKtC6UI4erLP213HwQtv4ObjRJmKzTc68nTMZm3XRom5DD8NyK3CRlHuYmY43VDGldU1gJJXUstSAhEjAT4uE2B2rNb5opfTjV0sel8R4ySEbO/nNR2n9K/n9Wy1mM/1nfdFmS5l/o/5qjhwXVaOZ8DNVWekgXjKRoxIg0Ym0l8MNS6kN/XqgcXG95dxcRg/pZ15M6xlQPaeNp8TDtgfyItrvY3DIGRi2uK9FXjldUur2orRo0/0R5nx2qadq9embd7PJ6rE+FDdILz7MLTDYvfLEUTRCI0nTfaE0Kcl3FmapUTbAB2J+ho9kZFVofZDI55FJi1aASLD43vk8ymJTSM+IsPIoqf642pWe0zmmhV5lBTCSO+1sQjL7NCbd1GAQG5ynMxvkj4LWFyBt223mDYRNHWHT0DhmSysIgODgaIwqOTA+mlGFdPSbP+7NxYBHYBrPtULWkaMglbVdfX8hp2Ddilhf24M9zbgIYMX2PiaNUMsrmGSoAq8tXfGhWGn1b8fIy9o4dtCIlRGEBWEO0r/knj3Fx7CuU+cuSk//1QkutLTiz8m8VlJ8sUuOXDNnXluCQntmjxKt2EVxpW4NTdDGgtu/wA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34cce9db-ecf1-4b58-d1c8-08dc9272c845 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2024 04:21:26.8265 (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: TY0PR06MB5494 Subject: [FFmpeg-devel] [PATCH 1/4] checkasm/vvc_alf: only check the valid filter and classify sizes 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: benjamin.bross@hhi.fraunhofer.de, Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: szZu4Uxy8WhJ --- tests/checkasm/vvc_alf.c | 61 ++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/tests/checkasm/vvc_alf.c b/tests/checkasm/vvc_alf.c index 84b0f9da15..902757aff1 100644 --- a/tests/checkasm/vvc_alf.c +++ b/tests/checkasm/vvc_alf.c @@ -90,35 +90,41 @@ static void check_alf_filter(VVCDSPContext *c, const int bit_depth) randomize_buffers2(filter, LUMA_PARAMS_SIZE, 1); randomize_buffers2(clip, LUMA_PARAMS_SIZE, 0); - for (int h = 4; h <= MAX_CTU_SIZE; h += 8) { - for (int w = 4; w <= MAX_CTU_SIZE; w += 8) { + for (int h = 4; h <= MAX_CTU_SIZE; h += 4) { + for (int w = 4; w <= MAX_CTU_SIZE; w += 4) { const int ctu_size = MAX_CTU_SIZE; - if (check_func(c->alf.filter[LUMA], "vvc_alf_filter_luma_%dx%d_%d", w, h, bit_depth)) { - const int vb_pos = ctu_size - ALF_VB_POS_ABOVE_LUMA; - memset(dst0, 0, DST_BUF_SIZE); - memset(dst1, 0, DST_BUF_SIZE); - call_ref(dst0, dst_stride, src0 + offset, src_stride, w, h, filter, clip, vb_pos); - call_new(dst1, dst_stride, src1 + offset, src_stride, w, h, filter, clip, vb_pos); - for (int i = 0; i < h; i++) { - if (memcmp(dst0 + i * dst_stride, dst1 + i * dst_stride, w * SIZEOF_PIXEL)) - fail(); + //Both picture size and virtual boundaries are 8-aligned. For luma, we only need to check 8-aligned sizes. + if (!(w % 8) && !(h % 8)) { + if (check_func(c->alf.filter[LUMA], "vvc_alf_filter_luma_%dx%d_%d", w, h, bit_depth)) { + const int vb_pos = ctu_size - ALF_VB_POS_ABOVE_LUMA; + memset(dst0, 0, DST_BUF_SIZE); + memset(dst1, 0, DST_BUF_SIZE); + call_ref(dst0, dst_stride, src0 + offset, src_stride, w, h, filter, clip, vb_pos); + call_new(dst1, dst_stride, src1 + offset, src_stride, w, h, filter, clip, vb_pos); + for (int i = 0; i < h; i++) { + if (memcmp(dst0 + i * dst_stride, dst1 + i * dst_stride, w * SIZEOF_PIXEL)) + fail(); + } + // Bench only square sizes, and ones with dimensions being a power of two. + if (w == h && (w & (w - 1)) == 0) + bench_new(dst1, dst_stride, src1 + offset, src_stride, w, h, filter, clip, vb_pos); } - // Bench only square sizes, and ones with dimensions being a power of two. - if (w == h && (w & (w - 1)) == 0) - bench_new(dst1, dst_stride, src1 + offset, src_stride, w, h, filter, clip, vb_pos); } - if (check_func(c->alf.filter[CHROMA], "vvc_alf_filter_chroma_%dx%d_%d", w, h, bit_depth)) { - const int vb_pos = ctu_size - ALF_VB_POS_ABOVE_CHROMA; - memset(dst0, 0, DST_BUF_SIZE); - memset(dst1, 0, DST_BUF_SIZE); - call_ref(dst0, dst_stride, src0 + offset, src_stride, w, h, filter, clip, vb_pos); - call_new(dst1, dst_stride, src1 + offset, src_stride, w, h, filter, clip, vb_pos); - for (int i = 0; i < h; i++) { - if (memcmp(dst0 + i * dst_stride, dst1 + i * dst_stride, w * SIZEOF_PIXEL)) - fail(); + //For chroma, once it exceeds 64, it's not a 4:2:0 format, so we only need to check 8-aligned sizes as well. + if ((w <= 64 || !(w % 8)) && (h <= 64 || !(h % 8))) { + if (check_func(c->alf.filter[CHROMA], "vvc_alf_filter_chroma_%dx%d_%d", w, h, bit_depth)) { + const int vb_pos = ctu_size - ALF_VB_POS_ABOVE_CHROMA; + memset(dst0, 0, DST_BUF_SIZE); + memset(dst1, 0, DST_BUF_SIZE); + call_ref(dst0, dst_stride, src0 + offset, src_stride, w, h, filter, clip, vb_pos); + call_new(dst1, dst_stride, src1 + offset, src_stride, w, h, filter, clip, vb_pos); + for (int i = 0; i < h; i++) { + if (memcmp(dst0 + i * dst_stride, dst1 + i * dst_stride, w * SIZEOF_PIXEL)) + fail(); + } + if (w == h && (w & (w - 1)) == 0) + bench_new(dst1, dst_stride, src1 + offset, src_stride, w, h, filter, clip, vb_pos); } - if (w == h && (w & (w - 1)) == 0) - bench_new(dst1, dst_stride, src1 + offset, src_stride, w, h, filter, clip, vb_pos); } } } @@ -142,8 +148,9 @@ static void check_alf_classify(VVCDSPContext *c, const int bit_depth) randomize_buffers(src0, src1, SRC_BUF_SIZE); - for (int h = 4; h <= MAX_CTU_SIZE; h += 8) { - for (int w = 4; w <= MAX_CTU_SIZE; w += 8) { + //Both picture size and virtual boundaries are 8-aligned. Classify is luma only, we only need to check 8-aligned sizes. + for (int h = 8; h <= MAX_CTU_SIZE; h += 8) { + for (int w = 8; w <= MAX_CTU_SIZE; w += 8) { const int id_size = w * h / ALF_BLOCK_SIZE / ALF_BLOCK_SIZE * sizeof(int); const int vb_pos = MAX_CTU_SIZE - ALF_BLOCK_SIZE; if (check_func(c->alf.classify, "vvc_alf_classify_%dx%d_%d", w, h, bit_depth)) { From patchwork Sat Jun 22 04:21:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 50055 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp917630vqz; Fri, 21 Jun 2024 22:12:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXgRP7s/zuxyNxFsHV5Krw34SjLI1kdnEBwpq231P6f79YWcOWEAnILPTdWTZ2YAnNNUmXUHDwTVFjaXk5WKIaVkuhBf2IrffKY6Q== X-Google-Smtp-Source: AGHT+IHPjVxbHn5snaD8DU3HvdNO9f6S6F7SWoCu8k9o0h481sgs3Z2Qowfzq3QEo9Y9VJqnPTA1 X-Received: by 2002:a05:6402:40d5:b0:57d:432a:582f with SMTP id 4fb4d7f45d1cf-57d432a5e3amr459120a12.1.1719033168393; Fri, 21 Jun 2024 22:12:48 -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-57d30632bd3si1455291a12.113.2024.06.21.22.12.47; Fri, 21 Jun 2024 22:12:48 -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=RrHu7DBs; 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 ADD7B68D615; Sat, 22 Jun 2024 07:56:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01olkn2100.outbound.protection.outlook.com [40.92.107.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3002768D615 for ; Sat, 22 Jun 2024 07:55:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b7Mdlv0+bMHeJWeknc0cjCCHHXfc64MGKngY4pX/5CbIJe8y1PT7LLQVQuznDykciQYaDqLc7K7S+fIB/slFSF1w7QAyNLwa7dqYxAKj2/HV3FYbtSzu2zfXYVBhg+DCJKqtUL/QhrUVtIyoswdH6xM8yaqOCukNF/ox28Vwt24ET6Ds4Q0fb6Eiyi7nHRR+tihL6cAVjPQsO79bZhP236cUnRELmQh1RaCUoYPzO3KBs3S7IZHoPVTOZZhWYSw4T0UwXWoefUEblsgkcePRl6GyO644hmaL4myRvA96ue+fF/tMw2S1zqa0EG2GfzZXTxcerIbqL/z261pMDtj+Hg== 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=JXo6PQFC3y8/N/QM07hBI5sk2nBnBK9hRPqoQ+ZMNk0=; b=eaYMHWk4QfYR9xFsXpfAD4FjSV3Idi07eH+1VlCP/QsEv4Ashn3Di93Unb/scO7U8rGbjrF2+x4arkw8auxMdHgImD6bm6UyVHQBQ+tb6iM4yVA5L63KJz3fiX3FlCNyvJJyJfoiRPZ7drYx0QIZGCSEXyl2KjXDrUXComRnq2OSjmLGt1c8q2Klsr8mH5liPxCmD+fsQt3nXzoCNwxnbVBsMmVIyvo0zcqcbXr38b0cp+tDyr7WNgBg8s6wU/6c05ICKB4/1sHieWQEed8RjQhHdP2+dV21ZA2Gq6OOZIwRLA6QNGa7sR5R1m5W236K75Jyzdjdf5zWcbqKRrNWOQ== 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=JXo6PQFC3y8/N/QM07hBI5sk2nBnBK9hRPqoQ+ZMNk0=; b=RrHu7DBszL480RyE5x1uZWi80N6EeFgR2dihbSXDPELeo4VrG0JDqfiATACya7Zf1vWU4qXDBfkszzC4SweO0Op64F6aoH5N0piFB+2QOjIJwjz+mLYO/kBBDBjNoTnnsj9UIGD1knZapQOaewfngkPTjBn6WBHz6jutnwJt2HvJH2TGGzC2L4WIf55b33e645Xr2hI9hGvoY8Rb4daN8fC08QrPYB49wmEcwlmPKI6FscznqwTBy6jFzxZwxYCj1Rqq/8b/+pFPB9ARpNgvfsBMHYGy631JpJupl2RXgYMweyOPH++podFxehE07RN/+UOgFhimKcKMXUmls+tchA== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TY0PR06MB5494.apcprd06.prod.outlook.com (2603:1096:400:265::7) 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 04:21:28 +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 04:21:28 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:21:12 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240622042114.92873-1-nuomi2021@gmail.com> References: <20240622042114.92873-1-nuomi2021@gmail.com> X-TMN: [PSbSoY3oDOyf9T9WXvXU+SDIheYGheZz] X-ClientProxiedBy: SG2P153CA0008.APCP153.PROD.OUTLOOK.COM (2603:1096::18) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240622042114.92873-2-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TY0PR06MB5494:EE_ X-MS-Office365-Filtering-Correlation-Id: bc76cb18-885d-4013-cfc3-08dc9272c912 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|3412199022|440099025|1710799023; X-Microsoft-Antispam-Message-Info: Sd3s8RG28JL+KIR4avqqmRdlIYLo1sjjwxCoydkSr7gXE+aP4bCfqmRTgdwPbdks1+BNIuF+RIOTlMRfZQaxnlDUt7wbtaKEoSEhsHTQ59AkR3KysnCgYbREvVljE68f2c8ZDurfEkMsA/PexvNTo0jU5NDagZEjbjjofZOT894kryv28Cz/MfUtI3xJLwcG7bfxNDq1CXSN+g3mcYo2BLvgDUHXwoflioe+bp/FRq8/IJNbYd14SPwn6krGoEB/DAHtZO4Fu7noFOmbcd1yyMtWFNegq8q4vI3cIiA6mNFBzum3Ts915CTnJKauUPd7nRi1WGrEtaifu0F8LWG/UscLZpmRULNi4W7PZi/XkAVKD6Dl+yHo/b2TFUzsL4SCjDvWT2O/Qjo4NHzoxwM3L4cVmHK11ESPN6yHQ/OK1OFbx0tyDm0ygIUocAYs7IU5OK/3H2GQ3D+9Ii5SbMEvca/MNVCFFzRqw2mWs4FBLt1sMWti/i16Ylm+beiEcBMfqFl4CUSJpzl8MRprcS+OAuw4zN4iVtstNsl7qFtQgZ8VS7SbS5BVXP3z2LiJJ2NkeMIm++Q9eH8SnmQMsLbprtgzHAVdLvJrLd5/rS4zBMUpi69CY5RCMU5lGMYiEk8F X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x253GgcfgEc43vzEXJSQeCWnJdvq2O/sqTCfAKjCznynyPV6AN3cv6QMAuOeBHXvFDJXphZdYvKIZd037WC0IE7F8UAgDGDuD4mOEdonWf2HurZlt14Ct2GxR3DIAxvLFCfj1wVWC/YUGCyzeAp0cZ63JOVL7K+aYT+cKI/hClmu6QUy9hzkwMMv+E3E0BdFoWIAjustbqA+DSzHJIjSQcLL3Gv4v8lDw9vlSfJRx+y4NJdzHbr7TdX0rlY25OnhsR6K1/ZDro0FtL6rCtF16V23e0YB69cUejeqOczT+xSqYcAoQCmX5EMa6m0IyT6BMfOC0g3b45WgVTvBEdqUOdZBjnB1cVjxCh0uUyaJyVzFvUHBMCPOraXfl12k04qnsw0dDifefpcj57Vbk7NLUsL/v/s08IM6pC4iDrilwicrvkceqke1Ay68dfzBItVBgV5/AWx4nnbeUtieRVUY9FC4aosotQoIBseNb8TMbfbf2XIB6moh2ydeTDdL1ikzjtmZdjaqbKE8ATGB0Ar4MH7CnNkH1ODpiALy9Mk0pSFklD6CTThfjlOayXX8LPGeliqBH13r3S4619LTHhtIBxqYKmdWlbaW9nk9VaeP/4sitKxzn2/RsQov8egHMxoOK6s3nFtxgWE7BNgpHSb3mgMNcjf27N87lXqn8s50WRA29k8Thjm0jQMztUzYE1zVCxH2JfyWB1NmkdhnW+J9DnatZlmUOUemvkgzjpfR5EoFO1dNVrcQJlP5Kby7S/5D0rGdomOImvRXnG2FytDTaQ50pV0TykANVnMwj5yuu8FDeUV4xsvJrSQgXGwXVsdEjlPSoXDUm0vSYxD+kLluJ3HoqWX5UxijwSlyGiN98ZHe1jBOpWYCt2LTM8W2+mL/bouyYQ/2OFN+199NoeQZK3gF4QlKalugIr/9f1Gp0Ldn11o9GRccEPnffa/IWBfBvlXMJr+okCJ60VYQxncl87H1TpA2tfy7240u6C/rxsPCLndCBQ9ug+Gb4rYX7lnZNk4I6CU9KZUQrS0NmexH4B3uIIZrWDYxqfS3dBHimIrAvCLOu6kLQPyCBls6jnp2UbIatVrJeCGURkBEkAZSqvmKGwqgIl1zv+TmU3Tgk4lEidD9k1Js/jbrrSw+W2MvxzH362hWv+UoPVf4q2IFEUpU4VgVgfMfMZk1of7KLCN0GqQnqmy17sbxkoSDT8Jg6cA8lUjvAZwvcR5uEQu8Jvup/3sDzhju5nEAWTF5sJiee9RqiVODzw37CPVzCyHgXRghS+gJUlswwFmGJqL9kg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc76cb18-885d-4013-cfc3-08dc9272c912 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2024 04:21:27.8689 (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: TY0PR06MB5494 Subject: [FFmpeg-devel] [PATCH 2/4] checkasm/vvc_alf: random select alf virtual boundaries position 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: benjamin.bross@hhi.fraunhofer.de, Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4h9xjfo+M8xL A picture's virtual boundaries will split a CTU into 4 ALF blocks. The ALF virtual boundary may cross or not cross a ALF block. --- tests/checkasm/vvc_alf.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/checkasm/vvc_alf.c b/tests/checkasm/vvc_alf.c index 902757aff1..be8b930810 100644 --- a/tests/checkasm/vvc_alf.c +++ b/tests/checkasm/vvc_alf.c @@ -66,6 +66,14 @@ static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff }; } \ } while (0) +static int get_alf_vb_pos(const int h, const int vb_pos_above) +{ + if (h == MAX_CTU_SIZE) + return MAX_CTU_SIZE - vb_pos_above; + // If h < MAX_CTU_SIZE and picture virtual boundaries are involved, ALF virtual boundaries can either be within or outside this ALF block. + return ((rnd() & 1) ? h : MAX_CTU_SIZE) - vb_pos_above; +} + static void check_alf_filter(VVCDSPContext *c, const int bit_depth) { LOCAL_ALIGNED_32(uint8_t, dst0, [DST_BUF_SIZE]); @@ -92,11 +100,10 @@ static void check_alf_filter(VVCDSPContext *c, const int bit_depth) for (int h = 4; h <= MAX_CTU_SIZE; h += 4) { for (int w = 4; w <= MAX_CTU_SIZE; w += 4) { - const int ctu_size = MAX_CTU_SIZE; //Both picture size and virtual boundaries are 8-aligned. For luma, we only need to check 8-aligned sizes. if (!(w % 8) && !(h % 8)) { if (check_func(c->alf.filter[LUMA], "vvc_alf_filter_luma_%dx%d_%d", w, h, bit_depth)) { - const int vb_pos = ctu_size - ALF_VB_POS_ABOVE_LUMA; + const int vb_pos = get_alf_vb_pos(h, ALF_VB_POS_ABOVE_LUMA); memset(dst0, 0, DST_BUF_SIZE); memset(dst1, 0, DST_BUF_SIZE); call_ref(dst0, dst_stride, src0 + offset, src_stride, w, h, filter, clip, vb_pos); @@ -113,7 +120,7 @@ static void check_alf_filter(VVCDSPContext *c, const int bit_depth) //For chroma, once it exceeds 64, it's not a 4:2:0 format, so we only need to check 8-aligned sizes as well. if ((w <= 64 || !(w % 8)) && (h <= 64 || !(h % 8))) { if (check_func(c->alf.filter[CHROMA], "vvc_alf_filter_chroma_%dx%d_%d", w, h, bit_depth)) { - const int vb_pos = ctu_size - ALF_VB_POS_ABOVE_CHROMA; + const int vb_pos = get_alf_vb_pos(h, ALF_VB_POS_ABOVE_CHROMA); memset(dst0, 0, DST_BUF_SIZE); memset(dst1, 0, DST_BUF_SIZE); call_ref(dst0, dst_stride, src0 + offset, src_stride, w, h, filter, clip, vb_pos); @@ -152,7 +159,7 @@ static void check_alf_classify(VVCDSPContext *c, const int bit_depth) for (int h = 8; h <= MAX_CTU_SIZE; h += 8) { for (int w = 8; w <= MAX_CTU_SIZE; w += 8) { const int id_size = w * h / ALF_BLOCK_SIZE / ALF_BLOCK_SIZE * sizeof(int); - const int vb_pos = MAX_CTU_SIZE - ALF_BLOCK_SIZE; + const int vb_pos = get_alf_vb_pos(h, ALF_VB_POS_ABOVE_LUMA); if (check_func(c->alf.classify, "vvc_alf_classify_%dx%d_%d", w, h, bit_depth)) { memset(class_idx0, 0, id_size); memset(class_idx1, 0, id_size); From patchwork Sat Jun 22 04:21:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 50053 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp907178vqz; Fri, 21 Jun 2024 21:27:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVtyND4LLUmQO/UhH2Zu3bt2vRuvF4cL+u9T1C9MZRZF+5YFuOjMOR/3HT79k4/oHKUOl3ZJ5gVNQ//0ojRJGo71mt3iuRdYYoTaQ== X-Google-Smtp-Source: AGHT+IF8g70q8YIlfjaMpOXfxD4GKzzmera4QatpyEgTY4LoI0SIOhSIMHru12a7Ge6/yIA0w6rh X-Received: by 2002:a17:906:3c0f:b0:a6f:b411:d5d8 with SMTP id a640c23a62f3a-a6fe76b5da5mr22551866b.1.1719030466898; Fri, 21 Jun 2024 21:27:46 -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-a6fcf57977esi148899566b.851.2024.06.21.21.27.46; Fri, 21 Jun 2024 21:27:46 -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=QvaPkt0Z; 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 76BA868D6C5; Sat, 22 Jun 2024 07:21:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01olkn2095.outbound.protection.outlook.com [40.92.107.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C709A68D6F2 for ; Sat, 22 Jun 2024 07:21:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CSw/snQj2psR5vp8MmniX+j3Dc4EkEvPUGDix30cG+4IeGr5dPzyQmeYDo7gtbiAJ+YyrA1ZDdDX2cNOYp8GWDE4nW0YAWb225tFjarJQ7tjqf2fJqP2bRUneodqjYvoCsERccJWoBxgcddV4sX6Bg72rybLnXqLgx+aZTbDOaydoF+h62DqRuIIv9mqSBfo2dKzBLetaIkvDRmWKr9hqQw9Zn1vJjh3Axq52Z9W8iQaL9CUuvJePaPzUSicRbA8F2p/K0n1ed0xzzSfeePkiMVuHoZ9uSs5RR8MNKN1Dn0I7F1INXVI0oh5z7G7lKrBgilKgXaiJthjSdH2jlyHBQ== 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=6sci6EGbUUqXn6iHPC1UoJGtawEbUFF/bfVJc23zw90=; b=SbxQ3apiUct70POLRj8Bk7xgFM3LwsdJ9ynmoi1TTZOjmq2NRX8xvJe1E9GeMX5uDbF8QqFML4f+qwfUfAjijOicAw6lpRuwbPVM3BWjsB4YwMjiw1Cgd3i9uRXAZ+2hl9SiegKtIei3wpHt5mEIVyH+pLcbtqgxvZLsg/lGn0zsMLrqueT3aqcGmJwlnysC1cr8kNSJo4lCtyOrjko6UOqT3BFnuFBixrHgrZ1xvdPVDn1ltv6Nl+0LIS82At1mQ8+mVWTGyL4uG4Pb6OOuWloHYER4fgh1yJQzStgU+/+hM6laMkpHPNzua+sMZm8KljEWBn+vOIfABuNO5llC6g== 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=6sci6EGbUUqXn6iHPC1UoJGtawEbUFF/bfVJc23zw90=; b=QvaPkt0ZEAjG2rbGzEmTaE+XuRoNaIRmwkW7CkqpoNu52mxf8FymSKKhvUR53nDaLqths6ZmmKAroz80p87voIiecihOSOpMCrkGIQHNaOGi63i6hTEqY4yPDxZqivx2XQKaKhrhZowaMbcOgfFwW+W/tT59//Ilfr8JlEC3CDj0swqQxcOwtfPmuBswAYx84rsSmIaN+j4HHJri6TKQIhwfa7mj1tt2naiDN2xA/RxSYbwf4svvUV+6ZtB1Y/icDBkd0bMQtyhGEcjbXOVpH3k3U7NBjXTtIm0kXXFvPxdbhlZR2SJkiQF7C/Ol2Ct0CuZHCrmb6zRAtohMUIb4+g== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TY0PR06MB5494.apcprd06.prod.outlook.com (2603:1096:400:265::7) 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 04:21:29 +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 04:21:29 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:21:13 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240622042114.92873-1-nuomi2021@gmail.com> References: <20240622042114.92873-1-nuomi2021@gmail.com> X-TMN: [IQrtk+6OhOy0VcwgaHgOku6g1OK8tENH] X-ClientProxiedBy: SG2P153CA0008.APCP153.PROD.OUTLOOK.COM (2603:1096::18) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240622042114.92873-3-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TY0PR06MB5494:EE_ X-MS-Office365-Filtering-Correlation-Id: f0d959d3-cde4-4756-ddd0-08dc9272c9aa X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|3412199022|440099025|1710799023; X-Microsoft-Antispam-Message-Info: eOjX/EUFk4/gxHoSYXFzZSNb6aXYnZEybbFd60XZGaZxsggvh7wbhltsABzm4mjTWmItp7//aPsvHikeitfaKS+xbxz7kPMwN1FvfJP+4yW57HNxhz+EAbdN69BOaaZWMxomrwtdRQVMzudolhq4Jp6II96IIQHVtR6Q24YgosqeynLeD/wUu5WMtq8UP1x2yOIxiYfLrERiCWpRVhWB0vVUYMWEgz/9woS5rVLmzaiewmBD0WoBHS/Ued4mnrQlcmlAnmHiXJB1P0CVhuWp4wa97NLdZfPOxlRqswtI/jA0ZA64qDSCWyOwQX1EfAQAf2yfwxZxmE07DMaprY3PK2H5zxbtouZ8I8xGMnvt2oyrKFVWi7qIA1LhK1uJtnnJJpuQkbmv3trfH/Z0KCNkm77qHZwDWluZIl4O8lnYqDdKBGKADDbyriboMuM2WFAR7yyPQsTrb1fdM6WXZoabL+pwyjlLNljwLhSODY3Ip7BakOmCTsBaLZG3itl686v4KxVZzla85h0ccY9lvi++R4Yb9bbqiN70aI+/F6PsEO3NmGALhP5p8TllhN6AeGFjVwD7M9SpgET75wEYL2k7iuXHkVfcK3c8GiokfmKplXa8/8mjNtGEKsmyqTLS8vW1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8ZayQWCb++ZVLwicPG037lBun0p5KZWJ7JEPm1VxzsAjPcfgYJhkAdx7rPecSWGtODulJdLoV/K+6Z9rA0njDl2JuM4zoGQV3/YW/LFym9v7IIYsLGi9qaRoWoYQFG1uBI50HBop+YsxRm4tBUL13medLGkqKaoqYUD+1+4sxtC27qSd9iYV9semYZlqEHBFgxjw9UedDQCnr0Qak69a7Q6wcBFVbNVkTrB8J6Cyip8ylBRQ5g73jTfykpBelecedQrA+aemvoMhwQX33nWcQqyBsVh9qbJn0HMSp7aJQfWY2Dp4yziMp+PmuJy3A1DZATkKsSd7guEOlP21ATzqwr7yxsbUhdKyfTj6D1NdXq/haEabQ67y5JVOKJP11LvfNSmvW9jmgA3c/jmTct9v0kFePwyk0So6u0T0PD1ne/YgX6Zfmd2A5to9EGZN9dbC8fTvFCznlTjndRA8sxad539UVwxeK7/YhWOMgePmUQmMLbpwwilBXbH9AwmaJW76wdr8xMyQMNvN17sl601m6AeCkQ2ooUeU/u6AB/npPptdrlFc1bHMoVqwhiCNi47o1VapxhVCSmAGORNDzkZzptF1QHGSOGDxIAwgcToZf1QUDb5SYgqAJAB13YX+4O86+tFWn/BghAToPJxO/fgj5R1fkNy40xI8Oz28ODOSikyQYUp88LbfjwNPEpEQ6f6W190aW9+dCV+JeWfbzqFXmVatlmclHFVfz8splcsq24Te7fuPccXJ2SnysPfOswoBy2d+o1KYXC9kToUmBMqFXKMa6CI0JzObVYkLis8RsabrYZsyvIU3kvOGbGfbTbYSJHdleeNa8AImKQSPgfIPxhsopieEbUkWaNJa0E/zeZdy0Z6qOSfEDnaMj4v9JIz/UG1HY+40w3mJrenVybfZEQkQ0F3Vnfrh62iegyakceZ2ZpeKOH0j6C4leZ7PyvvxN0h5sN8NSKWLcG2RSTlQg34eDY2Aiv63++cwg3jakn2dzBNFg0ShTSpQjTLZabtNVfCKBxHaPXU0K3CSPs81ZdUuEM/mf1fUAwut1OOjlVlU+6WZdzhtog8LbJpOX51EbCC8ayCLy2MSMF8Ldwb6ZyqJJqb/GcdX1m4LLgVdbT99OWbUAlUcNL8Xu6bdgPYhbyIFBaY8+6hwBKQiEA8aD9KaEJmiHBeFOiXZMdFysijy4nsqMf5U4eiHUxjyCN1gDwskCR88ybdLAV6SGfskksCEJROny3RXZ7Kfxj8hcjTBJWPn5NEDE2TOY35SBDECxNMTSlZMNnxvHmokWf9Owg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0d959d3-cde4-4756-ddd0-08dc9272c9aa X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2024 04:21:28.8588 (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: TY0PR06MB5494 Subject: [FFmpeg-devel] [PATCH 3/4] x86/vvc_alf: avoid overwriting for non-16 aligned widths 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: benjamin.bross@hhi.fraunhofer.de, Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: npVYZ2si0IZb Previously, the code allowed overwriting on 16-aligned blocks, which was suitable when there were no picture's virtual boundaries because both CTU sizes and strides were 16-aligned. However, with picture's virtual boundaries, each CTU is divided into four ALF blocks, leading to potential issues with overwriting later CTUs. In cases involving picture virtual boundaries, each ALF block is 8-pixel aligned. For luma, we consistently ensure an 8-aligned width. For chroma in 4:2:0 format, we need to account for a 4-aligned width. --- libavcodec/x86/vvc/vvc_alf.asm | 85 ++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 10 deletions(-) diff --git a/libavcodec/x86/vvc/vvc_alf.asm b/libavcodec/x86/vvc/vvc_alf.asm index b35dd9b0e9..f69a69f05f 100644 --- a/libavcodec/x86/vvc/vvc_alf.asm +++ b/libavcodec/x86/vvc/vvc_alf.asm @@ -324,18 +324,69 @@ SECTION .text %endif %endmacro -; STORE_PIXELS(dst, src) -%macro STORE_PIXELS 2 +; STORE_PIXELS_W16(dst, src) +%macro STORE_PIXELS_W16 2 %if ps == 2 - movu %1, m%2 + movu [%1], m%2 %else + movu [%1], xm%2 + %endif +%endmacro + +%macro STORE_PIXELS_W8 2 + %if ps == 2 + movu [%1], xm%2 + %else + movq [%1], xm%2 + %endif +%endmacro + +; STORE_PIXELS_W4(dst, src, offset) +%macro STORE_PIXELS_W4 3 + %if ps == 2 + movq [%1 + %3 * ps], xm%2 + %else + movd [%1 + %3], xm%2 + %endif +%endmacro + +%macro STORE_PIXELS_W8LE 3 + cmp %3, 8 + jl .w4 + STORE_PIXELS_W8 %1, %2 + cmp %3, 12 + %if ps == 2 + vpermq m%2, m%2, q0302 + %else + vpermq m%2, m%2, q0101 + %endif + jl .end + STORE_PIXELS_W4 %1, %2, 8 + jmp .end +.w4: + STORE_PIXELS_W4 %1, %2, 0 +.end: +%endmacro + +; STORE_PIXELS(dst, src, width) +%macro STORE_PIXELS 3 + %if ps == 1 packuswb m%2, m%2 vpermq m%2, m%2, 0x8 - movu %1, xm%2 + %endif + + %ifidn %3, 16 + STORE_PIXELS_W16 %1, %2 + %else + %if LUMA + STORE_PIXELS_W8 %1, %2 + %else + STORE_PIXELS_W8LE %1, %2, %3 + %endif %endif %endmacro -%macro FILTER_16x4 0 +%macro FILTER_16x4 1 %if LUMA push clipq push strideq @@ -362,7 +413,7 @@ SECTION .text ; clip to pixel CLIPW m0, m14, m15 - STORE_PIXELS [dstq], 0 + STORE_PIXELS dstq, 0, %1 lea srcq, [srcq + src_strideq] lea dstq, [dstq + dst_strideq] @@ -399,7 +450,7 @@ SECTION .text ; const uint8_t *src, ptrdiff_t src_stride, const ptrdiff_t width, cosnt ptr_diff_t height, ; const int16_t *filter, const int16_t *clip, ptrdiff_t stride, ptrdiff_t vb_pos, ptrdiff_t pixel_max); ; ****************************** -cglobal vvc_alf_filter_%2_%1bpc, 11, 15, 16, 0-0x28, dst, dst_stride, src, src_stride, width, height, filter, clip, stride, vb_pos, pixel_max, \ +cglobal vvc_alf_filter_%2_%1bpc, 11, 15, 16, 0-0x30, dst, dst_stride, src, src_stride, width, height, filter, clip, stride, vb_pos, pixel_max, \ offset, x, s5, s6 %define ps (%1 / 8) ; pixel size movd xm15, pixel_maxd @@ -409,18 +460,32 @@ cglobal vvc_alf_filter_%2_%1bpc, 11, 15, 16, 0-0x28, dst, dst_stride, src, src_s .loop: push srcq push dstq + push widthq xor xq, xq .loop_w: + cmp widthq, 16 + jl .loop_w_end + LOAD_PARAMS - FILTER_16x4 + FILTER_16x4 16 add srcq, 16 * ps add dstq, 16 * ps add xq, 16 - cmp xq, widthq - jl .loop_w + sub widthq, 16 + jmp .loop_w + +.loop_w_end: + cmp widthq, 0 + je .w_end + + LOAD_PARAMS + FILTER_16x4 widthq + +.w_end: + pop widthq pop dstq pop srcq lea srcq, [srcq + 4 * src_strideq] From patchwork Sat Jun 22 04:21:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 50054 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp907183vqz; Fri, 21 Jun 2024 21:27:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVMexO/uRXBOVzWj+i1dBXwQtk8Iao02Q1+61ODfV8rkNoWjfgvsqRKwcttfshfPDMduuklg+mXJYrFPlYhvBnGKu5V+tgzakLDMA== X-Google-Smtp-Source: AGHT+IEdlFIWUtyOqwAmPG7MkMzxPhsPPJXffwtB7TVCLqVX0sK9oTa7dJ2Hdyz8SqJ7CE/kvIyX X-Received: by 2002:a17:906:bf49:b0:a6f:e8a3:7d4a with SMTP id a640c23a62f3a-a6fe8a37f68mr33045866b.24.1719030467669; Fri, 21 Jun 2024 21:27: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 4fb4d7f45d1cf-57d306b6215si1378143a12.323.2024.06.21.21.27.47; Fri, 21 Jun 2024 21:27: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=BzTUHBQn; 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 C9CB168D749; Sat, 22 Jun 2024 07:21:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01olkn2095.outbound.protection.outlook.com [40.92.107.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6FFBA68D70F for ; Sat, 22 Jun 2024 07:21:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=THmSUzy82pyGwWspaV3VprJQO7FmMiH5PWGPGIBJ2buC7DaonZ3fNiyxAMvaFEUdLhwdmeDwgUUWvYeh9qHrZcEj7VYxglgFB6GvV9x0GedvUY5CN58y5sAOAkRaGQrZACobQTsZPFiu9PtvunjGnT7Ei+bxy+eUUXTD/Q7DIY/PdWiQolq9NTgDyNq2Ml3brSr7G/KUerEJGsFQ4THxgwn6q5je37itQeb9seVOu93u4ecEJPfA+GW/kXmepSTHpJGcOH2mEpX55A7pahNz0hG9QgJQKroOWTwixy42CMo8GIg/ijsbz1Bh7O3mrqU42yEURwzFKl8q63TDlNRHlg== 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=bEcB5/CA7DCRzxpBwT1KedyG2gWwln4H+JcYe9029XA=; b=LbhWQWOPuDwap1+fRw9juy95FkOp9pg1rabgGCQh1VgOS5LpJ+PDu8A0eRCFYaiTpC6OKKNbSI6YmMtMiAbqRnLUCYZycY3ORQDRAG7ycGtF9BfqCRE+BXNd7B0WcWLa2R5IKQITfglEhe8sYrxdb5cDZI3p9+Er+8VA50FdVqp/AEjh4S3ffm8xb6/T7U+kggzElrUjMb8iLeCsgCcoCjQzmDiQCi9C0EThQcKhlAOmvFPgQNHmR+rARitLziaAyd08P1sqhk6VGz74Huc98lXntyLcppscLdI0TTRWEE+lWzk0JcpceO/+1J9TjCb29KYX5WP0yh09zCD0kzBtIw== 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=bEcB5/CA7DCRzxpBwT1KedyG2gWwln4H+JcYe9029XA=; b=BzTUHBQnhCUbfeyzaTgP8tVUmrUP3AI74d9Y/Hu2gepBAL12GrvOQjfWyNhLOreXs8xYRQPZ+pRvV6XD28cqHfljQARxHfv78tCHWbgXW/c4rJRzLXrfTlKEArJHxyffA53L0FlDQoKrzfNHGchk97iq1GoyUsj1OLOSGxkYQCkKqNkn0KcebeFJUfLIK4zkZKZqmOYpkQUO63xAFfny0xyuSIEjLPNeLnE9OfT1/TgZImuZMOw03ojCSiLQLaO3wdbXa+DBOBDfpwitseQk7c9Q1fOXy6gL6BpQdGwogVl+oxHqwJe66qDlfY8XwYkpl40N4Hmy4rqTvKVaJJJ20Q== Received: from TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) by TY0PR06MB5494.apcprd06.prod.outlook.com (2603:1096:400:265::7) 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 04:21:30 +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 04:21:30 +0000 From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:21:14 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240622042114.92873-1-nuomi2021@gmail.com> References: <20240622042114.92873-1-nuomi2021@gmail.com> X-TMN: [Cryh5ee3Azy+VgHuUZ6UVkUfYvVoRUd/] X-ClientProxiedBy: SG2P153CA0008.APCP153.PROD.OUTLOOK.COM (2603:1096::18) To TYSPR06MB6433.apcprd06.prod.outlook.com (2603:1096:400:47a::6) X-Microsoft-Original-Message-ID: <20240622042114.92873-4-nuomi2021@gmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 2 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYSPR06MB6433:EE_|TY0PR06MB5494:EE_ X-MS-Office365-Filtering-Correlation-Id: f247e98a-94dc-4d19-3fa4-08dc9272ca40 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|3412199022|440099025|1710799023; X-Microsoft-Antispam-Message-Info: t6F77nu3LKIRp2F9wAkj3qp9VPSarC8fBL1wEBrq6LGA/sCPTQ5CYlfgr9lVQvL5KnT9KggEYByLYyXg2p5fRmJQvdtwyxPf5cQiyXh58fr0LR4FToWhArW1B8LMZkTEguffg4hMaRenYaiXbLeE/X1MA8XaFoKhRm1V9fdwo7JVXInDL+uTvYJI5fnh5WI/H1Vyf1uQA3CXPIg8PiE7qeN/tzyzFiGScHQiXmneDSQJ5kOJDrFiDvylv4oTmxx8jXGI5BByP1OWAfkFQwq7QMz5cj+rEQSK+bqVZbU7aEF0+SVcodrJgGCzjRocCtR6LuhOCjqcAI9kK1dxQGYAwv7SY6ICM1bJrEzVW+PSYJ3yaEx96eUEleLTQbvk5Dtk8/DCOP0obCGmACRTJIhRwE9O0psg1y2o0x4pn2jfVozkiXNHdAKuWf7LqC+RSlIpkTGKSkJgatr03JsR5G5A3M1MSMJaoxkMWKQoOwIvwy8EHspEJ4ImNMYuRDV6iQv8ASAMB6bfnlWkAfwjj6BCRIVHfCfA2zPrARSUBxWngNYntPyx/bR30HseJoZLZwQiYGshrcN8SZJkl0qlohGcil/0mdqFK/5lUDb+Gqd3hJg= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4CJ/++XD1UrusPBVAe6nYr+dKXTMAHy107B0Rz0N4uCJR2XmX6plNy47DFVEty4VUqIXkCYEtm2Upbf3FRjGDflg8XGlFzgzwNqCDYlyc2mqCVyWowp+vK9j1Q5zw9gY/ykQAPWpvnnSh4lnD42tsXvozgdiBWHQE+ySOS/tMCcVbW9dFGvfFEbMJAwiMJnLIoCW63hhrU4/0vSmuYWbD240d0P/0Y0+oQ7YxkBYRLYKoIvMm3b8GzbLZ6riVsLuQYWqIEqqvbj8/RpcawkgrK4td7wmjvmYIiXQsL842Z0zp6t5kEHU3ZIR12NrO0gucK5dlBPwWFqV+vwqTCP4uqx0JOfOQcxr0rU03eZm0PDrdKFs/EoepARBYKJEn+YjVjkPqqcynoLc2H8nKgNvSYCisAvaxuIHjJeID2SRvBBb9SgCMXwQ/MT5Fy3J8cBvwpemN6VJnJx+VWQ091hGsb3LJpwtkyGzLXRGqSGAGtrVI5NW0/zi96tCAvDbd/1TcuJBDVP6rq58edQSjGRgX1VoaNffE7NUOtJVj13b6Y1L1GEpXmDJpPqoYGDDgWNACk2MQKTJas7J6ly0KU94fyF+VZus0Vb+7VVacKlm25RJTAmWxzYYA5WaI6jdbfMcDOE1RcCi7tHJit45bQZj38m4enUtovaK5NJmNP6vN6x4iYh+ejhgN01ohajzdoUt4toAfrAR+14CNRlolB1kwYbVLu1sq6cXKLFx4JVaA4h7BIx01F3gsrUmfk9DG7U+3c9qfJGxGYhuGTZKZ4/S2qG2akRNyIXuYUrc7sEz/oXjE+PDAhHQy/2KzBwWibuKPuvsKaGFRTKCWjU0nu2z5qWwjM84iAkE/+G6CLQqVAevYo7s8LXVcoNZfP9LWHw5QzGkUPN9zdr86wwK2EGtkUcYv+8bMG59aXpgsAOta2mrD/w10FtDJPxRgA+wG3p4VLOo4tsp6bJ7048KVZyc8Ycr4Gv2LTwkp82lNp4YNa0whnIuv29Ugxd3rh8GbhVDgZ4dKiod0Llw6L3KY/dwMOKZK30Kbis14egZ9jarclPYhNdFLJtgUOrXHrv4HX0tOkPyguL9nZrVDcjYPinUkNw7Rd6GM5NGPbtmH240tCIIG1BF6LyCnAz8VafBsofzQoi0kb+JNtXH+V5UIqe5qmzF7MPT+B0q+cX6a/tCXKdgaZaaq6PAs+yN8hcwTz3KZmU11fSz1FwFZaXc68NM08Nl3TqTbNnMz9/2Irehw0WJvl8NGY7Wkc8aMabS6ZZcbzmVHHfK23pjK2tu7XdguQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f247e98a-94dc-4d19-3fa4-08dc9272ca40 X-MS-Exchange-CrossTenant-AuthSource: TYSPR06MB6433.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2024 04:21:29.8487 (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: TY0PR06MB5494 Subject: [FFmpeg-devel] [PATCH 4/4] checkasm/vvc_alf: ensure right and bottom boundaries are not overwritten by asm 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: benjamin.bross@hhi.fraunhofer.de, Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2ia3bw6MWPwM --- tests/checkasm/vvc_alf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/checkasm/vvc_alf.c b/tests/checkasm/vvc_alf.c index be8b930810..15e79289cd 100644 --- a/tests/checkasm/vvc_alf.c +++ b/tests/checkasm/vvc_alf.c @@ -108,8 +108,8 @@ static void check_alf_filter(VVCDSPContext *c, const int bit_depth) memset(dst1, 0, DST_BUF_SIZE); call_ref(dst0, dst_stride, src0 + offset, src_stride, w, h, filter, clip, vb_pos); call_new(dst1, dst_stride, src1 + offset, src_stride, w, h, filter, clip, vb_pos); - for (int i = 0; i < h; i++) { - if (memcmp(dst0 + i * dst_stride, dst1 + i * dst_stride, w * SIZEOF_PIXEL)) + for (int i = 0; i < (h + 1); i++) { + if (memcmp(dst0 + i * dst_stride, dst1 + i * dst_stride, (w + 1) * SIZEOF_PIXEL)) fail(); } // Bench only square sizes, and ones with dimensions being a power of two. @@ -125,8 +125,8 @@ static void check_alf_filter(VVCDSPContext *c, const int bit_depth) memset(dst1, 0, DST_BUF_SIZE); call_ref(dst0, dst_stride, src0 + offset, src_stride, w, h, filter, clip, vb_pos); call_new(dst1, dst_stride, src1 + offset, src_stride, w, h, filter, clip, vb_pos); - for (int i = 0; i < h; i++) { - if (memcmp(dst0 + i * dst_stride, dst1 + i * dst_stride, w * SIZEOF_PIXEL)) + for (int i = 0; i < (h + 1); i++) { + if (memcmp(dst0 + i * dst_stride, dst1 + i * dst_stride, (w + 1) * SIZEOF_PIXEL)) fail(); } if (w == h && (w & (w - 1)) == 0)