From patchwork Sat Mar 30 22:54:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47675 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2722052pzb; Sat, 30 Mar 2024 15:55:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU/BUkzIsBMLmxnhmX1S5pDEFwqD/keOyvXTocZKRDcHV0k/Xo9Xh4wB4NRg+a74c2E2zLZ81f+Q9E+fORkEnRCfJjcTBlrV+ggFw== X-Google-Smtp-Source: AGHT+IHON+7lAieshoPjeVO0Wqhdjm6tyo0R1iJHezuq6q+2qsWBD/nNByYj/wuWeSAnZ1vHDnBB X-Received: by 2002:adf:f092:0:b0:341:bffe:e5b6 with SMTP id n18-20020adff092000000b00341bffee5b6mr3073718wro.29.1711839323662; Sat, 30 Mar 2024 15:55:23 -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 s21-20020a508d15000000b0056be08e083asi3251253eds.554.2024.03.30.15.55.23; Sat, 30 Mar 2024 15:55:23 -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=Heb5u+YU; 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 ED2BE68CA9C; Sun, 31 Mar 2024 00:55:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2037.outbound.protection.outlook.com [40.92.73.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4755168C903 for ; Sun, 31 Mar 2024 00:55:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PYJShOHcgpaIxP1rI3BSQF73txLr6gOES7iZcAr9IeA04mHlmT0qq4ISiCE6jRRfnngha7Ox2N6Ohh57HVeXuiHCg8n0As/sSyaBCB9N61wTHir/rSXoOn1+t1coQxjle9NmR3j9co8i3FDlfq38ZwARndNljmBw8SrsvpDZJm/22c0V3fmQRAeevyqbuC/rD5/FJRQ8oyDG7Ka26Jlr/1tIFjsLU2heVseh3tP6zIbv6eBstS4aWLx0p9+csBB5f3X0Q2wvkBKlFzvJyHOsfstIyVhKzbaJ+Vz3MgVFqfmvvwz4QXBwB1rV5a8LF6zhd1XxKemz87tGe2bbWT+haw== 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=19sG4fjUTFkdHwjOkRvL3TqTAMrTzf7iyuOSZ2YiOv8=; b=gcNcKBVFNNf0bvIyyH2j+K/mEdxuNjbO4f1z70iDyrXC67DD03sBrRIqquxwCAwdZkp0ifVaohd33E6hJAJSrpY9+Pqr8Wo9NW7eTeCeEqe39swcf0swGDqCaHrdEwgxih7zO5WKcOAYjuogwHSfNxt4Zd9A388zdpRv0HotW4pKOwL+igP1vKHn2ztIG/Ar26tdpByQz5SWuSrt37A6i2N3SlqlhNOwYh5dAZuvKoxeBsFNrNplgffNwc+BffM3U1w+qijXQQ5/ouPensn551wbr2ppNHumAuZT84UGgzdmXe2IeWfa4ymT949wjqs6oCcFgaSFJMyeCzg9ZQXRIQ== 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=19sG4fjUTFkdHwjOkRvL3TqTAMrTzf7iyuOSZ2YiOv8=; b=Heb5u+YUtrdmqNcWiac+sGD2XIROPbINXy5/rsuqYuAi1jD//qjEEqKU7crFeftAyfQP/F0zPiimgNexlw9IVsQSeexiUW7vOOU9Flr6Bm3iW9Ifcfmn1u6/INoo8KBK3NcVfuGxaFxegtgn1AzOBG0XKZfltvw/5KOLCLkvzHq8pZOj/pSh/HpJlzk/ULCa5kANBWk+8BrwtVt25K8fXQdUuaY7ryMX9ddizD/OaF3lFK78FClPVtzXy+p0DI6oXC2/4UEg3bhl6Q/s08ReUojN/livOGshEH2MqZnEKSNvrjnIcBppI0NpFq4Hrfp9FELdI8e+t6ZYMHuOMEzzSw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0488.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4b7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.42; Sat, 30 Mar 2024 22:54:59 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Sat, 30 Mar 2024 22:54:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Mar 2024 23:54:48 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [wgrByVFviOi2Ovu9xdPrNdjyBipANvY1B7YiCkhRTZ8=] X-ClientProxiedBy: FR0P281CA0198.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ad::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240330225448.3406381-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0488:EE_ X-MS-Office365-Filtering-Correlation-Id: c871ed4c-ac17-4910-338e-08dc510c6cf9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Gw6VE5FpVJL/XOvaqLGetRnaDj3NbdiPoYeiW8ibvJ+XM6biQRjeLr4jrti8YxYsnZttSuV6rAxG70esc10j5hNz0iS+/dL7uxUJmoTE3cJHVjQk+ZLvgnR2bDgifAJFYPUA+pIemgrQ5rZce/Tqapi6MRlnzt0YfXQmvRaobHfYxkt93g50npVb1Lr819BrO+MovEdaKZg4ckE333qu47u+UHlPXb2RjDeodOjtvOfIYiacsorYp5NavPT+ccYEZTo2R+yJ98mkgTyoa44Tijy+24GvvTv/L/2ORoPkFvz11cy7QEDFJFtDTRrBp0jTZVAF/EAYeeWYTbp79OmwckdZ+lYXz2hzzLWc0g/XmH0HD2Ip6um1PaBjsqjVitnt/rAB5lg7g6KwEzOLbyQh0AhK8QOizJZv+esALZTTQbYcOLcmtruI6JZU04kE88ZzLKenDFgjv0vLh33BsALELfYolMk8in33FLSSSMtb71rargAVKaK9d96FXI4NWfPzz9QBMGk/+dh+Uoxfcnda4sjjdURkBwYxaunsibXGq7j9YTN6HbYwmW8krr2UUmYhJK3vcsZmC5BebGHLvOeaPwqi7OgtYbhI5cAOWe8k6oaEnrm5SSqBwHGfLzp7icIK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wiSDMnzH8O5xpkTrCI/jYzYhOtwV4d4P0r1wIDDa+KEEEbakydUDeM9L0wHdj7+8mf+9cubOq5VFAP87KBVLhAYV1Mm9JVSn7Znid7PSEDcwgx528PJgho2H3kXXzMDk3BK05UERoetVsradph+ip2Wg3DjiQig2XjNt16nhl8jrWx4P1zxMCyEcJ+0t+kVXNEQ4tk5uIFL5MkY2xj7zdPCFAuV7Q3SchxeJGGeynUf2JR+Lo0MRa0MvxMOq25m31+DW5MUM2N7QWoCUvGOv8wHMIIODwdd/nh9K171s+KioNCAW3EqRtUO56p+sn3MLBpnQAqMjMaZawet2N2lQr8RFByBpgFuaZqKVCzv7Uba+9Al6RnDk69/jInXhHFxOxMuwlCUThz71fHMatL9IE6thjDyvLpA1awL9tm6ynGb2aJI7kD72VxDLrDZdoA04td/gjyYwDJOCpxBWdihxLaw1EO8h6s+nJyDhyf/cvBC/6RWrHFjWQUSwzqN9UkHYk54XkL0J1pci4SzRjJcfe2vwkkTK20eHLUIDeI9mSo1xuV5x72BI/NTTsyeBQTebZUi3dmogBCjz+fa7H05Lihyo2hqZ8AHudn/3FoYZmffyEYL7Ph2VO03gymOhILmSLZiPBtNkC6zRd/RMuMo7XXNuJ7iS6SDPoUMiMk/0fcQB9hpe7qN+H5tcizghsaZtivImOi4ubQYK71kVmxeEQHQiMs6f2NQtQGNHcRg5L8+XY8Q2SHp+ko5F630XnojB2UDdu88tg79X9/tVOmHn7uPUR900VB0J8xDGO83FgtBWUqI05nq+j+JY3R/CZnpyPdtl6HXKSL0S41lY4bEyqAhVNlJ8VhxzcqeE4727nD9ZJr7InIUOgiW7KgR0AH50oahyAqTXrtBfqblCCgJa0JFafHkOs839af8f/XYMOAOXFKe5DHHFKKMq8jZzdNAN72uyuhXcshzZR9mCCQUnItvKmFsRqU+4iJr0j5+0HoTir7XWhPyNNRflnTqusf3NNaJRhzzHGp4v179oZEJ/CEuMSXgUafRc79HhIPot3Xci3b2JGWhiQNkUVnxNZV8+9eTnEWXA9r6UfGAaWDgYupSwFoArge+UAgoVIJWpYDP32gBWBp9dd1LnQfmTLn6l+shFxnUwVDH2iPy8IRVB227u632/9N6hgTyQNliDp0kfraSOv8sMl0HFKTi4m5K3hkW0Jota350nL7YGbiH4zWMeCtPwlL+2frfViP2w59vq8XNwBxOuUFeDeHL3YLN9cwQXfHau7HEgfjMEpunGtQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c871ed4c-ac17-4910-338e-08dc510c6cf9 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2024 22:54:59.1243 (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: AS4P250MB0488 Subject: [FFmpeg-devel] [PATCH 4/4] fate/ffprobe: Fix test requirements 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: m6FOtZ/y30Bp The ffprobe-test file is generated via ffmpeg and several filters; the requirements for them were missing. Also deduplicate this while just at it. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 1 + tests/fate/ffprobe.mak | 40 +++++++++------------------------------- 2 files changed, 10 insertions(+), 31 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index ed6b1801a8..9b70145015 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -253,6 +253,7 @@ include $(SRC_PATH)/tests/fate/xvid.mak FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes) FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) +FATE_FFPROBE += $(FATE_FFPROBE-yes) FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE) FATE-$(call ALLYES, FFMPEG FFPROBE) += $(FATE_FFMPEG_FFPROBE) diff --git a/tests/fate/ffprobe.mak b/tests/fate/ffprobe.mak index f30cc2d4ba..23c6d3550d 100644 --- a/tests/fate/ffprobe.mak +++ b/tests/fate/ffprobe.mak @@ -10,41 +10,19 @@ tests/data/ffprobe-test.nut: ffmpeg$(PROGSSUF)$(EXESUF) tests/test_copy.ffmeta | FFPROBE_TEST_FILE=tests/data/ffprobe-test.nut FFPROBE_COMMAND=ffprobe$(PROGSSUF)$(EXESUF) -show_streams -show_packets -show_format -show_frames -bitexact $(TARGET_PATH)/$(FFPROBE_TEST_FILE) -print_filename $(FFPROBE_TEST_FILE) -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_compact -fate-ffprobe_compact: $(FFPROBE_TEST_FILE) -fate-ffprobe_compact: CMD = run $(FFPROBE_COMMAND) -of compact +FFPROBE_OUTPUT_MODES_TESTS = $(addprefix fate-ffprobe_, compact csv default flat ini json xml) +$(FFPROBE_OUTPUT_MODES_TESTS): $(FFPROBE_TEST_FILE) +$(FFPROBE_OUTPUT_MODES_TESTS): CMD = run $(FFPROBE_COMMAND) -of $(@:fate-ffprobe_%=%) +FFPROBE_TEST_FILE_TESTS-yes += $(FFPROBE_OUTPUT_MODES_TESTS) -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_csv -fate-ffprobe_csv: $(FFPROBE_TEST_FILE) -fate-ffprobe_csv: CMD = run $(FFPROBE_COMMAND) -of csv - -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_default -fate-ffprobe_default: $(FFPROBE_TEST_FILE) -fate-ffprobe_default: CMD = run $(FFPROBE_COMMAND) -of default - -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_flat -fate-ffprobe_flat: $(FFPROBE_TEST_FILE) -fate-ffprobe_flat: CMD = run $(FFPROBE_COMMAND) -of flat - -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_ini -fate-ffprobe_ini: $(FFPROBE_TEST_FILE) -fate-ffprobe_ini: CMD = run $(FFPROBE_COMMAND) -of ini - -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_json -fate-ffprobe_json: $(FFPROBE_TEST_FILE) -fate-ffprobe_json: CMD = run $(FFPROBE_COMMAND) -of json - -FATE_FFPROBE-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_xml -fate-ffprobe_xml: $(FFPROBE_TEST_FILE) -fate-ffprobe_xml: CMD = run $(FFPROBE_COMMAND) -of xml - -FATE_FFPROBE_SCHEMA-$(call ALLYES, AVDEVICE ARESAMPLE_FILTER) += fate-ffprobe_xsd +FFPROBE_TEST_FILE_TESTS-$(HAVE_XMLLINT) += fate-ffprobe_xsd fate-ffprobe_xsd: $(FFPROBE_TEST_FILE) fate-ffprobe_xsd: CMD = run $(FFPROBE_COMMAND) -noprivate -of xml=q=1:x=1 | \ xmllint --schema $(SRC_PATH)/doc/ffprobe.xsd - -FATE_FFPROBE-$(HAVE_XMLLINT) += $(FATE_FFPROBE_SCHEMA-yes) -FATE_FFPROBE += $(FATE_FFPROBE-yes) +FATE_FFPROBE-$(call FILTERDEMDECENCMUX, AEVALSRC TESTSRC ARESAMPLE, FFMETADATA, WRAPPED_AVFRAME, RAWVIDEO, NUT, \ + FFMPEG LAVFI_INDEV PCM_F64BE_DECODER PCM_F64LE_DECODER PCM_S16LE_ENCODER) \ + += $(FFPROBE_TEST_FILE_TESTS-yes) -fate-ffprobe: $(FATE_FFPROBE) +fate-ffprobe: $(FATE_FFPROBE-yes)