From patchwork Sun Apr 24 03:33:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35407 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219991pzh; Sat, 23 Apr 2022 20:36:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3iCtyMkEAvsC+ocTyDtwUoGChdACzq5OStH1S9QON15B4P5CV3+NVR5ozKNFbI3cB4IOy X-Received: by 2002:a17:907:72d5:b0:6ef:a49f:133a with SMTP id du21-20020a17090772d500b006efa49f133amr10854634ejc.420.1650771416252; Sat, 23 Apr 2022 20:36:56 -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 z21-20020a1709060ad500b006e883d7759dsi9885830ejf.182.2022.04.23.20.36.55; Sat, 23 Apr 2022 20:36:56 -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=oqKZ7FVz; 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 8CAE868B42A; Sun, 24 Apr 2022 06:35:06 +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-oln040092075104.outbound.protection.outlook.com [40.92.75.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5396B68B3B0 for ; Sun, 24 Apr 2022 06:34:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PKUN2YrnVehEnW/BmMDYZxzu1DyB725x9QyqebX1Qu2vHatnIh34IqEN7dei7JvNXuFVc51xUUX5w/FLpG1T91FxlBaMEHeTWKdgvc2H9+3IBmA/HGCecSvp55Mynd/qJ/s0lyOBQs/CVhqzYCU30Hj89Q+gplKOLHoeLo8aE5lgnT7Jkuv++HGOQ8twjeut4cGuCAwEElL6zo6pHgw33oKm2PRjgPJAXFe4C/sB0cyqZY26qsBCO929zqB6agMotbi175LV9sD8zQOyBlB+xe+ZzKq1eWIwXCsvqOopiLh/qbBLdfYBs9GpeEVpk1JCsq/GyYIDRm7OOstR8SzJIQ== 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=WIXiqfF2X6HXLOeruShiJjFnq2Vsnu55PTx7wmHaJ00=; b=kXhrWfVChWh2bNrzBoG+/61mCaokLJWqo2jbyGAIUy2neFIklQpPL/O6aDYofEw2t2k6sxsu2dmFoL/IiZMkOWlU9EUQ7pKALr0K0hE8R6eVtvWbYhAx6pjXcq/JAOeE6oHn02Iynd86Dnr8dR4k7hqhz5a27NpsKzHfo+aTdekzZjK12AocB3jjLIC0rwAATGkdBaHsw1yCBMIT5ehhkFJsxvCvFSwp2dq7+nVxvwg5EiOPSX7TmU37+YoCpOQiOYx0sbYDZ74MiGlP+IT6UaBmxxM/Qe+13OuWt8ftVdQdgqvQEzPQfv64hY5nBt2tc41zSIlvnW1MFS/5NnkUtQ== 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=WIXiqfF2X6HXLOeruShiJjFnq2Vsnu55PTx7wmHaJ00=; b=oqKZ7FVzYOBO6+7K10Qh3VKvJCq+Sqm/0yIMWoPX8UrgQzs3oDRjvkB0prfchJLV+Xb/vgpGluJVeGfxyE2h3kYFK2WDrj7JeuqgslflBokGn6tJVbPflUn77JKGo3zODCSHe9sdqV35cF4OChnRSjmexHAHXY5IBz6MaDuusV+2Q84/GLfoElmukuswtRe+NId98Cpbss4+hDnbkybLq2zQaktOAEqrjJK2spQXbZ53pmrL3SfFRglkUmNod1h9XqVaxS1K39m4xSKBadR8hZAzD0qedc+yrudBoaJCNLCiK1QpQDP+784y7SPbecwaiPG+RIIbnv5bGY66tGF7vg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3062.eurprd01.prod.exchangelabs.com (2603:10a6:209:b::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Sun, 24 Apr 2022 03:34:43 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5186.020; Sun, 24 Apr 2022 03:34:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:52 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [TzU2e0LATtF3GCKmUhCAgcODUQ4c5lyM] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bdc6cd9f-b3ce-4596-53cf-08da25a35f39 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEsD4rNWXL7bI8FSMaAYlfs4AslwylNe5ul2rSQ7bXJaKYHLBZHrPwwdCcvSctBhOjtHWHyW8ib7TS/6jI3fRtt+hHUWI8WHsQ5J5gFIxTkogI9LcUsWFbMc3PyGDM9tloImcdapMcd00A5/Ke2wK+97JLTJEGiLrTlwFiD3A2fT6rMbWWXshjj78dWVoUaLs8xevFeXU2VVT9/o78gMRpb2gflkVvwOPuVrYLnAsznC7SwyEsqRW5jZ3M08uJqymUZNDewr/z2M+bx1shqGliOPaSi3B+ufwp/nGPKKn51jn03uCO1IvnrWH0PBROvtr8lLAoPi4DbVUPrj+wICLM59MHhqb2lelAMJsl/2tPk7CgsfH2Wz/j48jwYsSOlAPGC1iG9LQVZ09r1fir8NKCiKZEL5HnUaKRvf/IbdnNmO6J6AP6ol+G8BKostylEZrRMBVXWCYllk8ksKfOcETzK38mDmRwn0mMuLWZ7xwBkZTxkUJNKgdKNHZUpXkxo3+nUpABU2btY1XFM4IEHoK/GilqdhR+cEYXu2wwvgFu5pkXcCpg3I2l6kyhQz/wBGTQ8r7ad9m7lE8RsDfJMufnStR+rNOSinYVU/1Z0yv7/d5syuogIaQEM/xqNZFy9dlupzQbKD7whsSGdi2FKwTXnkFJHCPwBbxXnkrIgbT1+vpcJ5+Q5FpQKlTW4mmDjEDaCFoZY8WLRXCd30rjx7Zi5Bqc8xGIQsXCaBEbTogxZWjEGy1GaCGKziKA1wKW9av10lV6wyHRbAfoZhoZnJM6ad X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2pkmCsPrTazbAaHz5U+cPDvzt224oOe5fzUlYGFCpNLb7Jw13vDQsnbfcs/9NHMa47X02ccW31Yaht604eE/j3IWjvDEq8OV6jiENzncptiIKvW7mid7LTz1eL5u9w9O5Hb6sKIO/qrzLwW+LCNhjnKYyjTf7XP5gH80iYrvli098XmTRkf7B0TgO/h4129GUT1zCCmRreZK54aLE0sy/oFXK7iO8qmoMEzXDLlA37Bhng+vgscDPFDpnVkcP8A9X/GtpZhZO9m5L57LSA305jchfpvRlAFSvBSeDF1tLZLnExGwvdRtr01BtYpf3h/qvVivSWMmusLY2WM19Uu1OruhymY7VuvzX28oNMF0Wh65XEuG46ruZ4LA9xrrGbAngKDTWgvLgHlBVy6uiRobmR/U4SW6RXk49IT+X6bDu6XQt+rLFdeQh6+/zqacWYsJ4y2bH8dS0/T8sDZqC9OZP43qjsrILSlSgvUCU2Qv7QbZXLyi0rOP6GX8C6AdXAbsObVi9NU3fW4i0iYKl3ytzp9wTM6CMWRlU+IFlgAIlAcS21ejRQf3/fRGw5iH6ox5HlRQ0TkfcCz6qAs3bnfOcg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n8494FeET+IGkUDD3jD4WoktwJfyRbB1/Wt5JrGg/8dRmzKKPVa0rRbyjdsGilj1JPivmBxUh/kDx+C573vziBgt2I4/JNDDyW5YYLAMRzNtXuccKXoGAc+IsevRNoEey3kRZroXnhr/dp+HViW5KBYf8QRdOhPox+VTPbNc0l/oZ0OpYoFQ4p5IXTVsYkM43J+SiAmfxZfy0SkID8OvUiCRXGxdoBYlnkaP+RR1AMm7kF5xdHa6JBkMEr/UqIktS+FvtxhJtunnEIwZdJELoyC5a7uUhrWjFLRjlPUGKIqftgWLpwf1ScRbGpKOEKFyEcjgEtAx5hAOk2L5MX6iiNcJkGl8arpM/LogIq5927vSGVFTagKm4AY7vuQfHYIAO/KqH1wcUupjujkMoqGNBSD4+0Lj3N67TUz4zdqaawMsn4q7r218sW7ryxwOtK4sNblOGvbCfD8MHWq/94cv7ros4KU4NyDx4+kdyLavaP/z8vbMpJbxYqrNh7zlwaGJsCufk4U9vvvSeKBTIDjNNaWXvS3NunHOShTeV9QEEpCuINuViAZ3T1rIg/QcMU1n1cKk3mZFGJfhdLIJl1CUmQLZxLJqNZMX9SYsdRbGq9nQgZIqJIgkskOoUqnkN0USCA2E4bKQv08zuj0K4ubAA6sOMKXVoXAsX/FHZyt4BOiE6CunTpaghC7iruWLWbL+cH7uUOXBfVjAKiEjra65nqQf5wLppPbFsPxxCY2FNWzSifwjeUU03Zafn9Ai8/cHHRSNj1bbXMgv7u1sJkDNY8QKAV1BYz5WF7UJZPiiBhDrzHoCJ/nmIQelEHqX2z8BffXDLm/ii+Tjk+yDiEFzMVoXPu5955U39mzxEBEdz25FLmAx4vThfl02NgKaCYPummCtg91+4nM5jq+PbKe8nXCiCOTEDzaQsiEXxr5b287QSUxbchy9XVhqYLpctAd5z2fTMozLPvEk22Mhu0xv+zhNWO/xazG0KOdq7OjBE6cfbw0P1SjsYRurGKrkODJM22tQXVpR9gTanTrJdhB5sJLoLz2lcqQ9cOmxTBl5UN7JlQ9T6mKpEKMgYsXZPhIdNB1qX/0QB7aLuhyM2SR32gzKDvczpR3hTnbD3mjwF1BO0TkU9w9iT1xjJukjswaLFewEptIy4BmTVuYL3uSR4/+vU/Z/1vjfjNl5qroXMnP7IGXP+8iaDwKWg/KoCCSBfEMDLvZIAYNXWdvzTfsWXHFqYChjGfL9Pmy3lh69yusjdNfnB/yc4/C1EglpOQeCtoXsa/+Aco0xV6py5irlcAJ/87v1Oe9qeFj0BdtcU97LzyChipLDxaeRHPfK+sHaOg//Imc3Xbv/eUXsUutK4Ox7S0FI+BhTn0QBxvhi/SBRhe/RiyuFCMZIqX4iwspRylC9ZfO6s8H6hw2/rqDkYkz8y7s3Wc12nxOdYc2sucSCgOHkjWpdQZVnBczf/qfwfa+6+Gvf26Ymq+uoLT6hMg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bdc6cd9f-b3ce-4596-53cf-08da25a35f39 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 03:34:43.5710 (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: AM6PR0102MB3062 Subject: [FFmpeg-devel] [PATCH 07/32] tests/Makefile: Make DEMDEC etc. auxiliary functions more flexible 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: cneIuLBUYnfD Add a parameter that allows to add additional requirements. Also add FILE_PROTOCOL to all the auxiliary functions that use a demuxer. Also fix the requirements for the fate-mpegts-probe-(latm|program) tests. They have misused DEMDEC. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 20 +++++++++++--------- tests/fate/mpegts.mak | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 5e4da2c42f..e175631258 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -68,11 +68,13 @@ XYES = $(if $(strip $(1)), \ yes) ENCDEC = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ - $(firstword $(2))_MUXER $(lastword $(2))_DEMUXER) + $(firstword $(2))_MUXER $(lastword $(2))_DEMUXER \ + $(3) FILE_PROTOCOL) ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ $(firstword $(2))_ENCODER $(lastword $(2))_DECODER \ - $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER) + $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER \ + $(4) FILE_PROTOCOL) # RAWVIDEO_ENCODER and PCM_S16LE_ENCODER corresponds to the default codecs # for framecrc. These requirements are not always necessary. @@ -84,16 +86,16 @@ TRANSCODE = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ 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) +DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) FILE_PROTOCOL) +ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER $(3)) -DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER) +DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER $(3) FILE_PROTOCOL) -FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER) -FILTERDEMDECMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_MUXER) -FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER) +FILTERDEMDEC = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL) +FILTERDEMDECMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(4)_MUXER $(5) FILE_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) +PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER $(4) FILE_PROTOCOL) # Allow overriding CONFIG_LARGE_TESTS via LARGE_TESTS, if set on the # make command line. diff --git a/tests/fate/mpegts.mak b/tests/fate/mpegts.mak index bbcbfc47b2..eaca8ec289 100644 --- a/tests/fate/mpegts.mak +++ b/tests/fate/mpegts.mak @@ -5,12 +5,12 @@ PROBE_CODEC_NAME_COMMAND = \ ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=codec_name \ -print_format default -bitexact -v 0 -FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, AAC_LATM) += fate-mpegts-probe-latm +FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, LOAS_DEMUXER) += fate-mpegts-probe-latm fate-mpegts-probe-latm: SRC = $(TARGET_SAMPLES)/mpegts/loewe.ts fate-mpegts-probe-latm: CMD = run $(PROBE_CODEC_NAME_COMMAND) -i "$(SRC)" -FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, AAC_LATM) += fate-mpegts-probe-program +FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, LOAS_DEMUXER) += fate-mpegts-probe-program fate-mpegts-probe-program: SRC = $(TARGET_SAMPLES)/mpegts/loewe.ts fate-mpegts-probe-program: CMD = run $(PROBE_CODEC_NAME_COMMAND) -select_streams p:769:v:0 -i "$(SRC)"