From patchwork Wed May 4 14:39:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35588 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp479490pzb; Wed, 4 May 2022 07:39:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtkDT90CD66YtPo/zrDsmPBCCNHgyFDFqk5o269xNqSC8aJg+ief0DTmz8dvi55mqu5w9Y X-Received: by 2002:a05:6402:4313:b0:427:ca44:5d5e with SMTP id m19-20020a056402431300b00427ca445d5emr15383780edc.67.1651675196593; Wed, 04 May 2022 07:39: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 w6-20020a05640234c600b00427c7649503si7889736edc.628.2022.05.04.07.39.56; Wed, 04 May 2022 07:39: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=VaDGCewa; 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 83E1D68B2EE; Wed, 4 May 2022 17:39:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2026.outbound.protection.outlook.com [40.92.90.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 553C568B16F for ; Wed, 4 May 2022 17:39:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M8StrTJPHIBwX3XUepZCOl2RXFbjiQXjaJ3apdUaDcVhpMHg5cdUtwqeQhEg9meTVKT5oeVwq89Bghdhc2q3ze+TwVcF9jqO2adkEj4114obHa5YRSovPIakOiuTpmj3Fhjiz3qUm3Waa9U+aGC4ajyOIENbHs0LuNPI6hvoboZae//qU9JHXhSok6PqRoRXoDbni/t6EtmkomeiEeOoz45eXcUPD6hKf1v3sAc34cwzvAiWP9Joyi+qMn5Z8izyJi1VeaL2AGQpHvA/e1gMLuBcS1WjCIEMQwZ1M9WnaTc/4SFCzBJObJkMheqR0n+LM84BIIvAZ3yU0CUOvqfbjA== 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=P3zBPtJXsbEqUARU/3D3nVnvPE79i2oMPDd9v1ZmFcQ=; b=AYg+oKP+va3x2sKwA7W1nnnLloiTqiAYmVeYU1FLAyJN/+oq3DF3fdPAC4sZxb9YjPPqwBFi8MzydPJd33mjVLuQYP2br4XNIHqAy1y/hxPkh38K8qhW0kC/vR5gh4HCXNxIbWJc6N7+l4Po7KyrPA5PqMzUVZN3Lq51sReWYp4vkFGNaK/CX0XcB0gkR1o1iSUyMYXyENc+IpVYsKzQ00zPNPMPencI9YZGcWM8UeZqghrXXODpFwNMSVtO+gu+t7x0XSzozApbG8hDODNyfi/Q0svznmUCm2K9aOjxeUQPQVhEzRwYeHw63eJ2yHJ8f0h8UdhrYYQUmMzuS0rvnw== 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=P3zBPtJXsbEqUARU/3D3nVnvPE79i2oMPDd9v1ZmFcQ=; b=VaDGCewaMb7g/+rLaPaWxHU26rFhS7n8MmIvT5E0ZZVaTMOyVNctr9p7+dfGKq1VlliVR7tgYKqhJqvdG+2zsAvztU5QMHrKilzpisyOaxAeC6FhwhwMhMhHBPaqGbskdzBPeG3WEZBcuYAi9xBNmujokrqGchksD6RzRX7HLAVxeiIpLRWXAxlWXrw694o+/arIYEpO23wBFHlhfJMoD6htSav8tIE8AtSmFbXYdHMpz8Uc0KYIwZNzhOCgAfJ2EmfO1aEtdYbexLhIoOZL3G7+qvkCTxseOHGO1PhhMkGq5UjEgrusoY1T0s/NfdCA3dRLaxoKQUjXC8vlMxdaWw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VI1PR0102MB2624.eurprd01.prod.exchangelabs.com (2603:10a6:802:3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Wed, 4 May 2022 14:39:30 +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.5206.024; Wed, 4 May 2022 14:39:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 May 2022 16:39:04 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [4Hh5SbVNNMtwol1oMsXESR+klrONYQST] X-ClientProxiedBy: ZR0P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::7) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220504143905.3538928-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb549eee-aa7e-4294-d19a-08da2ddbe5f4 X-MS-Exchange-SLBlob-MailProps: ZTmCor6bjd9UcTOmE6DaDaQYka//eRE4KPKm1vfN9hYhzdd5nleEd9ADjSingB3KMqZafbkicPEQlQmEfmhThQqcxaBdTdCBAshACueh6X0W+UrqteQawhYMubLESECywdXYrqDLCbpJspG8v3b1UlPwrG+tEHAA/RydKoX+vmR6EVFSxqwKxyvrwqp2xLCUSeJTSUinMIJLE/HjzOTmDKg35S8h+srjB5PpksOpvU3f9Hyxqp68NWs3Nb1TZVf48E6imV+J4OpsIu4+BZUbcH3Br9nU8TaYkMSzLgFt3Mr4M+OZfjO0iwA8OMnR9FLEeynmJhZKGAgd5dDA1z86t+ZCSEOvdqfU2KTQLtyEcx3laGZFfBfYA9kL/iL3Atpg3AZx3cWupO6x2D0v2uEQdWEQ+CJvAimlcNYRZSO8/JD1iMNdLdfNnWyW1MHOOE+WLC6JEVIe2BgfjWgCYjjjtI8/RoAMRL+taqEZBcUUTwSxytYQJH3Gc/WQG6VpOvzKMfdnG0sXVV/pGa274xfaDhE3o0nj333piom/J1uq+6pO0aRL0hLkhIVfo6SqEytI0YdaG/gGPsgZoOoIdfipUrpHO5Ty72GITONYMhsf1mce+Npor/oskP50/XxGAiLDVoIw6kVU8/8PZvT4Tu3F8xJd5/r3dMqEX2appBlavsEwgD7eFjbQbzieZCLyRaydqXawosRrhbEnqJ0XFazMd6XkVib5A80AVV/rqfAPUrBuoUU/i9G0H9Fw2eK94VASYaqplDPVkWwILjJV6msc3USFy5OJw+Ui33LVWkXgMjrXSDdYDYBxVlCKCLhey7/s X-MS-TrafficTypeDiagnostic: VI1PR0102MB2624:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jg0yUT06YGJNuVA3iKcaN/OzBRusDoZRkbE/sx/nmWTH4mZW8owtZfo7+7nq/P12e56IW7qjDzQCo2wZ/aubX2fGBdxrulwS2xPnjfdZJnQdby8K6IrHcDBpdYckJiDLh2cg1c7l8gd47Sn+uopLO+wM6g/XUcOqK/S5I/pg4RyHnUw829YUyTNEM6eb2lbcHnVrtYrtEdga+IoCw42aE9BZJAMYuJnaDC/7TbLg72N4R8hf7M5FGL3AyYRQf++vyZjcqVJi8rBSk2dkErDJv+d5qQ73fk+hh3DlNOkbFRE2m7Ge1ubH4QW/6UuTwxpigp/e2+sPXq/23dJSmz5VXD6hBTBbXnZoSik5I2lwqLxd1gTTv6UwnGpFnK3uiCoY6C6DLfYgUPW0aH0ViGDvqghIikvqBmGxoln9Zyp/9BP8tv5OtDrOTD3js4RF7DKi4y0S8E0zAuOTlrqE2rxk3s0AeyyvVH6kt5UEZn/PE5SJQ7NWcZJhUKm+RmuYBtWfY3xKDvWuoBbyChJGno25Bq/4Uu7Zjw6zp6K7W5YMDzOLpDtD2I6u9ANWz8FWUuUEiqvQyPs06OC3zi7G1bHa4OeswZ00k3dG65lk7cMADN5LanXkeSh7nUXuhTp3KWL3bMziNH/Gj4Cga8zjmku9cQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +Tkl7v6v9Y0AJwk3QvDK9apGdFmr+657Pe+fW518q1QXt6NRnVoS/OK3fBk+kNF/CQAtLN6UevtGxO7noTRTXkj1EI49QX7tsp7Bf31Jf6hnEGqUpnz/g721iKy1GH6ahQzhPas99heJZfl5R25OqctVNZ7df7MXZowsx1qavKjmLGBlvO6FfrMRaDF5I4sxtGpZxc/7V8Uw6Ypa3hKx0CQraiz2WTpfKEgpud93sH2uRt2EdIGpzfM1oZUa4+xO50LzQKWRyb8LLRGvL4ki2q10Hq1RvoOkB3QLmce0KI1rpVJ4haJgLRSHAhHPn1pUUS1Jcuz3HxT5vHLQ3NwipWKBOTZsWhG4EowVPCkm/TFxM1ZjVrKt9YXLR9Ps/axrJBqGqSp/uB59jzp/w1SpyKNQuYmNJkCgorgKe6d2UgINh2+B1scvhNfC+GtC7VGtoeORPA6cN9uxEyiQ28BcQUIuc8q+Ti9JzfuL9t5Wd+hvAHf0oQ5V1H33vob9WTmtejZBqT7RXNkwXgnbMvCVTSDZ9zKAoo8E3hTo2J3J5r9ShyMxCb6i3PiFPxXEA9gmm6trgyLsjvSz+/SIi3qgnpRSY1S2e+Iw4QbIoUhHhPSpQ0MnXfMtw4j8Wmu4i366tlLA5YL2DVqbD6/pFDoVOK8+mYP6PHyCfWkYpWzy1o4wFOduGCOzYbhXR+Kxr61Ef8c6XhBqRyPeyh3DHa6nbPWK27QT6tLJsq7aap9SLxhLfkxWkdOc8wrpSXYj+YCTBBPtsXmhGSK6m6596VoWj91P/X1yinLYltHATi8sz38j92k1Ww6tEPgdj2xWhN+GDUgxgzjSg2+gUs7N2PVt90b38OjNWnC/6I1yVi5Jizg289g9XEN4M6FbZX9fp1Ju/5/wwOONFofBBDI7cD1U4fwyDkHwciQvjjXvMuX0n1n4MWRvgCk7dCm4C5is+aTrHmUyH8y4STLFIk71wP+z1UFFKE3n+3KHixQDdESaZiLnowg0ZLo1MaVDONvdOJBF9QOGpz6Q7605dF+31aIRwBlUm6ui+4W6Fml/ROL0ymnE2ze0ZWgQvOlLsXmWXYIPfebfdv01gNGAPiaetJjqx5D2Ax8n0SllMmQBWB3vEsR80QQHLn2QuYLnGNz+h8OErccSeiAup7lJN/mldMMBl9mKM/U0wY/gKbQvyxRGBbHglbJQIYrrb8rrsGaX/kFcWcZrlncgXktSJLMuy3p5c5EVOptUqogFOzhloqILoKhn6wi8wDDVa+JVWvf1EyDFxS3RUF587u91gpTMiljXq2ga4cj+/os+0jIorgr/eRT2dshy8tZBF3Sy7hTpSeH3fh0Ao8v7D8R56PN0oBSW3co3PQQLp5vU8Mqxx9a6xapFsbDO6LWbu2MrAJsdkRH1rfxKxYkY/SwUvk7znTpyl52uFqo9KiQdNYj+Yda50WeIQzAfV5V2eiT8UH2GwbTfq9SZsnY3xOioTSv0dXgS2g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb549eee-aa7e-4294-d19a-08da2ddbe5f4 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 14:39:30.8116 (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: VI1PR0102MB2624 Subject: [FFmpeg-devel] [PATCH 6/7] tests/fate-run: Remove temporary fate-lavf files if possible 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: tqO6jk3+oFGg The temporary fate-lavf files can easily be removed if they are not needed as inputs for other tests (mainly fate-seek-tests). This commit implements this. The size of the remaining files decreases from 260890083B to 79481793B. Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 12 +++++++++++- tests/fate/api.mak | 1 + tests/fate/concatdec.mak | 7 ++++++- tests/fate/ffmpeg.mak | 1 + 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 42cd50f50f..5939761997 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -310,6 +310,7 @@ lavf_audio(){ t="${test#lavf-}" outdir="tests/data/lavf" file=${outdir}/lavf.$t + test "$keep" -ge 1 || cleanfiles="$cleanfiles $file" do_avconv $file -auto_conversion_filters $DEC_OPTS $1 -ar 44100 -f s16le -i $pcm_src "$ENC_OPTS -metadata title=lavftest" -t 1 -qscale 10 $2 test "$4" = "disable_crc" || do_avconv_crc $file -auto_conversion_filters $DEC_OPTS $3 -i $target_path/$file @@ -319,6 +320,7 @@ lavf_container(){ t="${test#lavf-}" outdir="tests/data/lavf" file=${outdir}/lavf.$t + test "$keep" -ge 1 || cleanfiles="$cleanfiles $file" do_avconv $file -auto_conversion_filters $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $1 -i $pcm_src "$ENC_OPTS -metadata title=lavftest" -b:a 64k -t 1 -qscale:v 10 $2 test "$3" = "disable_crc" || do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i $target_path/$file $3 @@ -347,11 +349,18 @@ lavf_container_fate() } lavf_image(){ + nb_frames=13 t="${test#lavf-}" outdir="tests/data/images/$t" mkdir -p "$outdir" file=${outdir}/%02d.$t - run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $1 "$ENC_OPTS -metadata title=lavftest" -vf scale -frames 13 -y -qscale 10 $target_path/$file + if [ "$keep" -lt 1 ]; then + for i in `seq $nb_frames`; do + filename=`printf "$file" $i` + cleanfiles="$cleanfiles $filename" + done + fi + run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $1 "$ENC_OPTS -metadata title=lavftest" -vf scale -frames $nb_frames -y -qscale 10 $target_path/$file do_md5sum ${outdir}/02.$t do_avconv_crc $file -auto_conversion_filters $DEC_OPTS $2 -i $target_path/$file $2 echo $(wc -c ${outdir}/02.$t) @@ -370,6 +379,7 @@ lavf_video(){ t="${test#lavf-}" outdir="tests/data/lavf" file=${outdir}/lavf.$t + test "$keep" -ge 1 || cleanfiles="$cleanfiles $file" do_avconv $file -auto_conversion_filters $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src "$ENC_OPTS -metadata title=lavftest" -t 1 -qscale 10 $1 $2 do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i $target_path/$file $1 } diff --git a/tests/fate/api.mak b/tests/fate/api.mak index 10288f5aba..688fc0f9b3 100644 --- a/tests/fate/api.mak +++ b/tests/fate/api.mak @@ -18,6 +18,7 @@ fate-api-h264-slice: CMD = run $(APITESTSDIR)/api-h264-slice-test$(EXESUF) 2 $(T FATE_API_LIBAVFORMAT-$(call DEMDEC, FLV, FLV) += fate-api-seek fate-api-seek: $(APITESTSDIR)/api-seek-test$(EXESUF) fate-lavf-flv +fate-lavf-flv: KEEP_FILES ?= 1 fate-api-seek: CMD = run $(APITESTSDIR)/api-seek-test$(EXESUF) $(TARGET_PATH)/tests/data/lavf/lavf.flv 0 720 fate-api-seek: CMP = null diff --git a/tests/fate/concatdec.mak b/tests/fate/concatdec.mak index 26d4a63179..c0dc6d4c94 100644 --- a/tests/fate/concatdec.mak +++ b/tests/fate/concatdec.mak @@ -4,7 +4,12 @@ FATE_CONCAT_DEMUXER_SIMPLE2_LAVF := ts FATE_CONCAT_DEMUXER_EXTENDED_LAVF := mxf mxf_d10 -$(foreach D,SIMPLE1 SIMPLE2 EXTENDED,$(eval FATE_CONCAT_DEMUXER_$(D)_LAVF := $$(filter $$(FATE_LAVF_CONTAINER:fate-lavf-%=%),$$(FATE_CONCAT_DEMUXER_$(D)_LAVF)))) +define FATE_CONCAT_DEMUXER_SUITE +$$(addprefix fate-lavf-,$$(FATE_CONCAT_DEMUXER_$(D)_LAVF)): KEEP_FILES ?= 1 +FATE_CONCAT_DEMUXER_$(D)_LAVF := $$(filter $$(FATE_LAVF_CONTAINER:fate-lavf-%=%),$$(FATE_CONCAT_DEMUXER_$(D)_LAVF)) +endef + +$(foreach D,SIMPLE1 SIMPLE2 EXTENDED,$(eval $(FATE_CONCAT_DEMUXER_SUITE))) $(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF),$(eval fate-concat-demuxer-simple1-lavf-$(D): fate-lavf-$(D))) $(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF),$(eval fate-concat-demuxer-simple1-lavf-$(D): CMD = concat $(SRC_PATH)/tests/simple1.ffconcat ../lavf/lavf.$(D))) diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index c83978f39e..9d14a96e13 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -138,6 +138,7 @@ fate-copy-trac2211-avi: CMD = transcode "h264 -r 14" $(TARGET_SAMPLES)/h264/bbc2 FATE_STREAMCOPY-$(call ENCDEC, APNG, APNG) += fate-copy-apng fate-copy-apng: fate-lavf-apng +fate-lavf-apng: KEEP_FILES ?= 1 fate-copy-apng: CMD = transcode apng tests/data/lavf/lavf.apng apng "-c:v copy" FATE_STREAMCOPY-$(call DEMMUX, OGG, OGG) += fate-limited_input_seek fate-limited_input_seek-copyts