From patchwork Wed May 18 12:26:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35812 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp305753pzb; Wed, 18 May 2022 05:26:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaiMyXBohs6CyArPGCJu5XXmVRpgwD/aroUuQu0B8hJloQ4E819ILBXNlYM2fr+0OZC9cG X-Received: by 2002:a17:907:628a:b0:6fe:526c:ebc with SMTP id nd10-20020a170907628a00b006fe526c0ebcmr10244039ejc.531.1652876793832; Wed, 18 May 2022 05:26:33 -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 qw12-20020a1709066a0c00b006e8bf488698si2494371ejc.202.2022.05.18.05.26.33; Wed, 18 May 2022 05:26:33 -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=A3YohVK8; 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 C7CFC68B493; Wed, 18 May 2022 15:26:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075082.outbound.protection.outlook.com [40.92.75.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E02AF68B1F6 for ; Wed, 18 May 2022 15:26:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=klrbUt9xNNx5vMaAnSTIqRx2kigtPdWLTt3bBxRgF6ANvSsyhTbWk0IpE55tbhGtbEOkk5ReGX+gjUUNYFEzG28T2GpJH1RC5AeIPO28eVXj8Y+W73kXipgdvg87DOaJZclW9WwpXELeCuxqTX3bpZuOKXlyNKTXoggRgoxxIdz6wc4/newajzQxJY6NRLOacMHHdKzjPn3oIqJt/E9XWTi6zvEOfxgc+bcDijH3aI12S1VdME44eJYfVp9LVHKoe3pqU47rxu/Fi7VG4z6yNA2lbg9sroSUjuSDYkUs17dLSuLv3R+NgWW1jYNTf4/GLQh+4RTdEULRc+GNe6ZpJg== 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=F7TSqngq0PPVn5+G53gW7Ms+4VvQu+37LFkMollyILc=; b=JynccMNRafPEQ57VWabeYsgoYmw/N4YoprTe9mxHkkrK0qbBjDUKXltOfBVBeam/xyvGEZZkFKLXQTVqA3bt+ulwjXGgiez4LeFMvGsLQcm4ai9kfYtrj1QwRh77nzTdRP0b0/TrDbgebxZ+e5lSWB/xFCqpRUCOjUWwn03SnZrtDsnShCSFigigzHOr0xgpezf5K0XcHuG1eomTzEDw/aGNtuTYY418Aeae94DrvrYMd0iYH1vWXTmwMGfgz6D5iVx3HGhnBO/5KBayJE2PXdSSXsDPlubnM5ujjt0Q2q8q4AiCXJ/I/5ZXDr1I9rd0uAPjDixvcAVxqC2DTyf2Hw== 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=F7TSqngq0PPVn5+G53gW7Ms+4VvQu+37LFkMollyILc=; b=A3YohVK8nJl34kRAXGHQRsZJEN7K/2UgeKYETaJr+qGYqWduFLm8vFwrCZQAHzn8wbhk10ln6SGjpYkMxPkgCGpj+PUge9tmN8LDBwU0SECIndXamG38A5Qj5EOx/eAciEmIv+32I9mFAKln3+18pUlgW/ZkqBg/Q75DLboM+VL90DFZ9SUyZZ5mKSB1bFODJuueb6hjTDHVIlNgByDmRIm7KMpQxIEDFGxXqVq9dGMrukT/mxh2UKGnFbfDAUj+YorZJazGMR8pKi4QVETCSsRYqW+VnaX+AAKZ7tXdkbUekKak2Ubi6ygd1Rjt7cvIbrAip5B9dpCNp7Hwd9LiaQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM6PR01MB5911.eurprd01.prod.exchangelabs.com (2603:10a6:20b:e2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.17; Wed, 18 May 2022 12:26:22 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5250.018; Wed, 18 May 2022 12:26:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 May 2022 14:26:10 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Y/cm/120EX6zclrqcjyWjzyPTOq3WYR/] X-ClientProxiedBy: AM6PR04CA0060.eurprd04.prod.outlook.com (2603:10a6:20b:f0::37) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220518122614.1295310-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1237aef-a223-433f-c394-08da38c99e2c X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEsS2ePgsgvfWYUNc+grnheHmSHtLvpzBwOVh798a49YpWn1L8B6vawy71wgs29okw5iRo4Z5c8StkfDrtwePFu8DrydnRCzcDwMZ3N2g30vFT3R+lFRzun6n1vAtiC/Fkzg3MksTytfpE/shA2CxSeQBjPDD2sQHAHJdujmjgirliSOQ6io+NDSxGKZ6CHCgFwLsmhRebnVahesu4ase5PsXwpS5TP9oy19IK14RJ3aILcCMGu5oP+/myW3ebEMrgmSjbz9HjHMC+kBb0ikoNvmPHAXxVS4nV1aRjFA+Z33Wa9nOSaK0SFCwXrRc6RGRD1DmLUUa0qnPbfLcpEuyOkWBjsLHplfCtTIWAEWHRqTOzkTxBlaJeZ32kNl8hwVav807HjurHPznEmbiohynVJ+6HxtwwdL0GZzXrGHYNtWffhbozzqCVFbmKG6eMjtGKLg/SgpfSuI8Xi0OU3vJypVEVAeLxoIG96FqAgsMAvjWoFXpryUx8qlYDrCt3Bfn6lxwib08c8ofOR7Qa2MVtXI/PTmvpaErH6JBYe1/+3U8wmnwc9gOs18V1dQD0ntoUV8r7KsN7O6DhLlUC0BeRqVihot8+hYB7Zwos8GLlQOT1uaC7kJ0e/DcfCVKi30/R/pTFB+SHqWn0WfFHkxeZVbF2cpdxY4SGCDw/Asw8RY4jArzVgh1QmqXNdhLcigmTjnkFa2IxxyJwQWL1hOGsO+jZ7QxaOmvnuoppYcJJo7FwYykfoyS4NAzmba1yIxXD/UfjgWkZxiKzOQmJaZoKU/ X-MS-TrafficTypeDiagnostic: AM6PR01MB5911:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5AbpBRayhWqLE6sj6s/pIDUQ8vKangJ8PX55RV5otNjcXIWz6Wj38Z+TmjAVfspzi+dcyztmGh7wUrgwhiGgzqyC7NEzLHVrnFfDMHYA07/EnndLYxYP+lhOlrTkFfLqiDrwHFM2QMCylsNbq+wieQMkaJUGPVUcknSiNf4O+G3OP7hJ2zbRuRpaPJuulzQEEvH6pyx3j/LfAzvCxJVBB4TnV3ec7BX3sZR3s8//LOdb9/4D+obbYMuTtrD/Bfnif/UJ6fzyw2uFK7ytaFbpCAHiYooYoSi91VYO4jbsPyrI1EPelQnSFQYsYgd7WOBbIDkrDVfFMd4zWXh2x1kLVcxCdBg2rNb6SKP/9j4ZGjez6QNq4FHyXchHQb62gsIiRGxlAQqRjBt65kN3uzN4/fGqiklTzmMb3tFZsOLb8Cye9QTDo8QGVf+h7jS24qnjZ7B2HciGWht8ou/p1nsJ7/8orZAzZVdU9F6Jp5QbHELkvExspySIuL7aIbaVQ9LUOUU/bxJoo8TWKVJFdTGfeX6x75a04QNMZ7QSFvx8lohA8KKK2NoFbsXCSOzCZTmxbtchkJEYIK6kv1ayNnP++g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3wrMwL36YvpbzGdUs9zDOpdjubQfM+DcIQzzYZHrRgQqcDbE6M6yXpSvIEyZdS/8ozOkxKlmlv3IK002JPHB5sUWw5q175frgE9j1ljUhTegAp7b0/1HxfFxM2c20YK9GU8QnlvKWNNfWLrUe5WnpcWnFJ31DsiClmdH0PeMcVg42HgHg/LBr2/Hiem9nePvEjeBoIdUv+iZJwrVLNrE3lbA0RsaRTjX2PMig/ZcM+HH+vf/Y63keGM+pqHA5BIWIx3niLcmqcbk9ZQn+NcM3+y+EDMj9/3T3dY8NhWQvK+mQmdhK4uaguSgL2YnsNbH64YRSlZAI6dLv+Ji5kXqy2RzSzdqdXuR4KC58VjGz3/lhbsV+XtIB6za0YKWlNVeBS8ahvNkuI3uTffllQSPH2g1hGbeJKKPa4ctSNI1SRK2fq6xF6skBQxw8/Pn1V1cU5hbgVzvjv7uCwwvG0XLxF0zGMFiT6VK0FqIyMf9NYjEudvjqUNapo07757a715x0kCJ34KcOc/9ufm9ZoXoz3s312Y1BXz76i9pieJ9Rt9bWNCu6JzTDxKuTPK9HtcP/48KImBgeJQANuFe14MJrvF/mn3K+oZKLTonU9rtuYWj3+HIE+ZGKI10cRb8/gGH9QQBZvXRxAxW77BnkrF1PH6jWNpvtyVEb9pPnsPUyQ6RfbUYYj5yV/LMZ8UM5APz+QTeUw7m13yvCzeIppGR4yoKytw16ux5pqe8ANFMvPk/0ax4/alZapTLyrf7bxoeBilsFLpua5CwYxuTHIxo+q/HMmSMHAWC8yDoDUbkQsIodZYqqTZTr8dpd3zedHEvhPHoPWv8AnNtToVYj1TzlKtlKVu3eP5nhiJDajanMpvkCk6tgA5nNqqefrykEVUkYPOsYiVcDXnW+6RJTB/NBv5NHECd9HcnvZYGl8MFJU0401Hk4F7YIDiZo06yzbdNJhUZ2VT/VZjcld2N0gtFduLEVA8/2SHDgf8lGTLssXSDoZO2j5h60jtDoYOR3GNZApwWpSzSWrXWM/t+usssjcRhtZ3/8J1mEB/za+BTviBD26PmFr6krr5oS4Icu4FB3H8fDUQP7l+s/mm/bBLu8RfW7okEigwEDPloFZQenJPCQ7t/UH29VLZe5hnEdL2zNYesIYcqxhaWBcsfeR99rsVth7qgmiZMS1/5utbMcaye+lP4VVyF/LDBkUApCK9XnAGmWAAvBiTDKWtUnabd8R1RLNS9vr3bghZE7rveu3kuwcIfwtc9N/guPk1GyLQ+wZTYRU5KyG881cePn5IhTutEd80n8tiswiH4wVYbNITmsI0gwBmZ8b9PKKlxVuWZtjvoSBSYY/prf15ZQI+AMK3PEqxuOjxbNXxulW4dZvGX768NT16u0GGeAdxp0rHugPViD2zISfY/2ymqkBQ1E/6fXKAUjkkMDh7SgBRt0Mm3qDutn1nlDcQWog/j3RJTmOc5bMV7HFMMMnu78V3Wyw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1237aef-a223-433f-c394-08da38c99e2c X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 12:26:22.2162 (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: AM6PR01MB5911 Subject: [FFmpeg-devel] [PATCH 2/6] tests/Makefile: Add FRAMECRC variants for filtering 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: gHEmluVHtAdB Lots of tests use the framecrc command together with some filters, so adding a special function for it seems worthwhile. This commit adds one new one and modifies an already existing one: All users of FILTERDEMDEC already use framecrc and the more general FILTERDEMDECENCMUX can be used in scenarios where more control over the used encoders/muxers is needed, so use this in cases where an actual input file is involved. Furthermore, add FILTERFRAMECRC for the cases where no demuxing/decoding occurs, because the input is generated via lavfi. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index 5cb33b6c65..7622e5c984 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -110,7 +110,13 @@ FRAMECRC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) \ DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER $(3) FILE_PROTOCOL) -FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL) +# Variant of FRAMECRC for the cases with -lavfi where no demuxer is involved. +FILTERFRAMECRC = $(call ALLYES, $(1:%=%_FILTER) $(2) PCM_S16LE_ENCODER \ + RAWVIDEO_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) +# Specialization of FRAMECRC to be used when filtering is involved. +FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2:%=%_DEMUXER) $(3:%=%_DECODER) \ + $(4) PCM_S16LE_ENCODER RAWVIDEO_ENCODER \ + FRAMECRC_MUXER FILE_PROTOCOL PIPE_PROTOCOL) FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER $(6) FILE_PROTOCOL) PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL)