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