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)