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)) {