From patchwork Mon Sep 19 21:28:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38061 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1507780pzh; Mon, 19 Sep 2022 14:29:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6J2iiWPjLiM5F9Tx6509OPkyfiDjfDWG0LLFSvW0MLpwi2pZSmCQm6S+GIaV3+zZCDo5he X-Received: by 2002:a50:9344:0:b0:448:ce76:7c81 with SMTP id n4-20020a509344000000b00448ce767c81mr17310964eda.187.1663622942036; Mon, 19 Sep 2022 14:29:02 -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 n22-20020a056402061600b0045435548220si2507730edv.517.2022.09.19.14.29.01; Mon, 19 Sep 2022 14:29:02 -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=dK90a6xN; 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 282AA68BA76; Tue, 20 Sep 2022 00:28:57 +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-db8eur05olkn2048.outbound.protection.outlook.com [40.92.89.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC28068BA2D for ; Tue, 20 Sep 2022 00:28:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GMYguDL2qx/Y1coijbx3tamm1rSz7ZiYlVhnnL0j/YCWZS0b6lQeo3YYdJYeMKUnxlVZzEfyWKY5oiLuA9lR2Am48S3EM7b0haBTWyimjtBS7OkIMzWTah5dPFuOR8i02OD9nVE1E1rML1Oq377rOieEWcKgCkvTp7CyXc3jF2scbiAhMEBajgMVbOaFjX2xaw+wv5skXl/wyitD/jaVydvrMj1CxryE0UzGkK8SUI9Ts3aKcmExQaHS4etd8PLzFMUnSKt5Agfne1B9v8Zuq5o1KwB2H3ZkdtmV/9qx0zZtS0LDQAPb+Eco9wpd6d3nd324tXIn2bkNAasSQwqhAw== 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=fDwXRW9Sme2b4034ZqULIUwINJmKSBqS0fYGUy94M0A=; b=V9tP9xl57W0e1YV7cDxTVY8wouAKX84DMMIRWOFEBokhJgfq+ZlVYyPdQ5wY8Up9o19INtcpDbmeAJjCdgnTyg9Uz6BojDVgzy4tLqnhX+M3RVJH2DneIeZYqcDiswZ79wYLA7eKhLhfZ0lh00yI0ryQRq/MZfRT+PhUWjl2X+3uNT27SnAQrrnlWM9LmKtU4+B09j5orSpmQycbKbjEUhN7UZ7ix2h+jjwmzR3sirck2RpTbI97r0SjD4pi/bZ/qDq3DwuyyIsl3F+VGx7iNtTW0Ld4Ywan6genZlqqBMLAKEpxMwWWffCWAeCSNRfBJY/tf3H3gu5RSJPOM4LtDw== 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=fDwXRW9Sme2b4034ZqULIUwINJmKSBqS0fYGUy94M0A=; b=dK90a6xNDy2GFa/e3AIjzS2mBAsXflK7GY0eJF1a16N3oYOIgxnS4WppveJYT33saMavO2QmiNFflPDrGgBZ7sg5aOm8jcuCouRuWcytggTJ3SSZMxK/MKvDAa8+5Jx0Gb3G5KUDMVvhEmDthUurW5ZQ4rFaBMIbuVzI9a/052hmyeBa8ixY5rlGpjKmbDUWQ3KLqhKBRSVONVo1PEitxbXQ7HHspgFS0KXlcxs8NeT7Ku/gpLIU2Pm55oT8EubZv8nnpYMbUVJ5HRqs63UiUFXmoz6QR877AZjMKLjv2GauA53Mt1Dn1niGJR0HFpyd19uH5qEICirguTII+xgtnA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0188.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.19; Mon, 19 Sep 2022 21:28:45 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Mon, 19 Sep 2022 21:28:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Sep 2022 23:28:38 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [4AFhNTzagEs1yjeI9AmXPcOnLDDx+2L0XhMaLfU+NNA=] X-ClientProxiedBy: AS9PR06CA0123.eurprd06.prod.outlook.com (2603:10a6:20b:467::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220919212839.2950812-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0188:EE_ X-MS-Office365-Filtering-Correlation-Id: 567f92c1-0de7-4f5a-aff0-08da9a85eeaa X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kyBfxgtFTZKTHv/1vp0dNUzGQNjtvcVRA3AOEj8wbY7JcScPr1hE40dMfBdALkEWHj1M2BpsA8DVjJbxTXakA3/Yl/TP/520exlshlW9JYiqYUl87gO3UIlbT6CW+zUR+LTqXWC7H0XHXOt+BpMkrSu2eqvAeWcI2eavpHOgnFZwLq3amoGYIN0CfZFojcFiTW9BjJ8n3kG+WEjFdAwGQclhXh09w4GE5DhdzdMbl9IUT5K5/Mm8Madk4pRJ16kaFLH5dnI1IyHRgDIn59wqIggL/XWcBbcGcDKvfDQ/w+OrIUyWW6l1KrKlbnGxfnJXuRjFeQNw/dyLdjWd0QyaeDVBhjbewAwCH+5NYbwsRGDhV6w33W+iNtVLgEvlDeHvHMEiFdBJb4UMuZzmijSLWvomuvbyn7zWEkkBV7TzcYSmBRQuUJezrxNjhSiCLx7A/Jlkg7mEg4oNphSn8RiEaVuUPIhI3PM3XN4XEl/GzUyPIeaACKsqzMfZ5STVD03sZcnE9rvV52yUYW9YJnoQGnQ7kwWofZctLIJFWhIEBrKJL2WHmhzS0t9PoIx+8Ta1cd54acTWtkFkMYDzSvOy2G6kBEQZN9wXD2BEadCAlN9Kaulb9/W6kTs3P6033oxwb3IZcOWHMd95Xc56C3Tg9G3XTH4WFjhm8wuXTjBLaxWBtRzkv39hWW4xms1BvO1VYUC7RAzIzF+idGhKBOcBdl4cQULRt1XpbscVHwmZDXFxiJ8wk0cwmuyi6E4Smn2VoBP2gO7pejaYd/qLXKgdM0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4h5bHwno/xzQc2ltMz5d2NOU3V8bQN0EEcw/QQlsvHTU491nR34E6sQnh1Twz9/2oxXI0DJXwT+I7ZHgNAMNyoXzuK5G1r68ugbMWLd9EOeanoFTNyDhWdkl8aCVeOUp9gWbliPezJnwQuQrxhvJVF91vAwO0FbSWPXZrmRiXlvXXb2XzCcqV9ml5IQmhfwgRUD83E25EG075O6g9x0vmDZ2nJvEqw6Dno/aWuKFsSV/sSJyiwn/xFRf0/DZMm+ewbP3qmP98utNicjNSh5Den4g/xjMI2l+4kqcTL0Y3ZGx/JkoDvUhd4pszV06b6Q8KQDUEJAVbIB+MZyK8kq9nHBI9/oXKWn45kBFS6/6fN/mAoHQEasSgGHVV6pKdCtMit26kMP9fzZ6T5BligAGdtuPGutEZA9fcItfj/JhqoolpuGePiuhoJGsm8Zluql5XOXEQnK616VCrRQdWjcQXDla2F6ujcbHFSVjHbsDG119/MEDvvB9gZnDJsC7kumE6F8K+i4lq6H24Ik2pbzevLJqevWAsFuccyAcf+WHJ3gHha11a1GYOu25p2VFZDqUpcpaQqQip5BwsTXs8mYvzsd0UWjxMjbyyUIhSQVhrRZ4IL4jtUuRSpQghFCeQzUQxShjgVo+2p6X/lq8bvPj4A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P2Qq1P+OmAuWpVYnwrDT4Bey8FheGyDorRaufUUdscFgydVfj9JZu+oX6BZAjzvVLEIzGY2Q+G9hcMNcFgGEsNdLLPh6iPP89jCUfwT2OwV6RahmKDZqwGKjTON6qKxlpvNFNLaRgybShG9MnA2IXGyYdfuPRSyuLeQzpNKFgK02J2H4WSnPYY5vcw8bBH40dL3Z76vPq/Gud92aJef0FUwGpJ5BCjCX7ZeOUKsiiXtBxtV8YOzgMB4uDP2Hy9LwnKGNxC4TChVnqL2tCKCDGRnmXRhcL44vtiQZfxbfUQbQCBq1dDyMWlIkE+KclFn8t4gcxYyFq0tt6DyO5I7exbPevFDeTPznh8HizXlNQiF3e6rGbxengI6iXNxU4TGVDSgQBtJr8P5Pv/60S2EL9emiKqlca5xX/wUvLtFcUXlpT2plBTLboYhVfYD7mRn4A/AwBCaxyREYjtnb3OJi0Vq/CrzreUBM501Iyxv0O+dV6RiCjXpVZ6Lba3qOjiI62v/qwqdR4RMyYOj5zJPrwgyckWjvZ1NthEhi9bDKAgJ++vDc4JwOFh8YBsAjkhidv/SYmzSIN8dxdWgVosJYrM/Ty9ZPBBc3CVAqWdpBUeTgD/7RwtbZYdPxyb87KEkvGV1gwzUbHkYB5WXK4x8Nlt4IZ+OBex61GromlbafiSCNk/3Ag1/Tc6+09J2RLGKna2ikUFq+XgzhrnjYVxIAcTN0GKCv/xRQz1PKuq3+Mn9xm37Y5aOKy4h9O672HzrsT7GvfFG/hr6To8wRsZKsX+Br7iQ1//rgfKLzNoHcgw41Od1uyoZX0eUlv7mJYJp/jpMgib2V7O+I4Ubnfw/0oVZutNweeL7dZlvjH8N9q7u6LGMQvhRV9+bIQr66VLEF6m6E5W8diIq2jqfR5Vh96TcU16zVqPoRZMRYZJeDNkDDyCvtTaZIISjhiHdHNP8EQ8EbXeATkt07qX07wpSFgzQHmBKrestviEdUq/vopSDDGFCD035fuY0o1WjpoXWMxHPV6tuvH6qRug39rBA/QRRoIEL/Hog8Vf0vaFznOc37Rkhmk6yHLBM+fUBZAGpIRLar30cZyR1++Us84jNdz59lzPWX71kveK03yMH2wHYUYRMf9mKwsmxMlhXbNAL+1PGNP9uNt8MTDmWZXy4JY44H5rwYvxCCyBCOX28clKosrqoy3xSK7wmAMFzybHhN3iFYobsx51HY3tsCD9FBwSX6vHBueM9eIY8oMiiaYKFc+YyhU3UymogRcErKWaxvvO4YdTcMPYhqotkDkZ4YkauEL2A8L4sqg+BhwgdyiHUAaQVEM8U+/ykn6tWFLgxE X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 567f92c1-0de7-4f5a-aff0-08da9a85eeaa X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2022 21:28:45.3868 (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: AS8P250MB0188 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/tests/snowenc: Don't use SnowContext 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: Pegy2SS2s+5h This test tests only the DSP functions and does not really use the SnowContext at all. Signed-off-by: Andreas Rheinhardt --- libavcodec/tests/snowenc.c | 43 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/libavcodec/tests/snowenc.c b/libavcodec/tests/snowenc.c index 6beb43d562..cb11bb1752 100644 --- a/libavcodec/tests/snowenc.c +++ b/libavcodec/tests/snowenc.c @@ -30,23 +30,22 @@ #include "libavutil/mathematics.h" #include "libavutil/mem.h" -#include "libavcodec/snow.h" #include "libavcodec/snow_dwt.h" int main(void){ #define width 256 #define height 256 int buffer[2][width*height]; - SnowContext s; + DWTELEM *temp_dwt_buffer; + IDWTELEM *temp_idwt_buffer; + int spatial_decomposition_type = 1, spatial_decomposition_count = 6; int i; AVLFG prng; - s.spatial_decomposition_count=6; - s.spatial_decomposition_type=1; - s.temp_dwt_buffer = av_calloc(width, sizeof(*s.temp_dwt_buffer)); - s.temp_idwt_buffer = av_calloc(width, sizeof(*s.temp_idwt_buffer)); + temp_dwt_buffer = av_calloc(width, sizeof(*temp_dwt_buffer)); + temp_idwt_buffer = av_calloc(width, sizeof(*temp_idwt_buffer)); - if (!s.temp_dwt_buffer || !s.temp_idwt_buffer) { + if (!temp_dwt_buffer || !temp_idwt_buffer) { fprintf(stderr, "Failed to allocate memory\n"); return 1; } @@ -57,36 +56,36 @@ int main(void){ for(i=0; i20) printf("fsck: %6d %12d %7d\n",i, buffer[0][i], buffer[1][i]); { - int level, orientation, x, y; + int orientation, x, y; int64_t errors[8][4]; int64_t g=0; memset(errors, 0, sizeof(errors)); - s.spatial_decomposition_count=3; - s.spatial_decomposition_type=0; - for(level=0; level> (s.spatial_decomposition_count-level); - int h= height >> (s.spatial_decomposition_count-level); - int stride= width << (s.spatial_decomposition_count-level); + int w = width >> (spatial_decomposition_count - level); + int h = height >> (spatial_decomposition_count - level); + int stride = width << (spatial_decomposition_count - level); DWTELEM *buf= buffer[0]; int64_t error=0; @@ -95,7 +94,7 @@ int main(void){ memset(buffer[0], 0, sizeof(int)*width*height); buf[w/2 + h/2*stride]= 256*256; - ff_spatial_idwt((IDWTELEM*)buffer[0], s.temp_idwt_buffer, width, height, width, s.spatial_decomposition_type, s.spatial_decomposition_count); + ff_spatial_idwt((IDWTELEM*)buffer[0], temp_idwt_buffer, width, height, width, spatial_decomposition_type, spatial_decomposition_count); for(y=0; y