From patchwork Tue Apr 12 01:52:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35271 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1341589pzh; Mon, 11 Apr 2022 18:52:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmMgGiUsRO329Ctz9O4oOA77vNKnkddsu3mED5OzBjBdXnDNQNQd5dzq/1C6DmxDCvLPT8 X-Received: by 2002:a17:906:3547:b0:6e8:6cc7:3df5 with SMTP id s7-20020a170906354700b006e86cc73df5mr13088843eja.719.1649728363010; Mon, 11 Apr 2022 18:52:43 -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 k18-20020a50ce52000000b00418c2b5bd71si8045898edj.83.2022.04.11.18.52.42; Mon, 11 Apr 2022 18:52:43 -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=GLqqKpY1; 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 3BCB868B343; Tue, 12 Apr 2022 04:52:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069097.outbound.protection.outlook.com [40.92.69.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A437F68B28D for ; Tue, 12 Apr 2022 04:52:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CF2IXiRGDNMitpATTCu3ydSfD7iHXvZa1mbOGO+R2ZVOWe/kssVvsi62PMGbKsyzlHcjiQRI+q76s6sDlS6OkB3+iNKt0Z++PdByGI3XOltVv6PvlIo+p00MIrnqbm3i4vMG06KtFq5xemWnsuNTHEp2kxEQq1AusVmBKTiOLMUuZShBGeZHTvbNKUvsfg86vUo9md84DbTpsKEhTpEtPBX0MD7CSA/D9Y20wC7Bv/3fKF2+4UWiKwSF06d1r6kwhvV08csmysSzF8RWD61y1dDNP8xSqll6jlkhyk0weyV7dI/YASE8G5v0BSolGMdOC9SCtL7WVFE/NDAQfvENbw== 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=NbClmf8vz/X9LL0/btcTGqw5OR2maS50hWq9o2R1M3E=; b=YYZqr22ybYXDJUd2tpCbDYfO8s0FffIiue94camqsi4whmWnOUAl8L1MgBXEtVXfEJxnZ95AxJLC1vTyUc2yoKMgHUqIBKcgQ8W+BivKM/w+algXaeS6psNtOm4LPLAXxm5sUzsQ+uiKBe5oDVzyCrDuOgqvtEpVIeMJqoao/oWhWa4yeyxbl2kY/ExKlwPvAjScVKVUzRQs4UX6yK9FNdrK8qQNVL9vlTQOOng9CffGDxWSR063OL+KsvPyXpATA4U7gKDlj7RNQat7KFwQpmFPXWil7W60pZhs4tYF/GTDQrKaMeZ+IukQo3++4FqSI2ZCHZipW7wZnZsrq89CKg== 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=NbClmf8vz/X9LL0/btcTGqw5OR2maS50hWq9o2R1M3E=; b=GLqqKpY1YCQeQZRNJMX77sCTakivZqwKtYxMX5zKMiYqDO9wygU/L3M3e3vlIDZjBfpu24C+BRTPAmFBGZeE/DbAX0ljvx5br3HeVWX7LbB1TfZOXwAQkJP0hRsuBQpTol8SuiVpcRMFEiF19CELDE8agrW0DIhVdyQRceCrQDVMFf6xhB+Y0aV38dfNyqMih5SQ7VaXuvnNt2pMrGMtQgXflRiVh6LEWjuCWa7jxfVCuFNy5OaYACHsoYM3lG7JIskORDRDKYRGsr8+egY6ap71f5BRLH1FlzcrN+aF6ZsZxTidMRoOfpY4f25l914O8Ppr3yjyrntKfC9N1G0M7A== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PR3PR01MB6409.eurprd01.prod.exchangelabs.com (2603:10a6:102:24::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Tue, 12 Apr 2022 01:52:32 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2%5]) with mapi id 15.20.5144.030; Tue, 12 Apr 2022 01:52:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 03:52:21 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [N31a3bISzeKOo5wVX9GXNirfrYJi0hjo] X-ClientProxiedBy: ZR0P278CA0153.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::20) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220412015223.495845-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 22932ae6-33a5-489b-3009-08da1c271b91 X-MS-Exchange-SLBlob-MailProps: ZTmCor6bjd9ik/eYfNsWv7YMzTYdH5MIqvLhIbSiiNMD49C/jeyqArDH86avliiLOiB3VPoMNRbntS/+XDkn134DgCs9x9C5KolvZjfDz+dwDkz0ut28VzkTpwwG0m9UtnXqL6fpxO8aIyP4h1DvcxOnSLOtkKdqBRFFEJICHLhEOJSb6bKdHaCXtplaH4QtIcnGlanExkpLV9A69euwyaHchM8EjU4YdB+hQrlzFIWHBoBBIRQohLDZ2w3dbUo+MvXqweA6mfBN+yG+XSxTdmgHtJ3kaNDXU0RIMh92/2kaAzSRLyoZTJI8iVyybyTbuAlLY0eGlhGFIFNQPa8jyxNkE0haugGOZh9yXObdWNaS5HPH9AI0Z3JUqase5PO3XUITpz1uZPwW/ASY6YDmHrJvKG/WsnokKHSy7l6qzY3CbhFRh9P7oUoTQoWdRbSuVy+/vaWDRH18p05SxnGEeaB9FcQvpu0e3jqH5vkyYUrQutKM/AIOJTb2QV777UY4wQzchmVl6ECZLNl+/D4Qhi9t5NzcQ3KUzrhtrBkksuoRVF9OUiAuntE56YDVxBhuX7dTeZKqduLS608tiRvMaWJH3yYRu0l0+kIjQFh8znQoQBsgUjjSWFFdyodSYv1+fNTI2zXl3930WJyD2Cqit41HP6Gn/N7/vA3g/BYuIaGO/IAHFTVnTHkuoJWHxl53d2P9U3WoB/VrntZSEezhNyjNXupFhy02NiL+MSCisZLV0ZEXg2AYf26rUBlvaa5pOkWQfC8nAF+dT3LySbQsDjjFrTp8Z2gzch8y+kCExfAIqDm7nlUIkixMhYAygAr6 X-MS-TrafficTypeDiagnostic: PR3PR01MB6409:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oHsGLbTlT/NXFUiZuybyKZxW7tdX9PYkEjqmryIQHwotqm7mnGPI2PMUXpEQPqaqCY5Ql8JyjeTpi7PLTmn4+6kzZc/efZpzXOaCdNOAe8nkFnzAk9rT3K0XCl557El06e2bgPmAut1mK5Pg/jnnIc2Jfs+344qnn0SHrQ8szsMz0z1osD0539yu1WCDWbkL5SKmXdydKMAu/bZxqjWvakLtDQ/xyBGjIOAg+zyY03yB5i3nIC9xXd8VCo3ID5xqQtGaC1yhceaL4BJIGocAwhfmvFGmNFQyFS8tCcLjMag+onTcwcRR+fWm4ZbB/QpXnxeeiakL69DScJGxtv2amjvN3z/wVo+Pc1th/v4R4NC0v79d1FllV1rV9XRs5LJQIVYeygXfzBpKkvDBybbY8gv9ERI6bfEZhdjd5XosJqP+CeS5EotGmX/2vV4DV7WKiapcjkbAKfJRNNDbekvLBZmgmdh6Qj5X+eN+VsIb6I2B2MzpYNJOdZ2OTq6OUtRFKBzXaa+D8ulZNO1pF82e70cgdu1sSqMkPys0FcznRuBkvhAV4Boru27g7eo6QNb6iH0wjlDEXOuB0vcWpubHSSty6vyyoBNKvOOlbXvfoBTQXTZtjyTqmhK3iGjH2tc1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yHHWtG+20tPxB1E6pmY3c0iC4bzfvfRg0vqUsYn7COTUptZwaO0w/PPttGeWk0kavqEc0Rdo4L2i552n5miBzATTbX4Bf+33Lz1LclcM5AaHLgzhmUIHE/rMU7JLCQSDpS+qzl6Ljficv6jJGN1iRKsi3bWMeNSBI21PMpzot+moZdK3B9QsFSWZvcUSIp07Rlvl03U1S4Y45O3m/Ua/mB7ZB0A6NlzhIQN8JLkF/yHwGgG4FQkxm+c2NfqR7giGbl6DSSSFtd/1FHeoKTVYERxqyTqv7fq1XIIVEftO4wDoRnRVqr14lzENhAvUdBETuc0ZfEWI1fNoBX/rT8qXVAJ5noj9Yt1vt3OCo9xGW8lzLHEWYDtClsdAtZv66Wi0b/ZjDyrpqSOV2RfC8tICIaD32n0R/5RA6Q4LCA9+WAxmhGYDgYyNEKus2cvZz+/e2fK2upev3LQaG8xF6zeKp02fUWtlHm4b3S/aJSMVPp+gKak9DwuvHkQ1MhTYF+0cLZGQP04+1+La0CjvPX4Wj3KzB6huY5Hk/seaiQake4KAd+pXkBx0DSrh2cVTv7ACLLfqiVpuDMv3BAiFzsyvUisChSnDLDgZCe2lnjkNmESUpmpwpghZRytW3fI28M59iM+cZuTogo8cO2EFuDTXOV8xpfic53v+VQEpwhgHEbfcsw+1wwDfM/r1dU29u+KvJpVhjjzKBgAoqio6zuYUFo2kREjob9spuRhIpiE1B1Y/PhXQqERINFi6xUNmLvU1ep0JddD1Coyyn8lUhNp5Y0fy5etgOUHRbZX6jVL09wAgPoK+nMGh2f15AlNPDwPvAV4V1Vz1pRFmSdkVUT9i+aHa9DZDeRBltPkmQV9EkuYWWnW9fdLZ4RPXjvpqft40pHuEJM7D5K+mrABj6sIUjelZZveXV7DleXCYkYKl3RqkdQl74lFFKrSRR2h8yZIdDTZlJ6dRh1dSC3pmf/2zsHf6JudCE6Je5SxfgG326V5TNZU3XvoDIFeplBJkUOPePI4PLavFAHQqUiEEtOLJ+v6osUd4SPdF5IDwipUqe95xwEXlNQcSvY8tN6/9cWFuGQKGjDgw0NvyxTecjDbZShG11BHxPiwevuuau/uVgIDkBwahXXTFYhoW9OTwbDNpPGxmE620ETNaGF55Svx/w2+UfFRObNzhR5Sy1IaohlUBoeK3HKbvYbC5f6qneQ55W03f8fEs1zk6dIDCpnaN/ryB+skC+ehFyMBz5syX8xtcXnzfdSzWVHHD+dVOlUfYnkx1f0HPxccTQW5xQ7oXRIWANXXbC3qfZ7cZ+5l8DEWITsPogQBixO5Aney9zHUcQMms+KNyFfd5VjJYEPd2Epong+uI5v6BNn1zPeYuYkja/R/PPw1EVFNrqlc/WqQpyHdCdMAXZVjty+HMjpryriyNpniovY98tzj1o8zZFz522evJwXFZ3i/24jsglsh5 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22932ae6-33a5-489b-3009-08da1c271b91 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2022 01:52:32.0179 (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: PR3PR01MB6409 Subject: [FFmpeg-devel] [PATCH 2/4] fate/image: Use TRANSCODE where appropriate 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: LzV0Biw3hRP+ This also adds previously forgotten requirements. E.g. fate-jpg-icc actually depends on the png decoder, so that it should not be run when e.g. zlib is disabled, yet it happens, see http://fate.ffmpeg.org/report.cgi?time=20220411182746&slot=x86_64-archlinux-gcc-disablezlib Signed-off-by: Andreas Rheinhardt --- tests/fate/image.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 70be281411..63076f8ded 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -337,7 +337,7 @@ fate-jpg-12bpp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/12bpp.jpg - FATE_JPG += fate-jpg-jfif fate-jpg-jfif: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/20242.jpg -FATE_JPG_TRANSCODE-$(call ENCDEC, MJPEG, IMAGE2) += fate-jpg-icc +FATE_JPG_TRANSCODE-$(call TRANSCODE, MJPEG, MJPEG IMAGE_JPEG_PIPE, IMAGE_PNG_PIPE_DEMUXER PNG_DECODER SCALE_FILTER) += fate-jpg-icc fate-jpg-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png mjpeg "-vf scale" "" "" "-show_frames" FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG) += $(FATE_JPG) @@ -389,7 +389,7 @@ FATE_PNG_PROBE += fate-png-side-data fate-png-side-data: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \ -i $(TARGET_SAMPLES)/png1/lena-int_rgb24.png -FATE_PNG_TRANSCODE-$(call ENCDEC, PNG, IMAGE2) += fate-png-icc +FATE_PNG_TRANSCODE-$(call TRANSCODE, PNG, IMAGE2 IMAGE_PNG_PIPE) += fate-png-icc fate-png-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png image2 "-c png" "" "" "-show_frames" FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG)