From patchwork Mon May 13 09:30:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48845 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp214456pzb; Mon, 13 May 2024 02:32:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXVcIcUFFUPfPUHsbheYqVfKqhOo+TM1H/4I1KnTshNtkU48Pd3fSLzV/QWa3+DZIZkXw927lu5MlhBK1xkEXSTTh++mX1XdLO5wg== X-Google-Smtp-Source: AGHT+IGkKMkEpHXzv/cML0zgE9doUd+DYTMmG5QVq7oNgIsLz0YEfR2sx98qdlgjETKnR0KJk3NA X-Received: by 2002:a19:8c19:0:b0:51f:2a80:a982 with SMTP id 2adb3069b0e04-522102786f5mr7458861e87.47.1715592770250; Mon, 13 May 2024 02:32:50 -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-a5a17b20f40si512843166b.354.2024.05.13.02.32.49; Mon, 13 May 2024 02:32:50 -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="i5+6/hzS"; 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A6E5268D6F3; Mon, 13 May 2024 12:32:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2057.outbound.protection.outlook.com [40.92.89.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5205E68D6ED for ; Mon, 13 May 2024 12:32:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GWSHHBzBSKQeS2AoLaoRPDzWJC87Dkp4cqM154jDYdtEIZQ4ejmwrOQ+faDkcANmalr1I+e8DJ0Sf+8WqzRMjF13Bx9+nqYjocWk4ApEZAMSH8wuxhPLwKpcwQWIYi5Zg1qCI+PlNWZ3sI52QLR2dNmDNAI1Nc/G9y1io2gAuDNlN3BSPktSDc1x9kNr1GXI4s/bjvubyXU/PGjsrLi0kEDho22FDxIH/ZKTbvCZJUfQ4i9qCXigR3wjW/O4ptxeApXWHJ39nK6TniXTUhvoARsCTuyqAr79U/s3a+zVoczgEgE9Mmig5bC65lK6B+Lrt+5sYnJwgcpCljFqZJwdvQ== 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=tkJpboGhGPLOnP1yOqKx3l3GepUZVq94NsEGs7UcGz4=; b=jIvgqMQgdG5bjKTmirWwMp2uG78wjeTM8FbMxoKg79iLBGMCyd3OTy3dp8kmwYdfQdJCcmXynoItUSZAAGtQxNTgrU4JFsN99WDfWmDaAS1/KsjhM9p0uRoYWpt9z6z7XfHJgUBJgZES0gVVDxP2CrjVPPHM/sFqlpl9wJot+4BoYUgITEZqCHuhzidwebgz2DVTl+5FzQWVn2IfMXyYeJAwg1k31UEZ7Yvl6pdje3JgPQPJfia4t+9gfaWtKaOKQABMmXzn2CW8phGO0QwPN0rkVWsKF9foBOYcx0uylt5ivDEiPHVl6bT+zx4M6Bh26CaO6jKg7hDw3paAZQgeRQ== 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=tkJpboGhGPLOnP1yOqKx3l3GepUZVq94NsEGs7UcGz4=; b=i5+6/hzSx+jZgC6FaAjLxawzwaDRgCU9EuGotB4Q9pxTwciCuxLwTTYJ9wOieX4FvnGtapeq3trKCw/7QHBvddGX3GhOQqOa74Bg9b5+IdRsH7axM5olPziDIxft2izAjcG/Jn3aTy4Z1ZsA5WcgCOuteJJnikN8kywwFhZbyYWoMZX5ZmLi6l6bF0jQa6P47eU82I0icgyKT/Wdn85Zll3T54km4Buat3yLC8pm3BiYZ6uCW3XmT5AzELWodvt14Uj5dUBxaG1ksQc7Hx0V5EL19BMvS+O8UrH0HmKfyz8WnHPl5sZ+syKDG7PpmxqPBl2B4fz15zAkz66YUMtrTA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0215.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Mon, 13 May 2024 09:32:37 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Mon, 13 May 2024 09:32:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 May 2024 11:30:59 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [A5X1LEIs9T5CzAmceD63idMRA54LYzEpQp3ZLlG6WMk=] X-ClientProxiedBy: ZR0P278CA0159.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240513093059.3029693-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0215:EE_ X-MS-Office365-Filtering-Correlation-Id: a1e77af9-7cc2-4449-5429-08dc732fa01f X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: oLaKbw8g6xUgzrDDdgz2Gaa+UZvsEw0nb7SzFFYnzbL0pmhgC4k0zeN6LzAFSG49GZSKfH+RQAkuIkRO2/WPbydKSAlRRTjey5D3LVPENpn8bWWuKO9Lu9Ji7h9Z3LFYfwNSFXKKG0yjONdFt9qPryINl29ivWfnnCMnK0FG48afMOb7yjk5b48fox/SAE7kOhndd0Vo7iKr9O+T09PGQ7IXMDH8FGJNKBlXbGDJNQl3q0zmSsz2Ob9ewUDn/GnaXMI9vpirArHH+AaQIfRTt+Qlzu2WI45EnZztRJp+ex/wf8JGY4qf4GvGb+OJijFR5oZUafCO51n52lg0sAQJ9lp2l/lA3BXsKhogXusrW3kRyevrcc6dlja5QD0qSqzy0tegJdiMnFI37omBiUFd/CScFXRq7YHlqka31AFAXUctWpUeNiFe6THnEGCBYaD65YUo5Ch/65HuN5v1snBY1BOLcV9lQYvf5xWbdU7wkm2GhlEJFN2gMrY4dAWvagLP1jQnoM7syY6he/pOBdsgFyqeVco8WhAxxOWMX9Rf6vlJZ2g81u8v7U7xc5h7DoSvqfVEJjkdorD5jHLJjiUZ1AQiZ7eoZTJjs3wHCdwaS65+9yWI97UIdBuLkUeMAWYC X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Gmtr9xXfENAcG0OmXG8RGaBlJDoMkL3z9MTK8VC/yVqEBamDBrIHSNuoI8qW/cZGiDcK/16CfifdzLiqEL9Vh9wWUOqwSsn477Lh/qEA3Xg2h0dqe2IlhBZN67OQBvLw+S1Mg4LOXtIdeuc10JN+TicrQHtMyv8R4ITN5Xd6R26xGuIz5wNNuj4uOxapWG+wk8qTsAEL6JbLouuYvc8iEXiLIKaWsprpXCRmHWuvxH1LXxqKRx4FCyrcVBiey5jwB8oKb/PreuacFdLhQwKXhGyau6nAQ+8yjEFiPDLSuRySzGYh0CIqY+bvELo6JVWnayenVHGvLglVZHbgL45HLfS3ehqGzm9DMjFxbQTIrxdxXtntfxCW1Se5Lvs4xQGYfpMQSwircDY7WK1M/jRX9X8LCLCRPul/MzDrLT5G1x8qp9JHiMTOKJMKwvf+34ecQgvFAKyAbO9eh2vFsswqHLCguXX8n5yXTlkfghd+uMrhg9oFChs5145YJriUjjjUS+v341vH7eKyyHrgyArbC+Ms1j69u0h9/6bu+Ck9i90omcpBNoo2/iptp8Rt/2Qo+OmA2a/dSR0TGx3bg7ATw+yn7mleVFwbrmlc+FkJePbKUpwYL+db25pjthcVOqCl+0UWndbVZLQCmBKfNZtE5UK71/6Ht70FBWCHeLA398bd+UEe7WhjJ22L3G3KpmALoeWAQBOYIsjECfmRtU6QemNGd/aExnLThvNgXCtli2pcOd4Yg0xf2TAZtyfkfqQF6qkG0DzWtF8vx7wBccd6UAad0DrWqBZQHYBzsJfgC2O7H4waabeVesiU2ODKjPbVKcB51rWnekMMCh9fxyR40i9HXvs54I+im51LyCSPJDMqv+IVOXTpX5rS+vmOEJFofWfXglzNpMDWiHtZQOPs8z639IJcwj6J0AyCN0ufshS23AbhywSo3KKdot6hr1DYESVK+LQ5GhF+MRzIr3EX2jBoU60ec7bBMqFgsOHQCTbHiuhT5S++voFO1Lg+7zFYa+j33u1H5vPQRPXvdgrDxmUpNhPGImNGo4oTsrogp+lvN0Cmmi5TxjeuMfdvqNsFNAusSmUe4gd2bCMCBebSPmGSCBABrlDzlu/3WnKTDPx1NGQaDLOkl9C4Woh6T9WSQAmGy+LYgeCuVTSMEOdp98cvd7vLL6tlbVWFlEZEP7wAGXZZb5bD8nLKiIKNjuUte+KhjSPQQh/bc28YOSHG335yHvTheqQR7q2OzX+N+1UWyfCJhLONzoqXY2pOQ/xjpDe/JFCB2m2IdIIPMoLHog== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1e77af9-7cc2-4449-5429-08dc732fa01f X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2024 09:32:36.9079 (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: AM8P250MB0215 Subject: [FFmpeg-devel] [PATCH 10/10] tests/checkasm/sw_gbrp: Use correct function types for calls 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Y1mSoH+Qy747 E.g. f2de911818fbd7e73343803626b697fd0c968121 forgot to add the unused void* here. Signed-off-by: Andreas Rheinhardt --- tests/checkasm/sw_gbrp.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/tests/checkasm/sw_gbrp.c b/tests/checkasm/sw_gbrp.c index 848e5366ad..b845da32a6 100644 --- a/tests/checkasm/sw_gbrp.c +++ b/tests/checkasm/sw_gbrp.c @@ -76,7 +76,7 @@ static void check_output_yuv2gbrp(void) uint8_t *dst0[4]; uint8_t *dst1[4]; - declare_func(void, void *c, const int16_t *lumFilter, + declare_func(void, struct SwsContext *c, const int16_t *lumFilter, const int16_t **lumSrcx, int lumFilterSize, const int16_t *chrFilter, const int16_t **chrUSrcx, const int16_t **chrVSrcx, int chrFilterSize, @@ -202,10 +202,11 @@ static void check_input_planar_rgb_to_y(void) #define LARGEST_INPUT_SIZE 512 #define INPUT_SIZES 6 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; - uint8_t *src[4]; + const uint8_t *src[4]; int32_t rgb2yuv[9] = {0}; - declare_func(void, uint8_t *dst, uint8_t *src[4], int w, int32_t *rgb2yuv); + declare_func(void, uint8_t *dst, const uint8_t *src[4], + int w, int32_t *rgb2yuv, void *opaque); LOCAL_ALIGNED_8(int32_t, src_r, [LARGEST_INPUT_SIZE]); LOCAL_ALIGNED_8(int32_t, src_g, [LARGEST_INPUT_SIZE]); @@ -243,13 +244,13 @@ static void check_input_planar_rgb_to_y(void) memset(dst0_y, 0xFF, LARGEST_INPUT_SIZE * sizeof(int32_t)); memset(dst1_y, 0xFF, LARGEST_INPUT_SIZE * sizeof(int32_t)); - call_ref(dst0_y, src, dstW, rgb2yuv); - call_new(dst1_y, src, dstW, rgb2yuv); + call_ref(dst0_y, src, dstW, rgb2yuv, NULL); + call_new(dst1_y, src, dstW, rgb2yuv, NULL); if (memcmp(dst0_y, dst1_y, dstW * byte_size)) fail(); - bench_new(dst1_y, src, dstW, rgb2yuv); + bench_new(dst1_y, src, dstW, rgb2yuv, NULL); } } @@ -269,11 +270,11 @@ static void check_input_planar_rgb_to_uv(void) #define LARGEST_INPUT_SIZE 512 #define INPUT_SIZES 6 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; - uint8_t *src[4]; + const uint8_t *src[4]; int32_t rgb2yuv[9] = {0}; declare_func(void, uint8_t *dstU, uint8_t *dstV, - uint8_t *src[4], int w, int32_t *rgb2yuv); + const uint8_t *src[4], int w, int32_t *rgb2yuv, void *opaque); LOCAL_ALIGNED_8(int32_t, src_r, [LARGEST_INPUT_SIZE]); LOCAL_ALIGNED_8(int32_t, src_g, [LARGEST_INPUT_SIZE]); @@ -316,14 +317,14 @@ static void check_input_planar_rgb_to_uv(void) memset(dst1_u, 0xFF, LARGEST_INPUT_SIZE * sizeof(int32_t)); memset(dst1_v, 0xFF, LARGEST_INPUT_SIZE * sizeof(int32_t)); - call_ref(dst0_u, dst0_v, src, dstW, rgb2yuv); - call_new(dst1_u, dst1_v, src, dstW, rgb2yuv); + call_ref(dst0_u, dst0_v, src, dstW, rgb2yuv, NULL); + call_new(dst1_u, dst1_v, src, dstW, rgb2yuv, NULL); if (memcmp(dst0_u, dst1_u, dstW * byte_size) || memcmp(dst0_v, dst1_v, dstW * byte_size)) fail(); - bench_new(dst1_u, dst1_v, src, dstW, rgb2yuv); + bench_new(dst1_u, dst1_v, src, dstW, rgb2yuv, NULL); } } } @@ -342,10 +343,11 @@ static void check_input_planar_rgb_to_a(void) #define LARGEST_INPUT_SIZE 512 #define INPUT_SIZES 6 static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; - uint8_t *src[4]; + const uint8_t *src[4]; int32_t rgb2yuv[9] = {0}; - declare_func(void, uint8_t *dst, uint8_t *src[4], int w, int32_t *rgb2yuv); + declare_func(void, uint8_t *dst, const uint8_t *src[4], + int w, int32_t *rgb2yuv, void *opaque); LOCAL_ALIGNED_8(int32_t, src_r, [LARGEST_INPUT_SIZE]); LOCAL_ALIGNED_8(int32_t, src_g, [LARGEST_INPUT_SIZE]); @@ -386,12 +388,12 @@ static void check_input_planar_rgb_to_a(void) memset(dst0_a, 0x00, LARGEST_INPUT_SIZE * sizeof(int32_t)); memset(dst1_a, 0x00, LARGEST_INPUT_SIZE * sizeof(int32_t)); - call_ref(dst0_a, src, dstW, rgb2yuv); - call_new(dst1_a, src, dstW, rgb2yuv); + call_ref(dst0_a, src, dstW, rgb2yuv, NULL); + call_new(dst1_a, src, dstW, rgb2yuv, NULL); if (memcmp(dst0_a, dst1_a, dstW * byte_size)) fail(); - bench_new(dst1_a, src, dstW, rgb2yuv); + bench_new(dst1_a, src, dstW, rgb2yuv, NULL); } } }