From patchwork Fri Mar 29 03:23:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47635 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1754563pzb; Thu, 28 Mar 2024 20:23:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVzKBH4gh6Cc1aQX33+DmcDcuuihc+vQ9ttl/ZIx3ai//H7UyofT70I9MtdeKxR14v913xK16wrALPSAx49fht1tf6RFBasLusoVg== X-Google-Smtp-Source: AGHT+IFnJkASBUnmc+J/HEA1QC0IJAH0Yy7Y8+8TQOLda8fOGiGl1mGtxUorpHieHsnjLTRAvy51 X-Received: by 2002:a17:906:e2d5:b0:a46:bbb3:f0d2 with SMTP id gr21-20020a170906e2d500b00a46bbb3f0d2mr615717ejb.47.1711682628042; Thu, 28 Mar 2024 20:23: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 he7-20020a1709073d8700b00a46bda1dbedsi1410050ejc.557.2024.03.28.20.23.47; Thu, 28 Mar 2024 20:23: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=cDpnQhpp; 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 2B21068D556; Fri, 29 Mar 2024 05:23:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2036.outbound.protection.outlook.com [40.92.73.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CE8368D450 for ; Fri, 29 Mar 2024 05:23:37 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dm8KEL+blBt4+ms+yXns8n2HMAnPIL/DS9kOZD6awdgbMgZxtKm9i3iGXrZtMBarqegMHi13Sl8YzvdjILiIKN68N10Lsjshrl6M8DGFLTrmhdFfggXrFdZhQo3fTGBF6MH0i753dcvPaYmurQylIoVDQ/+VkZJuvRVXjfR0NCt+WYJFbaZ6E30VpT1SKZfTfMuC4MHkWXtRrsbckGpVkPDb1mof2QWAMyESAesB9vdZyYa8WmLsKR7QiYh94U2q26wfPb808kbsix4b4ZnRO/qe4D/KBFF7AQESQ+10n8XZd1Zsu9SRo9YinWY7YCX7NzYA4s5hWXI5Ddk2v6aBkQ== 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=Vxv2hqeS5+Ucxkf1TM6aOpdv/mV42xZgWLNb+7EssmQ=; b=F7A7zWVCI4ST/7ZfkSKiK993ObmQERh1oN9Zf3sCETtneZbX9GBACHpcX5F2SooSWuPbf0UiHADQaCCdPrSiTdDfLB1SEes09bxnxIM0Z0vuO5dyzhW2hguhXyXhyq9L2D9fpK1ma7BIvIBnMlZYD2SqLKdVNh/A1Idbo3+8HuHl3F20Wajy624Pj1ynELDtoYm9QzFahNr+ODq32QCG1RUoR0YKB2blmcIZuytX0jxA2HyBX0OQ+rQFkQNfR9IwLEl1/irtFJ61iR8skgsVMfq9grz1lYzTT0hQl4Gw3cgZ3M9aLUZr4K/scr+R3NB9auyvUo4JpG782B05vTS1HA== 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=Vxv2hqeS5+Ucxkf1TM6aOpdv/mV42xZgWLNb+7EssmQ=; b=cDpnQhppTBAAnkurbSSV0NNSWjPqbc3bJH9quAwrOIbEKqARQfJ2ZWJgeX5D4cFsYXzeOwWlUjDWj63C0RxqpcxpRsl0CDbUbQlhOltkPNszHiB+XJ5CAXRvvIdpL+NyQS03SzfvMq84lGT8/o9vzy6ag1YADP4rkuLDPmrSbnlay0uU0tWc3uQQRVrgq5ge4TzeI0TsFQEpkjJuSFiHM8opExJWE91jG/nnHYIg/jaEgYz/AXtfJ58JKfkp3q54+EorG9L3Vwa0upMCfiwWCNBer8WnXXDlu+brWmmMfuUIL37ei5j/hZoAXql/3m+yMnn7OLoSzxc9I9rWXiCKVw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0116.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:173::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.39; Fri, 29 Mar 2024 03:23:34 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.039; Fri, 29 Mar 2024 03:23:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 04:23:23 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [vYOqzZglMor4Hwn6pMKCWRWetjcdyQeNLADiVpVxdLY=] X-ClientProxiedBy: FR3P281CA0140.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:95::12) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240329032327.2304945-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0116:EE_ X-MS-Office365-Filtering-Correlation-Id: 2fd5e321-4c8a-45f9-bb1b-08dc4f9f9dc3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aJZFjsZt/DKqlMujMlu4Y7hQ5yHMAjKsQGC2gamRxZjRriswsZtgwk6fDfFXOdRrCXqVryCtkvw/2jYhCxfs1cerA7ctl03vkQbp3UzhNvzhH+a/tNRcaiQrI8ipnM2KKbkH1gBq/xDpd9b0gHdXFxa2DPsVewEbPAx7LULMj36dqDeTCCKDGP0yJtXwNKZu+IdlsV0PLYS3c7HLWzxVxO84AkpFb4qyQRwm5762vFiqYz2B7x+VKfzgHDqt64/rcOJFGMEkuLSQgFchu7a89QpWmVfvkVEBsPzDWseeDRQ7Gcdsd5r7+oC2mHO1ku2AaSxIWyuqXTTO2HCJsR9S61wCrbcClbTjyVyHvyXMrv+4P4meKnNDXBTqAkri3zjHNovuoMyAYNltvhR5bdp2OOfcd1OAXRtvG4ZKVbgRHWaz11tXOoDAUNrUIpY10EDRS03Fb6sYOeiFXKRs0ETGGvRoS7LKWPPGtCqaEg9pa7gjncJp+eYP2g9IdwPco+eIClzJl7DxmX16/PJwDaBYX6GZiDJSnGNDbmPXqW8DsFRSC6A9IWhwBudUfqnyjaApSFfkZdVtwDg430EL8+5q0HoNxTnUu7tpSR9OcBSnnsXCXas1nFy7sIyDUntoJULYWweavd44DVzpERfZnRLfliw1oZpVHEh3iLNvqfGI9fGrVxOR8uY1CTDFTb89X+85 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9hJZOyQWN+D1vPIKdL+8eXAIKqNNcu6subX9qZ08iSzoswfQWGwn5A4R4oYLJqaCv/CZADkOnUBeYH7hUtzDedlNk+tnbiJ9XTtTVluElJbrHjnjZQVQsh2//2QQGheHch7AOeoWPQR9KXVxXhscNyMH8eZ4mIz+jDaq8xbPIgHiDqjCuhXLKvw095x5zAitDw9GVD5ySK04Mwu4Fw3XJTlwKWeIZGKv+v0JkDqei0E4qRDPgyXPzkqk727w44l+M5+5NyGyncHOBAB5XtUnwGTy8kjiJlPe2/I1BcF8k+xU//QTsiSbdEv9K9D4LQwkemc4qDpoklRcP+Wxnc7tcfDqAeoY63BU4SyYiet2gFA6OtvYVfVVYr7iNcmP9IEAmKWyE9px8+sWFFIcwMdtyHXezRfvFyk0oXyRzRAVp9Xm5qQ66n3AoRKZl7U50lylSXLMZDc/1U0B+VYToC30t8tI/CxPnmw4GqyeNVnyJe8IPrYlxWv8I7c2+jlSjbAShjcjISTHye5oGoXh7t8G7DDXsSjTwDv3CNM+70msXKo+at6e5Olye6l4a573P3z1Lt9bkFr8aaTgHPipJUd1FNqRuVZkPf1922fCDCLwPtnVTL3UPKsBufyPLWeaJYIeeltvbDgd/3utN7+eEcnx9E7ORBMnSUXGGTCVrFSpwlrQn0qsKqr6urGSTiSQAr5kK80xXX+zaZSSmlk9OUqsnW7mHSz+N3Eb+r4Yj5pBpqq3Z98N2tXPZqMSfkTGNUM5gdcOexmMHLmiC9zLSILzuBhCFi4RfT1AkkRfYYL90qbyAAaufvX+ybh6IgMlfiOgFgLfcWb+BhKzQYTnUco0BcsVSb3vFtUZuH+jiero+FbqwY+xEu+HVBRaJgpMXm+2l7OyH/kVQgTJBW2nvFaZ9Wqs39JgPTud/MnC3MvOqzIH733jDYaTW3TA1BElZXFy+LiT72H9eMPiFsP350AjBmglnwRCxal8LlyA78qU3O9BPZ8TVJwhsqSaZ3Gn5R8pDExLIrmzmv8azRvvaK2+2yTqFRYJ2EcDThvQn0ekZ8/UR1NiobGkmxR7a0u+vX/3jaLrO7JFS8Xfh//HCVLIm4TnbzQyhv+UcXc0C1Mob+nvYP8CpNvYrEWKc3uo087fnMn9UjXlsRSkVH6C1k5oRehnBnFObKzJmC0LJOZBc0bpauZXYdAw9f2lVpMLdAjzLo0cFAm1XKvj/8gCbdMMkV3GSqlQM7Puah2cezL85dyXBwy/hCSLTS5H6Lmr4UOLyPS8ltVQjkHv12MzbQEuZQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fd5e321-4c8a-45f9-bb1b-08dc4f9f9dc3 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2024 03:23:34.7669 (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: PR3P250MB0116 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/ppc/hpeldsp_altivec: Fix left-shift of negative number 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: bmlE0zrQfx2V It is UB and affected e.g. the vp5 and vp61 FATE tests: https://fate.ffmpeg.org/report.cgi?time=20240327083327&slot=ppc-linux-gcc-13.2-ubsan-altivec-qemu Signed-off-by: Andreas Rheinhardt --- libavcodec/ppc/hpeldsp_altivec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/ppc/hpeldsp_altivec.c b/libavcodec/ppc/hpeldsp_altivec.c index a531b6b6ec..4bf6b28ed6 100644 --- a/libavcodec/ppc/hpeldsp_altivec.c +++ b/libavcodec/ppc/hpeldsp_altivec.c @@ -41,9 +41,9 @@ void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t li register vector unsigned char pixelsv1D; int i; - register ptrdiff_t line_size_2 = line_size << 1; + register ptrdiff_t line_size_2 = line_size * (1 << 1); register ptrdiff_t line_size_3 = line_size + line_size_2; - register ptrdiff_t line_size_4 = line_size << 2; + register ptrdiff_t line_size_4 = line_size * (1 << 2); // hand-unrolling the loop by 4 gains about 15% // mininum execution time goes from 74 to 60 cycles From patchwork Fri Mar 29 03:24:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47636 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1754841pzb; Thu, 28 Mar 2024 20:24:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUcDi2VkEV+ZmWGS9nvEXTLRzgNPkbFEfxThUJs6/m7s8i/nOwpT71FBFtMwm76dKp9aQSMIw/6QS69C5UyAkAO9DgCAUJxlob/1g== X-Google-Smtp-Source: AGHT+IG/gflZXHj46Z3oM9o9zlk/f2LYzg4oEA/OGU2p773bhVk8wxKBFhnOuCCgczfajXZV7E+x X-Received: by 2002:ac2:4181:0:b0:515:b630:c3b9 with SMTP id z1-20020ac24181000000b00515b630c3b9mr774097lfh.16.1711682689764; Thu, 28 Mar 2024 20:24:49 -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 20-20020a170906059400b00a468bcde798si1365303ejn.59.2024.03.28.20.24.49; Thu, 28 Mar 2024 20:24:49 -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=HzWmwAmO; 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 6394468D5BB; Fri, 29 Mar 2024 05:24:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2037.outbound.protection.outlook.com [40.92.50.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5480768D554 for ; Fri, 29 Mar 2024 05:24:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kj/9caWrgJlnbfyrG78M3GdjC302475ae6/4KOJp8sMvmDb4laSLLaNbl0cMLyxOfAGWMN/RrzqakuK6y7F5ryQiz2fB2uhDeDQy/Ht6WgsUZmlb91KDzf7Dg3CcpeYiptEOGOJTbzgMrS9UK6NL6B1C44xzBugNH2JxG4dIiDHSP40B1Z/AE3bdCo5UqbF3T6jLKlqsRlFLgDSciGJYejU3sBjcBHVUHgYcj4b+Fx6z43ZaKHrF250/ii/XvqDLfgA/qSv6cj/6VgQ02Ve65SmyLn8VXmemf90eRyJ28ubq4en1lOWg6ZapEyYO5X9iFp0Gg3GIqIQwvDrqPWLINA== 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=YLmWN4aSKSCHXR6JHCpT0cjM1FdmttQ1K6Sq+rXcXlM=; b=MhHjciW2UIjSFbQyyEhKPdfq14MJQU5+/C+GOMbBDS4sMeVNfLJhOPk6yPpHY6hd+d1Koy2FAlZ1VKm+2s50m09imYPjB5Q5BfqHqWjkkEvnJ13X13zLGtItHvf/+bQiYfBJ9Txrbgp93iE/KLkjJbMTnzOmgRyCiQLzEpZMoJ6AuvL1ylUoXnuwFQ9mkR6QmzEf7mFMlB2OBeOJt4x/oFxggYc9uP1/SFZDAtqy7Mdq7wifAxVx/aMZxKujTD1s8AsL9wWP60rhvDziQpUl9Z/y9X2g2L/SvgOxXPeO2SaRjq3XHr2vNGbVITceaqRRK9E/F7fhq3nJ7pq40Rl1BQ== 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=YLmWN4aSKSCHXR6JHCpT0cjM1FdmttQ1K6Sq+rXcXlM=; b=HzWmwAmOhLCTiL+ySgK/VOiobR1yIRRCsD4mS6r0c+ha4IbETflyo76ls03oPAQl7boWo3OO3yv8Vov0sXFBljEGpt+NjPx0BDpUUOioFKDTmAXk5rix9jEi9iW8EHNAUwYqn7t+Qjyr9YQ9Rkf9POubCn6QaAT8bCmhATahOs+yMIBGkU4QEksl9s9u5TYBSUwH1CKNeH+t6z5GRb7uLsTFJQwc508k/heqJFZ3cNnxb0XRRrv1gkMSnEJ0vEgUbB/+D2vV+cO9/NwgNllpKnWEuFhlE9yNUkkCZ51DM47D/OBdPe1A6LBai91Gl3EQ1q6lquP1SQqkLtsqI22yrQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0116.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:173::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.39; Fri, 29 Mar 2024 03:24:37 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.039; Fri, 29 Mar 2024 03:24:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 04:24:26 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [oOTXKTiqWiu1EpcVlw4e+kgRlIVnYH3xVIC2y+Ksv94=] X-ClientProxiedBy: FR0P281CA0061.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240329032429.2305146-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0116:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f14f733-3b9e-4ed2-6639-08dc4f9fc2f8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ko0WlRM7mkZ3tNfBtTyoSqm90lGUUYopuT5aN91QZWvbMUTslUBt+8zrLnjRqDnYXWB0oqbmQzffjG9JjcTo4/8Fr7Qu+BQ9RWoazB5oMj99+/XICohZefGiMH8aAhPNalFZWUdTKTPhEQbz85HNFkTfsx4YWcH+RVrB3WdUkvkhLXQnWGaixRlDOv+kf9ynemBu8TTOGtOtYgdfWvQwovwqN0RH8x5yZzq1Nrk1k385VfO85SxbvzvERQUbP+vYmnqMxWeXk+zKrjMSjc86braRJa0JTbgZARCLyu/R2FoS2WLvkErZeZnR5m+Y1iiK1uMv1TlwVcpVr6gYMt9mr7MqKp7mYYDggeEnTjsC08X5YxLvB1MJEI8rXVf2et71MV42iDmKa7LkphARHhL9Tp/38ttzTW0NE1mNGhdvoFH2nYBQs2W7Tu4PpdV30EjL1PIYZDPptaQKDnAyryyosINUKr86OVsBvCoof1HL/GgsIdpR0+Ha1d1ThGfgsKNai6PyrLPfKJ2MbVJxhpk+0/lS0y2biigIHQgQ7mHYH1KaoQdYN8LM+UJyoAkmXz45eXQO/tZTcG+nZRUMAcnklgn2cIfeByr7vlJw0eM81ryOeUdHgvex4rKGTvlvO7Pk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lYyLu01KdIbsj8yHwh9h7i+B6hqRCIjP6D8ktODi5uJrXxRQSUYqt4wZ6nfqg+KLyc3xfu2T7OFazEZKaDTcWWjdtyOUd+20fiY7tLgV43C1IqK3wfgO5nQmiJCxc9zhhYaiY+30m5w3V3VDGkTKl0PU7YYUK3Sx6CtCIe2VIG4dWjDSb+USVn8PIPCInZprycvjNR6M4iPNT05nKN05o+GhrHwCH5bjHl0Fxm/coaibl/wd1KrbLVreoNrL5lQW++1TZlTzGYT46I8yx/GvjvXmyx79R1XYAU71mwInAWA09KuO74+JQjiiL/eKoiTQdD1L11isvrPZAsMNxOs1Z473l19Hjn5tA/CoQAbqagNqR5liZEySCtduYVEVuif7dyViFeVCf3O62m0x3Rd67qRoZxbt6PwGvM8LH27YNHVdJlj7fJ7AQlVgJHJQQ52EGKbXUB1Q1lqlGYKld1/pWAfbMGD8JIsrOcId7PDJmzK1eAS8tO0GNhz/TfAEV91IAZLdnQ2mjLaeQ/KCSXjFjncdMGsdH6aEOhzlfxMuAD4gbynoSF6lT6pj0fBlMmPRdLaZObbPxnEG4xp3gn28V6RhcZmExAy4sfSlV+LmrsjvgMdIHyILMjS5FtSXxKfTL+aSUiCBWlr/mYa8JZWUGB0tQ+TZyK0Lk7orOehPocal3xZBq26Y7HRjcfWgt7WGDVwhKUHpf+eGCPWijqGetMB9vo+GBT+pMw50O4jj2U+/lbCRprm5VshgsfNdPLE65V1GQ5g9p17BK5ch9Aaje+1owokvb7s4DiXlI4j+nQGCUIBwgtPhanPfkq7Agayd2sGVhr1zYcJVtoyNyQ08xm+pylIEVtB07LLVFPpOOuXnNXKHZgLdmuxgibxxNecHaBDofAFWulja4En0adq7JqKNcVE8VZtZshFTkvfbAheoQnCfai9244va75eSVtNbfNwDqpHaxsq3VKloV9BFD2aBXLwt+/vnW6KlutFqxYzACIUr7Qp9+b4os9YdzfLJspuEAd+T5S16ruImvjH0fibRuAq7+0tqKVtV5tA9e3K2/FAtPi+02yWD8llQ8n0ZvCuK1Ge7qxLGgE3R2XRoyRwoEWASGHTM9PgQhUQUWqWwvzFNRSZ8IVpw9BG1cgglwMsG3lKZtTrTQ++bkubTb46HoJGXpH7Yoo3IrqcuEOLJuRssYHIuFJ6SINPb74K50zXjaqos4jk5iISEFRZZtWMEml5mOBGnOK1+/yy1p3kbBR6S1CPj+IBuDOfB++l0uQUPuyV0oCuFC5325HFkVA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f14f733-3b9e-4ed2-6639-08dc4f9fc2f8 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2024 03:24:37.2146 (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: PR3P250MB0116 Subject: [FFmpeg-devel] [PATCH 2/5] fate/ffmpeg: Explicitly set pix fmt for sub2video tests 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: qBnVTrTVbJLH Otherwise the test would use bgra on little endian and argb on big endian. Signed-off-by: Andreas Rheinhardt --- tests/fate/ffmpeg.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 3c549b265e..fda3a29239 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -64,7 +64,7 @@ fate-sub2video_basic: CMD = framecrc -auto_conversion_filters \ -i $(TARGET_SAMPLES)/sub/vobsub.idx \ -fps_mode passthrough -copyts \ -filter_complex "sws_flags=+accurate_rnd+bitexact\;[0:s:0]scale" \ - -c:v rawvideo -threads 1 + -c:v rawvideo -pix_fmt bgra -threads 1 # Time-limited run with a sample that doesn't require seeking and # contains samples within the initial period. @@ -74,7 +74,7 @@ fate-sub2video_time_limited: CMD = framecrc -auto_conversion_filters \ -fps_mode passthrough -copyts \ -t 15 \ -filter_complex "sws_flags=+accurate_rnd+bitexact\;[0:s:0]scale" \ - -c:v rawvideo -threads 1 + -c:v rawvideo -threads 1 -pix_fmt bgra FATE_FFMPEG-$(call ENCDEC, PCM_S16LE, PCM_S16LE) += fate-unknown_layout-pcm fate-unknown_layout-pcm: $(AREF) From patchwork Fri Mar 29 03:24:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47637 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1754886pzb; Thu, 28 Mar 2024 20:24:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVEpvjcwuYcYRrhOBY5uDQUPr9LS2zYguhjHxJjUyKL8vmR59aw/3er/l6vcrB4KMVbTpg+5OE4I3OXVV7R7PP9Dzd64DBC39TxKA== X-Google-Smtp-Source: AGHT+IFweEYi3W2P1vY3IPKDLgpShjfv00LXUVNiFSDlRXYETK3DVmZJUAJqfUdZgN5UVIO2KOEt X-Received: by 2002:a17:906:2b09:b0:a4a:20df:e032 with SMTP id a9-20020a1709062b0900b00a4a20dfe032mr633944ejg.66.1711682698559; Thu, 28 Mar 2024 20:24:58 -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 r13-20020a170906a20d00b00a46a90e7afesi1309047ejy.96.2024.03.28.20.24.58; Thu, 28 Mar 2024 20:24:58 -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=DIUH9HZp; 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 6C71168D742; Fri, 29 Mar 2024 05:24:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2037.outbound.protection.outlook.com [40.92.50.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C43568D66C for ; Fri, 29 Mar 2024 05:24:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RvrRUn4rv1WRUxOKbljKUsDzKeJb7NrmrIo9qbEvj0UZsHAOVPKNe5uM5CciBHadolPW+yHZ6z8nTToDGprcvAxiqwTDGjbFKoPrSwWuJo/myyrFfZoWQHw2FY99IHo2KFF09ICK439Av1AfrgDWVIQap6W76/kTz9RNJ+p6Jq1aXKTwdUI/ae5e5vY4nm1wXfwj5faa6Un/y7/yB5PDSvQeZf0jWGH1cEUIjE56wrYD5HCBM7/y1eKSeHzGWRSzG83dlxHGo4Y6k/fIXk2jBVazRuPmmdCbaQjiWi9auVwMlMxJLw7cy2ExSezofNHG9kvwRGTu352q9NB8hIQglQ== 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=GGFPXxR2SOAG8LqVAp2pSWoRBoJa1o1dJWHuZIo/tRk=; b=WiCBuMkjc149U+L7Ys3RkFCj9eV2ZNGS5HaHnstTc6YJjya+tBOmy/Ut84nr0M2rYQQn2yULmTsg3roUxtcfR1iu1vkoyxI0qlE9XQfYMzCjMn2xu3dDuApsb1Eo6ygtaSh1cyNaqPk5k1bKQBkNY31QT2Ek7fbWP2dVhppHAz4OD9QCVJrrylAWtVx9A8FBPDWxMACHarwwLth6r+74+0wj/XIdJWS1z3JbsnE0Amu5nvfv1zsz0VYzXxIh9v7j+BKGj+ogHV9rbjYox4VxVDfmWtvTtX9cyUk4MJ6qSTolOLLwQlVhRn+gPIXcAIpFabhnsvGbo6GYH314tjNp1Q== 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=GGFPXxR2SOAG8LqVAp2pSWoRBoJa1o1dJWHuZIo/tRk=; b=DIUH9HZp+m46rlYK2L9rC4yMJ1qSI4oH94VnM4ZCLJuo4T2EL0heeAgzv+ghJ3SfzDxXbg97NuRJGnaoEfM6eI8MrFIQZ0FTVJqxdK2FOCv90SMpiI+S1AwSuoQCV58gulYgMhtzRpw1gf8Q4vdm7V97N+OCW25AdPaD+6SHqSVUhZRsidIHMAd5m2VdBzoWGueQVIjZpZFOD2J8hDikF+G5Tmdw9CJ8Ie2l7pjZseZdbWfh079m/EqCAsVG7EaNUWT03awyIVAb2N4l16pr9SlFbveeKfZPZ8Faq+BwAtRGJ6A2h18+okdSE0Zo69+16gpI8xh7nIQfTWnL66PL0Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0116.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:173::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.39; Fri, 29 Mar 2024 03:24:39 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.039; Fri, 29 Mar 2024 03:24:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 04:24:27 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [skJXWpXBbZqUymF4rmBjyDwxhOcjZs0We2S6kt3rH/U=] X-ClientProxiedBy: FR0P281CA0061.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240329032429.2305146-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0116:EE_ X-MS-Office365-Filtering-Correlation-Id: b08e0fd4-6acc-4408-28c2-08dc4f9fc3ca X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /zTVgZiF6Nbxblewnr1eJsBtUl7T9ApRunzvt47ONGf9NWoUJYosS74fVW/e67BTuxDRvQpd7xG9RWW6NVnq7I8IKbhtBhxyLGDCBlZ59SXzz3wDFLIWC1tZD9Hb1Dizk8EuqTonEDLDuv+gNjbWjB+kMXP4H0Ry2MdIU4PeRYZdoAcJjSKLoabpwzMYMYKeMF3SpkQvpef21RC/G21IDFfQtH2MZrXvJGz7p5dX7LIEN5rZeNHp56G2uoRWwFB+1xoe1huMCnPM8Lhi/HSf1U4fvel0XYZFqFKzasN2hZ4o3Ns5qr1iEzOIOeFpEsa4f4W6BYsnvrFsZPGP7AsrYbCZ2cs2rM3X3rHu5fCPqypXfetfxYHMkZ690YTrP6/zKroW3iyZFlx0/d8gLt0aV2X9HvcqSgNklIjRmuPWVY9g/TzZkfYPPdE688u8iDBLD1SNpumN47wkUpmRDnAPCsM8Vvgf3laMjKEeSUwMn062bf6ccaicSbOYTMVi4H0pfu/PnrgwG/LSTJ0U7ZHxPeRNX+C9gI+Lob/8As8+PO1gXSy890xzP6A34vAEZfbUOH6awB1FrZ2H/txOgKCEbyv039kHbzXrDdB7VLkweWZlqZJPeRfUNoMq3qyoSPGQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BsOUe+rKc5MJm3UBj1HrUHEF5vrW0zW3MTjAu5UoBCjpra6VjIuBfGBVpWq045b7gFggINfrJgPMimzpH1VKzszUpLGFyg2WAmDCoOYIPcGZ20iZA/BMhXdz6VNaMljAC2V2Anz+TF4UGeDguzLxfWLNsBMHnsrmPk1qyHxUnoaltTkxKyauWll/nQuBPqgpfJlweel9SESY35yERUfeu9P+te55e3uobd+AxbvOL4FXoE9TY9hAG40O5ycw3RaYbAOBZ1y9VlAXD//2+9NmwzmZTUq+SiDvJp8lOKJqO4S90XwT8O5r/6QeCDA8GZja+32XLAjdXlv8uv3tjpw3E4u5Qs+vQdAkRLXOcsoGtZ6jpyDrVblt+Rg+h/DBmfvWfrAoqfdb+K9DtaNOLE0609sN1UT+v6O0JUJA4ZQB16dcVP2P52bfnyaoXwD4flJF0Cyl7QCqhWvhDdVncfwTtX8HDuttDnYUjMfgiYnJtaYqQHFv9boZB1siD1iJrywgxS+7qR0NOaABre6rYJ6QXARVzO6i0ozYJb65JnM6yG7+qKdgViybRJJ/arw36ZNvRYfUFJEn9LTHq6k28tecCEzn/NkpLu8huChl34Uo8mdsbCaatLBpyNxYqKV+JfmcMUG31pY7opJnbwnqWpE1jI6T7SuoMuE1BEE9eRZEfQxbFqx4IMVKWS4dEMbaCw6408XiQnWS9igxNsFftxLmRXKWOsaEKHRdh0q/NBLpc/HKqySRZFIg4lFQdqBHnWxZgyeXcZMmT7MpJOzCNKDMSYSccX7u/cML+zYfW/il9Isw8Yf6C23ZeraFiOTCdAFPUrRUuOn8aRNg6FfSE7z4kAQzOcwYlLv7B9EHtnOIHKnVLtkhIYcBA0riFS9bpJFZRXVch+K+HZLqXudkuIVcuuf64TRgBZpGFAaNV7xsQQOT7mnItFiA8UZGfQEiFFU0C7VR4Ve5Nnyolsd8W2jAky90Kzne45oH/PLM1o/uuKetp/Wvn2ot9XNpJ3TUiWI15zAvOcfCuNaGoWykugmuWXW2+5pJAFwr6Be/aOBkxtb/c+I0QKHdxApClp9nRhmFtW/hsDjmC/bBYT2/Ys8N9F0iWVXDzkEAZSLGF/k6nPx+rA2kjtbMXI45Z0XHJH6/uPv/Au6zZ5I16mLB1wY/YryUv8MbYk4usfpz+tM8pdHefs3sLEYg8TRJrrtRnMihuskCVsU1rdrgjq7s4YaykBCrH8ynW/YDzbY6Q+fZGwJito1nKg4n7rMI1/3Z5hig5oC4Q5FMxB9mWn0+beTnOA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b08e0fd4-6acc-4408-28c2-08dc4f9fc3ca X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2024 03:24:38.4849 (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: PR3P250MB0116 Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/pngdsp: Fix unaligned accesses, effective type violations 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: rhxp2sOhj1Lc Affected the lscr fate-test (only visible on x86 if the SSE2 is disabled). Signed-off-by: Andreas Rheinhardt --- libavcodec/pngdsp.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/libavcodec/pngdsp.c b/libavcodec/pngdsp.c index 65916b1386..50ee96a684 100644 --- a/libavcodec/pngdsp.c +++ b/libavcodec/pngdsp.c @@ -21,20 +21,33 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/macros.h" #include "png.h" #include "pngdsp.h" +#if HAVE_FAST_64BIT +#define BITS 64 +typedef uint64_t uint_native; +#else +#define BITS 32 +typedef uint32_t uint_native; +#endif +#define RN AV_JOIN(AV_RN, BITS) +#define RNA AV_JOIN(AV_JOIN(AV_RN, BITS), A) +#define WN AV_JOIN(AV_WN, BITS) + // 0x7f7f7f7f or 0x7f7f7f7f7f7f7f7f or whatever, depending on the cpu's native arithmetic size -#define pb_7f (~0UL / 255 * 0x7f) -#define pb_80 (~0UL / 255 * 0x80) +#define pb_7f (~(uint_native)0 / 255 * 0x7f) +#define pb_80 (~(uint_native)0 / 255 * 0x80) static void add_bytes_l2_c(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w) { long i; - for (i = 0; i <= w - (int) sizeof(long); i += sizeof(long)) { - long a = *(long *)(src1 + i); - long b = *(long *)(src2 + i); - *(long *)(dst + i) = ((a & pb_7f) + (b & pb_7f)) ^ ((a ^ b) & pb_80); + for (i = 0; i <= w - (int) sizeof(uint_native); i += sizeof(uint_native)) { + uint_native a = RNA(src1 + i); + uint_native b = RN (src2 + i); + WN(dst + i, ((a & pb_7f) + (b & pb_7f)) ^ ((a ^ b) & pb_80)); } for (; i < w; i++) dst[i] = src1[i] + src2[i]; From patchwork Fri Mar 29 03:24:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47638 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1754925pzb; Thu, 28 Mar 2024 20:25:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWqd+yryUJ4usn15A24v92KvHo0FmXfJOjU/KIzi0KsmTClyyX5HvKuzXDOboY88E69NJEMDVvW6LDPUatdUcnldbJ+7clNX7/2Zg== X-Google-Smtp-Source: AGHT+IGZVERHaIneK2irdX0giLF+G20pabCw5CDaELySUtytDhalE4jutuRtN7GkDR0G0zksadeb X-Received: by 2002:a17:906:5fd5:b0:a47:3c66:b396 with SMTP id k21-20020a1709065fd500b00a473c66b396mr606278ejv.64.1711682706425; Thu, 28 Mar 2024 20:25:06 -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 o23-20020a17090608d700b00a474a2e5393si1335111eje.123.2024.03.28.20.25.06; Thu, 28 Mar 2024 20:25:06 -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=TTh0eudG; 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 71A2068D751; Fri, 29 Mar 2024 05:24:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2037.outbound.protection.outlook.com [40.92.50.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4AA868D747 for ; Fri, 29 Mar 2024 05:24:50 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bbB+jvtdnH5qF2dlGZmCyxjpaCIL48+AjUvQFVG3+ofGsD16oXG9PbGcXQee0vmQED5OrCrojTWVRtm5687GLuBd1ARCQTSGTmIhsmnBYZ9QdoCI/vkwKEWzcLor4m4h2UBhAlUrjQUCOGrbRwUPfdsc7whCwFu8hcKDR6VbcVmgUUX/6nibQunkif2vUx3Jxql9joSW5mY8Jc70Xnz29ERi9ih8T0bemkWLLD1uC6uSCiUl1VTxqzGl/1VzNO3aP7oXsfFW661VAgLZPwY0Vo9yfqGk3REp0p0ujY4kvS0/VgQQkD87gDsg5UdRmIC5A5RfFDxwDMOCAMlQV74+7w== 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=5QGxLO/+a2M+AlCCRtaREzkFg3rqQ5yEKDbjkyiU2CQ=; b=LUG58wE80A9yLXVIi94p93cM35tWhG6g2ikig9ABs09r2rLT40T3fM2eXwapfOu4HZq6ZpW19To20QIdaXbfJl4R6gga3knUixhnJDi2BWUcHpnsvqp4wSAxG29F+YVcmHXWemHJGsvL65L4T7OYOKXMiXUGHWEEViAEhBBU7ww7AGp0YgkSISTlcvOSDkkh01h8fIt7dI5dkZ399k43geeZq3KxaY91zH0q8w9RMCQhSaItpi02Yt9dn+qSy9DVFapLheQOdmiDUUmjVfrffCxuwxvDRb0skoenCn3MVmIJP+ecAlUcwyNb3yf/TOD3kazBj9YcvzqxBC5R5MlzYg== 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=5QGxLO/+a2M+AlCCRtaREzkFg3rqQ5yEKDbjkyiU2CQ=; b=TTh0eudGEcLdscp70BTjrFAuLflBWmC3iNbYoUMi/rV3sklwiJ+gM04LJuxluQTwg/2yO3LjjoHfs10AkpNziCMbsc8MrEZZ7dpXqze1fUNfVQAmliKMMDVEFFiZZhmN/zkN+bgPRe7CX5i5LF9w2t2X9v1MH2TMLoj6Eu92WDd9udieYmf0R0bDn7UKRpGUFuQVO3MgGbKQJCv0rIC47t82KmyTRee3w+s4/kweGkjpxQ4bSsLG+d/Xa3i6k1AkQmE9hYQ4CPZkj0w8ayxVkYdu9QvvD4savZ/hmZWq2TP/FTbNWrTWTmiXHg4qOeVqxFF/ICkMACww0sR9t6afiA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0116.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:173::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.39; Fri, 29 Mar 2024 03:24:39 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.039; Fri, 29 Mar 2024 03:24:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 04:24:28 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [iwUGwYuJoYjeJnXRIXmG2nuydZ+CVNNgCjeY/c1rC94=] X-ClientProxiedBy: FR0P281CA0061.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240329032429.2305146-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0116:EE_ X-MS-Office365-Filtering-Correlation-Id: 4129a281-0cf6-44db-3f2d-08dc4f9fc4a2 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sslOt7qXWG6Fy2mbVztAywoYTbPZfuDPmKIEIJiJHV2uUqCfXcSnNPzGtVqIAhGLnmJCT7GqnQtlUGo2nEiyLjwA8dENK5b08V92g5voZ7uw24fwXImX9Fhly4eJtDFW6gN/JnGjYAlTOMawuTL6C923T2a6D5oF7T3p22I1cP+CkZC/7jLIO3f7B2fR3p+W5PiEv1bR9o9DLzleMcUNQxPC4NffHTTVOjHKH8og0YMmO2cFgFOp4Ax50S2V57CkkDBcYonPqP2KawEG6AgZH2cf9/mWcy6mH4Il6FtCtRWdU/HTVuLkClz9EbmkstR9bqUvRqXr0K6ATNZ5kTzVsym2DL/8S6BcGjIcgSRmlSk2HHkR8E4ZQEtuOphZvzhBU2MrCbiIzOnV1ZMvyfEr0a1UgCa8HBeSCMSe64i9vYAdkAPOZkeoDHDtfvmkC+yrwuOp4lvAXH+kOkpI8U+A3sSl9W4h9Ur0b4CRHvlxqgL7O8cbnJi5h0/6L/B6OQAtkjuXL2LQCiG/yugcHFr7K+/Xbqbxh7ntDQSF7CDnwmEI3q8pZK6zM3oKdVgr7lAYfRDlWb6KR3PQq+TEPYHaEGyvyF4hg5mwR9KKDtpkPo1Ojq9tF/8ZaUiEzhm70WZ/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s4JDakektDgIT7uU3f8ALAYq7vLwplp+mzM2uzc1g4ZjYorUwn66r8T5TSbc9Wf096khk+qYpOVyDpqwPJ5ATGvupi4vJes7Rf0Bs6nQ96XMLkuiD0TYUvmIiWB0Y3k9MUQsxC4+0YzQmYBpDroRLRx+7t+2QptJyP8la3Eguw84h/A1x/3rc8O+G4/RbdGTa+HiuSypJqh9eG7RMYlFedoYlfDlECl+iuS/n7sS9b/3dRL5WaUaAseOZYLHR0P1C6BWi3Gvnd6+30gXKNkFJtT+haa/8xOtAnAwadUzNLApGraaIVIiJkVMpA0UxQgk+jIh6ORez1QeGZz38HrEByoOtvKFFz0W+jjUvLZ/gHbH9Pri4ydodQCia6SevdKG45byyDXDrlg+qZqNeT6W6JolZbi0rYEh7bhWAQV4/5JZGuCHycQc4xqq+8+yuMLIdJQKNh+c5Ng3oROwmCUYUfGBlctV41u4WC7Z0fq1GqP0XXAdj1dK5TGPN2WoPpCNcBnF19+UFMRZQm0uHkpRmBLMmMuagXe1TWqNqioq8VdI7pgKV0/EjYdwxVvemBUNmdoT55UmljMLcQwL8cUJMTVLtS20iHxkypSZM89lQewjd3U6nPu+S1nYAZTnizB05z47DHzLJSgoDpxJJgjNCMIfGXqMgwmhs5rhDO4qU936k5Mw6+I+20KKNUQ5aXK+5bFAERj4UhQva3SufyaeDBLWInQEIgDh6PqBn2WGBJSJAv/1j8NYmjNSZZw8gzj4QKx42YePXYIv8zaWEpcQKNupK2IlRSyRdfc+K5ZaJXzl2ISDx27BCc38BVMMKNG8B9CF19Jy4iRyMHrcvMKEg2ioY4NIfZoTUoRTqvLNPEHRydGJhIxB1Nta8WFNsXHKQZqXk1Bsez/tSKJHRnCiWK4AsioKF93xsIYZN4RFAz8CeobibGGirYI7XeU5p03ovFpFhM61DeiR5wy1fgBCrqd6D54SSu0fiqVtV6WiA6F+Dg9ngJnClXIEAhUM1KanVMCj0DjajV+TOw9iod3o/hFADnEsWpoR/plpk5h+rFpEynVH0hMJ/+gHF98fx+v60hOHr1CMDtMyihKOrSKa/MyV7y2FC+ueUSwWqZc11kjL9ahitBXmeSglxQQcZHgDD4iQf9mwg1eO4OxWDbjIZAjVDxlchN/esVAXEf5lIrXc31u/oZOoBs6EvXc1G/kQc8KE3NSgiSqt/ChMp1zFprNAToPUlkCgiEcgR4On7LpGYFxbN3U1FHz3kGfgg/leuJBHKhC9aOoDCEEmseCOCA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4129a281-0cf6-44db-3f2d-08dc4f9fc4a2 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2024 03:24:39.8974 (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: PR3P250MB0116 Subject: [FFmpeg-devel] [PATCH 4/5] avfilter/vf_spp: Fix left-shift of negative value 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: kHDnK+6BcAM1 Affected the vf-spp FATE-test (on x86 only when MMX is disabled). Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_spp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index 5c6495612b..c8366ae319 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -171,7 +171,7 @@ static void store_slice_c(uint8_t *dst, const int16_t *src, int y, x; #define STORE(pos) do { \ - temp = ((src[x + y*src_linesize + pos] << log2_scale) + d[pos]) >> 6; \ + temp = (src[x + y*src_linesize + pos] * (1 << log2_scale) + d[pos]) >> 6;\ if (temp & 0x100) \ temp = ~(temp >> 31); \ dst[x + y*dst_linesize + pos] = temp; \ @@ -202,7 +202,7 @@ static void store_slice16_c(uint16_t *dst, const int16_t *src, unsigned int mask = -1<>1)) >> 5; \ + temp = (src[x + y*src_linesize + pos] * (1 << log2_scale) + (d[pos]>>1)) >> 5; \ if (temp & mask ) \ temp = ~(temp >> 31); \ dst[x + y*dst_linesize + pos] = temp; \ From patchwork Fri Mar 29 03:24:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47639 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1754972pzb; Thu, 28 Mar 2024 20:25:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCULgNA1EHXD3HCoDapNVZnqIM5R8tHkNP9Lmd+CDjhkkRijK3DTU9JPn427vW8O9pJxuDzxTRqXftrmo9j7CYI4MUz2KV1a3qZODA== X-Google-Smtp-Source: AGHT+IEEEj6o4InvOSo57zfKuL0HXnL5CrmdIJ45ltTCbwp6zmMgS9x4oWj0BKWFtw2MbPJZllUK X-Received: by 2002:a17:906:39b:b0:a47:99c9:8823 with SMTP id b27-20020a170906039b00b00a4799c98823mr616419eja.42.1711682714648; Thu, 28 Mar 2024 20:25:14 -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 s10-20020a1709060c0a00b00a46abaf9fefsi1336966ejf.529.2024.03.28.20.25.14; Thu, 28 Mar 2024 20:25:14 -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="ZR2/T/H7"; 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 A8E3268D757; Fri, 29 Mar 2024 05:25:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2037.outbound.protection.outlook.com [40.92.50.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC8B368D4A6 for ; Fri, 29 Mar 2024 05:24:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cVUt5Q8Jp9Krxp5OmnC9nLq1yfqOXJmxJViKOTwoWGy2hVT0qjqbD4RAlvHNJgSFp8L0wLqgg2QjFnws8NKj8BZOlmAvt5H5jknFab9A9StE4OASLGMAjSaKEVBHfFjXXzIspAep7pYxpKLrnKN/DAP01iObqbc6N3J7Cl8r4wviZOjRcQ060AQedJU/10rajZm90XMSrMQV7i5wJg5JHjB1s564wD9kp2/l41Oj9WtKS8iVpLLV0lKaY/pw5tbbxaoU1Afy2LpCMOyE83ijTUrqCbbGSh3hLCmmqgdi2BzHK4axs6FqMA7qnqJq5ioI/XFCBO/cgG3auQ221CiyDg== 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=RGPXq2S51f0jInGH3bZLWstSWfHc8wRsM9vBUqPNxbM=; b=E0csbSWSjAWQBr3vgIlokw83D4ZvllwXxVBn987p42qynscQeiiKcp2JM0LyzPYLZWOQH6zxXNe6kuHP3hr+ETjDOX1gYyh2u5sAqxOY3PZaU+NH5Z6oJykvkdZKKf/sOLftij0v5h109++AdkaPFxr0nxQatHwijsInVWsLzYm1Tfv9OEgUAiJm+c3RQN9fDMNzWw8f7gM3I/Vw4iktNb/1VkUYjt+GoDohYjFruV4zb1fVFIGbP8wqzdwPaLlvDsPy5dB2f4m4YJX1MjP5ib8j+D4BMDBQVETe3iLy+r2xmy5NKNveYIbdowrSb7QxJT3X9sxSi236nk75Wymbvw== 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=RGPXq2S51f0jInGH3bZLWstSWfHc8wRsM9vBUqPNxbM=; b=ZR2/T/H7nHmOmpAUz8/v7Ge/WUFsHcdNvOa7d9oPWaHbWy6nSdRLMa2Q39Ck9lFGFHwyBsdi0afFsuT6N/QChIEMNjPw0ez+MzecVKF0FWP/wdgqlyV91+TbuiBY8UoMwICQaKHncjz665rb3kQMOhOBWvn+zVxHSdvjUAZn3VFtnWNPUgGwwn+JoN5V4O8edmpZtEn3nFqOs0wdf333kGpMevlZHGfcQJrkKr9d3e0WfBcPuaPQBzJ4okI4zrL/CggmzaSgLFsnRbiAE+qgvhUSx6Sx9E3XzerZspuX3VTvF4+2N5sZofh6IAYTBX+q9qjYVlKjR7/Ig2lNNiCVfQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0116.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:173::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.39; Fri, 29 Mar 2024 03:24:40 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.039; Fri, 29 Mar 2024 03:24:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 04:24:29 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [Zh272cBbX5wWzrWyzmzbDqWOKuN37YKf0m9jmLl6wbs=] X-ClientProxiedBy: FR0P281CA0061.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240329032429.2305146-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0116:EE_ X-MS-Office365-Filtering-Correlation-Id: d91de856-88be-42ec-2cd3-08dc4f9fc52c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ng3cP393NMfy9u4GQ4HGoisB7njo0iiicTGRDdl8ibG1qIt+T3mCo5yjDCZDk1ehzcWGXtUbzJFkPJx2dFPeim/vQVfbn9CCT0Zjsg3cmYxraUTJaXhQ//jaNpxn0bF58wQFK++om8QiUxXWcXSix/HRxk7J1KK5IyG1t6GL+eEfNYfFRBEx5HRdFw6mDtE1PXw4yeU572oCgJtUnLL8rH7tFBJZeUy5nMSii6K1PhVyAn/bb7vOlPUZoWRs8BOipVON1d9wFUlpI7zEZFnkq7LNpN3p01VPN0mbwEdVEbxtLzT/S7Wkockm3L0o98/+xnTd0PDwL0fLdRX5lXCTkyfMv6om0fbnRf6lU3n2DiquWvmffuQBnE8uVuBHKAD4nnLqX53t7ksUABIMKyt2r8QlB3v+x+n/gWzI44/bkfydUaVWFaFOXQndAOum/E0E5Y+SM1jpvh58aYwC/eqBFxBGZt6P79aj6apS0U4KbvclBU75Mcq103RrjkVypWG93ExlEJ1LltgqrdPZ085z8IuaeOQisekPbnhBgwbCsQ3pcfdvYtKNb2Cwa6tSnCiIdoRYMVlFdYdIpCbHzMPN3h52uQBcjSx7IaJTpIeyfARxPlit3Iznud2sSIDeF+iY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sWh9CNdHmanyI3TQAi8tFoU0GN/6X+odEn93k8GYwx7S7yUSAHYX4wRGjPNGemhPYi0LB9j4LoDWb5V5+JViy8ObBSp0k82obVNjlg/GpK8dzM4nqfTjCtzHsGfpyeSkGACl8ak9RZ8ngeBEd+0JwodIsFXXXd23n+ppV6QbolM8dEEY8Aqu37XO16DYeGgNrsfE64ioRjwDdyPpeCZkqnT4Pzf6JmpCUfoXt4qXds8zeYeywGhXX8xkEs22BWS6nR6J38E/SVwgDGxYurgq9Fn+QOH89ua5TtBu4CjsZ6L5c13gQe4RajlP50ugG1QUlUzow/ey42HoVPXpIkDhxrp2mVZcPyC0VPurQGYkC6xkWTzGK6KUVDwqGyGTdPbJmRHV7a8dovtlxyISysphhjM+mMjgjr3Zd6QxImiknRpwDreeOgySAfNBWNUKBY4jG2JU9kB8JieFx4hRGnJlW3ToVXmGb4TEJD+U6OMs4EA5tEBgsww2TN/F+2YrmL0pHY2yI5BMD2AvmjvHnU45iHhdX6I21ui8Prn9b0lzOfdZtnq5ya9KMU6pm2r0ReG9L3yljwHK+HakJEnkCwAKgHZzp36rB8AmNDdd109EzFXTqSC2z0RjWCTQfXbU5KdWVwo3jhyKfvt0em9rrznfT1CC90rA27+SLvweDNEE6bHu/OM1C3qR8iETXqWKiTrFsgmbuqMslctY6exsi5WCHm01EXOhQErX8zMXQTORXaGQhrY0gRqW/BCWYJXwPx8ffqSW6Pma5nlj/zQins4dRi4MJ/QJRPqQwG5D2/sHwpI4btGH7pqZNUmyLvkp1dz4cmSdFR5/4NGX0kUahQJmNQnDTVrhkzwadpJqO5nIytZsNxDrViPzNLaIa7JT5XJvEWbTY0xZC21XV69XL+rI5U1zQPf6ExFyVrXCED+PKaI0aQv5/Exl48BfW4sHaxDmTcGIjOxS2H6ltgXHqdSkN6pK0sfqcX0TeVJ22klPsmJuG/pgQoVUwpStS942bAixMhd1i7zy3kl4NU3I5OOW//mgUH7jS/BLXwH1y32eegfR5K/2ZTnFW7A05bwjJ9OreU3zVvOZQ3J5kXKAwWBB4VFD6wHasUFYHY6G8xzTnWndIFwDdstSCGcQfTaYIWGd2bcU4zJlqgZERUY55Abx89llAlyzQkuPERm9j3sD8RPBOYpZzEDYI8vQ9sWQpHr858Z2anoIUPPomYTJHzlLuV/1dvBTwAfuxpkX0Z987aAHMaljjDByhjNlTM9VVoNilcTY7I6q3Nd9HF6BV+FX8g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d91de856-88be-42ec-2cd3-08dc4f9fc52c X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2024 03:24:40.8062 (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: PR3P250MB0116 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/huffyuvencdsp: Fix load of misaligned values 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: TX7Zx9bn1OiJ Affected many ffvhuff FATE tests. Signed-off-by: Andreas Rheinhardt --- libavcodec/huffyuvencdsp.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/libavcodec/huffyuvencdsp.c b/libavcodec/huffyuvencdsp.c index 36e8f6130b..27428635af 100644 --- a/libavcodec/huffyuvencdsp.c +++ b/libavcodec/huffyuvencdsp.c @@ -18,16 +18,32 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/intreadwrite.h" #include "huffyuvencdsp.h" #include "mathops.h" +#if HAVE_FAST_64BIT +#define BITS 64 +typedef uint64_t uint_native; +#else +#define BITS 32 +typedef uint32_t uint_native; +#endif +#define RN AV_JOIN(AV_RN, BITS) +#define RNA AV_JOIN(AV_JOIN(AV_RN, BITS), A) +#define WNA AV_JOIN(AV_JOIN(AV_WN, BITS), A) + +// 0x7f7f7f7f or 0x7f7f7f7f7f7f7f7f or whatever, depending on the cpu's native arithmetic size +#define pb_7f (~(uint_native)0 / 255 * 0x7f) +#define pb_80 (~(uint_native)0 / 255 * 0x80) + // 0x00010001 or 0x0001000100010001 or whatever, depending on the cpu's native arithmetic size -#define pw_1 (ULONG_MAX / UINT16_MAX) +#define pw_1 ((uint_native)-1 / UINT16_MAX) static void diff_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w){ long i; #if !HAVE_FAST_UNALIGNED - if((long)src2 & (sizeof(long)-1)){ + if ((uintptr_t)src2 & (sizeof(uint_native) - 1)) { for(i=0; i+3> 1) * pw_1; - unsigned long pw_msb = pw_lsb + pw_1; + uint_native pw_lsb = (mask >> 1) * pw_1; + uint_native pw_msb = pw_lsb + pw_1; - for (i = 0; i <= w - (int)sizeof(long)/2; i += sizeof(long)/2) { - long a = *(long*)(src1+i); - long b = *(long*)(src2+i); - *(long*)(dst+i) = ((a|pw_msb) - (b&pw_lsb)) ^ ((a^b^pw_msb)&pw_msb); + for (i = 0; i <= w - (int)sizeof(uint_native)/2; i += sizeof(uint_native)/2) { + uint_native a = RNA(src1 + i); + uint_native b = RN (src2 + i); + WNA(dst + i, ((a | pw_msb) - (b & pw_lsb)) ^ ((a^b^pw_msb) & pw_msb)); } } for (; i X-Patchwork-Id: 47654 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2094084pzb; Fri, 29 Mar 2024 09:45:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV6HW/aBA5Qo07qlAIm+fZibQGtSD30vqX8ZPXNs+neMjMWlBROAc/eyQ3zanyyPEbPlBrjSiU28BCt/8fyrxFlzKN/b/u2KDTGlg== X-Google-Smtp-Source: AGHT+IFRtgWYp1qaHWzJyxWxlldJBb40H0k5fufNQjwcL5ADNBtkJ4Gsib5DW3RlSOlccDL6CTj5 X-Received: by 2002:a17:906:830c:b0:a4e:42bc:e01d with SMTP id j12-20020a170906830c00b00a4e42bce01dmr462337ejx.37.1711730758379; Fri, 29 Mar 2024 09:45:58 -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 i9-20020a170906250900b00a46dfb36484si1874374ejb.809.2024.03.29.09.45.57; Fri, 29 Mar 2024 09:45:58 -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=hZH1yFBq; 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 9B89B68D75C; Fri, 29 Mar 2024 18:45:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2043.outbound.protection.outlook.com [40.92.50.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F345268D56C for ; Fri, 29 Mar 2024 18:45:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HvA9hzdtnl+u1ys0450P2UCZWxkh4hMUmECs6uZp5SergyH7YdFWjvLkZHneXO5Uc/b6mjA5rS3HyhMMncQQZ+b/yc4lCYaQYYd3pZnI1rr3yUy92f1/85o6DoLVJpVShDspyVcGkanwxYev/C1ME9vE1Jt5i2LVhFaCND6fPZhXF6EnkXKLP6EC9NPvgrI6Es5Fk7ezrEuspDXlWhBpwCu667jn0WsM0qvdexlgKHnBn7abAnE3nQzuQ+eqmx+oKEXJhBKHYCiq3DqI0uccTt1qqLunW8NmwetlkUN4tK3KpGrHHzoWgEZuGDMGHIKzvdpp4kJIv6YYm+kTyUNrUA== 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=KvKgNSab3rqk0XOOHu20EZI06ZN+5r34AKfDRZn03Mc=; b=ofKVo0wGhvrpViFrMMuuOOqI+w0wqAfN+OLRh7LI0zzdTbpFv3MkT8FelhfZCTPFNqiZTHrezO1l2x1e98u806b1v1P7ZYE+2fbUUi0DaJDiVQucZXNEnkhbGvGTAzJ+UZ7uT3CYl4TbivRakUunJnIsx7XLNxis3N9UBhsp0L3dC2GZZ4rdJJt8LodLOGzu7potf0qBU/R2hkRu62F9CBqDmzCBuPKt876l1oouWFTVcvpsmLa8u0sScrYIzHVRGL/YtjeT7Vbc0YOrBOfYno58KgEc2wCWDIwqOOo8o62hJBfNe+5dlfWmIgGnx+Gf7ngfMYEYhglWHFylLFjhwA== 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=KvKgNSab3rqk0XOOHu20EZI06ZN+5r34AKfDRZn03Mc=; b=hZH1yFBqEdn4c9EndYWZemQ852aUzj3fuo9gF2CpFu9mJLTtIcu6vMpxVrUX3rN+hVmrD7R3Xv9jif7h9cspgJ7J/tK8CkwLIYMyEP+UAT3PXd9GNcN9cwsop0IRhyJvDUQWxpS2jb1mJyTK+ntA0VuuDEueSf2FPZnfOmGVzXefHjkKkdbEZci0JEPknBe5x6WdWR65JcrONJF/DkbjGzolKwQsYiH8INyRDOTI43BHSLXUOjToGWYqccwKCt9sY3+pB8dFYrFEgBbpVFTCl2JZVZN256LkwkuC7kB726CXzF1K4MPylnlyYSj+xdWhSLdpH7TT/ctr3mXMafFJcQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0353.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.38; Fri, 29 Mar 2024 16:45:45 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7409.039; Fri, 29 Mar 2024 16:45:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 17:45:38 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [MNqXhZl6fE28m8f3ZyO8sjJaXkZF+rmNZxAMJXEuhP8=] X-ClientProxiedBy: ZR2P278CA0056.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240329164538.2405597-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0353:EE_ X-MS-Office365-Filtering-Correlation-Id: 8311c3a7-e7be-4c97-e2d4-08dc500fade4 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xs+n9gQqarYbW01ey6WlsAUuiUL9uZE0s0Rw3SkllRUK83K6Gprw1cH28I8nyIGSOIZW08AnjBx3Nghuni43WwwLwWi3kNoNbRNL60abrgEtVZBIVWHeICaJeNlLTfNsEJr38H4JPWf9TEWjVPR6iCBMyA4idyAXwZvgQ7Gdzum/fX3xO2leqXCsC9TOLjNPse6p0v3iEnuCmvm6ISFbiYtwlXBfKSKjXeROFNABC3wlq1A8BWBS9hshhca+f66vui5P47T1nD5Z3WA6VZMGlN8IPjeINVvGChonAUdJl8PafIT332y2H2YOQKiJRPzewnsJWt81yKDLmmkou+cLh7FrOPL1KbYnj/k11GLcciT0PSBaFXyY/GX3LAffpi9SGFS9F6GZ6xeQdeFwpBwSE/vPbw6ir1Nok4McgdHnJj6W/MUojMzQ7a9jIS9kH9gzk3xXCHnM06LpmM08t7JI/EP7t5LrSbVHylzcL3mDHbLOLj3WBUyGenGNl6bRutRvC2FC5MhngrZUBwWn6sEQF6iHjassDWo90VykzccwI8auQtRv/fUKC4WZJy8JY6fURtuoVrGTC2zk4eNsSJfHDrFW9/MLeFesUMY7qfQTHZQrB0Q77TaqjZHrMnYcR0P8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XsLJUNCCbcUqoSveemVAwFq4nFBLxHjEUHpW8uXcgC+0QhtBbOWrxH9coXiMbWbb1a90if8t9NyUCtssWVdeN9radAQbyezNgvOK26Hr4LjKEpAK8TeJaUJhM1yZxSXxZzJ7R+6ya5gCMfiQcTEfKrI25a5DB1QkqMLH5JZOJyKy8Pvh+cBYvCeV7k10N6LyPTGLz4XByEuoBjqXGm8bQh8GIsgh7PVmDqAJCwKZYidPDzShrwjWmNjBJ7aTKDFp4GllIdKLSUdlM20e5cCgP0ZKlGoG/9P/tvX7mLllXnWVfVpq+JAFE8gI/HZz5BBrRtMSU3N3FAMYRy7XmCA7d7rc/8Na0mJ6ncBZspX/T3tQBv6fVs8FKry/e4n0YRZkzsylLBbhYF2QPzQG5N/cLKivHE7+wkBhOfNBEnpsXv+oMMnscbkZIQ7mP3W1bpDhoAwtzAVMWnGKtjIJxHdJFXCQ3WtXp4OFu52eP2FvIXCP4aN/P4Dc0uHN1XK4dB8xG3tHiqMqqCktYe2pg6AttQnF9cgS4Qjn65RvYmb3lBuyO5bI2WCeBy1617axpgN+IJgsz42jh57XJ6KpX9wEgCJMYzMNOvw77iE8FUbbNozM2mk2iNU4zpOLMdjCxEvRsQHyDIGnlnO6zF8OAn6WUqX2by5kqz/bgDDjpvVwW/a20bosMr98IDCjPzg8xyZNcgp6/XHfpUzEGPDIIWLCSzXAFccVABCG03UxDfSaU2gKFNzwhzKxlV58OkXri3tqs62DIbrzImWSIOMAusvfnfqDinTZscb5JYlXQuVOaM9Q/5psu96iAMXihcph38HOWGwnzSckL4EcaamvLAo8C7699ucRkMQiFVgHiUt55xOSj+xkavQkf/y1qlT6UzLjr++FuoyfEJ8//5Gac3jhFACoRelEkI4alpe0nFbrzACjV03Vi52qytTN1JxPp0MWk0u+3O0WDzryNWEVUFkVnLO8GiBvGe4w5ZUshHm9GjBvP+R7C+98ZTW7UkcY7lKPBR08pDfNkaZ7vJws7yS3U8gR6TBxl4cfQUBdRwJaVHOOmsmAFUeK6NhY3IlYZAG3bK4GaLnMXoOcNPOV4RRh0ISx6jtY97vWo1L3iSr5rmgE3W//rJYxkh9615n3GjTVrSWXzbCEoxoKGtCkrvvetyN7SKp/LgOMCKWUvuoOUrQlfnp4FYt3OfOhxuQEEDrFnPxZ7u4dwZGELiUR+BF9Rrgbw/TPbNCWxsD4x8kiLsPJWr5FwVdEOHl1BANxpr0OLoSKM4QlBPZR31S1dRYWMw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8311c3a7-e7be-4c97-e2d4-08dc500fade4 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2024 16:45:45.4242 (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: PR3P250MB0353 Subject: [FFmpeg-devel] [PATCH 6/6] fate/image: Fix EXR tests on big endian 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: I0O8UcKzkxf/ These tests need a scale filter to convert to the prescribed pixel format (the native format is endian-dependent). Signed-off-by: Andreas Rheinhardt --- And now I will deduplicate this mess... tests/fate/image.mak | 150 +++++++++++++++++++++---------------------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 7c0e0fec08..753936ec20 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -104,229 +104,229 @@ FATE_IMAGE_PROBE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx-probe fate-dpx-probe: CMD = probeframes -show_entries frame=color_transfer,color_range,color_space,color_primaries,sample_aspect_ratio $(TARGET_SAMPLES)/dpx/cyan.dpx FATE_EXR += fate-exr-slice-raw -fate-exr-slice-raw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_raw.exr -pix_fmt gbrapf32le +fate-exr-slice-raw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_raw.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-slice-rle -fate-exr-slice-rle: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_rle.exr -pix_fmt gbrapf32le +fate-exr-slice-rle: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_rle.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-slice-zip1 -fate-exr-slice-zip1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip1.exr -pix_fmt gbrapf32le +fate-exr-slice-zip1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip1.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-slice-zip16 -fate-exr-slice-zip16: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip16.exr -pix_fmt gbrapf32le +fate-exr-slice-zip16: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip16.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-slice-pxr24 -fate-exr-slice-pxr24: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_slice_pxr24.exr -pix_fmt gbrpf32le +fate-exr-slice-pxr24: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_slice_pxr24.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-pxr24-float-12x8 -fate-exr-rgb-scanline-pxr24-float-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_12x8.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-pxr24-float-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_12x8.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgba-multiscanline-half-b44 -fate-exr-rgba-multiscanline-half-b44: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_multiscanline_half_b44.exr -pix_fmt gbrapf32le +fate-exr-rgba-multiscanline-half-b44: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_multiscanline_half_b44.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-scanline-float-b44 -fate-exr-rgb-scanline-float-b44: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_float_b44.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-float-b44: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_float_b44.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-half-b44-12x8 -fate-exr-rgb-scanline-half-b44-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_b44_12x8.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-half-b44-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_b44_12x8.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-half-b44-13x9 -fate-exr-rgb-scanline-half-b44-13x9: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_b44_13x9.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-half-b44-13x9: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_b44_13x9.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-tile-float-raw-12x8 -fate-exr-rgb-tile-float-raw-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_float_raw_12x8.exr -pix_fmt gbrpf32le +fate-exr-rgb-tile-float-raw-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_float_raw_12x8.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-tile-float-raw-150x130 -fate-exr-rgb-tile-float-raw-150x130: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_float_raw_150x130.exr -pix_fmt gbrpf32le +fate-exr-rgb-tile-float-raw-150x130: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_float_raw_150x130.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-tile-half-raw-12x8 -fate-exr-rgb-tile-half-raw-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_raw_12x8.exr -pix_fmt gbrpf32le +fate-exr-rgb-tile-half-raw-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_raw_12x8.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgba-scanline-float-half-b44-13x9-l1 -fate-exr-rgba-scanline-float-half-b44-13x9-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_13x9.exr -pix_fmt gbrapf32le +fate-exr-rgba-scanline-float-half-b44-13x9-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_13x9.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgba-scanline-float-half-b44-13x9-l2 -fate-exr-rgba-scanline-float-half-b44-13x9-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_13x9.exr -pix_fmt gbrapf32le +fate-exr-rgba-scanline-float-half-b44-13x9-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_13x9.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgba-scanline-float-half-b44-12x8-l1 -fate-exr-rgba-scanline-float-half-b44-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_12x8.exr -pix_fmt gbrapf32le +fate-exr-rgba-scanline-float-half-b44-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_12x8.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgba-scanline-float-half-b44-12x8-l2 -fate-exr-rgba-scanline-float-half-b44-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_12x8.exr -pix_fmt gbrapf32le +fate-exr-rgba-scanline-float-half-b44-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_12x8.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgba-scanline-float-half-b44a-12x8-l1 -fate-exr-rgba-scanline-float-half-b44a-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_12x8.exr -pix_fmt gbrapf32le +fate-exr-rgba-scanline-float-half-b44a-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_12x8.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgba-scanline-float-half-b44a-12x8-l2 -fate-exr-rgba-scanline-float-half-b44a-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_12x8.exr -pix_fmt gbrapf32le +fate-exr-rgba-scanline-float-half-b44a-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_12x8.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgba-scanline-float-half-b44a-13x9-l1 -fate-exr-rgba-scanline-float-half-b44a-13x9-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_13x9.exr -pix_fmt gbrapf32le +fate-exr-rgba-scanline-float-half-b44a-13x9-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_13x9.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgba-scanline-float-half-b44a-13x9-l2 -fate-exr-rgba-scanline-float-half-b44a-13x9-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_13x9.exr -pix_fmt gbrapf32le +fate-exr-rgba-scanline-float-half-b44a-13x9-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_13x9.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-tile-pxr24-float-half-l1 -fate-exr-rgb-tile-pxr24-float-half-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_float_half.exr -pix_fmt gbrpf32le +fate-exr-rgb-tile-pxr24-float-half-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_float_half.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-tile-pxr24-float-half-l2 -fate-exr-rgb-tile-pxr24-float-half-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_float_half.exr -pix_fmt gbrapf32le +fate-exr-rgb-tile-pxr24-float-half-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_float_half.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-tile-pxr24-half-float-l1 -fate-exr-rgb-tile-pxr24-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_half_float.exr -pix_fmt gbrpf32le +fate-exr-rgb-tile-pxr24-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_half_float.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-tile-pxr24-half-float-l2 -fate-exr-rgb-tile-pxr24-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_half_float.exr -pix_fmt gbrapf32le +fate-exr-rgb-tile-pxr24-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_half_float.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-tile-half-float-b44-12x8-l1 -fate-exr-rgb-tile-half-float-b44-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_float_b44_12x8.exr -pix_fmt gbrpf32le +fate-exr-rgb-tile-half-float-b44-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_float_b44_12x8.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-tile-half-float-b44-12x8-l2 -fate-exr-rgb-tile-half-float-b44-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_half_float_b44_12x8.exr -pix_fmt gbrapf32le +fate-exr-rgb-tile-half-float-b44-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_half_float_b44_12x8.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-tile-zip-half-float-l1 -fate-exr-rgb-tile-zip-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_zip_half_float.exr -pix_fmt gbrpf32le +fate-exr-rgb-tile-zip-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_zip_half_float.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-tile-zip-half-float-l2 -fate-exr-rgb-tile-zip-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_zip_half_float.exr -pix_fmt gbrapf32le +fate-exr-rgb-tile-zip-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_zip_half_float.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-tile-zip1-half-float-l1 -fate-exr-rgb-tile-zip1-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_zip1_half_float.exr -pix_fmt gbrpf32le +fate-exr-rgb-tile-zip1-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_zip1_half_float.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-tile-zip1-half-float-l2 -fate-exr-rgb-tile-zip1-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_zip1_half_float.exr -pix_fmt gbrapf32le +fate-exr-rgb-tile-zip1-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_zip1_half_float.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-tile-rle-half-float-l1 -fate-exr-rgb-tile-rle-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_rle_half_float.exr -pix_fmt gbrpf32le +fate-exr-rgb-tile-rle-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_rle_half_float.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-tile-rle-half-float-l2 -fate-exr-rgb-tile-rle-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_rle_half_float.exr -pix_fmt gbrapf32le +fate-exr-rgb-tile-rle-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_rle_half_float.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-tile-raw-half-float-l1 -fate-exr-rgb-tile-raw-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_raw_half_float.exr -pix_fmt gbrpf32le +fate-exr-rgb-tile-raw-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_raw_half_float.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-tile-raw-half-float-l2 -fate-exr-rgb-tile-raw-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_raw_half_float.exr -pix_fmt gbrapf32le +fate-exr-rgb-tile-raw-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_raw_half_float.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-scanline-b44-half-float-12x8-l1 -fate-exr-rgb-scanline-b44-half-float-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_half_float_12x8.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-b44-half-float-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_half_float_12x8.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-b44-half-float-12x8-l2 -fate-exr-rgb-scanline-b44-half-float-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_half_float_12x8.exr -pix_fmt gbrapf32le +fate-exr-rgb-scanline-b44-half-float-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_half_float_12x8.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-scanline-pxr24-half-float-l1 -fate-exr-rgb-scanline-pxr24-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_float.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-pxr24-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_float.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-pxr24-half-float-l2 -fate-exr-rgb-scanline-pxr24-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_float.exr -pix_fmt gbrapf32le +fate-exr-rgb-scanline-pxr24-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_float.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-scanline-pxr24-float-half-l1 -fate-exr-rgb-scanline-pxr24-float-half-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_half.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-pxr24-float-half-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_half.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-pxr24-float-half-l2 -fate-exr-rgb-scanline-pxr24-float-half-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_half.exr -pix_fmt gbrapf32le +fate-exr-rgb-scanline-pxr24-float-half-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_half.exr -vf scale -pix_fmt gbrapf32le -FATE_EXR-$(call DEMDEC, IMAGE2, EXR, SCALE_FILTER) += fate-exr-rgb-scanline-pxr24-half-uint32-13x9 +FATE_EXR += fate-exr-rgb-scanline-pxr24-half-uint32-13x9 fate-exr-rgb-scanline-pxr24-half-uint32-13x9: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_uint32_13x9.exr -pix_fmt rgb48le -vf scale FATE_EXR += fate-exr-rgb-scanline-zip-half-float-l1 -fate-exr-rgb-scanline-zip-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip_half_float.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-zip-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip_half_float.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-zip-half-float-l2 -fate-exr-rgb-scanline-zip-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip_half_float.exr -pix_fmt gbrapf32le +fate-exr-rgb-scanline-zip-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip_half_float.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-scanline-zip1-half-float-l1 -fate-exr-rgb-scanline-zip1-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-zip1-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-zip1-half-float-l2 -fate-exr-rgb-scanline-zip1-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float.exr -pix_fmt gbrapf32le +fate-exr-rgb-scanline-zip1-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-scanline-rle-half-float-l1 -fate-exr-rgb-scanline-rle-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_rle_half_float.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-rle-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_rle_half_float.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-rle-half-float-l2 -fate-exr-rgb-scanline-rle-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_rle_half_float.exr -pix_fmt gbrapf32le +fate-exr-rgb-scanline-rle-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_rle_half_float.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-scanline-raw-half-float-l1 -fate-exr-rgb-scanline-raw-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_raw_half_float.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-raw-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_raw_half_float.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-raw-half-float-l2 -fate-exr-rgb-scanline-raw-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_raw_half_float.exr -pix_fmt gbrapf32le +fate-exr-rgb-scanline-raw-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_raw_half_float.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-scanline-b44-uint32 -fate-exr-rgb-scanline-b44-uint32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_uint32.exr -pix_fmt rgb48le +fate-exr-rgb-scanline-b44-uint32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_uint32.exr -vf scale -pix_fmt rgb48le FATE_EXR += fate-exr-rgb-scanline-pxr24-uint32 -fate-exr-rgb-scanline-pxr24-uint32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_uint32.exr -pix_fmt rgb48le +fate-exr-rgb-scanline-pxr24-uint32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_uint32.exr -vf scale -pix_fmt rgb48le FATE_EXR += fate-exr-rgb-scanline-zip1-half-float-l1-zero-offsets -fate-exr-rgb-scanline-zip1-half-float-l1-zero-offsets: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float_zero_offsets.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-zip1-half-float-l1-zero-offsets: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float_zero_offsets.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-half-piz-bw -fate-exr-rgb-scanline-half-piz-bw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_bw.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-half-piz-bw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_bw.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-half-piz-color -fate-exr-rgb-scanline-half-piz-color: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_color.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-half-piz-color: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_color.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-half-piz-dw-t01 -fate-exr-rgb-scanline-half-piz-dw-t01: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_dw_t01.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-half-piz-dw-t01: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_dw_t01.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-float-piz-48x32 -fate-exr-rgb-scanline-float-piz-48x32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_float_piz_48x32.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-float-piz-48x32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_float_piz_48x32.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-none-negative-red -fate-exr-rgb-scanline-none-negative-red: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_none_negative_red.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-none-negative-red: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_none_negative_red.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-b44a-half-negative-4x4 -fate-exr-rgb-b44a-half-negative-4x4: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_b44a_half_negative_4x4.exr -pix_fmt gbrpf32le +fate-exr-rgb-b44a-half-negative-4x4: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_b44a_half_negative_4x4.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-y-tile-zip-half-12x8 -fate-exr-y-tile-zip-half-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/y_tile_zip_half_12x8.exr -pix_fmt grayf32le +fate-exr-y-tile-zip-half-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/y_tile_zip_half_12x8.exr -vf scale -pix_fmt grayf32le FATE_EXR += fate-exr-y-scanline-zip-half-12x8 -fate-exr-y-scanline-zip-half-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/y_scanline_zip_half_12x8.exr -pix_fmt grayf32le +fate-exr-y-scanline-zip-half-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/y_scanline_zip_half_12x8.exr -vf scale -pix_fmt grayf32le FATE_EXR += fate-exr-rgb-scanline-half-piz-dw-t08 -fate-exr-rgb-scanline-half-piz-dw-t08: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_dw_t08.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-half-piz-dw-t08: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_dw_t08.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgba-zip16-16x32-flag4 -fate-exr-rgba-zip16-16x32-flag4: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_zip16_16x32_flag4.exr -pix_fmt gbrapf32le +fate-exr-rgba-zip16-16x32-flag4: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_zip16_16x32_flag4.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-ya-scanline-zip-half-12x8 -fate-exr-ya-scanline-zip-half-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/ya_scanline_zip_half_12x8.exr -pix_fmt gbrapf32le +fate-exr-ya-scanline-zip-half-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/ya_scanline_zip_half_12x8.exr -vf scale -pix_fmt gbrapf32le FATE_EXR += fate-exr-rgb-tile-half-zip -fate-exr-rgb-tile-half-zip: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_zip.exr -pix_fmt gbrpf32le +fate-exr-rgb-tile-half-zip: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_zip.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-float-zip-dw-large -fate-exr-rgb-scanline-float-zip-dw-large: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_float_zip_dw_large.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-float-zip-dw-large: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_float_zip_dw_large.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-half-piz-dw-large -fate-exr-rgb-scanline-half-piz-dw-large: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_dw_large.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-half-piz-dw-large: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_dw_large.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-half-zip-dw-large -fate-exr-rgb-scanline-half-zip-dw-large: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_zip_dw_large.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-half-zip-dw-large: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_zip_dw_large.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-uint32-piz-dw-large -fate-exr-rgb-scanline-uint32-piz-dw-large: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_uint32_piz_dw_large.exr -pix_fmt rgb48le +fate-exr-rgb-scanline-uint32-piz-dw-large: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_uint32_piz_dw_large.exr -vf scale -pix_fmt rgb48le FATE_EXR += fate-exr-rgb-tile-half-piz-dw-large -fate-exr-rgb-tile-half-piz-dw-large: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_piz_dw_large.exr -pix_fmt gbrpf32le +fate-exr-rgb-tile-half-piz-dw-large: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_piz_dw_large.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-tile-uint32-piz-dw-large -fate-exr-rgb-tile-uint32-piz-dw-large: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_uint32_piz_dw_large.exr -pix_fmt rgb48le +fate-exr-rgb-tile-uint32-piz-dw-large: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_uint32_piz_dw_large.exr -vf scale -pix_fmt rgb48le FATE_EXR += fate-exr-rgb-scanline-half-zip-dw-outside -fate-exr-rgb-scanline-half-zip-dw-outside: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_zip_dw_outside.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-half-zip-dw-outside: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_zip_dw_outside.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-tile-half-zip-dw-outside -fate-exr-rgb-tile-half-zip-dw-outside: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_zip_dw_outside.exr -pix_fmt gbrpf32le +fate-exr-rgb-tile-half-zip-dw-outside: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_zip_dw_outside.exr -vf scale -pix_fmt gbrpf32le FATE_EXR += fate-exr-rgb-scanline-zip-half-0x0-0xFFFF -fate-exr-rgb-scanline-zip-half-0x0-0xFFFF: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip_half_float_0x0_to_0xFFFF.exr -pix_fmt gbrpf32le +fate-exr-rgb-scanline-zip-half-0x0-0xFFFF: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip_half_float_0x0_to_0xFFFF.exr -vf scale -pix_fmt gbrpf32le -FATE_EXR-$(call DEMDEC, IMAGE2, EXR) += $(FATE_EXR) +FATE_EXR-$(call DEMDEC, IMAGE2, EXR, SCALE_FILTER) += $(FATE_EXR) FATE_IMAGE_FRAMECRC += $(FATE_EXR-yes) fate-exr: $(FATE_EXR-yes) From patchwork Fri Mar 29 18:07:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47658 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2135442pzb; Fri, 29 Mar 2024 11:08:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVRtKDw85sqxrwvPvlNoPGHlH3O+VOhx80O35XmmIUqWhq5dZsK7f4Ojg+3qXuLC/RCDFJcJscajysopUNsS9u+ePHOqo7kPMioZg== X-Google-Smtp-Source: AGHT+IFKZo3aLlr5TBbHHPy55+dRS+tsMOHuZxAtekd3ZJeWE7SKA5POIN7LY7HxpkVrOod5W1Fz X-Received: by 2002:a17:906:4ed5:b0:a47:761:37f0 with SMTP id i21-20020a1709064ed500b00a47076137f0mr1644764ejv.3.1711735696601; Fri, 29 Mar 2024 11:08:16 -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 jw14-20020a17090776ae00b00a4e39944b62si619178ejc.713.2024.03.29.11.08.16; Fri, 29 Mar 2024 11:08:16 -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=Q+1CdhYN; 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 5FBA468D51C; Fri, 29 Mar 2024 20:08:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2057.outbound.protection.outlook.com [40.92.75.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3922B68D51C for ; Fri, 29 Mar 2024 20:08:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WAKz8Llk6zUe599ecEot25Dp8Gj+cJHtBos18LlQFHih1eLujuqeHcGs2JGgGH0U440rGbHS8hnMrqfYE35MzecIdYMRTM5ZRcV+iZjjh/P93ePrfiAwgA7tmfz9RDKbq790/fXGZCRwf5A2TkP8JiRya7G5tXUvKx+SrqyGI+8XQpJuYyN4MAfeZJrjmh2WGOd1AHlUrua457brdGNLj3ozhdx/9mHcf8rQ9GdOuyIz9qvJZ63Eb0fFF3qGPJF9lSB4ffqx+4YZ3QZnNEP60TTs+24vnz7PXaTowUYjEdDnpIHUutkCoo8on69d0NEfTDBht64UFemOZ68ZaXNCTg== 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=T4Krp96rn4zOpziYKcZrzyDjvkL5xMLnDUVXB0H58rs=; b=O0Wz9GOKBBNVpLhtBUQLHhtYlhEqY9OfX0cUpeNT2d43pCeE2Zcc6Y6gvSZaR2LdJN80KmBtCvHTlVcE9Ty02txx3z/hx2Q1s7qB2r2BNjkAezv0ldP0r8wpB5NBmM1QxB8m+By5CnAOysUbGpfUmSHkoF3TiV/nveg9pnthT0EFCRJB1d41dAW1AScHyKGZhKEvVu9rhpIupmUGzjR7amMEsKFAn+7UvWLUxCuJMBfAuNy+YZIdZNWETbeVvAq98Wa2wvQ+DIsk24sSNByj+587B2QrsYIVZsoZq2HcwjRnR60CbyCiWrlNvwi53PIniXOV3UEQSmOPZvEKTBGr6Q== 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=T4Krp96rn4zOpziYKcZrzyDjvkL5xMLnDUVXB0H58rs=; b=Q+1CdhYNnOrY4d0EZfiW8p4w51VZfgCnBdxRknuWlhOkBTItnjzTW6bDCKAjZ/eEPrHyjfEMkAcvcGy7UCWGQ3AwnAAqYWF7R7bhWhqEAo9Yxg59/OYfRY4vVT2TFj2Z7QRKjb275NG6nBk3ouwUVBHaqrMOxna532mEkRv6WO7XXt6crWGeJX62Hddk7kH9xKVFaeJGB16yVgZsHtkNjdC2RhsiswHgFh3uyNGRmUAfCRig/BzA5HUo6CX47zs7DUlzXlmEzNkr8O/Mm3BNiamaTNKkz3fntiP8gnuIMHZm2gfLoQWwT+o1LR4LWRzWSokYlCMP24UP4NgPaQE9Gg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0274.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.40; Fri, 29 Mar 2024 18:08:03 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.039; Fri, 29 Mar 2024 18:08:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 19:07:55 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [v8Xy6I1rCKMt7z+i+r4XtnDq3yhaxdESWrJXm7ref/8=] X-ClientProxiedBy: ZR2P278CA0047.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::12) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240329180755.2543088-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0274:EE_ X-MS-Office365-Filtering-Correlation-Id: ebd29991-f713-4834-6814-08dc501b2d35 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /uWAiSiuyphq6yZNFzDW9A7LVuMFshzgyfL2F7V5RRstmZQc7wdNqn4S70L2QPlkMmOOa1XML2YMk3eDAyjjuh/eN+HeAVqiqD66FqoFMbKN810KOcfSbt+GnPBw1/3BI9p/SrAZcaJUXR4r9Jq5qqqv4v0OBX/QAGoc2ZRoxMEOtiJMztAYOYAomo4oVpz+zQWsFE/ijErAbNTRS/AgAYR00pHVEHv0LB+O++tHdf/6Cwhd8PY1kScglBOkl3JXs1vF1EmWNXqYy9DSc5GSdWEYU8dhzm9FXnfJ3iDnmoOQZQmY/x+fDveib2B8zB0DYs2zcRA6t75zejhMVUV4TWKs8zE2zYbjmCUPDwSHIJVOmZZLvKwmZPRZkLfA+gNeBiG/97DWja+1mVO141RXgKAoUSErxSdaGIF16eq0ZfQ9G9LtpBqEX6I2GqPSilkiQw0ajKg3kx4bacyNdHbETzxxBnNW44j/VKXkmqnx4duee4JOqxX0Jp6IiAz3zxmoQNmozSNXkvfElj0KsLBxa8646/uVBA6HinVYG84kp5WkbPLKWPZgiEXFFSCGzwIq0IXU5Cd8RKTcKPZtv7TpC0GiNuXo0zbqRiB7bUz0+004c1P1IA/mhjBIqGzjJiQ1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0R4xi5TrcCnXu/Mgy8IWEPxOYux1LPUF9KRvcdSNmKV+YXLfN2PuR/y/m8kxWwyP/PgzaiGpW5g02PF21B/DpEZE3fiDKGDTL5XaI2PcqdBnipi7koXPDlSLBOb8yW9/GZxCmvG14NrTaVA3ZSO24RzldOGX+B0NffKFcncoW82to1HAzTuIi+XhaopYCI3qUqnRfxSFxrGz+uKud0kEr/IGUBY2Brk8yX1HK1Q/WxxS19g2KqTU6w7pQtFoabPeJ35JXlWpW5rbZ2VvJdJkAmh1if3KFUqTL/oPCeGrot5WW+PuRW19I6jCGod9q3CZu8H5rLhbwaz9nRpx22tXLPx11vgFRQnPfHzzJeeaE1qzd5kzfbI/1V3nPmhEfcOipt94+2Gb98QSStlj63miqi2508PZC5pGruwFbFq7WdwiOnCGIhnd0L7P8g4nJJH7AefrbqjJ/YPN/ZordlgjY8cseSWx0cEgd3wVbRVJJo6oXY6CkuhbM7XPwJM+bD+exmtWREpuie0muvpwIWGiPbn3gQxBStEoNnlu8X6iGr2TvRGYWzVC/mAptDpb2TCi8AJlLYkCDtBDpmrvFlJZKkbe0jm2WWGakcinqeGtUJ2knRwwHP/xK3TtEUmuns7Xwn1Xmr6mrTytd/hOn/URnSwxtRjdBigbliuWS7UQRG9tANKDNn/dGCsxa23uwLtms9O7AA+keMTHkUc3PrNkm+x2Lk+Tz40+Pz63T1qdPBLddj9XzeHzYCLTjNqE85Z61oaHG6tO3vEfFhVwjP/z2rsHgoBf69pO/CiNNGxjb4uPWtXWIGMaX4HGWheM0F/LJVsM5mMzs7MWSf+eu5epkXArfAgXejkpW3t9R5WWRpUmX/xuGf1PgyMJ3vx7gQpOn3wxYoJwNAjOiQ73MKevCZVytJLm2UMNtdH+vmrSTXCfYBZiIgPISu7PZSwLzuZlB83EvywUCMsPoMITwqEbQjOrUZUykoPHyjk6G51iuJun3EIk6M8Vim0xHz2bcqzLbRcE33l5TgF8rOFvMkYtPh1BtCB5LX9YZKspvmyNojzreJAbMfJr6jUp8ZbgQ+wNqSXU/8zu5Dd/WHQ8ErcIB4dmGJUoQC+sYMZofoRbByzAtSEHzALhLqJdN1FEpi5a5uVkD6im8PM1/nBoGBfWJuZyOqB1+yC026p4QLR/a/Zkbnf+xcVyXzhqnpeyxIIWJhNF7GhULL3l0tykBkjjlOGnicJEvD2exA7tzuRIaye7nOS7A0tm6cNBKueW7w93bV3cU+QvTvkfbAAIZfo22w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebd29991-f713-4834-6814-08dc501b2d35 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2024 18:08:03.5091 (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: PR3P250MB0274 Subject: [FFmpeg-devel] [PATCH 7/7] fate/video: Only use bitexact IDCT in avid meridian 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: C46eUnTgqirC Precludes the usage of the altivec IDCT which fixes the avid-meridian FATE test on ppc64be here. Signed-off-by: Andreas Rheinhardt --- tests/fate/video.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 8f51a42077..9ad39e21ee 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -48,7 +48,7 @@ FATE_VIDEO-$(call FRAMECRC, AVI, AVRN) += fate-avid-interlaced fate-avid-interlaced: CMD = framecrc -i $(TARGET_SAMPLES)/avid/avid_ntsc_interlaced.avi FATE_VIDEO-$(call FRAMECRC, MOV, MJPEG) += fate-avid-meridian -fate-avid-meridian: CMD = framecrc -i $(TARGET_SAMPLES)/avid/avidmeridianntsc.mov +fate-avid-meridian: CMD = framecrc -bitexact -i $(TARGET_SAMPLES)/avid/avidmeridianntsc.mov FATE_VIDEO-$(call FRAMECRC, BETHSOFTVID, BETHSOFTVID, ARESAMPLE_FILTER SCALE_FILTER) += fate-bethsoft-vid fate-bethsoft-vid: CMD = framecrc -i $(TARGET_SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -pix_fmt rgb24 -vf scale -af aresample From patchwork Fri Mar 29 18:11:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47659 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2137362pzb; Fri, 29 Mar 2024 11:12:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW7BvW8gnirgfrjg06tF28g8vGsJd6p3OATBurioFEhJfUEmKxOP9zbf/HQzvl9ewQmyW5J/8Lj0vMyHXZJl997SvVGXxaFWUIkoA== X-Google-Smtp-Source: AGHT+IGRYxWP2d/v3H5o9yx3cr7rkZl4VLDWEsPLx6Y3pcjhK8fU11vOb1gLL/xhyInZXT1O6NFP X-Received: by 2002:a17:906:409a:b0:a4e:28ca:f172 with SMTP id u26-20020a170906409a00b00a4e28caf172mr3442988ejj.5.1711735937210; Fri, 29 Mar 2024 11:12:17 -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 u26-20020a50d51a000000b0056c104e2144si1986987edi.648.2024.03.29.11.12.13; Fri, 29 Mar 2024 11:12:17 -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=nMYDoh9S; 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 DC0C968D775; Fri, 29 Mar 2024 20:12:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2046.outbound.protection.outlook.com [40.92.75.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39E3068C545 for ; Fri, 29 Mar 2024 20:12:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P9Nuxn54Ja8YHmyEcODZiSGGvxhnv0GIZSIuAeL7+P1zrg8WAdwFxXeoChMI2YqlP9CygGPOWTSV78X4CfEXwwIsP7kQgPnZjvJpd5oHXl5t59zU5+ep+hx27qTKCh0eEEFAqCuU57TepIFXUhSNTer2ku9VNPQfoiEnyaV4xXJdGHGD4MGuusbvPP9nWWp/SdT/jdxkFo6pwCTShBJejiyzCU1ouuMs6fSghzowJMEfQl972j00RIAhyjWovlf0ShYDeWueKJlfFk5DBv/RMSIX9ZIb2eK7k5fJIe5behq/Ue37iCL8JssJYwZaaP8uHsQym8PB7jQ+9XCkLsq9Lw== 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=MzkEeTHnSBBuz5vvLV+K6du1m1T9OeQjDCKTpel82Mg=; b=kgqvJyda9u4Sy8pf2TV5XeGBwmi5gHXUDeUQbFWFvTvBTCRjSLzYSMICivU8Jxvf8WpWceRErX52/CH6W1Lbhj/AcH0Ac2HtO6dsGlMP51V8xCBcHoRbzTbvCjkmu1KKrWEvWzzIg5vq74qcblgJnfJxPtREvjT/mwCxFz7FF7GUXBsBtn+00lttbGC0qus8j16QjJHLRD8/DVGs0/7qsi9mHOlsuenOCSX9HcEWZ5xpeNDhXdjAaUkrmiGj1KGow5aIEcV+pmM7nmE7wVDrEs/Non/+ou6X6ZlRHYRvpZmwNRLlw9uft6GwRyH7nDUa62Cfi0BLcLgfFo6JUc9XgA== 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=MzkEeTHnSBBuz5vvLV+K6du1m1T9OeQjDCKTpel82Mg=; b=nMYDoh9ScL5mcgcTcLbv4666a2vOD/bFTX3QqbGJz3QURnDa9Tlqfc1OlwhNj8LzXNnIYJ/XsgCmgtjPkYvygxSQfo84Tn/qV5Nd1ol0vTIKTQ6HTpqGZ2TU9Nwb3tnIwryp9yGQJy17odIyGfQOrWJ+gPrryl3E+ZH9pPGOwgz+PR1xP/tfZOVo3xyptMy4iGYKr13XNfThXqxxyjQXZgd+/n0zoXOmetj4Pq3/NtHbCxyh90nFIYop6nee4YEsBn7ZUpt7FeOxlHhhy5PWayIP0ghODo8pim7jvJMHXSw+Upxc0zLAHReFv3tPJC/vEeBu2+41/UvoEnZj81dUkw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0224.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:279::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.24; Fri, 29 Mar 2024 18:12:01 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.039; Fri, 29 Mar 2024 18:12:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 19:11:53 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [Lu1lvnJk1t5Bu78dt/WJ4kSkcSPvJRW5RYoAKTdW87o=] X-ClientProxiedBy: ZR0P278CA0123.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240329181153.2543481-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0224:EE_ X-MS-Office365-Filtering-Correlation-Id: 2defdc56-38fa-4880-0bd9-08dc501bba73 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SlbaFpkPRlyjaqD+OqNZfLJGvn0VOdqSxPeu70ecY8zu3BRBWTTW3TNx/KZhx1RicckIctLv2dvT4e7W9kyZlwHygngOX1Wf64hjJuJtlZSu1o23WREX3GyIiQsh9LFRCaS//UxQxOE+sBVdO6wr2VkbHqmUqox+W4VFKUCf4T3+wFyNWNPvK8A8Wg71meORUpVElamu8Z6I6Ev8jn32Xl1498QPz5KJkqr3fhh2PDhRPuvrR6Pw8+yEy6fRsaCmOl2WCv431jCAksR73j2m77kKzjJ+xl58VPtz31jMEfcSDCL6HjDqLqJ3P/sJVi6shW2R2pMYewdAEpbzDa2SDwxI1ke9Rpb+1BBfAB970/VV4EHRofMH5XO3dlmSnPKnJIPinfcj5k8YD9F/POsduJQNxmeKv1BjGPHwdcQhFJtud00Dw5xeQf0L3Zan7TXnKgtsosl7qWexq1EX/YKrMEvKuEK95WVKVHYhrsCEHObbdOBrhuodXumigO73s1kGTtMP6LDRfzsFGj2OzPJM/lHYDHzEnCrrvmb1HK1a/sHZYCUVGILYT7znJ9MiiWGOnHG+5PGE8WmVe5t/sYKMYypAK1wyM0AjnBX+ycW4IA5OPMCRDQREsSBStycZyj1/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: X7z5QqH/71h5vQd+w+xWdonDHGURS99h0near21axdrbRfuagqyHHHmGi8h6M5Ijs88tfNgegJNWGTlb+ihf/rYPxNJnMpit3+VVTM5xCggElyp1j3gFyiyYq/Tx6CVmYxBUORWS1yscnc40SR3JzSojVfAknx7TIMhYoBCj364k14D5ay/jq6wPpb823+P8FYOwmod0Ul4tz6c3hqchNq6LPI9SSHah+EkcKwJQThiAc63pPB/wlEITtBxMYR8cQ0Q1pOlqpsbg3T5giPBIRD8gb+6++EDVCRYh/Xud2iyBxHRflT7X2WF5/CAvwOlVM1SyTQmiVfholkhhBtQWzglavNOhNmDmv7v5A+u25w2wZsBXhXNNydE4NzfDyfNO3pzitn1kLiCryufv0gCy5xiETV67Gqo9IPwg/xMxeciBF618incOEa4Wge7ItCt3axe5/XYomkSKfsuuwTyDwqNq+JXpEILRXdUN87Zt/UwGcINb/kUlOYiQw9hx8As1T2NzDlyI99gYSehCqFvYMy9k6XVQ0ioE8z16Dn8S3EA/CEPxo1+vSYzDdqhkUsOjoRQ1RKy56/Xo0QT+nNfetI0baL9m1UayTjbgSpedSEyekU3X6pE0cAf3MM9oXZGZHWRzeKZnip9ntON4EFJOFAXAeqTnxpEdrhMRc3ahlDtCuTQiiS84DrJNbJKO5/XZ0+VN8Un9EHePMoPaPRxUoKbLrT+g+XsatlPoK+MhxzJsxdiqb5E2uwXU0al8E/wHV1enj4rJj9kwejZGUaBfHtmFlFgRopiHdVb/ujSdZjAUbe89VxW2lJlY/vURRuJk3i9c/94yasLgseBCRqZQAWpxLf+B9Q2tVZYwxQ6YbVaY/P2XhSlcjkNwmauLYoP2R/Gr0dRyhyl0zDnEjfBtdlmb2rDz0Ist2OkQYPZyVBRdJnGFcy9tarVVy0sozYeQLu6cUDXXNCarwZ0JtgvsDGxemhsYjLhAdcalnkJhD+UYlbbZMeL7UkeUlEah0EI7PwRfZFtKABm1Xd7DT+oNOX5uzupI8uHKgD3UxHxgp/CJPHLXYKVY4BEreOuQw7y1gYLaNlRM+Jfsqyq6ukpCz6MEpPbZSSy/JtWC372GCU0Oti7A8pvZNvx5fXvNFKnAIZMKvr18wHADZESzDaqh+8GNw2RTbDgsI++cJz/6t+g6DGa/rKw3SG+pa/8xBiUHnzomNGio4vozzj0QV2J4Ox6lMXoZi3442+Zzn/93aXzTxKogZSNbJjQ4ghRTTRht3cGhM+ptklI7O3nE61i7uw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2defdc56-38fa-4880-0bd9-08dc501bba73 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2024 18:12:00.4188 (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: DU2P250MB0224 Subject: [FFmpeg-devel] [PATCH 8/8] fate/filter-video: Always use little endian pixel format 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: 2GLizvMnPu2z Fixes filter-metadata-signalstats-yuv420p10 on BE arches. Signed-off-by: Andreas Rheinhardt --- tests/fate/filter-video.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index ee9f0f5e40..681cddc33e 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -692,7 +692,7 @@ fate-filter-metadata-freezedetect: CMD = run $(FILTER_METADATA_COMMAND) "sws_fla SIGNALSTATS_DEPS = LAVFI_INDEV COLOR_FILTER SCALE_FILTER SIGNALSTATS_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(SIGNALSTATS_DEPS)) += fate-filter-metadata-signalstats-yuv420p fate-filter-metadata-signalstats-yuv420p10 fate-filter-metadata-signalstats-yuv420p: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;color=white:duration=1:r=1,signalstats" -fate-filter-metadata-signalstats-yuv420p10: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;color=white:duration=1:r=1,format=yuv420p10,signalstats" +fate-filter-metadata-signalstats-yuv420p10: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;color=white:duration=1:r=1,format=yuv420p10le,signalstats" SILENCEDETECT_DEPS = LAVFI_INDEV FILE_PROTOCOL AMOVIE_FILTER TTA_DEMUXER TTA_DECODER SILENCEDETECT_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(SILENCEDETECT_DEPS)) += fate-filter-metadata-silencedetect From patchwork Fri Mar 29 18:26:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47660 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2144033pzb; Fri, 29 Mar 2024 11:27:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWaSRr2lvH7erCV540pIWeC00RP/KOXKdgR3hL4IZHKAU2XUK7cWW5/DNa4Tv/FQbYCh8CFHveakD5QuucKCK8kxW3kaqCxkaomYA== X-Google-Smtp-Source: AGHT+IGMhQyuais29PgKhNfLZJOT0GzdZm/wqOyuzfmBV5ZhWLuncdmrJuEdfs1rVkj+YwBqkQ9W X-Received: by 2002:a17:906:1c59:b0:a4d:f999:de30 with SMTP id l25-20020a1709061c5900b00a4df999de30mr1803426ejg.2.1711736829725; Fri, 29 Mar 2024 11:27:09 -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 hh12-20020a170906a94c00b00a4e2871bfd5si1459710ejb.711.2024.03.29.11.27.09; Fri, 29 Mar 2024 11:27:09 -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=LpjNwjhK; 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 44BE868D771; Fri, 29 Mar 2024 20:27:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2074.outbound.protection.outlook.com [40.92.49.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A82EF68D5E0 for ; Fri, 29 Mar 2024 20:26:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NVnv9lmLbqGoSOQv6ZHKJ3DAVD7Yt4YRdg+0J9vXzl5xvxXmEaArFSqhh/toXW3GG62cuwjeFHCJPbqxawfk/kncn9UmnmNBwQRywAC5f+Ym3nY7RctXpFjMD5LAqxXq0v12akpxNsEilRJoh9mMeVMqWhCfZGI325DcKrM8tLYIIiALIzJeqReMO3YClbM09GzMqdTH7+Bdq80JZArwR8L2bGt16eM0ZVF995hDu/ymA2e06SFko0MiXWQgnG4iqyAYYffi9NLoYm+QHsDVjkwYH8RRGbHzyGiiciMiy0QeTGhslQ+JBSo+l2N/UKv6UwGBFL8YaKwJ8NEN6zwFaw== 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=SbC1EHR+Cbx2/n4qvMzLj5fLNdC7cnB7/Yi6fY74qWw=; b=AuYfFKzITtwPo0oC01Fhy+R5JcuRZGDx+cd80iTgKPKlmMyPnG8Q5Vxz03gQDuKe1RT6inpUIOvSele1R7/J+t74888c6eVH7skkFXd+Z7thXP+EAycsSMRhS7GQ5BJLkqTtP4wlvqEgVtMHUoUtvdb55enSU+N6pAlYpjoB2tWKeXvJa2u6NsI3Kfa9kPAgaEEiKdeV+xi4alL3o333BNV7hwSMBKYzwmH9DwDwnqGc9NMZJ9d6vMQkSyXOPZTRYxtyHEGgBwFkea/fT2XhqUL75YodCIUjQgO8QaZWbPgN/md+diNKET7AVvLXdROyaOzngNBUdH/vLiXvt7k4bg== 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=SbC1EHR+Cbx2/n4qvMzLj5fLNdC7cnB7/Yi6fY74qWw=; b=LpjNwjhKik9kTj4dzfinBG7I3biUYysb9vK+JIXV3RBTy/WvQmOOWmRX8VfsYlzul+0RQGxR84ECiGq+wc3Xnnki0WibRsOyByvs8sNojVXqFI0G8TRpxe6Wk8cDdnbx6jttnYcRXhGcoEYg205H6M2FK4uRgjJy9Tgvhi0PwBqgEHsUG+cUGSB5DImArWrbeEDjF15uH7ilR4jeoCKm9YvzhnFT/CT1giTm6pR6QsWnLBXujHrl6YejFrxrNi+pSpTrEIBZJAKNIHRHB/JNQQE4CgT9mp9fP3qiX74N3wGf/sRG2u+WTMcT+J+lArd9mrgmWWsrg9pLxFTUla2EnA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0065.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:177::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.40; Fri, 29 Mar 2024 18:26:57 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.039; Fri, 29 Mar 2024 18:26:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 19:26:50 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [ip3gy6K/Y58nstcF22IH7M4QacOOn0UWRUMghhqSdhM=] X-ClientProxiedBy: ZR0P278CA0033.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240329182650.2546095-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0065:EE_ X-MS-Office365-Filtering-Correlation-Id: ec904482-ca56-4fed-1316-08dc501dd13c X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnpFX5gNBgVui1VGe5tY9UlKXdkiAaInfzRcNNFTsxMe8QDt0z05Ed86tERJ4kY7LiLpY8MptArAvkZ7tTOId6fDPm/Fd7P4qXtVUXMVDpM9qx+6cpuhfT03NbyzPqHkEaE6ryIxWw16DfPc5L3ha8TKV1rZTRLaINqH7NXXzbq9x9cs9p8DulKLjUUkr7hPhhjCDU95YhLR/M+IyFDF3Qv5Acvx73tIzIMaGyLZttIX2OT5okl9agIygWtG1MkUSZODnbNlyq8UPNjBgEQMl+QQ8gSZiBjK+1x7lIw9vom4BRSoi1EuRXXIB2KTqFgLB5T4NGXsNuJvNDE6gdxVnFdB3YejXDdcwxQ4wchMlp+qtcETyhiXIrBfuylrwc7Nl3ii5crAFaUjfk1Qve/CoV7MDd0sThevPt/BpO8KbxaZzNxKhgXboYgSywWMfmr8wnyTBDzA1MwS69IL0AOyVybcxguwyfaxByDB5/eALGpqdeuEhtXDfm+96Kiu9wt/tQnFPvLPGmcxFI2n5TnU0PUCXfGl75J/7MSptPS+ySRjc4t4H4upRHFvVMaxnVeVtMhgSo0erEv87Jn1Y3/7hPe52IoScrxpjPTRXzSVPUC4XvoVGcVWlgTFibdssYJ3+7cvB2iAqb8zpHsAFE7rarlJgenVV7soTP0E4fnNOCxRTuTC90esyJPqtUEVonPZkEzFBXnVrP+eudYU3IJU56zs8iUJwUlv8VKJXIDEBoSMm5+1+jDu4QpzdlhMJIfob3w= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cqH0lpmy+RFh41P0jZMGxpPC2IHfNblxyVqRui1fCcmXsRuN9jbbcoglHtuzpadNopKghW4wU/1WsepmMR0Gq6HXkIPJjBlmbTdWpz7nXz7rIxoIM8BgyyB1+BIqd/nBHKOH0vtcu7DSWkCydrOoqD/s1QzBdrc2X7zHGk4uPbJvIuz0n4FAKCy22Vaa/weLJaTVtdLXNlGze8TpxQXKdq4h4RVFczRjexNB0nZE05Jtbwjeu7xzGss4VswceDRFF7VM8im3o1gc+uD14AkD5eCmmDYw3NUlc8pBudVuy9cclR1mCQ4aQoJR2r3W5CBG2UynTwvabSXqIWvNXQ01CxQw2KmAVKf5ez7g6sh18RvJyFnaFmXgSWqrpv3Qf7aLUE5Tl/aHEztCDcoLw0IoRZhErhg4+8ttAwwl4cVJDE2hH+Nsl6rHVs9ze/3Cm8ynKbbzZSxwCqnhRkwrrcY/7HTCKdzi0QYrN8IDAxnqXncBg9zhYJIkW80ymhSHrKreiiETNcymqOoy6Ag0v78a3Hs1FiBTZatnJgSiVfQ1F4msawq8TiV/2U14QHEhrCquC6JOzrbYQbrksIj4RmcriWmqr7+/BuvZdUOL2tcNY29LZkZIKBC3IlalbAgikJeX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GuLJjGz/iLf977KRcJjMIfzvYdPB6yT13y4dPaygTe5gcQiaseYh/9A0RXrMAEFeV+eJmZXaVnhIZdo0JtlT0qEtcn05VmX1dDiWjMa5irZJ/hdP84fOPmNq0mfsZWGmVFQpBGSLgfA3mH+clLqkJ92I8pkw3dWiCK0vDdk8m+65DHrg5yvcPTV9wQ0rnJQWAKMqT1fIkNs3SW6MBzP1077DyM0EPojzRtOkico0LBsYa2ZcYJs7uMBAK0vJRBp2GHmdQrHeK/ktwC6cNQfcUYrU3hwsiReZvzb7FomFHPzYolOgb4iG9Rdzl9zVzhk7UrTGvCE4/V4viI7E3SekR8O6LYBB/PxT2t903VLKx14XP398qVcMfhhxU/1r5h9DmIQtWM7akDukeM57efI0JuLdkpSy0UGB/M9TdtJfL/AuX5a90Qs0FEAJdz+HAYaSzjdZqyVLD0c/oH6Si9ECrV4oopQsBXer3uSbTIj3NIF0wrtSeXXnsiy4a1awYyksrwwjGWxYoEtaKZnm0JJq/FSDFA0yx/eOanUOvd4GS9SWCbG8gBzsnuVYvT7lgnTxLbdQXCBC1LP/Euawmk6xZWdSPRy6NEvbG8L+GUydKu88Lz+dRS684JByJsJ97rhReSpYdIA3YjI1iDil5WcR0OnhgvKJp5+v+igtMQtr4rlIA87LoX1Fh+ODjCcDnzCC5JFTSXwJFu2GOsUi0tCq7mb9cI8WQnmnWo382OU/GmYtfH0bicZOk3FHk7ApZq8DLuWAot0ogCoveJ8AOr3G14yJiaKEFENpC39m0cIwWa/zdFqhiB5bhdciZ1ufuf+PZH3F1+gmOx7260lVp+UaHzJYhWMgP0qtbk1q1rcfM46ACXbc31SZvJC9iGJ2XE7yEXbxz6IyJM2qVQfjBKqvrXODgqsT69Ex3hXFFQx0l6oVF28j67ru+ljLcvJXlqG/QtSIVAd4jyphvC6I51J8zNkvmKU+/D61NnLo2cfks7OO9TD+h6scDtyzES0hjFLHdsjZpLjrYaZqHwQF18w3w0jfk4U/jJ9iXZEZQTxDgw74QmG7baM96BOhor8hElwTSLVx3NqwmHWDg6CGkF4HUYkPWMHP4O0XQxOOBDClBfJtbFrudFsGbyMkiJ7Jh9ORXnVhGzVdhWSaO2/+F97eakiW7KXD4yi1WuBQzVjo8YDV9IhXvmIgA0/3OZk4HGYAMVLojQpP29sYj6JrOGdznmATOjxKs3hWgZmGOQfg/xDHocWPC+X4V05xAdtfTZtbgFw1VL/4CGdfDzh6Pux1Xg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec904482-ca56-4fed-1316-08dc501dd13c X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2024 18:26:57.6546 (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: PR3P250MB0065 Subject: [FFmpeg-devel] [PATCH 9/9] fate/filter-video: Insert scale, format filters in filter-yadif tests 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: Vdd7TvNpvyeY The format and the first scale filter ensures that the filter processing actually happens in high bit depth; the second scale filter is only necessary for big endian arches. Signed-off-by: Andreas Rheinhardt --- tests/fate/filter-video.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 681cddc33e..d8d29866b8 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -25,8 +25,8 @@ fate-filter-yadif-mode0: CMD = framecrc -ec 0 -flags bitexact -idct simple -i $( fate-filter-yadif-mode1: CMD = framecrc -ec 0 -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -frames:v 59 -vf yadif=1 FATE_YADIF-$(call FILTERDEMDEC, YADIF SCALE, MPEGTS, MPEG2VIDEO) += fate-filter-yadif10 fate-filter-yadif16 -fate-filter-yadif10: CMD = framecrc -ec 0 -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -flags bitexact -pix_fmt yuv420p10le -frames:v 30 -vf scale,yadif=0 -fate-filter-yadif16: CMD = framecrc -ec 0 -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -flags bitexact -pix_fmt yuv420p16le -frames:v 30 -vf scale,yadif=0 +fate-filter-yadif10: CMD = framecrc -ec 0 -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -flags bitexact -pix_fmt yuv420p10le -frames:v 30 -vf scale,format=yuv420p10,yadif=0,scale +fate-filter-yadif16: CMD = framecrc -ec 0 -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -flags bitexact -pix_fmt yuv420p16le -frames:v 30 -vf scale,format=yuv420p16,yadif=0,scale FATE_FILTER_SAMPLES-yes += $(FATE_YADIF-yes) From patchwork Sat Mar 30 03:15:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47666 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2319368pzb; Fri, 29 Mar 2024 20:15:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVxcUhfE/1wJKWoJ5ckgBxtdZSB+vvv1jvsfZFeoQKDfQETrSdq2iDvaMZo/GofDpTMcPRDv7fXBg1lImLvUXKoHz8gmiQM4IEnKg== X-Google-Smtp-Source: AGHT+IGlu4XIBXzN7HDy7cHH0cBmwxIE6/GF1aj63lkPQEJLWkthHmy1Bf126lutlc56M/mt0tvR X-Received: by 2002:a5d:5f95:0:b0:343:41ef:ab30 with SMTP id dr21-20020a5d5f95000000b0034341efab30mr471209wrb.47.1711768531284; Fri, 29 Mar 2024 20:15:31 -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 y14-20020a50bb0e000000b005685f2c2323si2389100ede.572.2024.03.29.20.15.30; Fri, 29 Mar 2024 20:15:31 -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=bc5ZUhya; 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 0C71468D3FC; Sat, 30 Mar 2024 05:15:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2061.outbound.protection.outlook.com [40.92.89.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A305668CB56 for ; Sat, 30 Mar 2024 05:15:23 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e9knP8aZBLOAIPpszy6TsjsqQGlWqn1iQplEPEy3MEPmRFvfrd1zRdIKiijSozag1XQyvZvUpq6spgC8fwe+D/kD3l5KQeaqMxvv/HfoO8v7Vo4RneFpF2Rhb3seh7AZeZgbDStCvcjVxsWvDRwt6eQPC6LCuJJr+jeNMHtIBR2oCrwx/cs5FqHByj9w/A5n271Fr0WvFunRAwpurRc3xJV9WEPXhvPi6MLSCUA8QC39PRRMWjBynDxwR35gSSj4payxlEbaJbMTQ/t9JZMVLpeq3Ct2QKjumeUaIMxjl4D9UvjdUTZeBiUjhaXkGO3KuEksI6KtzKeCgrKBBGxIdw== 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=TBhoQM5+SXmtNgALGiDkIKh/Pn7I753jKj6Zb58jMT8=; b=EvSS7Oqadp8dFecW+xJYQHRv/fi8qKar48zRHISgupL4KHGrUSiu+aeIbrDwZZqzldoRkhExupzhdApK4+RTGkuoDALY5XsaCec7DprP4VI/SnHlAyI79ZefPugPzO6S4R1XBVZ52rSpMJwFu5OMuq3BicI/nPtSqQnuTaBHLl3OeMQzkDpwyvpme+Q0uvOjlbYDr7SkXXn2aBYhlv35Bv9u+Q/sJXvhu7+W+YsFL/daMXxa6M6PVAPGNcP7Yf0fhCEFIK28fiCfIArKT3CMmSm84E/29tVwZJS+XQSR67NzifaHUPskhA6haMlS00pOEQlm5fHDycHVn0bc/kT5/Q== 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=TBhoQM5+SXmtNgALGiDkIKh/Pn7I753jKj6Zb58jMT8=; b=bc5ZUhyapNsMg4A5WaonqXcxJCp5U93SuIzSexcAMwH1ZLxbw/zRgaXRldemh07nOp2shmWSZbvIUp9ECUriVfox0YOZfYYkge++xNvMvHjlmeJIhMxJAibYRy7/wfqwkVmbNLKv2HmrJCi0++Q0fwpxNdBWkqSxPQ05B+GbWpqnx5CUDxV+Jxt6iluVAKD90bXWYJ0MR3GVZpbyoGRXkkxhVDAPac2DG+mhtMSTELqbGlWF7NHdb5PK9JHK+kcwSTqKa36O1gXE4VfXGMaHb1/ZxVCCgJuW4d0xWMpbYjm5P2bMdf7IXMPZTYxt1kVSrogD5Epn/cY9OZTGA5MmkA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0038.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:359::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.42; Sat, 30 Mar 2024 03:15:21 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.039; Sat, 30 Mar 2024 03:15:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Mar 2024 04:15:10 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [0TicXliyrGnenQ3G9GEAf8AOXbY0FsUOti5oRP9Xnsk=] X-ClientProxiedBy: FR3P281CA0172.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a0::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240330031512.2615619-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0038:EE_ X-MS-Office365-Filtering-Correlation-Id: aa431a09-e012-42e3-bfbd-08dc5067a1cc X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AEY7TWAQ9RJk7b9+Gt2DjDfZP8It91ILgWjVDFzEbOJuwzDbwAfnRf7++zDUi/ZkvHduOuEUelyDlqQ1adNLKugZDx2Rkp4Lh1PYzlhtX30CQ5M1FxWZIP0V17sL1dBI8K/V/zt7iRqxCBmj+/3Xz+AMaNWLmLA3YR28OnL2i0Ccy73XoxWJcyWjRcI+RLifOMqqI93D7b6Yyhssli4f8C+XDtmaIF5bA9+egPe2tsz5QU2/m+N9iFZoyH90zmyMiIdwbiKgqOre2AfPiXt7jQn8a7T0tFkgSi6Nm5RKLdKB3yaAtfnByql2yk8hUlQrtnPWUXV1+xTaUtU5qcGHGbrrI8K4Rxv3uQI+iU1xYPNkBo2XcRjMzecDp7/yEzry/IrjQR7KdZf0gVYLn+B1Fl7tA82EjWrb2alrXqWgUjBI8J68zTPJjjN63jGne6sJvBjsUbuHWo2dwzXIR8GyGE2INYrYgAzTvp2UKRYfeOEPSDTcKBnV3j4mSF8wtcxm3H5+2tPUwQKrWLzNMzQT3gqFGHvQK9w/xBkWh+jLBC9Iyn5G7YJmFPpKwIwsjkoK320Nyv1+I6NHL8yi+6WTNLISGEBR0q2vT4xUYK3K/+19Fobbu0lrpv/ZbxxqkoB2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: coT2oJbxpWivgUdxkSbXtGFTaPacNSTVKJGMwpOhBmarhHbHKnLXx6msra+2Ty3CuUeAAOruNysTs33IOVYjJFXMwSxTOWMn97SbB96IkgUKwIno3AfszYFGKWe0I/usgiDIhedn5XbTWIsq3Ukgs2I0XjGYkJm0s9h9X5OLmuQ/z462M0bbfqt6VZc2tenFK8BYTIjzgXZtTPw3z/6skrYejgMmNBKFfnb2U9+jfiqe8Dd3aAt2uGcLQ497vAe8Nba7x9/H7nCR+z0PBUCjHjdF7kkqxQqwGvk7PbCKfvp4khTj1FbwA5W6rixIfz7yv3+18jY2v2/le5bo8OBB3U5uZ15q04gLVAz4q6zFRXkINJDUliAkboU6w8mHRGK2lWq+TIvt24G3QniFfuu9HEGeQLB/9dxoifk1+XtLN6ociry29U2rtYaBLjxR+0i04eC2M+YcXPr/LpLWICStn/uTDV2s2gsTXeJtiRLtMP/CKTSjQ6hMhH1ZITiJht6+JDdzlTcGtnwzmLMIeCEM6D+vLzUHFjepV69mc/NHP1wl09p9WAEde5RTI0rsUMev4TNfGsSI7Jux2uHE4BACU5deRirAWa6STeje6lfIqLLFbP56ic9aVov03+DBauHD0VKv+tcij0k01WnFfAh7xL522zdH7hwVGdeDQvc8AORBtjpI2wLITTdnXnuPLtf7QVb1//AcdoMHdjnTSlg4jYyiNEDC/LVX0nXtpUpcXtTFtoGDODa65RIHa/ZHCDGGZnEpqq8wmcTXLkMgBjjhuvtw2o6eFGMDGRGkqhh7fESnUZWimUDjyhVcnBSt8C5pOo/dq2X5KPG66Jr/pO5W0A89Xj1bdDvpnxUdIgqyr2ywNBkRTlFvntuLmAZQty+FN+R0Lm42zXmzbRbaHwgV6/HyWxSbtlSH07Ch/zd+FY2hNv/yehRbhl0vzSy1VrYGCFwTRnuzNNc7dDQGEqlEFObTxGZukUWsAa+7snZaHZwklxB5FCMTRgby3aKrJ+HmiIwVWft1Jf7V23P16Yczl7dfkxrMFtDbTOGE8hp6I7LP14NC/O55cKugkNtC3DVAnuUL36ZF55j6Sd7CMewsYyK/Kv+lNAclgHwkUsi5kFLst2T34kdZ4R9Wkqzb26Vqb3YH4NKIAQw6bxPYF0Gv0uPI0H8p/NZgqjKiOeSGKB2Ajyz1J6wcUABpLcycQuhPRE35FMmez3Tc6pxxzMGiTBPUK/Q4Gr28FzE2EW2REQg8yTUZdSIh9SQ0qSUfFsHauDNA7jApgeJZ1Kws4tGD5A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa431a09-e012-42e3-bfbd-08dc5067a1cc X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2024 03:15:20.8327 (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: AS8P250MB0038 Subject: [FFmpeg-devel] [PATCH 10/12] fate/fits: Fix tests on BE 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: 0rM7Kc+mjmio The fits decoder decodes to native pixel formats; so the fitsdec-gbrap16be fate test failed on BE despite its name because the reference file is LE. This patch fixes this by forcing a pixel format; the forced pixel format is BE, causing a change in the reference file. The fitsdec-gbrp16be test was not affected, because its source file (lena-rgb48.png from tne FATE suite) is actually biendian (as if someone had multiplied 8bit content by 257...). Signed-off-by: Andreas Rheinhardt --- tests/fate/fits.mak | 2 +- tests/ref/fate/fitsdec-gbrap16be | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fate/fits.mak b/tests/fate/fits.mak index d85946bc1a..b83900aaee 100644 --- a/tests/fate/fits.mak +++ b/tests/fate/fits.mak @@ -28,7 +28,7 @@ fate-fitsdec-multi: tests/data/fits-multi.fits fate-fitsdec-multi: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -pix_fmt gbrap fate-fitsdec%: PIXFMT = $(word 3, $(subst -, ,$(@))) -fate-fitsdec%: CMD = transcode image2 $(TARGET_SAMPLES)/png1/lena-$(fits-png-map-$(PIXFMT)).png fits "-vf scale -pix_fmt $(PIXFMT)" +fate-fitsdec%: CMD = transcode image2 $(TARGET_SAMPLES)/png1/lena-$(fits-png-map-$(PIXFMT)).png fits "-vf scale -pix_fmt $(PIXFMT)" "-vf scale -pix_fmt $(PIXFMT)" FATE_FITS_DEC_PIXFMT = gray gbrp gbrp16be gbrap16be FATE_FITS_DEC-$(call TRANSCODE, FITS, FITS, IMAGE2_DEMUXER PNG_DECODER SCALE_FILTER) += $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%) diff --git a/tests/ref/fate/fitsdec-gbrap16be b/tests/ref/fate/fitsdec-gbrap16be index 1174a0f1d8..e57a878845 100644 --- a/tests/ref/fate/fitsdec-gbrap16be +++ b/tests/ref/fate/fitsdec-gbrap16be @@ -5,4 +5,4 @@ #codec_id 0: rawvideo #dimensions 0: 128x128 #sar 0: 0/1 -0, 0, 0, 1, 131072, 0x487894b2 +0, 0, 0, 1, 131072, 0xebb194b2 From patchwork Sat Mar 30 03:15:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47667 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2319404pzb; Fri, 29 Mar 2024 20:15:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWSd4igxvJSCY5ATzlWs7J4loDNcMo0UK0Cnccgwgq3LurCEskEQyIXGcsVPYxyk9qKvqoGXlAhHufIIqFbye13KW1u8G2gQqVYrw== X-Google-Smtp-Source: AGHT+IEBaeoSxGLd6EPqNRMiSwfpues9VpDf4BCbeIgC6rxFYddWbQtYRoIY1be3r1K+Pt6JAEyg X-Received: by 2002:a17:906:d112:b0:a4e:3910:72fd with SMTP id b18-20020a170906d11200b00a4e391072fdmr2440845ejz.20.1711768541423; Fri, 29 Mar 2024 20:15:41 -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 ws6-20020a170907704600b00a46a13e555csi2436810ejb.838.2024.03.29.20.15.40; Fri, 29 Mar 2024 20:15:41 -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=V7aCViuF; 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 2938168D43E; Sat, 30 Mar 2024 05:15:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2049.outbound.protection.outlook.com [40.92.89.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6C8B68D3DC for ; Sat, 30 Mar 2024 05:15:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AjEN2m8xP50keWQfiN58mwHjELRYRfULAmC2Z+QE4gEz5aiUTSR2mNKyCji3oAHxuP2OuukolkI/LpH5a8RYxkUAGBDlGGhWsjaxk/Az3smtKqYB/CVA34bme9p9fZoVnymVStzBuGeJDs979RVhLvGciBG/B2Wd5fMPPwIve2nNEwITMReg++VP/RvM4ATdVSFdFzXBINLnRNaSKOYvgXoFuCbOvheMr1BWX3RAZqH8mPfdZ/16DnKvalQyzfzkU338OED0pke3y/pePrj4gk+35bVDXoUlioqsqZknqDSbG5vGQa2bp8n8EzfuGyL+089ZIIEaHXKLxLBTLmvhBw== 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=yrBCecLbH8vS9kIGOJgQ2DPaV00tDbhca3KKhsthmc4=; b=FZYl0HCMQ+lKATLYtWD4DI4J24iJrifjzObXnCfn1Bjn/OwHzai/j3gv3cSV0NzyTTXlPKgVozPMoHT2ip1nHyRwBJ1iipNdhIQx+5AaVlN9RX2LBI67dO/iqk05bAHa6csPHgBxg4QR9ro9O2k5OIVDCjpGKZPJnp256CJn98TiNgzaiSKYMZfKbX9oFpJja58sfoREcbMvg+EJ6l2aZ4SFwXQuPz9hjI8jr5kdI6N/EK29UC0ns19fLUzi6JTTKtQjFwKLuTxgyXaiB9n8J20RZsShpsPPOSw/skth5qbPsG2ppGx8lyiVJVSTW3eh1eE6I9KdEvz1cSuV1YQgWg== 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=yrBCecLbH8vS9kIGOJgQ2DPaV00tDbhca3KKhsthmc4=; b=V7aCViuFKw1orqSdDgsZUxtatpK31y6c3Koe4jMQjEEMQFHLDWE039L2KNpVRx/tHOhTu3MckQhT2bW1X67XJilJ/pNwAUu+qEhY/SlK7sTnUNrR2f5D26aHdFiOz9sOBe/RoZ12BsY0DntRNRTe1z3iNTxjusXCh4Wh0R9FeLP0qUdrtze/G43H0nLivA1ZLQdgaNXd0Buc8F9zyCLjKXYRhng72kdJUSWTmyVeW9W6dGwS7vvXEuFWChUWe315HNWRdBx8xalX37dWkGw8cRQ7qNzeY4o9fwaNeCFdxLhfsLwNCzus+zMaWmKA9GtnBrzcyutX17vFf2WttEk2jQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0038.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:359::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.42; Sat, 30 Mar 2024 03:15:24 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.039; Sat, 30 Mar 2024 03:15:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Mar 2024 04:15:11 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [PIUWuAdq3HHruqZJv3npacXmjoMBzd2XYbBVHlCiOC4=] X-ClientProxiedBy: FR3P281CA0172.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a0::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240330031512.2615619-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0038:EE_ X-MS-Office365-Filtering-Correlation-Id: 46e3a2ae-e9a5-4614-af70-08dc5067a3ea X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UpxoMPzDWR/heoFu30TuGh86dhVi59E81PGk3Qq4MgS1qGQVSGfRkXt0ihCnp+tHLQw+5PNM7aKy8l+Fnl+edvxa1z1/NfMlJCWYx7bUDmFbkkj9iwTCYaT/VvSY3d0K7yySCAkMcMuAAvBQjjawfPTaZrFTlS312SjTfST4rJw2GA9QpYEUDXNc28t84MInvs+hjAiXKsfGaiJPmitjrtm3Ryl0mAmEjS4oBKrLvAcEEauR3gJPAGTSFyoG2zQPhxh5Wx+nqhidVsRmojD+k4MoiX/1Ai2gLipYkgdvPDFJ4ljtlB4p8pGXS4MwiabclEJKfURA9D5jdC2RK7qdZzzswIe9zDQJiScUj/IHjadotYO9szwMGQH3cLUK3CNc2by3EMGtsiyz2fsR/v8Aauyq2fy6+L1cUx/WOGHD87fn05TqROAN7Sop8/CxypnAgDFh/fEE8OoFRMKsQnn5oDzXXGjNO5etz7oWqoZuQ3QZU0GBs11nvXttglhTjipIpSDzwiBuLRGckWxZvfFiiCFeAhl4UdQQXswWhyZIu3Oqo/dm3qa26tV2Hgz+rnnIlUokJ4MW6gyz0Mj08sxSQsXksM1M29hV8xJAS6Bh0isTgJwhFhGoqrd5bbBbhs2P X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rMPfuKFGvXU/jl8AnKvhDbQKKlBHNJNjlPV+2kJ/ZS0Hg/0e/Id3tzbJ5qdT0oG+1VMCgfSWC01bMNTKmsuFLgd4bVMLd1f1+ARl7a4DX46iSsXOZVNL9VrDyCy9TNRlxa4HvuCbZIIcuG7+9vcpRP6D2LQ1M4AKQhuvZA2XaXLwXQkVvSzJiI1/cUj3cWVlv3FyM6HYDa76ByYwUC2+06GVsF++zcuoM7VjrW8gYMjgATuplRaAe4e0wtzYzN093o5MG+2qjAA3be6H2x9GZe3P652IJirMAKC8c7sgXBxQ//cIOUg81C0623Yh8jg29RayhlpK1eXLa/3wDgz00bwAVEx3p/ED3zVzSW8wMwBrOkJGGrUcgPjbdBCMsJv/t2prSA1u1Az+49VW2v63eZtA7y2nI77uR+/joGkZfEwZ9Jtyd4jcdOz/Z/fvchlIUInxVur0ZMV8edBVymDh1fXMjLxI9i7PXkdyG+bTKVIIdgvkw5UVBKCnbTjjtGzVjMssPwlPONxIAqHOJ4WVmbbDeYBQ3Z0JOBDwe0m//gzny5+Zsl1Fd64G6hM4xby3NljgORebGCjh35nx53PIbNfw4L7/j1vEXlPWKq+WY/Gbj3UXECh9B0tepXCMWlgvuEEJ129mMunTlaXTYuW7zCTyEAnc9n8WXkRl35aQXUPpolF1umkKeJvz8T781TONzdazSNzEheiomxK7JdRQzCBe3Jqo3I7SLFc2a8mGl5NCQyzp6HwajYm1UyQ4FrXB02vd8zGIXd9peazxDNFHgxWEKdt16lbLXRpIYUa3bZSdH29pSnws7czz2BaC8IDUTyD9Dq5MbMuFNRf69gn29KJsmlFY8R+PMddMAsR1FiWSiy+T81EmMYXEW76HLT60aU5iO6PHAXDJnhrBmCJS/1IJHgdR2UH2Nj+oPA5e4X8Fm88niaSIluXLe5hvXFIOTwrOoyJJqNgxjYoSlwyuj9XLMqGYgndVVso08CQA0HtkXcD8tvdfSuMv5n1Nn1kOnk8xEyN9mJSJO9DvVdVSBn5cyPmw260Z5S/yF/FRifqkVWXbZa3HtrwRDk7QlQDxWlNhszgAi9W/DVWq0UZ+EbvOFzl0Msx2A6RIp62xUkIhw7BJzdiaChGkFfNbdorldeteRFqHkTwRgxaTXLw7dzX7qme8bu5AhsQ7WHd9ks06mEmPl0OA0xBRibXEmXtpcowIsP6cROa3yuIExCJ4rGe1YM4OCxaNe+DEKxoIn0TzoFUFIjX0B2AVmNn99yDb4rAR3bQKJY+alJAaxBFWpA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46e3a2ae-e9a5-4614-af70-08dc5067a3ea X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2024 03:15:24.3329 (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: AS8P250MB0038 Subject: [FFmpeg-devel] [PATCH 11/12] avcodec/vlc, bitstream: Fix multi VLC with uint8_t syms on BE 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: lMRxfJNAvzgK VLC_MULTI_ELEM contains an uint8_t array that is supposed to be treated as an array of uint16_t when the used symbols have a size of two; otherwise it should be treated as just an array of uint8_t, but it was not always treated that way: vlc_multi_gen() initialized the first entry of the array by writing the symbol via AV_WN16; on big endian systems, the intended value was instead written into the second entry of the array (where it would likely be overwritten lateron during initialization). read_vlc_multi() also treated this case incorrectly: In case the code is so long that it needs a classical multi-stage lookup, the symbol has been written to the destination as if via AV_WN16. On little endian systems, this sets the correct first symbol and clobbers (zeroes) the next one, but the next one will be overwritten lateron anyway, so it won't be recognized. But on big-endian systems, the first symbol will be set to zero and the actually read symbol will be put into the slot for the next one (where it will be overwritten lateron). This commit fixes this; this fixes the magicyuv and utvideo FATE-tests on big endian arches. Signed-off-by: Andreas Rheinhardt --- libavcodec/bitstream_template.h | 8 ++++++-- libavcodec/get_bits.h | 3 ++- libavcodec/magicyuv.c | 2 +- libavcodec/utvideodec.c | 2 +- libavcodec/vlc.c | 5 ++++- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/libavcodec/bitstream_template.h b/libavcodec/bitstream_template.h index 4f3d07275f..c8e4a5131e 100644 --- a/libavcodec/bitstream_template.h +++ b/libavcodec/bitstream_template.h @@ -536,7 +536,8 @@ static inline int BS_FUNC(read_vlc)(BSCTX *bc, const VLCElem *table, static inline int BS_FUNC(read_vlc_multi)(BSCTX *bc, uint8_t dst[8], const VLC_MULTI_ELEM *const Jtable, const VLCElem *const table, - const int bits, const int max_depth) + const int bits, const int max_depth, + const int symbols_size) { unsigned idx = BS_FUNC(peek)(bc, bits); int ret, nb_bits, code, n = Jtable[idx].len; @@ -554,7 +555,10 @@ static inline int BS_FUNC(read_vlc_multi)(BSCTX *bc, uint8_t dst[8], code = BS_FUNC(priv_set_idx)(bc, code, &n, &nb_bits, table); } } - AV_WN16(dst, code); + if (symbols_size == 1) + *dst = code; + else + AV_WN16(dst, code); ret = n > 0; } BS_FUNC(priv_skip_remaining)(bc, n); diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index cfcf97c021..fe2f6378b4 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -667,7 +667,8 @@ static av_always_inline int get_vlc2(GetBitContext *s, const VLCElem *table, static inline int get_vlc_multi(GetBitContext *s, uint8_t *dst, const VLC_MULTI_ELEM *const Jtable, const VLCElem *const table, - const int bits, const int max_depth) + const int bits, const int max_depth, + const int symbols_size) { dst[0] = get_vlc2(s, table, bits, max_depth); return 1; diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c index 3f6348b531..4f30493626 100644 --- a/libavcodec/magicyuv.c +++ b/libavcodec/magicyuv.c @@ -124,7 +124,7 @@ static void magicyuv_median_pred16(uint16_t *dst, const uint16_t *src1, x = 0; \ for (; CACHED_BITSTREAM_READER && x < width-c && get_bits_left(&gb) > 0;) {\ ret = get_vlc_multi(&gb, (uint8_t *)dst + x * b, multi, \ - vlc, vlc_bits, 3); \ + vlc, vlc_bits, 3, b); \ if (ret <= 0) \ return AVERROR_INVALIDDATA; \ x += ret; \ diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index ce5d00f7af..0c2e67e282 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -120,7 +120,7 @@ static int build_huff(UtvideoContext *c, const uint8_t *src, VLC *vlc, i = 0; \ for (; CACHED_BITSTREAM_READER && i < width-end && get_bits_left(&gb) > 0;) {\ ret = get_vlc_multi(&gb, (uint8_t *)buf + i * b, multi.table, \ - vlc.table, VLC_BITS, 3); \ + vlc.table, VLC_BITS, 3, b); \ if (ret > 0) \ i += ret; \ if (ret <= 0) \ diff --git a/libavcodec/vlc.c b/libavcodec/vlc.c index 78510e30d6..e01cc41689 100644 --- a/libavcodec/vlc.c +++ b/libavcodec/vlc.c @@ -499,7 +499,10 @@ static int vlc_multi_gen(VLC_MULTI_ELEM *table, const VLC *single, for (int j = 0; j < 1<table[j].len; table[j].num = single->table[j].len > 0 ? 1 : 0; - AV_WN16(table[j].val, single->table[j].sym); + if (is16bit) + AV_WN16(table[j].val, single->table[j].sym); + else + table[j].val[0] = single->table[j].sym; } add_level(table, is16bit, nb_codes, numbits, buf, From patchwork Sat Mar 30 03:15:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47668 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2319428pzb; Fri, 29 Mar 2024 20:15:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUbWzQ7dAXznwt/32BfegMvK+f3JJMVG2PXlCLVZK161MNQeMM118zm/xCpuDyScMZkVZNVFgrDylyQW5hoIVUkV01qrxEtEUxg0A== X-Google-Smtp-Source: AGHT+IH+vHZxGcopmMXxvNciuCdPTxsrLWFVR+TLnuWq0WkCzlimIiQHDzsjQU/6Jiltbpo8SRjU X-Received: by 2002:a19:e04e:0:b0:513:c428:9daa with SMTP id g14-20020a19e04e000000b00513c4289daamr2336362lfj.0.1711768550070; Fri, 29 Mar 2024 20:15: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 kv2-20020a17090778c200b00a48475a0ee1si2349442ejc.547.2024.03.29.20.15.49; Fri, 29 Mar 2024 20:15: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=Uc9IfAzG; 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 4D36768D456; Sat, 30 Mar 2024 05:15:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2049.outbound.protection.outlook.com [40.92.89.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED08868D414 for ; Sat, 30 Mar 2024 05:15:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iKgCg6eqfN8CDWvekHiBehZ/eCui5mdmtqUXOjerxK2oS/I9MP7hvZL0suh/xwvWuqGYf5xZ6epbbOVuu3L8gX+iGh7ylvmObKXZ4B9qPJ9cwEd/HsRrNG1Tw81vM3xBrpr093bfIBaJYXLJBw3tyh9uvLLORbVZumEGPkRi3fBvNeZ+Dmh+yVhjq5uPG+diG/AjqOYIS2wU+2i2JDhELIoZvuVMLU5n4i1NvkJUd/Alg94hZ6+HsG1ZAEVWmWrgYYw1YGsdjgW+ZGcng3Do3+XYW+UYHuUpATOPUqoVfFOn3VN4Sot9ziXw3/HkS7WmpXa94j9v1YNzKDGdEbJ38g== 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=R+Ikoj+0tPTysPLdwJzhowHd4eyo7vC6XBiDDStPXjY=; b=Ewv7Rb7i/SMcmvDFNZmV0dB1R4GMYrCrih1GucgwMqTE7VdWfnVJ3HCHEC0nQx7XXUMPxov4wDIzBKrQLH4UV7U01OvEPleCjINhwWaoyUZbH4F6mUGPpBAXoB7yx/ma3drwbVK44P0YkXg8T3ci5EPc+wuptBI/plRt45kLRkwKyR20bS0A06rcsU9yO5SiI2CQghpk0+X8yPx0Tp8ZNLLHBdo2MVI9xCr5xOR+1cQupUUnUNmCzE2ukMMf5w+Q1o333xwMstqA3G3jO1WfNY9uRa9wRApCeL/iytBVF9DX8peGC3QFK06oAqkCHRlD+/c82n6H/sTH2HwLRFW8SQ== 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=R+Ikoj+0tPTysPLdwJzhowHd4eyo7vC6XBiDDStPXjY=; b=Uc9IfAzGYYxUJqcoB+uqpH+YdmpEa746xKtFk+eRUbxPznYimaDLpaTRIFovzE0o1ed5EpZTQOG0hZxk46v0k8DGaYIgBlpiW9Qvamatwq3wBiFELLnNFqZHd5qPwG5uz2RaIMvQapbo015r1goanrz3rOj2rYb1tmQNN8KHclVYTJC3XL09GsX9/tcpIEGhDagz9Fp18mMpq9baj487K0cC/n5xDm1l75HetLOQJBgihiXs303Vt4KbEmfqEedEWgRrYYa/f4EElDh7ffy+W9+7rWJaU8BNDUDM6/fbIzcuWRocrOjnOGzC4K9fKOOPWX2gYWEbjiFxo4xSI/7slA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0038.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:359::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.42; Sat, 30 Mar 2024 03:15:25 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.039; Sat, 30 Mar 2024 03:15:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Mar 2024 04:15:12 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [2z3CO/wmNv7ePlWEyUvQIwu5Ehrr0r3Nu8YiDC0Ca7Y=] X-ClientProxiedBy: FR3P281CA0172.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a0::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240330031512.2615619-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0038:EE_ X-MS-Office365-Filtering-Correlation-Id: ee12a01c-dda7-4c1a-f4a8-08dc5067a4c4 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WcGfStJypdR1bAMOGppifScP2bq5Yip/pyJ/UHxHXPmHuB7p8PewMDzodEVxw5EvkFdGMNcPQ3m/8A9V4Qokn+pPFv6ee+RAB5NsXUe5LSLf/7Qb8XH7kvrmcmy+P2ZFggD9RwfNTHXtLo9scbWewLTCXpeQyRvQjS6fNUdyi0xpglDLYoPGJYyImCai8IXGvbmUuiEqPlUeHR4SIcNUFibFyy+/l/JBUD6adnsY0EtODceXYNUOSiWrG6AJPKkwOo/Sx7QD24MDBq4u2sRuuldVUOksqxJhKN5YDZeDw+GiZtwcmmhEvpvH0gushGrjYWeP+owSFlEJwDVO0GEeRd5rqmM7/ojzVdde6hjEIRjEirMv6ZZ7c6NDQp35GDnzzW35I4R0vpswVzq6l6gn7DTkKv2bpxTj6BqkNT051KvOByirEOiGae1znCFbBZkLZQxYKPi/LF094f1pOZUriV/4kFy8ipVKrBUe8Sgq2O3A03EoOH+LRc+LY3hp81r7THYm0XemeeCo+6tYoHOV6DQ2Cfk8KdhQDCN9X00A+lcDQYnXbHu5+f3kDNSSuK+pxbDT3gP/VNLptIkbrrbNXlAJ8y2+gdVsjKRarxLdCSdBqCppbgQVQ5u+b31Az08K X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jeSmDGL+kpEas+PGSJmbidz+4v6Hvu+2Ri4bJbdG7OnnqRgmUy4zOSKIF4fESvnvCv2U+Afbq7x6qFi1M4lYjUGvy5/FRGGDEBelpo5qfD0+z7r95tlWkWXj2wIKf1mc988yvEiwKoJXtCfREVNSvZrV8YB3AqdFuw9XiRPQPWoH44vo5wujcVbFdxA9OaL+yLmzr7E5oLXUIiqudZ44FPK0N2drrJDoyyhpBMEET1kmrNLh5Yd28saINBEY+A8iE//vlVtH9gTVe4Dbueb8+15dANC6pyFLZtdLDCbLsTXcw1S7D2Ibd5IXnBKHWrxdNgZYnd1eBd8fpitA3f/T1pIJfSKc7np+DwSvDnPE4oeZWUK9IHUNCDMmgJLO8GQ6KYpqRmh1FydEcY1UwqmzqFxCfMjLJ6BXRxHlZazz0VP+asqeKbWPGKAbQaUXIFuL6HlWRDJlvyIiwPDIjB718xbn406BdbNtgE+0qhoMdjIIV3t7/PjeTVKw1D3NwO53ZBeueW7oEkCOWwezp8kPst0wcy5oSSKlePO90Cfp6m2i6VFG8Bm/xipVGr3M7//V5RzNUd9wEFwK9LJ19OBd/bOTBYtEoVr77rMZ9ugo78/d9CuUlLLpx7X3uaq6FcWgGuTMsCCTc10/5Y3UhYOarxMDtyOtGZCkrywom7KOctyjeuumxDxiPLNa0cT+iqg5BVYwjNwdUrCrBXNpR5+hVUzlagf85BHPXA7HfkxcUX+AuAHfb+WnVUe65+5gDZgksPdhBPXq5UbCOdy8jruPGJwlCq17XGxiKXmrrZYVDxd6e5se8zyzX1E/lBHqmBVe4kgIij0zW20VoKsUWJMKcLi1Z+l5fktvF2jwWTGQD5jJcqyz20zyx+e+HRFyDQagNP085+oeV2YMn4o0VQe0B9AKKLjHD3JO3j8dfH8l1hcYRiEUJglE4N4iio2GlGPUS5hzhUOqC7G4OSLKQi51mFvs/Y95xT7u+8hEqYv8CyBgf7TPL+TfaAbqEOYVAdBwaYgMYVQY3ijZ9GPh4S2HGoxwnZQTnAB9laJEViSQXqcAYmA2HW5WF6lBD+qQLBYGoPFrES0ra+AkEyUzLu7A4RwAPS/93JSL0y3guueIDBnTcj8wEXZrz+IDmU9oh3PHugQlzKPD1zxSzcY84sNvDwcJDN+KrPPza6O63CrmcAXAbVZ5zQexG/7vdUkHZK5mmU1aFx3uFPE3X6AHDfHQwT90hNN65Cpt1vrhaeLcskqoa1GIN/rRx4RC2ho6cBzADpnhykS0fC6lbUcg+qHLVA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee12a01c-dda7-4c1a-f4a8-08dc5067a4c4 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2024 03:15:25.7444 (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: AS8P250MB0038 Subject: [FFmpeg-devel] [PATCH 12/12] avcodec/vlc: Use union of uint8_t and uint16_t in VLC_MULTI_ELEM 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: 3uBC6EPEFoyZ It is more natural and simplifies writing these arrays. Signed-off-by: Andreas Rheinhardt --- libavcodec/bitstream_template.h | 2 +- libavcodec/vlc.c | 8 ++++---- libavcodec/vlc.h | 5 ++++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libavcodec/bitstream_template.h b/libavcodec/bitstream_template.h index c8e4a5131e..bbb8dfa555 100644 --- a/libavcodec/bitstream_template.h +++ b/libavcodec/bitstream_template.h @@ -542,7 +542,7 @@ static inline int BS_FUNC(read_vlc_multi)(BSCTX *bc, uint8_t dst[8], unsigned idx = BS_FUNC(peek)(bc, bits); int ret, nb_bits, code, n = Jtable[idx].len; if (Jtable[idx].num) { - AV_COPY64U(dst, Jtable[idx].val); + AV_COPY64U(dst, Jtable[idx].val8); ret = Jtable[idx].num; } else { code = table[idx].sym; diff --git a/libavcodec/vlc.c b/libavcodec/vlc.c index e01cc41689..e89866e869 100644 --- a/libavcodec/vlc.c +++ b/libavcodec/vlc.c @@ -440,8 +440,8 @@ static void add_level(VLC_MULTI_ELEM *table, const int is16bit, code = curcode + (buf[t].code >> curlen); newlimit = curlimit - l; l += curlen; - if (is16bit) AV_WN16(info.val+2*curlevel, sym); - else info.val[curlevel] = sym&0xFF; + if (is16bit) info.val16[curlevel] = sym; + else info.val8[curlevel] = sym&0xFF; if (curlevel) { // let's not add single entries uint32_t val = code >> (32 - numbits); @@ -500,9 +500,9 @@ static int vlc_multi_gen(VLC_MULTI_ELEM *table, const VLC *single, table[j].len = single->table[j].len; table[j].num = single->table[j].len > 0 ? 1 : 0; if (is16bit) - AV_WN16(table[j].val, single->table[j].sym); + table[j].val16[0] = single->table[j].sym; else - table[j].val[0] = single->table[j].sym; + table[j].val8[0] = single->table[j].sym; } add_level(table, is16bit, nb_codes, numbits, buf, diff --git a/libavcodec/vlc.h b/libavcodec/vlc.h index 0cc106c499..bf7b0e65b4 100644 --- a/libavcodec/vlc.h +++ b/libavcodec/vlc.h @@ -40,7 +40,10 @@ typedef struct VLC { } VLC; typedef struct VLC_MULTI_ELEM { - uint8_t val[VLC_MULTI_MAX_SYMBOLS]; + union { + uint8_t val8[VLC_MULTI_MAX_SYMBOLS]; + uint16_t val16[VLC_MULTI_MAX_SYMBOLS / 2]; + }; int8_t len; // -31,32 uint8_t num; } VLC_MULTI_ELEM;