From patchwork Tue Apr 12 01:50:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35270 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1341145pzh; Mon, 11 Apr 2022 18:50:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4MSaF367//CYY0LP221yLXYJK4Zw4vw5fNJIzbu4ao6RjaNditedcB50ZmXTIplXKDtQ/ X-Received: by 2002:a05:6402:518e:b0:419:675b:abeb with SMTP id q14-20020a056402518e00b00419675babebmr36119350edd.279.1649728248716; Mon, 11 Apr 2022 18:50: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 m30-20020a50931e000000b0041d2fcc31a6si7837751eda.127.2022.04.11.18.50.47; Mon, 11 Apr 2022 18:50: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=F4y3QRvu; 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 CC8EC68B326; Tue, 12 Apr 2022 04:50:43 +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-oln040092069086.outbound.protection.outlook.com [40.92.69.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 194F368A43D for ; Tue, 12 Apr 2022 04:50:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K9wZ6JwKikJddM2qCT99aFqjGyeG+at4Q14joglFftXQCErh4fVTEx+tgCYpZFgzzLfNS3oqJFd9qs2V8Auf34cXQO2jIxnl9b6rypLS/Ffh7ZX7t59DjVWTmWK5DpTLvnM6QJ3jSoZPpnSSeY6ftTSpUofdaGvLCxCijjS59Y+slt33AljlXvJ24J90Z53c+X6ajYWgpojo3UiyIFugMgaJOZoqAoz6krsRxbQImMVLNSehEwrbfcDgklLQ/RcYF99XxqU5MZGwaXMAQcX2C/mhCzBKS9Iep8XcjTKfVwSMGqWUusGd3JlAEKH7EvNiyy8PPQtA/WAWBcVvp8tqNw== 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=d6D3ZJDvVGMVCkFH79pLUWCJwFDU/XAINRLvLJccdFE=; b=eKEp08+EZjpRTVsaAUMByjEmqVmOSWgHP+UY1WnV3828OOJML8eHlT/WKw5c/DS6bm8Hs2xfEBrqTvoTBWmY7zL/pUaYFyHt4wiuPFtzeIJs1yMc+XoTz7ijKVC1y5QOdWnTE/sbS4f6Uy2S+i7SMQxxuYRwUhV1UV48rBgdP2jc63Xn1IaEA8cUi0PvvAbWUI7RFLm4AHelam/Cz8nReX6bqRM5f3CC1pRBLUFCvpZpYXCjGHGMrXdApjWely+7IktT1f+Fg/4v2quOdnZ4pBNqX3jYmroavJIkc8CgiS+KKJAFi81N5lmoos7KQmNtIDrlNEiQf/qoPn+sKP9dXQ== 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=d6D3ZJDvVGMVCkFH79pLUWCJwFDU/XAINRLvLJccdFE=; b=F4y3QRvuKwXAXxOsajWWtDOAPmGCK3dapc3Wnh7XgKyjIzrPsQxgzw3G/TuNjZbsRKWQxQYeYd2iswGNT5OZBKCRVFdCV9jI1YsxtysvTMfqx/HlV+YPdqS0HwL/oWuZmIViTys7Ywlra3K5gTelj0SdZ3tmtdvn5nJ3oTqZf6jkOMBZBJcETJBTFHuOETdhk6f+wGwoZw0nNbK+yhpy3jWrya/2de6UI00NRAbD9RMB6aCGzGkzqWiLbCPmQm76o3oQ74vJCjN1EtBgTJpK0SL/omYCUag/3J1qSlv/MKwD6iGt0JORT/CFP9TEYAu+S+Op8tIqc5d6b1ZJPPYMjA== 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:50:35 +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:50:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 03:50:22 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [VvwMl4p4PmjHnt/hPpSc+/UiLKYVjjuc] X-ClientProxiedBy: ZRAP278CA0015.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::25) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220412015025.495764-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de3d2402-b2ea-458b-78ca-08da1c26d561 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEsAw3Ae1LLjSc2X6FinMlRxSNfUt7TrBVULHvK5jnAMB72LVwnBpM/YowWVfxA+vNQ9DPM379T1kXOT3mZs3IRyy1QFux8qQoTpe7fHERRDis72j9tisn/Ags8JggQMnd6ey3G/5x5EQPot01vk2FejoTu68WGJLFTlPy24JSs/vfBceniKazVZnTSZNbsxRFZPisS+nBLzMphFV7eiU/+Q3GBGToGlZzwc+sTmup7jAsd0+gxri2OzhBhd7VK096dFgeGChN2OwvnsIj3BkPL2xnKRqRpxZ4qXyPNYF7W+P5RTTYUNv0JjoOzJ6YBmN33HoXHum0GpVDzQqnK05434wEJjhaeMPrb6O/zp83PVXniQXLtKEHuEiS3FecZvTMn8QUTnWmxsfSbDCL/bqSoiotHNoiL/xiJn7aEmwQ1JU4dOIUAMZBxbFdRvzmSymWiSwCGs0yfJ1rMGEmk8TaB9nn9BSbYw89rdw8T6VvHHJEsbrYbaTnTcWOuPRjCzilwFx9BlJpsZAoI2IptUmR3xP/YlDFvCuw2TYOJHettraXfFcttuJ/+/awKNWqtJ2Am9FMCcVTgjQkMXCTAVxnLwtP3xtMooPuWXwrOGEF4Kh2yXuZdIzLFSGrLddZHnDmqxQvfRxplpMNE10MM3QbM0aKnw1bsjLLypNfwBMP6DE9dg1WEDjrjzIMAdLjPI9qrWC9t+yiKqEdqrXBkL8yXcSdyWFmBZXtHy0IxdOmi2doCzT7dr/yzfXc7P4ndsO3ILPrtZ21ZwYAIJF1ZJOAag X-MS-TrafficTypeDiagnostic: PR3PR01MB6409:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Gd0vlj4sF5YXSS/HXNBtWHmuRpcyVYGL8SLfRQBGo2nHPOzLZao+4ocpJbDKxhLIBIWI+XHAUHUOXqmeCS3WoxB/9tDJfZ5OhBGS/+Nxz85tqgxvKxn+x0V2BQTTnLWzq3unzmieswxM3I8lj+64i4gcrl+j1SI+PuoJjATIdxAqSQkClUmq7lqns6zoNErALpqIYMC4TuZcokwr/BbKuqnjqCIJk9YR9GQxEFDuZvq9fKIiWqL/pwj3oMVkbDFPnh7Ansgggdxv+8+G9H96l0vegdFLPE3YZR14mmQAgfLoiC4c4YTIcOwSLI5MsWtfy0xgWTm2y2sdbjheqluOYLRqR+1JpKFVe3SFZyN6T729uZKCBfbjSDmXUO/8w3P2E+hzBU5Xo3pFA6ga4NaLqH/hE0QOc7TLo1ZAg1xpvzv8DxQt47oPn+pZS0gUQ8EaOManvpsUzsrfXxwnwrvx5o9HAF1orfcvjUh+Imjf0SvzAI++wtpkOKBHJdmBMpPJXsjvp3Ya3RopQNcbg2wP9vMGqX1o57gpTvhBJXTFlUxolBnH9zuLhVOmjZguPifURxpLgAwM4naoZknYu9I0hA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Z9m5IhXY+ebl4tD9a5Hj2ruTG17BXIU1nzO8fKnOogNh6pG7he3+lpawpPeppllEC1SBlljUqxUfPZOn5QaUhTG8T90SfIE5mLrWgOzqpXn92osVkfZ/iPuBXPnzmA4MIjB4Ve8yauKOsWR1vfZLPhGD2STtOcPJW2ixZZb87cNTWcSA5gq/+XHHkJnM0DyiIFNA+nxMvIRyxx4UoXWE2pjpzQxW7yslV2bJhEue0TUwSPrUm4gvR3qpEr03wbWBDtyTYsizNgo/uiq2qujdzZ9N2Nj8yJ+nhjJvHI5yq1dBaJCH68vY8lX3keoPM/McDACW66xrmlWIHHMj720wEU6bgXT59D3AysiO9JCvwsS7zdD1oF3+foNcvQgWj/8AvuB64bl5JZvZao2DxYTE37dYX1SNTi4FkhAUX0dpnEGbOQDYaV0d9Z3bKji1IxX+kCTHYadh9rJGghCE3/hxTM4HgFNZOaJb/xWQOdfugysoZJ4KVTfZug96J8HZfaEI4QRnjCMMfJ/nPvcqZ8/MX1u+sbIy7sEJRJser5C+ql7nrRyChwjuFlRnPOfk/VAU5paz/7MvDC6cK9eQtR3EDOKUBg3BBf/vq3CllN5M2MvGFK7Wn/6e+Vj6qqndnJLHjIJElWtMqbCAnQq9J8Js099BVaMnrkmwGN/78hSpG/IxYy57IduJNefCwJtKYdhPLVwPIjDES0PSFi8Y+Bc+0EMOMeaOs6zWY5ofgpbi1V3ns9ILpBqMt3Iqd/nxg2Df4XA9gyXXNJuq8pQ+tAlRLZCEe+dR//yuV8pQyu7lTk1zOc0St2CeCu599Hv9CXQyQ2m/TiYkbpkqt9p/yZDBAkdP7NlKdy0y3x9F5GHC5Mi3bMolc7tjl+Phs8CwLDfoztJIAF0SjY66zHkYTF4D/138Xlm22wz7hJp+XpKqcBkodH19eQa6legr4UDRHptv7p3idp87R8IlrIYN9nTjTL+nTg6df3uiqgtHP33eJCHX6ze0eAJo1WNTDDnx3w57wicx5RXRWReNDCInnD1ZGth/9KUKJoUb6rSIaXF6ceirw6AXiKIvnKa3teYtERyiMEXbnsw58FIFA7t29K3AdkixhmeXA7jYJFGMcO1rPzcGviyRqtakiYJr8r7/h5rz86vpxmmucgSULpYMcpbD3xG56CfWvCZ2aBubvP659BsW2N4YjmL+v6ipJ6ai2gW0+kwRj7ay6sXyRsZjubnUV7O1J+bsUQoV5PupdGkYDLFVZ0N/muhPKj/nWpoJidc5xGE5fTYhr8yCGenyXQaHnoNLOAeUCUY7JtVkvnknpaIAXz97FSGoRj7PugVHE/oMCq2prpLHb0RlwNEcsYGrADPgo7xzbckGVNAy7NGuFONcAxQNNCkfx3BbHPBGnUeCyPU9LIcvMqVvZJPdz+Dres8sJMqpEzuWfxJbh+hfqzD62Uv/Aqf7a3QPGrga17Fg X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: de3d2402-b2ea-458b-78ca-08da1c26d561 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:50:35.2647 (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 1/4] tests/Makefile: Add auxiliary functions for transcode and stream_remux 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: 2eU1YMiAcvjM Tests using the transcode and stream_remux functions have some common requirements (namely the file and pipe protocols as well as the framecrc muxer) and also other commonalities: The create a file and read it immediately afterwards, so that they typically rely on a corresponding muxer+demuxer pair which typically shares the same name; for transcode (if it does not use stream copy) the same is true for encoders and decoders. This means that using special Makefile-functions instead of the general ALLYES is worthwhile. This commit adds such functions. These functions allow to add arbitrary CONFIG-checks on top of the aforementioned ones in order to satisfy special needs (for e.g. parsers, filters) that several intended users have. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/Makefile b/tests/Makefile index e3b41a4f7b..5e4da2c42f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -74,6 +74,16 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ $(firstword $(2))_ENCODER $(lastword $(2))_DECODER \ $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER) +# RAWVIDEO_ENCODER and PCM_S16LE_ENCODER corresponds to the default codecs +# for framecrc. These requirements are not always necessary. +TRANSCODE = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ + $(firstword $(2))_MUXER $(lastword $(2))_DEMUXER \ + $(3) FILE_PROTOCOL PIPE_PROTOCOL RAWVIDEO_ENCODER \ + PCM_S16LE_ENCODER FRAMECRC_MUXER) + +REMUX = $(call ALLYES, $(firstword $(1))_MUXER $(lastword $(1))_DEMUXER \ + $(2) FILE_PROTOCOL PIPE_PROTOCOL FRAMECRC_MUXER) + DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER)) ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER) 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) From patchwork Tue Apr 12 01:52:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35272 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1341638pzh; Mon, 11 Apr 2022 18:52:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2xLrWhACcrXBf987v4OSpEw0qzhyw5Gol3BXJff1XCJVk7Fjt30fBQIqC9RzumfIVtV4d X-Received: by 2002:a17:907:1b10:b0:6e4:bac5:f080 with SMTP id mp16-20020a1709071b1000b006e4bac5f080mr32662710ejc.24.1649728371748; Mon, 11 Apr 2022 18:52:51 -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 m4-20020a170906160400b006e8960b76fdsi3023052ejd.67.2022.04.11.18.52.51; Mon, 11 Apr 2022 18:52:51 -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=PLwnKI2j; 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 55F8168B351; Tue, 12 Apr 2022 04:52:45 +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 C384968B326 for ; Tue, 12 Apr 2022 04:52:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ha3m904rB676smOioiGMCR2qxsROJMHol/Qp8lYgY1HQ8UHwtoTr2JbnUOv/StwwmO0mFD06V7tj/+uh8ryfLdesj8ttYuTtSsImyYEcG573zqLz1FEKzaLBtHJi+mr1fsJD+rle6GYtpqjavysw9N8cnpVr8OcxiEJtmB1L9fBUiODk9it8Gtm+rRS8u1HPVTGVPe8+tdABXZj6NP1+IZ6pNdJ2e13su9rw7MQsia9PtxQmxMl6vkqhzGNt8gVYQKN+ij0mCyA7jaNIk0uVH7NMO/jsDs8d52F++djsVGonim2WAhzmwViKJS8OYC7MzepGL3IYxNRfX7ZwC05BXg== 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=pKP2a1b0znQ9XkxuF6h07nVqI8R/0x1wAuYfiw5RQIY=; b=V6STGtGexmRRvqQYbgG2/42u/RAPs/ks2hQV+2AK++5qSj9NFkUs1GMt+4oy8uWiGGHHsUA7WREgHS7tIaWqyr9b305bZSJkIr1FxB9O5ixhtocjtm4R+GITQPPFvzaqUbOdgKGromr6vMEPBjOask37b79p5QMkaVHohdVR7uMc9xUbiQ99Jc32oCuUcqf+0/no8RoiwT5MVsd3sb1B8fMMmucyrE/8FlwW72XnNDkZoJtb6QWsjcqXoRQalTEr1epM5AaRTFpY8YY7Xsmz06TGKZgRdPZlYNgwZiT9zjo7IQhf9H/XfN2tRwsd1j6XU7Bfa7xW5EirpGGawtdLLg== 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=pKP2a1b0znQ9XkxuF6h07nVqI8R/0x1wAuYfiw5RQIY=; b=PLwnKI2jlzpP31/6KYoeVQSbESD9VqLvLujlIuScTeKvEOvam5YQYa0hlLcH5FssWX/A9trlDM9SDHGXu3+sFGkAUvLuph+FO68cekEpUOzXxTnwF8adkg2ghW/8LGweyErDMG7y1y82gFV9YwcajUvLuCGqQLimv4h8HpzIWh33JWCe4kWfhH6vJdTlRqu/AcWNpbFFfKG7ifkCfgytDvLsXk+PEwsMXQTwOpbQN9sLALIcDRRYLCovZC7DQUQVKK+T2Mx9n2gm3fs4JwgJ9hnBqFHXGTL9NVY0jNdT2eKppIOQqgXnoseQb2YjeAanOS/b2JvpGJFc307KTLy3OQ== 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:33 +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:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 03:52:22 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [MvqVud6YJOaz2nhZoWz5jtoKiiylTL2+] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aaa215c1-35e1-43cd-bfa6-08da1c271c9e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiThIBhrdRr4cLcE9KU0705s2cDDePIDQULozw/5cZqseGr3rIs/kxxZ17vMH2Aa7P16SMFZDfxz6cXO2ETmj8+j+/Wgy0/78rFIrj0gqWl0w9oDQA1YuxcEZrlygkS+jDPkAw4u1DD2dUg2v6HCKtIHiV8ldN4FnkhjMnorjFY6yZRWhXia7kB7Og8kLiOr992DYlbU/6E4DViC8ZFVbEeGas9gVBNNHIPyOBFWMZLWS9uCwPhhYzE6jJH3xXJDnKS3blUaRrwGFeJdIMxhRQ3FRTi55T7yU7rexmiKWirWkD1OkgTozRjEzMNB8QyyjNuOQ+yTvEOs7fR1jD+TbG7vti1LFib2j3Lhi7p5FPNXp8KzPb1TcEqDHHVLEWuZfagDBBq4B6v+JwHvDZlvUmsGjRwg76e+GNxLjYLiUXIulf8wzAyaR+EYBRwYuTZH1kU1Tf3cpQUAGq+4JXXFRCPO+xTJ1tQAZac9H6IbuHBul/0NwNJyGfxpkHsVtAniIKEBypbj5nCgvgNg0+IEb5YRePTd2H7USh8FtTvSOQFWIux+4uc/GCB8UhCU7ZxCRWOU1R6kj/Nv9fXit9vT9vkqyD6hFMpgpM3IjOrE4IdwKutaaW3UIZePaY+HEZu1cnlT60HEnaJ2LOrsC6pHdEHIz5ABBRZD6B9jh250weQTpueb+Pisba7/oDeocrJXqzt0pXLxrg9raIIWoE/R7A0cKG1jvlkM184B2H0tLsNJTZh7l2cfGVtnbH/i+K7QbpQ= X-MS-TrafficTypeDiagnostic: PR3PR01MB6409:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pBR4M273Zc7cvxHVKH1+Lw3eJYZwd2WAiTOqzjiBBS+vJVQC8Y0gEx/T0ECGXeAsU/ZDJvvy8ejcUaExIn34nCUKb8KfyEeitE1crAt7ue+sQP1XH4Y9rvMxH7MjxcZvIy/5IhhGMlpId7EXCI7Rq/IUnbrg0q3YiCN94SjKhkdQrPS2pyKXAWV3ljLQvHAbJ8FULSz8xJZT/9IBJ5FnBaYdL25lymKblfX4Uy+XiRdTJV47+LFn3pZuHaeaqsyTjf1d3SyjTsw5vg/hNGLBnZ+J0gIIC1cuV2omO3nl+93cdeXQRZrjsSA7v/rLSkK3jgDvvz4VsS7e5PN5Uag9ppalQArGd782eq3DDFFyK2p6T2PrVnoJrS+X2G33TBpobEasbzrIYkyvRaKHqQ1F6S0bY33DXWuWJGry4NMl9DjJgENlu5vQ2oUxwYlWVgsrkrD9L1cTj3eMB3fF9GlvQqe+LZEsEyA9zjYLkIZN5eIVVVABR8yQ2nt4oyT6JvRbAIRa6lwgTKG7yoCKZU2F9WdYJwYmCRwBwFhtM4ALR0NACmObROPSkgmVXzuHqjgWnVkRu7Qbba7YySxOh+VMHw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LxfrkS7wfT06msGySlwOiM4XH6/OFLVzXhYcngcTwB2w90O3Vd0zfVgAJzD5psVXzcE9uEIh4mURN3T0L1xs8wbncEXY4n2nMCSZMPHBQdSg/6a7HSsftQwVc6WRXZKIYFnfruPpGP3l0DZwWhJQO1KxO+4py5KZygwAFfyoLFhaejD4jwRzMRqznwUlDXQdfcsh90Zak6ioT4bMndgzFOwWMEAs7gNi8+SEuEdXq6xmAiLdR6wHf+fHO4q/5fnH/Y85dQ5SKAUZhqMN6Nw1JqCqpFnsjXBXH+ZVSFT4Kn8uKVcK5GXNqtO4OLlC/qjF6ulersZP+ZIxXkZgTFgw+drnvhseFTATPO9NK8HtkqeNzJ4YATmAktrH/7x60MMh+Jje2RrpvKHZh+72Uy7q07QYDjOrRJD//6XW0GG7MktV6y8zGxlcRUW8/+VSLTNDw/FgvfTr5xfn28ncbHecakEvdb452+OUTt/gGm44K4hvRr9aVv9wfPAUWQ5jbQX8p86M/nd1Z2H4nvj58vSC6wswSgPJng27Z2YD1ltqLtz61bHwKYWOGrlBjchbzJreW+TMVPL3+VID2jXfMUhS4Gr2m88q/DvOpyrmSm7nGHb1SXZwAeeTTml8+I7pqGsJXWeGPMdhmt5aae6Z2KTVjvtcMy/nMN0gPIkyv9LjAX+Dso/qF6G4MGVxjhFaI0k4nl6fZ5cjtA07wwblipIZbxq2/wvD+MaCXA6wxDffNn5ZBrla8TymtRCcSqpsNOA5CqX/AKDfGMZbkmbsFcN7QIuGbSAHQyCocCMCdWo9+ktWW8g55DPbSaI/x6xkT+FcWgtOD+Bj3L3pwK6PkWdE0u0xXzZBYBpLM5o0ByoAulNwo97gi+ap8nuAOaxTTIcHr6noDp45fTaGK5ZWPA1CU+7DjppmLZG5Zwy9BaORzncZL7sjJQzjJ9tZDjsjHT+vpb5RY45z7NKKGcBo5WWItSqhZXfGLnecR410xsUYjkOrRy8yv+EH0hB0e7mKXrlOeBioPEg3/8VUX/6DQb8oJPgZEH/9VCd52b7esYJViEgUnxpeIscmcKZ6ud6lwS41dsy6K8zMVTfMST+3pUUtDywr5xyvCWtAMfZEu2olfDTYnNL58BVTUJy3/9lLPyuYWbz6rjg1sYTKwXLGWAcQQ63pWXYw8C8RUlqji/7NwQzQSxeyc5qVZ7CCETS51rfdjwQrFG1k2q6vyBplB6cTXo8DC6jIZzHU2OWitsEiqUY78ipyoT/LEgewBGFFP2YGzYEoIWXRb0UOw/aXqghFOGsXWIBB8NaE9r7FgzNdoQ3isrZWTPP/M94xItwM8R/YuJzdhnOQ/dvYegP5iZRb7GNUEGFmCp0KCBOSytPKtbkPQ/IKC2UHe8rJhnXGQ1ZvfpTPNoijyFFgZk0bhz/nh0rbxdHSWfg4SAyTbqI6a56GZxn8xs2rpyDletuKsjR0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aaa215c1-35e1-43cd-bfa6-08da1c271c9e 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:33.8001 (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 3/4] fate/subtitles: Use REMUX 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: 4oVgKVAskyur It also adds the missing depenencies on the file and pipe protocols and the framecrc muxer. Signed-off-by: Andreas Rheinhardt --- tests/fate/subtitles.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index 8375cf2898..bc464edce6 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -22,7 +22,7 @@ fate-binsub-mksenc: CMD = md5pipe -i $(TARGET_SAMPLES)/sub/1ededcbd7b.ass -c cop FATE_SUBTITLES_ASS-$(call DEMDEC, JACOSUB, JACOSUB) += fate-sub-jacosub fate-sub-jacosub: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/JACOsub_capability_tester.jss -FATE_SUBTITLES-$(call DEMMUX, JACOSUB, JACOSUB) += fate-sub-jacosub-remux +FATE_SUBTITLES-$(call REMUX, JACOSUB) += fate-sub-jacosub-remux fate-sub-jacosub-remux: CMD = transcode jacosub $(TARGET_SAMPLES)/sub/JACOsub_capability_tester.jss jacosub "-map 0 -c copy" "-map 0 -c copy" fate-sub-jacosub-remux: CMP = diff From patchwork Tue Apr 12 01:52:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35273 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1341664pzh; Mon, 11 Apr 2022 18:53:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTm1hEJHdm+Ex0ukjoES5qsVvpx5aQPdxSb+Lw8k0sbmXrsy5oLi0k0/yBIIDct2o77eaw X-Received: by 2002:a17:906:b155:b0:6c9:ea2d:3363 with SMTP id bt21-20020a170906b15500b006c9ea2d3363mr32013513ejb.729.1649728380769; Mon, 11 Apr 2022 18:53:00 -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 26-20020a170906301a00b006dfacd07cc3si156897ejz.441.2022.04.11.18.53.00; Mon, 11 Apr 2022 18:53:00 -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=fFECm4wH; 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 5B81F68B2E9; Tue, 12 Apr 2022 04:52:50 +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 E290768B2E9 for ; Tue, 12 Apr 2022 04:52:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ey0Bu5QWgEjCGwSm6I265uDBiYQaT+UU9KZADM5foxKXzobieIavQS1sHYk0ou/aqyWYtjlp2f5dHk0Rs8DmpuzjeBfmP31GPbskUPgjNlox5BJZ3XHOEoCFjk0UgYqvZCA3M40EiW80egR32vMTy6kVphOo6GZyCx/JuJ7x5NFksfvoQ+NxKm6YpN/Ew4jLsjGX13/O+O6PWknHcMw9736p8DdMTNMBjnXcz4WGmTA+yfSINRsIno6o9tKC4y3bxXobpv/9HGWrrFTmJ+vcOcVsXFFQoTneA44o4zOXvyfWUXK9aagF12P8A/JHmv1ZWsoO/x7+qGYX7GGk7ZgF9A== 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=bQyTz4YGXT2gstv3ZczczeoB8sFZtZge7uuwic/Aows=; b=ajfKgXfJ/OUd00l4gvA2bos5VSvwq1/E/5HumhSgUvUKmE1XYfzPhKsPFteeaYq5pl7fzKCLkSqUXgUnFdqIlE3SBXsu/KEsyh+eNSR4WNru2LOupXG6eeFcp9yxVgJcHXUAGg5dW78UGEIiTvH7Tq8fs0MQ7GR+mmY9lWUU/Wb5213R/uULRPEwyT1lFqEIQ6tN9gwvmNc3gjczP9w5VxCTPz5A+7njdeZgN0YeNrKjEG16qnde1zTvWjeaLNb9ssXvHNB7gk9SviUyqOUOviuRxuXgvkHJVxtUJdBkLRde7Au7BSGD5pO/XmjPLbWR/NV1MGJqkAuJm3mn9Ytbwg== 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=bQyTz4YGXT2gstv3ZczczeoB8sFZtZge7uuwic/Aows=; b=fFECm4wHL45IVdwuq4feedkI3/n2+MtPoooUJXUnSgx/bWFApb7lwwbjxL0yxfaW9+JG02hCi+pMDxbGfwjP2iXlUg95rAIWUYgFXNZ/RN11YEBQAzjezmZ+C5DhDV1O2xpAMEI610mbCd/9mN+e0ZK60rqY7uSvBpvhbPQw2vBr+OaK7EjlfKVE40snH29c5X/Zn65KcImFFFb6F9FWaNnj/floY9yJADUeFjv4x1dDTSmvP3kH7krJ97BIimuhGBLiBRpisb/WYKgM6G6NY/MZwiEeReE81thN8mPQBe864zkiae4Ou/ga10ijzZlPZfSe3CM+cb+4Us/dgLKrQw== 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:34 +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:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 03:52:23 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [kWoDyUO62DnWEH3SJFbDuRCKZrrzZkmP] 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-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cf2ce400-eb1b-426c-e176-08da1c271d3b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiThIBhrdRr4cLcE9KU0705soFxsQsA/6i0Q28XGSvbsbCNs4C65TwoQUrotIoYIaHeUg83PPRFLY6GI77wmKmTAo+1xKD5c6GAbnkAsZY0KYIH2+Ge5EuKssZlwvqz6dy0CjA/QS9945yLaK3/lBW80caA7KxKMmyzJzIe5Tq/JfB9eOhlVLzmI/iAqDsIJgEy82cAdoDwqgPvohZYJtP/eSHa8L2Dnb4zHmJtlisVt+sluhJctpx1V0EaR32saxqmzORy+rOSHS1UgGCQO7eOW9BvFFvmR1in9889ducVHXN8lUe0H4UfPSlEZ15D5VE9IN1h3w8CMY1eDoRExonc5UDZTOPETkGQR8aC3oTPwYz7ypMyVRXEPLbgLXz8I3ipHKwAQAYIMy1+LXMM1N1PeXldkaNcM7JKUo2rngfl92AnDShO7qJyES8AgmCM3ZeP4E0WN8x1y8mwAAyfozCHsp0sSbhTzjwG+HObRbF7ZmhsP8t/H70A5Xy1HIRsncJDpBCtRmC9P4TtI+8QSfFLd5E0vGm5rvYC4ebGC8THVh17yDehpgxUW2E2vQhgTj9fUkCbVfxArVmFIfh5FY7Nij9PgNYOPIpSXtTTy0vIFqJnmDaZHpPvfWKRjLhuXBqoOyzi/8GKHNh1lMtwOw7sOYa+4BpBQbnBqObplj7Z+C9Rel0Cp+x/Cl1GZmycjg1P2SD7XeTdVMg1l1JeqKt2uJtcY08DJiqgU/tij3fod589E/1WYEzLd05ZGOGtDZ5s= X-MS-TrafficTypeDiagnostic: PR3PR01MB6409:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5TfUuTHA45MiPR9LzMz4Q5E4vrrIbkIRkskbv9o+0cgZ3oaFHDtPnu1r8ORoqpqAkh6zWeR9dkC/+I24gueCRUYfNdlkWRsZJO9BMHUNB6z1ru/k1F/jUAPQUcW/sN8e8d7n3+yCbBfvrHsM70LVUi5A1wqrob8U7jaE9lvZCaq6yXyWR4Lsr+CfETM2m9Z6kq4W2nHnegQaE2GVjbCoB95KnkS5rFWTzARzapXmFciOdqPZC01o1K6wsWROaQ/92DdGnDB1jeiCZcSt526xTPYrWou/3bDLnbGwVNmpJZBOzOSGQcptjNOqkiLzcHm9xYCNHqRTeKQmJ9lDYVYUnQL7yLLji7H+M/foupsDC3hBSYv+ZYcC214vvPG88X69/D7uhxzlCtAAIeL+RRDGXw98sGeApvFCciGe4u/aK5SL69E/A47O1Y76OU3dXIyfFnd2lKQDNqrUHv508ebJLFxwIDcBADboTgm4bWSGl8HYIC6EVjrhRoKFDZYagpfA0k20NL1MUAiPLl2PV3HOLPAoxYAKRsnt2llKRXKhuoTlT/20sMFZ5r5/Nj4wdIL6A+K+GfkR56u0KNzRr7J2Dg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: imA8WDTpkmzULCtqObmsNeuH5h3qd1FlMxCgEX5TQUZMGxu0RDeFjYP45xjDOsyyqY2cgGdvO9GekkAORUL/leQWJRy34RBuiMK4IK0wyOjBwkl8Nf4lRFJa1ozXAZGo8uiZ3YP1mvnLpYaYS6ZMP8B/XYcY83506XG4JbvMUvDSmunsCkAbvs8hmg5sF39lL0MpWovciqmEIwokUFVnTXgow2p9TbwZdvvUEmj6wYWj0z0yygIBGmwNXijdkXbQ68EOH9/sU53majA0Yd3unXlbCnt0W9ErbQwTrA456vJVtGmhgdgF04ynzoGvXoXoki4X0eRZVQ8Qn6CaEj8l6WP8ZiBn9iX08tPZpWkDbNysy0AP9NWBJHMbb5pHQLG3QM6xjao/CEHJldn2nEM1GPj8gSPDD25UogAF3h4c/ElVxzqANju0uLYXmEUEOR2nPSTo64InNHAHjhchP7zbchoI72wx3kmeDdcHum6lMVYmRi5pq9GKdFvHy3UGHvzpARaBHL+5dEHnsTJY8qVDEEo19tFZMzTsrBcwSqP4vcxxhPl5ACMIuzq1BfhZ07nRCj6Emyv7n7uy1ZPFunv2qETbe6+8+HSInxqXKpKWh3lhptikrpG1ldGHB0LgjlS8NL2HTyfwMZSvrnHxH96+JnGNMfw6zZjTar+4ukAsNIq+VHJdIfyLKmlcVH5r6VEcRzfPFOmiGketBaS81QZwUZw1bjb7shRmoZWcA4CUwbdtU40xappxwsWx9RbpqaXLUR91TOX9lxJHbzWA1M2315DC6VS7g327/Uo08+hzwj3QJPmxPneHIvliU4ZuoBZc99nOq+Sz/Ygu0yU9akpTrLZTXWk8ZFbUo1H/DhtC1vRuWRm26Zo8jb3wrMF4DWjDgBAcL/JHvzStGUMNouvXNJK1/Jmc6FkMH0prjm99p60oxXSmB3nOx8KwgaizVj0UfzZ8ZbwJKM07EpC8SB0zqEkspyMDxw0DE2eorM7/cxBlDHzb5fDyFqxW0u8/yiJMIMXRPOOJLS4buM8qzNVjuLbgXTb5e6NPSElnnNXMtmSQLQUIe/RVQjI2ZH2Ed9w7ZbLe9zlONKZa8aZqNBENGkkVwMmgdGRA5kxnYhsDg7aMBONoKetPqo1f4b2rMmOpJzV/tOQgjQptDFKRzuT0gEzzv4eJ4ZvnIpXM65PUgi4azSUVQtwqefwDoKE66zLUqSxlEd8B6MLKompkVN9wzfkRIaFjQ5w1Eo+FPgTd3nnvdQlw6ndJcsQQKKb5g0A50iCzw7faB/K5YJyJgTjAG4V/B8+5Pm3tKHGjUuNZsqSwJZhZcbVuyZeYjxXNRn8m+wNe9mD2U2/26+yFt4bPG6fhQOo255mZ9/hqlUcrMMHUrJg5cDYfHVe+jdvuq+gztheFl+nS6EoN7jRAoj9xeEvXIW0cJ7snGKhtDvkCbL5nTfuzGwzKGZXCwhTLzJI/ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf2ce400-eb1b-426c-e176-08da1c271d3b 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:34.7843 (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 4/4] fate/oma: Use REMUX 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: yGOq9ERbxcoL Simplifies the checks. Signed-off-by: Andreas Rheinhardt --- tests/fate/oma.mak | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/fate/oma.mak b/tests/fate/oma.mak index a088feff21..7e2020b7d0 100644 --- a/tests/fate/oma.mak +++ b/tests/fate/oma.mak @@ -8,14 +8,8 @@ fate-oma-atrac3p-remux: CMD = transcode oma $(TARGET_SAMPLES)/atrac3p/at3p_sampl FATE_OMA_REMUX-$(CONFIG_WAV_DEMUXER) += fate-oma-atrac3-remux fate-oma-atrac3-remux: CMD = transcode wav $(TARGET_SAMPLES)/atrac3/mc_sich_at3_132_small.wav oma "-c copy" "-c copy -t 0.1" -FATE_OMA_FFMPEG-$(call ALLYES, FILE_PROTOCOL OMA_MUXER \ - OMA_DEMUXER FRAMECRC_MUXER \ - PIPE_PROTOCOL) \ - += $(FATE_OMA_REMUX-yes) -FATE_OMA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL OMA_MUXER \ - OMA_DEMUXER FRAMECRC_MUXER \ - PIPE_PROTOCOL) \ - += $(FATE_OMA_REMUX_FFPROBE-yes) +FATE_OMA_FFMPEG-$(call REMUX, OMA) += $(FATE_OMA_REMUX-yes) +FATE_OMA_FFMPEG_FFPROBE-$(call REMUX, OMA) += $(FATE_OMA_REMUX_FFPROBE-yes) FATE_SAMPLES_FFMPEG += $(FATE_OMA_FFMPEG-yes) FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_OMA_FFMPEG_FFPROBE-yes) fate-oma: $(FATE_OMA_FFMPEG-yes) $(FATE_OMA_FFMPEG_FFPROBE-yes)