From patchwork Tue May 3 03:27:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35549 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp204687pzb; Mon, 2 May 2022 20:27:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxo9TfgKCsTxKcofM7gsta6ochIZLNVCI1DEzm50imJ6qaUadJuJ45SFsxjHOhyiMbNBea8 X-Received: by 2002:a05:6402:2999:b0:418:eb22:64f9 with SMTP id eq25-20020a056402299900b00418eb2264f9mr15822348edb.391.1651548449754; Mon, 02 May 2022 20:27:29 -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 b96-20020a509f69000000b00425ffedf73asi11392993edf.223.2022.05.02.20.27.26; Mon, 02 May 2022 20:27:29 -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=VVqAk3iS; 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 3C99268AFDF; Tue, 3 May 2022 06:27:22 +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-vi1eur05olkn2049.outbound.protection.outlook.com [40.92.90.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79CA268AFDF for ; Tue, 3 May 2022 06:27:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U6FJbyn4Kk0CQ74FYyrnS9zHtU9bnQcSjWw15JRQMkiTw2Dr+p5pQYGklqzB725Ulef/yU+EYwUXQ54No8nbZITTm9gy595AlNmggDeq8Tx9BdKWUruvVbIQr1xwfbWARtj+5HR6RAVDTvyxfk2XuzBSDGml9jxr8XFcVIqbzm9tM08FPKcMqRjUQvOf24L8YEvasLQIFWtC2GJk+w8Th8ngcOVQ1i3u9yKQk8fi6+II23StjdKTzEBLhnYQT99aJbiBQijMBsAfZJSsao4G3/9Pla4uUIn0Xvx+e2jZGGBmqi6XYk9hjVl59ANJKH4jA4gYTSKq9zRe5gxntllTzA== 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=t1DG/axekNtJH4OCJ6CiTjNt2HTu+3k+A2p4t4FsH20=; b=YCQx/F0cXsJ6zOqrL0SaEGnRa0Guyj1qoHptGucEqMvapJWqyc4KgUz9XDtdjzX9/Y/VR5uQIKla2V1yTk9umO4v5Hf5Ba/1BMU7zbT5IODsXhef1czFOsgFlqI8M3FGrlkmIHpi/6YeKgdjin/WEqgNjAFOfE7brPzBTSFFhXdnObAylvuV8Hu14+xnawLzCNFPzkt1jwdyFZsIimjMszVqqSllICJ9KvQt5e93slEeSTWsVmixd5mY1ZMItwXRG+sdgoLj2XOkUIcG+DlWyU7YQaNeo1uVP+HHxvc+x/mzrv6mW7sGQwCWuBUflBl+9tngfIm6bmp1gsDlMeG6XQ== 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=t1DG/axekNtJH4OCJ6CiTjNt2HTu+3k+A2p4t4FsH20=; b=VVqAk3iS2EVgtAS4NeIYyANnjkxumb+klQzH9JscLnGMm4aoNg9Y0Tbm1bs7EdxRUEPvjHMSMrb3AGnvROu3MQeWlccNcfb7AWj42ylgSVMkijwqG1Gnj53uaBZberOIcU++hA3qyLkr0+XLphMAHcjNugg8dRtjuABfO7VEiRM493Xalx8u18yKo6OsbMXqxfyUaQ1/jGhcjchpJOXyVxKy8kCNPJ7cE0xfj6zdIgo9Ri6kCmRmxw+g+MfyLpTrRtAFjMHuVx84BoiGQOea3ZIt4VAIovKR+fhU3C27Uw0Z8SyxFSE0nCKIThyMvw4HqtJ6M3RaArRv8I5K9fMVwQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PR1PR01MB4988.eurprd01.prod.exchangelabs.com (2603:10a6:102:9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Tue, 3 May 2022 03:27:12 +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; Tue, 3 May 2022 03:27:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 May 2022 05:27:00 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [uNnHT9nSKX90n6WzAgs6aNdQnFBESv41] X-ClientProxiedBy: ZR0P278CA0158.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::17) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220503032701.148531-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a4ddbba2-2811-495c-0aa2-08da2cb4cdf8 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEshfmgJKOBnMup7aFnPglP19VEK7sLNEM+mp+usja6iM/tF6d4MWgQLr6t10NyPHUkhhdDQKiCxZRhCuFJRmVDMfM/jKdaTYM8qhQ9aS7zBUBRyQXx9jNLtcVKbxzbNPc8O0V2DHkQ50U5Y6+lgNC2AG5MJ/gEheR4eNr3NrANZDtgx/+WUxfV2xW7TGMcMTV6q1FwOpFANZkTh8MJ2T3fT6aA5QAdh1qCuwJBFUAGY4tL7i4cztHvZjym9K1CZZB7GjhHEfDVS7Rmpv5vWZkiwJKpScqn9cmVe4ogLHlECVUQdswmCvjIBPxqwVYRgO+O5KZGcn5mBumIEQAKFD3SyxTXZoPqFaEmMJB37EMgKjkpKNCGd7YqPMQEabLnaxu5TNEgffS+Yd1SB0rdi/c6TDDuyHLv8r+1yQaf5uNJu20rZiwn5QoR1kvJ2EF49EPIwan3KWRNjqQYmhvK/Vfcbi27H8nPXpSJ1pGQsja1mVjZuJ4ClWwDjGmDHnKVsD6kXWebklNBo0geZWz3POAL9mcUEW6pVO9+UG1DyYUJJl0WUpGWO0SLZD0dvACI+nT7NjPXRPboGugn1Jj7aCDPPkszmYYLMZ3XdT+ZLlp5TlWpJerJqCv3HvP5ZzFk5k79bRJIytTa8PHssPOKrQlpqa2Ut1IRwJDY4GysTo3Vtp6866yjmj6eVQui+EU1zp3BMSDguLy5CUVpXAaW3F6hFby3l1EORiEyY4GnKejTAKS51XtRcQcapDGcyoxJzV9IlVSGtAuSW7iTEzyQJ94PV X-MS-TrafficTypeDiagnostic: PR1PR01MB4988:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O9C33RP/YeuTX21Stz/Fsx4b7Xd0swvDICZXv81iBDMZkkTO0g8RZY7liXkGK5Bzh0nmLRvqOBdOcZPukG3a98GVNZ7nqWKSaqQru9s/ij9Nptor6mag1KngBg4JLCKqxQK0fRMgv6HAfhS7s1DH41KYVloph38jRvZCmDXbYAE6qUa5G8fjQxMz7JmcfKUwkptQms6FZBqZixa5RL21Rz2gvIcJ+v2rbOUCuRYhtP259kDWgZbomRGJlsV7v7dwV3dirUgh2ymTx2GZIaMDTF2gO52cHzVu9LTyCxbr1b3Sq2GM9jkWqHSLoIJ5iJOlRFY2ZozKgZG4t1pFH90LPhqeT+whUe62eTBOaX9D26EBnbpynxo/uUFoSWF+MJFOhPxDSdetxo32bIZQ7DLQ+ZVHZucX6Rb7nmTIy3gtxKewvTadGevnYRcK+8vHdRF9r8/pl78MWekg08vPBciEXhq0ldiovjqXRtaA7/hGB7qWkeStitK7nx4YETfRXT/gTGPL72cdGkkiQK+j+yEDdm3KhiW+tGpOG2vP7+tXwVhMTqFlWfkCOSonscrYAMCa/UFqyHLI9gB97m4rpTl+Yw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wOU1DFpGQqY9FIJd1/Dy3urrRoDn3Ly63QMDPQWm0ZmdO1MyV5vLz82tK1F6wor5p6Jv0o96r+m7/K0TB80uWt0YQ+k1LioNN2/YOfZeUfnWoiqbqTdeTY5/rod/8IBYpAOBMo4RWpBa0aWdio8HRIGioLpWRm3udEQbNgPLtYmYc+7XAl+jrOr1yxyKtzbfTsBYCAa/cvX5uPUO13uujU3bPuOwbrH/Mhg3zQNMKREMcJrez/GCaX8nxRZYSPVl9Ae20wxSGrb+v3FtdDM4DN0vvJlVrLfJdCSnt5ajSd0S+ZKOcSyTDg2ZrKVkg/cqHxlP2rC3K9yrwD4CBMepIPeBXH/G84M9TSg7BKMh1xoNW/3iWLZh/LeUeF2wMSJwnsBJyhqwrl+/EolfK0nzQ7yXrsNk8wGx3g1QLwhlUtky5jNx3bQsuhSyxCph6OebAVlDmg932yBxkUMHsec67UUv5r5gyz3LDF4pUAunWbHTEEIAAdoc6IkZih+KcbiHC94jijFJjZhXJa94J5w9e+f+i3H91jFG4/PrukWFD710K2081PZFsz9rhXV1SnuPfJiHSJ/KrSf6OG0xvUn6VqP4ef6dN3Dg5uMPRHQQLaAENdprY6iPHN4IBsjipyNXzzavPl9lB3Bh/UM+UiteOfKqNqZV9b6MLs3H+AE+JAmALGLo99Xt2CAhb0bcEgJ9jFikTSTWrBlmXIGvcnw+zkZipdtRxGrrrxkuIgBUfMPSb14h8y4FRCjRCMh0Ae62FQjwJTGU1N+ZcRmOdA/cAf6BY37CBeSOGI9y8JuY/lsswlLxQgJvhOOpdhOBBF2pnmXuxodFAALFjvhTzrafVczVktOfnHdVPrTUwZGyG5jI5BefhN2PHWgT8dACcwsl5Gdu4YOQcxSgK2cl2STeCdVVF9mGMKldtnn0rnC6+v82fbj/0Fwfl+v1V+ESXUpsKkHPwFLcp5Nh+AAlS1mMzDE5+66pFMlGqeX/huhCDWmZJ3KSPYC09+tLVF1zSwSy3ZWW1oyTP/GCP6eTxe91tlAP7IkcZLa56yul9xe/XZTVYBRPe4XWPZBOZsQr1qOXLhGW0y+8AXsA6awzwuEnGPWINfqhIhfGOTn9k73vUXL4GtmyuJx5/tSVTYbnKLrp51jdkuYVhU/hwjoWnyM31+9kbwaxj2Xgg5IPWs8WW3pPNIGUXyvjocx3yzfg9X68uc3ukqT4qq0GWl/IlBZRoPN+SLLSEnnNqUO2OJglyQ6GAFF+w6qEiGhC3MIrvoL1NAkQt5d1K1g5IItqH3Tj98bC+oJMwkin+8Nc9hhVixSsvY02cI/ToUOnF1+6x6xPEpCstDBAGqHGZtChCH/ccbTtLALKrgwajhWhdc6bNW+7diIdJw+cSUEW1NvhxGybPa5n0QoEtYMZxbWEXovp1UxZfp/L5Dd101hf1sReIWC3G7kznJbAW53ViwVMVJ0VAXh5bjHZ1L4e8hGtGRRcxA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4ddbba2-2811-495c-0aa2-08da2cb4cdf8 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 03:27:12.3144 (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: PR1PR01MB4988 Subject: [FFmpeg-devel] [PATCH 1/2] fate/lavf-audio: Disable CRC for lavf-peak_only.wav test 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: IHWt6oV2KX6+ The output of this test is just a file containing the positions of peaks; it is not a wave file and trying to demuxing it just returns AVERROR_INVALIDDATA; said error has just been ignored as the return value from do_avconv_crc is the return value from echo. Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 3 ++- tests/fate/lavf-audio.mak | 2 +- tests/ref/lavf/peak_only.wav | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 821e949b01..c206a439b2 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -312,7 +312,8 @@ lavf_audio(){ outdir="tests/data/lavf" file=${outdir}/lavf.$t 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 - do_avconv_crc $file -auto_conversion_filters $DEC_OPTS $3 -i $target_path/$file + test "$4" = "disable_crc" || + do_avconv_crc $file -auto_conversion_filters $DEC_OPTS $3 -i $target_path/$file } lavf_container(){ diff --git a/tests/fate/lavf-audio.mak b/tests/fate/lavf-audio.mak index b03030176c..68fca35298 100644 --- a/tests/fate/lavf-audio.mak +++ b/tests/fate/lavf-audio.mak @@ -34,7 +34,7 @@ fate-lavf-ast: CMD = lavf_audio "-ac 2" "-loopstart 1 -loopend 10" fate-lavf-mka: CMD = lavf_audio "" "-c:a tta" fate-lavf-voc: CMD = lavf_audio "" "-c:a pcm_u8" fate-lavf-peak.wav: CMD = lavf_audio "" "-write_peak on" -fate-lavf-peak_only.wav: CMD = lavf_audio "" "-write_peak only" +fate-lavf-peak_only.wav: CMD = lavf_audio "" "-write_peak only" "" disable_crc FATE_AVCONV += $(FATE_LAVF_AUDIO) fate-lavf-audio fate-lavf: $(FATE_LAVF_AUDIO) diff --git a/tests/ref/lavf/peak_only.wav b/tests/ref/lavf/peak_only.wav index c468731b00..9548e639f8 100644 --- a/tests/ref/lavf/peak_only.wav +++ b/tests/ref/lavf/peak_only.wav @@ -1,3 +1,2 @@ f1a8aeeae8069f3992c4d780436c3d23 *tests/data/lavf/lavf.peak_only.wav 832 tests/data/lavf/lavf.peak_only.wav -tests/data/lavf/lavf.peak_only.wav From patchwork Tue May 3 03:27:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35550 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp204902pzb; Mon, 2 May 2022 20:28:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8xv9ZoFlMwjNS3Ffln2fbaQPpSva2YRR1z3suvuuvEJfd5Lk5wd+HCynhGFnvsFY7K0d4 X-Received: by 2002:a17:906:b006:b0:6f3:dcf0:6f6f with SMTP id v6-20020a170906b00600b006f3dcf06f6fmr14646620ejy.649.1651548498025; Mon, 02 May 2022 20:28:18 -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 kd7-20020a17090798c700b006f3b3dd9712si12993599ejc.196.2022.05.02.20.28.17; Mon, 02 May 2022 20:28:18 -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=R9d1b9en; 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 5F82868AEAF; Tue, 3 May 2022 06:28:15 +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-vi1eur05olkn2038.outbound.protection.outlook.com [40.92.90.38]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D36EF68AEAF for ; Tue, 3 May 2022 06:28:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bYVyKfRSEGzp8xVYtz3zx24j/Z1KPy2pngi6Cvkcu78WjiNo4/A2HWFByTqTraRhpAPqFEaJHbGx3cTga7xy72D+Cxiwj6srXIXLQWG+Tf2mW0QqPY2B5O+tyWRJVmg7N//N2Pw++spWqdMDV01q0rWMzkxnOKA4yRjrscsdko3pcUKDY2+YuyL67HVf3xSDNfttZ75wCw3dijfOLPo4ZdPz3T1xaPeV80av8lg8wHh6xPZ/Dq+/aEUOsb39nJjH1wbn/93yFvYsyeJ0zK3k1DWpUVkxVaDSGKIrs/eXlS/LUYY5lxHmiyi3I80m/SPz6hPo6SY0hX+w5KgMmIwzgQ== 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=KyTj3qN4ZaTSmirqJissu/2TcpfA8pm/Ne7znn+nZ7A=; b=hI5aNO3XZ9WHTwMnz2KiyhXwUz1eCnb+IUIE3n49l/FB+/VWAeEQuZ/2l+9qZAyu7LgJd8jAV+XcZ23FJ+0sPZH67+Jhq5reLn+KV4O9WN9CMNhXm/F4RUR1PySeQSVjFSk7a9/tfMXsX2ft0ffesOtZIuYfYjM9mcJ+DEXQpKytQD0oDLO3uJDnu0wt6Fs+4POOragJbLjn6Hh8OKz2dkOyXBpu7ZQv7s/n1mnJICBtrj3Q4rHHrle/nkZ9u9sthoXjEQz6RpdzqC9oTRvgwkKD0DxcXMCswzDEyqWuxfwAak9w8OVEvEe52L5h9XIumhrVk2adfL516KaStilLgw== 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=KyTj3qN4ZaTSmirqJissu/2TcpfA8pm/Ne7znn+nZ7A=; b=R9d1b9enOXmI5KJkuVkkeff7JRJ/2BH8LUM8tLVKmvZFj4fvV75EB6GZ2brD3SvIwG2reFe+hhvAhOvTYIGjiZUpk/UnM8xmWinscETdPzYEIFlwLLF4wXX1v41VQKUwpANdzd+4XVlBPVqOPPRr5eTNqMyqoO0r9fkgjvkiP3uAosR7gug6oIKXo/1cST6SNH02LqAEO9x5baS28RnSI4QcIrLITeZsPw87e6t/iYri5toxn+SsCFZMirJGOsSLpQITkBgBtMB02/XOjMVDm9GThhEikQZGz3YpLaHPkw4rbxug7Aq0aATTiq1eLIeyoqnk7g+QnYN9Yzl+RFdCvg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PR1PR01MB4988.eurprd01.prod.exchangelabs.com (2603:10a6:102:9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Tue, 3 May 2022 03:28:06 +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; Tue, 3 May 2022 03:28:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 May 2022 05:27:57 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [qjlungDzYBUb/mvhdmZJu4iaBbtlim1f] X-ClientProxiedBy: ZR0P278CA0091.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::6) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220503032757.152713-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1301eee2-df94-4184-bd69-08da2cb4efe5 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTQEkMEhbgfP1CXQyS+IofoQ+B854RISIxjoOCREaJXe0Wg25ItbO1OlxW+Aaw5wHrfenpTBzP7GLSx24eEGT8bbNjuXEyeEJ2GPWy7vNOsfhMRQI3vx4nrDfw5XSbrGDcqfXBowvs+feTE7m/6SWaKcd9tzn0LRwWqZmG4xKVkrd3vj4fezUQlalGufkmq01uJBl27WHr1ni/2xJCUAtvTs2LzauV7FbwGqlnvIa6x+ZGckdOLDn8YlBS/KcO0z1IgxwCKyjWD39LAQStg/XHchNAauuYVuSLxsD4VO6fbM89VVUvtuMvuaQtz00b4H7Itgi1B+y1EIsmczJ0gQUDYZCqQZ8vc3RVwtSh4rykV1r8Nlb1vtk3NY/Gp6L30OlXxTdEwjeh8j8lTDsPp5qVXlixWKvERcfBffX3Pej1qq5W5FpU7u3eatSDc1RyYCuDyuNTClv/MgAvahJBELfSfhQzC1QON4Veq/8CG2qau0yXr5n4vxJp/9MHeY/HkQIje74t6tZISNWHNp6dm23X94lEz8NZVi5MTtEB21tHl2irVrzYW8Olh+eZiLkBZhCDMIT4AcSnt5mrxSntpQE7RdPn94Uq/x0lqZTmnF/Fk/Q1myv59RPByAyhrOhsX4DeG+totji9JTcPGhYArAakaasBf7S9gY2GYHYl7GP09NtZGc6O5b+RgP2YOk2p+ekcig4wWvBtezdZpwSZV9DinCicSkm0KtF81XvEpaNL64KhhuN/HwW+6tpWgONPeFK4= X-MS-TrafficTypeDiagnostic: PR1PR01MB4988:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y/Lio9KnCjONuUI8DP1PLdYamOrVw1ATg9qBVxyXwX3JBm8C01l7ahSXv8YbHhJWc4NlaZqStlTCdFKVBpohx9udsXisDheC/lX9n33u65rH5pyx9vZ0PTQjqvPDryEZTjXS6neL06Z02RpoDyM5vJr5USs1enrIwgBFP0+c30mHBH+UA6n5kFdIGomBlCsl2A47y8ZmwpOVUbf9FbleCP8fAHnkbi5Cm6oNRJhA7BUziL/qbU133M7ajBsMGC3zrbCFKSoApIdYdkoy5jaLJVhr/Xeb+fc40l2H+IKyj0F1uPMCmzRNlGfo+iAX9VXAZy2wYeeSH3bsrJ7cdmCSj8x2GukXqrSYQykO49BoQnXUPUq/o5LuRqMrkaaXNfK2TcnM6wmYHJKH1+IeKipMcayY8LJqFc2AFil5NPdH+ha4ABWnETdk/keJQNzPimrkXAC/sX16RWkOh1HwjDKrz+Va9GRE3KD/4D2AUnhA+J25CjUSChKPMBkytR5dSR/u5Y4BbHTVGgKX/8hNEljYFkj6V8SL2sO5mMZg3JaaotrxI4pYzF2r3Es5HghShF1zOAp7vAIWLIo1m9x6waFbiQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mZdrubklIH0OUMgzLwCwfdNxVi5FwBn3VVGQzLwYnd0Zotpcd3MfI013+QfwKW1BC8Pp2hNiU+CbGNdEdlXsxRPQuk1+GSJ4MAk48z8ZGbBzL6fCwHATWQGyHGdX2/4UI5eC7y9xs6Xw2AWA3gxdRg+hRtGCQG7gCv6MpHVGCmKJ9A4sF8kecZ8vBM5GHQf7rZNcAOXx3cUQyNffqno+YNYJw5wmEkKtGv4/SfBC4jDMwGJMLIVQUz0K3EfYMghrp42aVMX1cO/vstJvsr7gDfh78IlKO1Ww4C7MTyST29eC79PfYfK50g68Au8/Jp8oMdcbTQRdpt5ao2MEV+XOb4OFJ4c24Qr9bRy6PfcwX308M7oC7WwAZU77FswujbwzkjNfF1UQu5L/2U0ouI+A9/7Caf8lR630xdsMNil22CbCfAdouF/PFRQF5ViYnE3pL/rdz41IQzwFdc32Ew/GVhJvksQFaWuShuIkP3dT96c4RJ2YNsj5qvl6tMDhA21jcMN6/NeuurEBZW2Yduq2jBXdHJ7SizNqt5cdYiWmxVrpjV3SQNjtdHfB9uxehlSnf4HaQHEIsjo4L64Zom741TN9Yy2hbInz2/ItInfZLgPA3W6zgjVIZlJJiK4wTS6K2c0s/XbnNNbx+k8l372KFQXOiE7jW4+3Bqe0eh6ZZcFc0BnaneSUDcjsZVQTFPmtwn65i7Tn43HBhd4+NLgy6F3l6VkmgqilqmChiAT+uypTmpYx6J/U+JV/T+yaMihSs7N1t4f4JJr2PAvnSs/7Sn0Bp2hXzBXJhxs0Nwlg1kw2HD98vr07jPEKGmVroHz1/lc78IR7zGQxFQeqL/60nltRQsRx2qYRhUP2celARV89Q2Kh+QOAGRTpER3ngF5CIqpto2fhYrHSTCfH3wAtv73XQ2e9TnR5uvdZQExMJ/C2IIhZ4V/P8Fs0BWJTLX3rcZM/nI1HeCO+q9pIYESWqjesrTMbqGfnPNfHWHyOM6UlFrrkcXpxk8tDnI95Jm2kMjpa17fBbyBAcqHGYHldlzewEnJQiverGeK/ZI2SooJG4n07ZdvcJzIL+cEV1FMOtkhvNTtBgSp9f3grtFY5AA2iN60RoGe3yvVmmwXgG3LpyPirnYcZDV8x9RrpRZ+dfv+cPu4rNgsKykJCZKKYjlCJuvLqaDg7hp7If88ohl0Ji22ByZyFMhPBHG3Xm6NlAENpKgD1474jAsu9IZGd2+nPyc1EOvn5QKnvqtHqR1SoDPNfAxwf4j0YF4CVPL/bxIV2yQLsEcwIOLFxjAY3HBrhVTKiHbDhSBtf/HgOo33XXFxEdc7PqlHMo3X92iwsf9iIa0t3eIArPkmZ9PGmAJ2glANE0D50qejbLAWYzzFHOpNdgbQXQbxK1gmLElMjqCXVTnyWZt/5Ej7+n5KERVcqWE5BKDq2bmc5jx6B7PMoE2yH6jIItFXqbfGkQ7kQH1GdgWATrY1eQLkqD3qsRQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1301eee2-df94-4184-bd69-08da2cb4efe5 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 03:28:06.8764 (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: PR1PR01MB4988 Subject: [FFmpeg-devel] [PATCH 2/2] tests/fate-run: Don't create unnecessary CRC-files, forward errors 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: Nyi7CUShmW3j These CRC-only files (the output of the CRC-muxer) are only used once, so they need not be preserved. Furthermore, errors from ffmpeg (used for creating the CRC) are no longer ignored with this patch. Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index c206a439b2..4f8988b964 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -272,8 +272,6 @@ stream_remux(){ ffmpeg2="$target_exec ${target_path}/ffmpeg${PROGSUF}${EXECSUF}" raw_src="${target_path}/tests/vsynth1/%02d.pgm" pcm_src="${target_path}/tests/data/asynth1.sw" -crcfile="tests/data/$test.lavf.crc" -target_crcfile="${target_path}/$crcfile" [ "${V-0}" -gt 0 ] && echov=echov || echov=: @@ -303,8 +301,8 @@ do_avconv(){ do_avconv_crc(){ f="$1" shift - run_avconv $* -f crc "$target_crcfile" - echo "$f $(cat $crcfile)" + printf "%s " "$f" + run_avconv $* -f crc - } lavf_audio(){ From patchwork Tue May 3 13:59:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35561 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp425626pzb; Tue, 3 May 2022 07:00:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxVRvKLY1ftPJ+YJTMXAmPbWNX0zWMWfPoRZC8/lPtFuSgXG8bCul/HG/T3ZWOqNRh8dbAs X-Received: by 2002:a05:6402:2804:b0:420:caf1:961c with SMTP id h4-20020a056402280400b00420caf1961cmr18183841ede.280.1651586409992; Tue, 03 May 2022 07:00:09 -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 ak14-20020a170906888e00b006f4697bd26bsi3142863ejc.636.2022.05.03.07.00.09; Tue, 03 May 2022 07:00:09 -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=aEMDyxoO; 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 D697C68B1C2; Tue, 3 May 2022 17:00:05 +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-oln040092075016.outbound.protection.outlook.com [40.92.75.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C84D568B1C2 for ; Tue, 3 May 2022 16:59:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jvUIYF83qc7xu5Dr5cvpj1CEmZmklmdpRHdy8dZAdcaW9L/yp9W/JRfspxcrM2criOrZVhHe9f1+okJnnC4y9IXUqOilXsRxuVZdUgnP4GURSWOuUGkiGMZZXh3/aYn7ilC/jCCztQQejpthB4QUjjqhqa+Z5IQtKDMSCqObIzTvbiHeZKeTeNNH2aE4sHnP+/HEthosLeqA/EkdAplxs4SkqbifClTqV0pGpsiUS41ufrX5Vx4TscfHDzSKEqWVF1Ljqx5GkuYM83Ggcjb2NcA3KL8olkZR2wmoNRqRgv7RizDM5k2Ny2Vcl/tJH8rU8IEE26FHLi8hfoXvLFNd1A== 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=ug+EzGl+ZhRrAoFdb2fZbhgZOMIqFYhnMsUm2Cj1+Mc=; b=Fx+N04I55aXqCjVJy5fFKUdRmD2YyYDOK59CYM1c1xFq7xsRylgiVaEf+iloeLasnqysrNpHnVhdTamdEFUi8NNn30EKSy/znRWA/sXQt8QNn0ivVJ7bHhdDQFxeKPM7xuC99Z9u6Io0AA5SiA8lEuxZ0ST2Wj9gti55Z1xkiGCtgXSygrrq0e9yxDtbsvDvwPT0TBEoJrbOcRcalY6OE/CBXrkhrgqRx7sX8u4l0heFl+7U7mK+NWP7lfGyasoCND6wU6rLg4sG91o/lIIqIWABYw7ONnfN8JANIfz5HlVuqgXztC3ylBGx89Xc0bTBfgRjSff02qzclFp+gHU0+A== 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=ug+EzGl+ZhRrAoFdb2fZbhgZOMIqFYhnMsUm2Cj1+Mc=; b=aEMDyxoOWooYwBh+I8vLx4WeUwUl+oAn3/DdDAksYMPqwJDwUJGXrBR2sgT10J5hQ7EMLNs5/vMvx6yH0ot1AOolik+Pr6PQjeeEGgUIwfoWtdM46gbSOOIiZ6bSypVheDFh5e8mNvfYoz1Yte/GOUA/c6hUFW6h+L5uQ5XLIxRdWsW3ZkiwWyI7PW9u1+cPQFiV0FBnT25hNpvJi1XTGXcFR+bLgmB7+uq/EBsakdePGX+7Kt8xDGnuiZeTGjfUdNRwI7fjwt2MzBJcQSBUex23dNnWGVXUF+p0VZFz1Sc+6eqL9oAcOh/y4YxbC5gaOEpEdogbnQCwAvS5Yyz/sQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PAXPR01MB8453.eurprd01.prod.exchangelabs.com (2603:10a6:102:230::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Tue, 3 May 2022 13:59:57 +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; Tue, 3 May 2022 13:59:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 May 2022 15:59:48 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [TJpsPS0BJp9iZhry19zqo5a/aiAoqmL7] X-ClientProxiedBy: ZR0P278CA0186.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::7) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220503135949.2305713-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f39da1d1-aac1-4b86-5a2d-08da2d0d34d7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR+Na9ab5G77V8Sa6irtr55HnR4kxCE6kMmQ9P9O6BpEEN2xcGQmPQPc29fqVe16WEHYCmVTSQYzp29LRKxMJ9UW70Jg7fn6e4w0p9pP78tOiKJ8ArwsBtXfNkAUq9yYdQMcUMnmtHeCY4e8QhyVDVag1IGdfXVhw00M3LW7CelPW/3COG9eWffB0DK8ccqQxjkcS3/KxHSBBCfOj0NzfnwRbLlBQgmk/CTAOoA+Kmr7x9JvulJeELxWB/sw7BngmyhFBsoQNwR1I6fXR2oBEMdyMoQpSVsUvU6ZIJMYOtWPcmswzIv3OeyPYInKrDnZXFVt8jWuEX4arWoUgIiuJbjJfKP53vdL2GaWBEdszUS0t4awrwN8K4sJ2eEJNuFvQScBJ05DmvXPVhu19n0LydgWSH6QGRwRDoAff0UCQSRqWm+Bh1EnAsDix9VDC4JVOXrF23LcsY0PPtsL4brHOT5lUllRR/CfIJk7Qn9naCg+qCscQCIx1xCe1UhOcDvIUptd/GIqpQtXFF1NOXerSeEGX6OmC2gbjIDW0RW7DtUbEGGjoXKqLiq5diEj44HIMKV7ZpFwRAG+fwfMrYxzALVWur3u4gLbMUjz7yDFcE2Qt1Y99N9xHZ3FzqMYTXXtRK921ultxC3wpUP73whUH0YLPuEkln3WhviQeVeXAMpXHqUmYHlkbDfOjuEx0wnTdvXoXzSrPQDUPNtC82K0CiaBuQJa6Z7hACcRe9iF07c4DYkzMgGEr6YTLmVaQq2rMk= X-MS-TrafficTypeDiagnostic: PAXPR01MB8453:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Bz+QxAAxjmtMW+3TtBFDN0oR88KEK1aJGs8R0JKS6gDBBGTCCELIQgFE0v7CSpIejdxp4vKm8L3iMVeqQ6s3yp9LlZJGfONDUOWl9AKo7FpXeBYZe57NkUWwVd41Uifn6LbjXTcMLhNJR3ylXZwoU1RyEvoyPPb4hYyrpNrPoeKBDlMi4EXyerFTeg/T9vlfU4jVYk5Qy0UowiVKWsLuFS1gOPqqfEEowAD+fTE4PP479Xw6zYUdmq3NM+RNPwc55Qai6rdddSgBHOhK/f/oRlWTPsxgi8yC1mxFj75tKW7WftRMT4oEk1dWOe8Tho58oiwmYn45kkh0w3wTh8ekASZwWy/GWAAUAeXG4LeRjM4aT4rrPxWrOPLCs3AVSv2IlrNwnODveEPHsQ6FEFdFsOMCKrIPVGblofMFXTATmjAP5w5jdBrD3Ewr3d7thNgkRVWwoBoUvNLzLXiwXACk3Xi6/1DLNxrWmYp8YoL4xXtcCfEzy/nCJ6SQKzvSZ83uYmhTYS2GJIOUEygW+qtiJKv+n6OmTZie+E+FpUmEbGNJ3L9uyCxaHPCnMqQRK1GikxkrJOTj2UVQdM33CSfe9g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /KUAG976S58DlWODi0uDxWnUaTDhNeFa3PDqydAmsLRyBjq5onqNFfbGYEPTTLwtxD24Nk2lKioXxm8ceOFrdfoJGLehKM0lyNtnvdGB2ySnklLVL5fIE0T7/A4IIz10gVqNW9HgJulr7oOGj76bYdhuQMk57uRH7voAcYKilrhbjnYkzIJT/vgX6DWxSZTQ0Gb2cGSlKZtATLao/PJKwLEnvk3S/XVQLt9YtnIN2Yr87lzTzap12EUIf4YwUHVRWSkXDQRSwLwJh//J3NSSQRAMK3QR9HZ1W+3rB/QQDYo56ZK9MKdk7LssysRXoJLR+YDKLctKU7HL20/E5+uZXPOH9/KXywwz0YMdY9vSBW/efrT40f5Q+E3EPYUyUwnE98siEfp2AEK6uSjWV7T8gWuOmCg8qCXV/oo7o4ppi63klTX9+Si24WrG48BSYiDJDDUBwoGC4By+JnCGj4JhEailpQwhqy8p91/4Uz74mF3rRAwtmctW7fKJJR3IQmFrUMto5edXCCqXudz8YtN2/pdJN5l9f3g9+grPqv7ub2rK0Og4jMMvvTJ4imTEqTYHLMUCx3mEgcbFlx6C0PV/lSLzRShI1ZChZgTRNTV8uXk8fPV40E34iUPX1J0roOR8wUERW20DDG/10wAZe2Ai4AWmnR6YDEYfHn2njX+PwAf3Foj2N/fbabc7sw6rLFWjQDnodKtpR7lKydgtCYkpAVqs/KOYaz+7PAvj8AdeLX5QWAtxXVipIm+RYLuRcGBeo9xYrIX3ZwjXOBqjBs4VtU+3AdT2mBvFdK7cvVsm1E1c1xKk57JgY7bvnCBvZY/Mvf3a+gkq1u5KcNBO6TjUPyHQG1Accy/rkvNIUaET/nXAnGyIIYqpKmMGEYUcOCyBN9xA4exdkrxHFzN7jUdeO54tWDvxva8SrtAEyoabp2bIqTPk4k2ftASMi3GvhZ62M320V2Sl2T6K+Kgx2fuupU1mRtf87aj66Joo4ZzTmZjSwYtzLFR8WUvsgC4bNde7jcHo4qZTFNo9D/rZ+BSJLVGBJjvAZtXY2T9x+y1RoyM3Lh2GzLkid0E16/9ytCaCvmnB8xoBJKAozB9hg+8+Lvt/AEw/BhTMMmJLIY6kNz/63TyU3EiWqRxxcJOoYx5H8nkPvBXuLRJ0YeMAh33kVxe+YIAA6a3/W57ACyBzRzrIS6m7QszRu30KQQTrE6kuV9+DRitC+WK+k8n/bPvarFim9FHE8mCVlQynzvFBkSiAeSMf8elwgYhC0+I0hM4XWjCOyfEXLkZVxvjJpKQT99jeMI/M/SRUy3rZZ4EtdmQaNaHfXZlNIvSXXIbMm1Uuce9GPEK1kGxsl65kBUOYogk18x7SMD41nxyS8SnXuoeD0HlrmFox1zZUNe3R1mpK0j0wfs/ne4iLWY8axcXdZSHuWU9mNq6H1eF+S904mKr+L34XbgApg3DfnZepuRheDrCnbbUv0WWxe42u/dYyJg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f39da1d1-aac1-4b86-5a2d-08da2d0d34d7 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 13:59:57.8513 (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: PAXPR01MB8453 Subject: [FFmpeg-devel] [PATCH 3/4] tests/fate-run: Allow to set dec opts for generated file in transcode 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: 3b6UWxKVVMjk This can be necessary to e.g. force a fixed-point audio codec. Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 4f8988b964..2606fcb917 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -230,9 +230,10 @@ transcode(){ srcfile=$2 enc_fmt=$3 enc_opt=$4 - final_decode=$5 + final_encode=$5 ffprobe_opts=$7 additional_input=$8 + final_decode=$9 test -z "$additional_input" || additional_input="$DEC_OPTS $additional_input" encfile="${outdir}/${test}.${enc_fmt}" test "$6" = -keep || cleanfiles="$cleanfiles $encfile" @@ -242,7 +243,7 @@ transcode(){ $ENC_OPTS $enc_opt $FLAGS -f $enc_fmt -y $tencfile || return do_md5sum $encfile echo $(wc -c $encfile) - ffmpeg $DEC_OPTS -i $tencfile $ENC_OPTS $FLAGS $final_decode \ + ffmpeg $DEC_OPTS $final_decode -i $tencfile $ENC_OPTS $FLAGS $final_encode \ -f framecrc - || return test -z $ffprobe_opts || \ run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return From patchwork Tue May 3 13:59:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35562 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp425708pzb; Tue, 3 May 2022 07:00:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjbWV72jYkmA1MqNMvOteVcdrd3h3AOXFtQeY16frdLxtdA2L69Wuf7bKnJ7v/L0kjA0l2 X-Received: by 2002:a17:907:3f8a:b0:6f4:3f00:b1e9 with SMTP id hr10-20020a1709073f8a00b006f43f00b1e9mr10419692ejc.59.1651586420286; Tue, 03 May 2022 07:00:20 -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 y21-20020a056402171500b00425f86e7823si13011399edu.31.2022.05.03.07.00.19; Tue, 03 May 2022 07:00:20 -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=q0rYKUF7; 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 47CAF68B2C9; Tue, 3 May 2022 17:00:11 +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-oln040092075016.outbound.protection.outlook.com [40.92.75.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E599268B2AE for ; Tue, 3 May 2022 17:00:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jh08GgkcP8N+encBzzEBYDkg6rVlHMFRbbWsY3IKXfC20D9S7vczw1soFQxJdwtJI2BypwPrrlVkZ4Zm4SEKVdbKP3idIiYScYJU5IBuJqh7N+G9ILhCjJsO0NHRKHr+r0p1bufHc1kpZMHwPjVUp8BRZ+ZxyEU1e0aRTQ7xxqBDE15U1Re2Ha684sNHXj7p8ym3QGq3cqW+1KHHk9XkmxIaWUaTi4OIyJ6qDrKMrvUrvidfo8xR3Wa76a/y+c4nQMJjW2Jxgf0P1PLCpITMcMzwCwtZZ5Hu22CGng6CkeVlPcRImwcc4Ic/ozPU4kJy4tqM/0131kPXwCy6sHXqdg== 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=i98AOmbq285L/llQkaVlPp+/qdgMFompReYZWc3f1nc=; b=VNcLjaQsGMw4qBVzqWyr9QCWWibHHiU0Dr7pz0OQD88SYnntAG1E/MKb0cI32xJ3+/EtYy0okeiLEfquxFflSXZYzKpI3MIDZ9HF2LPj56OVdyLEZ1hJocchGjOBq2K/thsix0+QluvyQfMqmVME9mo9gaLFpF04Zo3ygg8umq/DeuoF1Kzqxbc2oFQFIiMY9fJ9p1FI+q3CQbDbksttnkUOLz5qnbvBnYzCzMmNKfsdMsjmx+JVvc4kF4RskhOE5p9M3HDlhsA7w4Hbw/RZoreZ56KshkUZRczMwcW/pNJ9vhVxYGdUXPj1bGADfN+mHLA+oUy3W0jHpSD72T2FfQ== 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=i98AOmbq285L/llQkaVlPp+/qdgMFompReYZWc3f1nc=; b=q0rYKUF7Lz5HgcxAgQkCRwCqxg/dD+d59aTwv6TDCSo83xTjpPLL4pGVvLpD36kC4IBMfyqszFeJx0fDcxY+eKiTI7jNPDYRT9jhPktvDoJ1DGXICFrqHpUmJE2t2fO+9UMXoiTygna0nu+SfijlNLNzHGNtaeX6kZVX+498n+IzPByinOCNG0PjVg6MyeVYI/kE7qrnNQkSZAVmHdtfUhex8BC8QgKdN+k/UQGfbxn/mvrSlWdhcXrLqQgtGI61ggtrnkv3RYSFnmmbFUrADxvM4syMCjSIL2EdEvlyerPYiDyKmzJTDcFTs/IQbgari/v9ueG5ml7105dfpCj7zQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by PAXPR01MB8453.eurprd01.prod.exchangelabs.com (2603:10a6:102:230::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Tue, 3 May 2022 14:00:01 +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; Tue, 3 May 2022 14:00:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 May 2022 15:59:49 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [t3OTLvZz7BrOphotmuaBo+nfi/FKqA3Q] X-ClientProxiedBy: ZR0P278CA0186.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::7) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220503135949.2305713-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 04b51d20-44bb-4c6f-7f27-08da2d0d3670 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR+Na9ab5G77V8Sa6irtr550JFtQZaS5mkK9l8qAJR3G3VTXux1ahGz4yB4c2Yz63PnI7q8fApTEmAbl32n8ecINviKeHKmA/2e26w7LwDnOYovJe29/RjV/r83CUjwJrrq9ygGd6pIrbXeOisq/8z7R7QOAR/jdp0kGTavRqA5DbQ93L9rNURFraYplGRh1Np6AwsRpPMhlYpIEU4WFj3d0iMQ74FTe8RLdVN/Ha/+v13joQkJbqBf+obfm9D/2cqsu32mvYBOBaLws+f2YFs71UaSnfORDSfESu2AfsCKuiKp0YSOTPJ3dA8XXZpOjdDWX+iuepGrncd3MZpuIDCIKL+RlJqSRNrRsJEWnhsZ1A5pnstml9jpCtOAMP/Y0mquv14koMH6K/jZuhq40fjoKgJ3OjSakXYx2/WFjc+jwFjR9pdlIXjCRYFcPCJOZY9ezVpAaagLTzn4Z/XCaSM1fExX3c0qDu/BC0gDD9yE4XsJu4D0gooeHIZ/7uB7UGBlhM19HZfNRrzx5Q+WS9fYj9Wyv9+0ZfAOofkzqCZ08X/wD7Urx98NJ3T9y3LyTeaTDBYMa2AzS6oPM9+/xHvbPCprt8svmKBCWWKqtk+LNfdpLWSJDcu/YRvti6jkWmVKPEy7E6DjIAPlGhCVrSn1IHhNpMCkKdk4fzvITkGDVuR8Qa/wblF2/IwFXkiZg9gwYSMzuhbYSkUkcCoyDyDturRn76o8wKMhAr0JLLHgqDwmn5XB00MNBc/EBF7Tm/o= X-MS-TrafficTypeDiagnostic: PAXPR01MB8453:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xMOXCotBoyHqkNaaJCt+H6yKIofX0xG+NiS7AbxuQJRk30C0+Nssqkpay4/UMkX06cE+UKQ85sMSVMCag9htnMTiNWhv2Ez4HOj1PLoOksMBETqWyduZi3/IKxALglNzMXi87ohMB5yj5YaFHMOt1PuWqgGWgsGWODIYu8W5lYKF/Mk6M9Q2xlqvndWL37zt1x7YjEOJVwNGctVbVZj7U6jPJZJ9OOrFA+q5CSApAl6aJ3uRWflomDQlej/DfDgJhJFySUPAK1sGFk/26d0ajpPFo2SnBbvprDCfRH3sQrrSwk1ERihen8xoMIGYSN7SMTlJEDQ2ZPXPpiiaLsGpg1wwvvAReskBiNLnVKxd2504CvzMILMvcY9r6Tp4VtQWuosfW1nlyZLSnbFxG+6Op+R8a1y9fBst+kViKWRGpYl3uS8tqvlyKK6Q8NdVpiDMvaBtxxfiC34zZOleFD0vDvlF4fEpUUIm+6+RPvYogTFERtvKRcRUwoRmwa8soN9+Vovfb/uinqkaMHeQioyMN9wJaUwl/zWkyA0sskQGBmYuTHZHIqrgIBMWGhPTPaqvUeZzp57EI3gWSOk/EfFZ7Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IsC+8+WME/pDSnP8RrUVwgR1XvuRRh2JqjC1/OZgT9D9miC5Y36m4wk5ag1HI4CRI7p41mPgjsHsHxqIjw5XE1ZB268uCn8GqAhrYBZj9YIxFUF5MAK++1nn62zl0pejT9rScxVZDwFgVzTH1D8xt9Jkdel+cR8XDxUwK6s/paPjjG85wH2JX9N0qJD61TVywGm88suTSCR/1RX+hqD3PuY+pB2nZXzZFP37GQ6aPPG6bEUVDMMu1cO+bO3L4Tpqul01itbRxZLUuKqQNREXlTcQjNPMJGOwrP8XQae5dgdVB3mv3PDliiw1yK7vmyPBBKLFpVJ1NVCWCCRQDDRoopzDWqB40FGkwielgYRYzle606p5tERSnFQI8cInyuYGM0xNdOq3q00FcO7Qy8OtmEqXwwfeWhh73HQ0MJl+zAj5BYqkeMXxzxw+Ho9bOJ0eUQQ0PNgg4mMwzI+GHJNXVyPEqx73QJw9w/OU37BzCPWSxM+qxyW+RF1xWfBCXwrebkaE0yoxzRez0ODsuSlb309+E45hC/zyVMwBxU5VRxvRAMK6mN8TLsE3xRgEEqTqkKjEfmcDlvRtT0YtIx2QB90DI+2P6sAzaEpLao4p44v7tnlQzDg9QrjcR00IA/BgfTCc03q31RYymiUknS9/cntAng8dYqsOC1pavNWXNQt0v1kyBiEXtD9Sp0A5pxGjNm2o9C4iIPD3COIcY8zyC3/m9+KnftApoCi6/sik9LJaGa78ua3GNGy11cLqykVVHwyaDLdjoh7vzV6As8Ghb4J7CpABcf0XrPCsRRm7oIdyfW2orzavxP2fsttwgYIeQ0YAYsWyTo5HRhFLJPgtSlF9LG95kcWyvotcYhUOz4V5kUdlwcotBN8U9o6gQEHyB9hHVLWKWpArgzFs5wvskhpfSG9YS/YVcwkYIepv4RL4hMLWtoPktJ2OQ1vsN/6070RYv2DVf09Ivp0ZHUktq1Yu9NWHLMfMy6Oop4bIPoh6KlzdlnXRTMgNhrD/Nl0dEjiAJz1XMvLWeNSf/W5HGyOcG3Tji9TY8TLWqVtTe6PV2b0xgZBY9Hy4/r6fUjkc7aLrxXbz8ULZCHMcph/S6BklIIWBmFRNo3+jHk0BwfN2B1Q5H9FbtOm7DCfhYiLaniB6GkVRrDhzkh1vYfG50oRPp6xzi2edHZ6VWh2/EET2zYoYRc9Q4rsXi0BSySUT3UwOb8neUTmRnInlUa9qTSkZ+TBqt73J2EOCK1Pc8fj1s2PKQU7kLXclfGz4M8QqwlaSxTXZtauWEDvAajKYbMmxterewUD/Vflj7Z7SraH5nIiDcdK7Gkp3fSAJiUyxfw8MfjwUl8rtlQY1wQqCjHC4/WkuRtEAFIBZ/FWPI6oed2nTpSvqnz1RrsgH0egSNA7lfkide3wjb31F1tJ0HzE5W+4R7K/kg1WckHVPJGZqkEr1+mfj+c0jOuB2+fns32iFVArjHMrgpMc8cB0sgA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04b51d20-44bb-4c6f-7f27-08da2d0d3670 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 14:00:01.4546 (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: PAXPR01MB8453 Subject: [FFmpeg-devel] [PATCH 4/4] fate/filter-video: Remove intermediate file of meta-4560-rotate0 test 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: 2PSUkqq/T8BN Signed-off-by: Andreas Rheinhardt --- tests/fate/filter-video.mak | 10 ++-------- tests/ref/fate/filter-meta-4560-rotate0 | 2 ++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 68f4c084f8..b9f3ef238b 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -856,14 +856,8 @@ FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-meta fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filter/out-of-phase-1000hz.flac fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter=video=0" -tests/data/file4560-override2rotate0.mov: TAG = GEN -tests/data/file4560-override2rotate0.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ - -i $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov -c copy -flags +bitexact -metadata:s:v:0 rotate=0 $(TARGET_PATH)/$@ -y 2>/dev/null - -FATE_FILTER_SAMPLES-$(call ALLYES, MOV_DEMUXER H264_DECODER AAC_FIXED_DECODER PCM_S16LE_ENCODER MOV_MUXER) += fate-filter-meta-4560-rotate0 -fate-filter-meta-4560-rotate0: tests/data/file4560-override2rotate0.mov -fate-filter-meta-4560-rotate0: CMD = framecrc -auto_conversion_filters -flags +bitexact -c:a aac_fixed -i $(TARGET_PATH)/tests/data/file4560-override2rotate0.mov +FATE_FILTER_SAMPLES-$(call TRANSCODE, RAWVIDEO H264, MOV, ARESAMPLE_FILTER AAC_FIXED_DECODER) += fate-filter-meta-4560-rotate0 +fate-filter-meta-4560-rotate0: CMD = transcode mov $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c copy -metadata:s:v:0 rotate=0" "-af aresample" "" "" "" "-flags +bitexact -c:a aac_fixed" REFCMP_DEPS = FFMPEG LAVFI_INDEV TESTSRC2_FILTER AVGBLUR_FILTER METADATA_FILTER diff --git a/tests/ref/fate/filter-meta-4560-rotate0 b/tests/ref/fate/filter-meta-4560-rotate0 index 0c33709b77..82703e009c 100644 --- a/tests/ref/fate/filter-meta-4560-rotate0 +++ b/tests/ref/fate/filter-meta-4560-rotate0 @@ -1,3 +1,5 @@ +dc213aee944a55af2f41950921fd62d7 *tests/data/fate/filter-meta-4560-rotate0.mov +347433 tests/data/fate/filter-meta-4560-rotate0.mov #tb 0: 1/30 #media_type 0: video #codec_id 0: rawvideo From patchwork Wed May 4 14:39:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35587 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp479397pzb; Wed, 4 May 2022 07:39:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLIKiM5hlddZncA1BQpMjmOoKkPmcCZISA4CiySwUF+x/+VkG3UnR4IIj0QbBrIyC3gC6m X-Received: by 2002:a05:6402:54:b0:419:9b58:e305 with SMTP id f20-20020a056402005400b004199b58e305mr23216916edu.158.1651675181623; Wed, 04 May 2022 07:39:41 -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 c23-20020a056402121700b00425b061062esi15446679edw.398.2022.05.04.07.39.40; Wed, 04 May 2022 07:39:41 -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=vQTpRH7M; 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 597B868B30A; Wed, 4 May 2022 17:39:32 +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-vi1eur05olkn2105.outbound.protection.outlook.com [40.92.90.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7A5F68B1D9 for ; Wed, 4 May 2022 17:39:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fwmvq3gbdbzWOsq/FcQJ1XjfcAltzwB5G+933XFU75B81e6Wlt4YRh5MDkgLMyhNjV1Vba1uI3Xgglsn1R4jVz+xmU9IctBQWbmoyA42SzpCFXdOONztbv+/PimV2QaenHPf57IkNBS+fkWiNa+ZQfjJGtqGS/u5LiTfzYpvjgBsoCjM3u6gAvPB7KfCuucxKgViZjjYHWAiTaJaK1KH2+D1Um44y2zgkW/DEGWqNsv3EhhvDYXWjfE01KnNB/NyyvU7Axe8bsoFLhAC8SkRoTKhnMbJKnwDFXAFolrxakFRn7fahwAf848DDtVpeAFy8WGXTCcMELmUpIuw401fOA== 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=h/bebJCvE67kWdX2w9c9i4TfIZFw13uUssVeHbY0NH8=; b=SwRrQKjnQylPGa1T5hRjKLQsjmP9w6c4c8MnzySPyt5oyZZtQU0OZ9NQJ3y8ThuVycIakLxh+pltq6tV9m8RJM15hIuzGugaP8KiEyu8P1MoUtdWD52Td8ANtHhZ6xan7W3MQajH13biQpaCAdmibrfZM3vqbz7nX5ddaS7fcYN3TllinHLbrAXg0CrSobKyOUV+1JR+x7I85eK5HelA8uJ7vFUh+O4DX4DbPO0KZKv7SV9ONNABIwn3xszZLSU1siDQ1o0Vn7rz4Dv6eMN5aHhzGkS/nT2BAkqIke6v0urSnpulz6H+EgXwCCuRm08stGvuYak2tNWF9PqyAm0Z+w== 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=h/bebJCvE67kWdX2w9c9i4TfIZFw13uUssVeHbY0NH8=; b=vQTpRH7MjMCrneMNSe6ukB1+iM2ZSVYwbgRxvZwLlDAc5FAP7UhJaI193EWtglTMRDP6+uvzs6RYPZF7HdX/cDENYd1Ydtt107Zye7mvxrdvUE38dmt+lpfoQhoV22F3gHuHKu/Nkobkv2D4/VMbURh5+fle/kFvPK98OkuZP5y43nbOqxYhZx4voTV+hH7U5w4P3SQfvjGH9G0dbLyF1cg2xXOVvDO1k6pS843HBugHWz3pkgN/JakeOLo+JIrDgxZDgjvtsDfVRzgU+EQCdtU8GRxK7z/5L7HwVtQIsXIgN64xJKAbZeiX85m8RGjOS/eTf66uDzuDQmulUE8Bhw== 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:20 +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:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 May 2022 16:39:03 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [7lcwz94PnP+ZBJcZksry3qSm7ahiRoe2] 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-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3d0cff28-0387-4f19-1ed1-08da2ddbdc2c X-MS-Exchange-SLBlob-MailProps: 7FNIAzWC7TqPI1ERYlHByH/t+XG2DjExs8TreRegC6D09yt6d8XAMm7YUeUlvPxkbl0/t8vHfNd+8pOLYIWT8S4Fkg1wvAULUtqPvjNVQVnrWVAazco+0jE+DVO/jqfsFumsUNzQYpok9LiyVgOzmH0ojxn3EmbZacU45L7ccs3HefSmLL3otbHirmuyUSIARXusxaAQMW+eQPnbKShGGYYPBd1oZRgqM5OEHqVfQzP5JC6j0PJcVXrVIGmpPrA6o0WkU7AjDTmbmjAYf/6efMh64KiHbdO5qo+JZQMPQFw1SWYCb2gCqKaunsncpEVKclF9xdMJc//7tQTz0VsS9512m91xwBgLuuIBoyN/d6EQjGw2x16YaobxOf2Z3phQ7kohBknUxuEyUQBteEw7Uc4StkQHj2US1UXPi6iM+y2BUemfEE18noTgGRxidXsKgpZJppC0BLqJEubdvmh7N3JwZCq+p9tPxRpd4jEFveZJyAbGUrN0jpQrir5NlGo9jUNbFYqPnF3K/uGbUQd/PHAWtQG3fRqy3SvRj8LJukOQWX1mSvg00/PJujfDiz5ISbB9/rc+tNk9UdUla23fEBmGno0+LEbWtJAjUV5qRQaIbK2QYTMgHqwMecozeo5+3/dXA1IpFcmWDbwmxsUckj9Bxk4FeVWqOYTmo99mLqs4jSLLs6bizhRZbvCsmnwC69LTp0HGE3v04wnKgvcBbFGuEB/oBdlPhHSDig+6Hje+o/f6K6UUgG9RfxGEDIysKCGrLN/wCXsGFHB1BZY9RGNNkVCM/l2R18e/hkJZc9E69IGzpwmeYdtNVob4kEdCDWvD16hMrRffwaju7UowKIhP8QG38mtKfCEIPcfqhfop0WEckMTAdc1kF7NKkL4KQMvMDqPEzl7PSrjNsA8ds2tYq9WPoxHtfvuUohEACAzhVgnO6e/EFsFJNBXzBO4vBy1ivDfpeIuXCWGkil++cvGgrwY2q1LZtefPdYI6Z02T86EX/jMkeudyo+KGwX7Pjt9DW8u85YXblFHk2I4frvKSmpK4lL2qwpC9jbfZV4Sq2aPeDYT9zl4zNyjI4dxfI2CL5t/cIpk= X-MS-TrafficTypeDiagnostic: VI1PR0102MB2624:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wpwfPTE6ZXFq6xQ5m0Wo/SozE5ZcUMFPHiJaNrhJFztRBlEvkqUpVrPzqYp1wpPsuWk+6SDWKmeC4XMxZAX08bmF/evQt6BA7b/bos0GHoCllN6rrO9run3CAzQzuf1mmMgDsOVL8wrJyb9VmdCmrCq1AU7Z3s3gOUtFPFiHAhWx4lNd5WwuV03mcuDOvFHRIlS81v6O3Bj8VwLcWVel5J5cXZkju125RxyXM4AHbMjdkxATx7eJRxmO5nDjUuOn0idiQK7sHasEE5oWu0etJQLZOJPxWbbhM6dtgnsmn71uJZqudCHHyNePAUmY990QSPDVv3iFjxyutOYj0h28jgoshiCI+qaqBvjObqyRAPkpwuaeZqGvfs72cKE7jDyl8JekXT97TPyQmLdn4e+CWHLMhfZINbrMVuf+VXAQT3tNcAE7svM/1cbALlLt3mVL5B+aA0GEDqYu8Mvh/Tpzx4E5qEiot8TVJsc/evRTgQk9msNpHdOSUXM5JbQnSq4bPBfrVfHECtLCdNidkPOVHJVnc0aaQzymrGs/jAsBg3Z/uUWroOFt4Ch/vvF7gH7mbK4VU29q+zL9l7ZqMpXYAJYzg8NkfwcVA9M1BYMNwxvCLvis6ZLq68uxQLcpAe113dysBDvnNWOHc6sl8LAW7Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LToCv+cIPvU5kZaGnOpE/e1QnOF5cpYlXFhiMGBrmkCMHUfvIonj/cUO3jTyM1bumuDHxrLchvB8kEBPxKJDeDuANEURVhDfVvaT3x0ZXjLGg1iVih9H23H7bRbacB1grF03KUEOytMApE0W7J610iat6Nswh4kQ8WSGs6uvRc390Ye2CxoG+0t8nxtX1xiWrTpzc/nEtJ7iGf5by8BAUR1/A+N2IMEQ7+F1KTcC5urilzIEddc0tXMAqF7qqdyWlU6NiyoYoJB7yNj2QKh2tL7pHH003N4jo4YA9JIbAmh4GzJdJmk0CX1N0x+9t4/9MUrW7i61awb+/tgtK6zWaZHuZQRU3K61w9MixYSbIPGFw3V21VKqMFPuGoSgcRl+L9EHDf+089800kiRLCuryqh5wuZdlepWcxK/wWjV9I2TdlN3G0MvZOvq2J0V48T6L1y11WwHutq2isOjNMTtu4o8eDJwwAmZOgdtwj+cDiSL1sKSrKvTPqpUhxRdg29FGUhPjeFn4ZWAPCExGNkcyNGcAHKq0kTf379Jlz3K0PiXAkfJ5fb+W1ByI8e5reQ13ig7bmn4eAmJLu5+oRPr4LQCu5aRdn4AKf/GWmQCTKN5OtuBATitY81tgI5Lk9GgYKf6kTk21HawEfmCuCCNLOlz+cwBDMmO2zG0RAttE8gBD5DuCfozC1V6G3vO818FlbzifaTUVUoKGTo2/ZvtrgLu06gwurTn0eIkH4OVmfp4x4Hp3f2vtJizNRL9DSy7QBJf3cZescBVSMEwbQkAOIXDxHFJR3ANDvj0zfaA/mpoB+rRCQPmtDQIDejvwiTgcIc/6+UEpMTREK+LE8T1pBTNYXbFANWh1lbrbcb5bFbD8ketSBcs3uc08/SYgBIYHoy/X/9hKyPMYJ4Wglfwx9KveSxVJFAiaqaStB9HV5DNb+opMBvEUBXSGCk0e7t85P54P052+rBwxchizAfIKMoqHsLOZsyJZ2/gXFZQUNPWSHFFCjRBp/KZ+x0MDlJ2QKj7Vws9+3uzOp8wPYKvQ8/p5NEzziovGq0dYFBNDRJqehl0EbldnyOX0wwE5dhlicoBlAShVF5urmTypuo3wn0PXyxLImRij44xDeyC/IT0ql9fMGwy7Y/OQPe4Cc6k868TY2RXQomIMsEWO82JL5NA3EBJqTl6Zjvq+S9C5s4Da48XYcGt+2VUXiiDSjeF1GZDtk1gmniwPf7OyNptjb0rgTZMpz+m0Ceyx1aldLJ8M8m4fWE8m0LjurnHTmsrq8wxUgyvLMnz3K/zoaB+vfd2BCOpGdx4iQfzSZeQLNVjpS4edGBV8JEV3uvVo58T1AwZKwK9X9AYc4AdsSFRkUQP5ZIavxmX/QYN0WKtadbaouVf64xZv1FINxgZmMp/KedjzAjHwBVm+dX86ieykYOqLbTTO+g/4nh0plrG4mcbLKa/zgmIPgahOWfiiFIyVUP5bVzhjA5PHDNSSmky2g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d0cff28-0387-4f19-1ed1-08da2ddbdc2c 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:20.2751 (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 5/7] tests/Makefile: Redo how to keep intermediate FATE-files 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: Ugr5ZkOF89mR Extend the ordinary mechanism to signal KEEP for this. This also allows to remove the keep-parameter from enc_dec, transcode and stream_remux, so that several empty parameters '""' could be removed. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 14 +++++++++++++- tests/fate-run.sh | 20 ++++++++++---------- tests/fate/acodec.mak | 2 +- tests/fate/caf.mak | 2 +- tests/fate/cover-art.mak | 6 +++--- tests/fate/ffmpeg.mak | 4 ++-- tests/fate/filter-video.mak | 4 ++-- tests/fate/id3v2.mak | 4 ++-- tests/fate/image.mak | 4 ++-- tests/fate/matroska.mak | 20 ++++++++++---------- tests/fate/mov.mak | 10 +++++----- tests/fate/mxf.mak | 2 +- tests/fate/oma.mak | 2 +- tests/fate/seek.mak | 2 +- tests/fate/vcodec.mak | 2 +- 15 files changed, 55 insertions(+), 43 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index ca228ae897..7ddfbcfd7e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,4 +1,16 @@ +ifneq ($(strip $(KEEP)),) +ifneq ($(strip $(KEEP)),0) +# KEEP_FILES is normally undefined; it is set to 2 # if the user requested +# to keep all intermediate FATE-files by setting KEEP. +# For some tests it is also set to 1 if it is unset; this indicates +# that only some intermediate files (namely only non-raw files) +# are to be kept. This allows reusing these intermediate files as input +# files for other tests (mostly the seek-tests). +KEEP_FILES = 2 +endif +endif + THREADS = 1 VREF = tests/vsynth1/00.pgm AREF = tests/data/asynth1.sw @@ -279,7 +291,7 @@ $(FATE): export EXECSUF = $(EXESUF) $(FATE): export HOSTEXECSUF = $(HOSTEXESUF) $(FATE): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) | $(FATE_OUTDIRS) @echo "TEST $(@:fate-%=%)" - $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)' '$(REPORT)' '$(KEEP)' + $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)' '$(REPORT)' '$(KEEP_FILES)' fate-list: @printf '%s\n' $(sort $(FATE)) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 2606fcb917..42cd50f50f 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -205,11 +205,11 @@ enc_dec(){ enc_opt=$4 dec_fmt=$5 dec_opt=$6 - ffprobe_opts=$9 + ffprobe_opts=$8 encfile="${outdir}/${test}.${enc_fmt}" decfile="${outdir}/${test}.out.${dec_fmt}" cleanfiles="$cleanfiles $decfile" - test "$7" = -keep || cleanfiles="$cleanfiles $encfile" + test "$keep" -ge 1 || cleanfiles="$cleanfiles $encfile" tsrcfile=$(target_path $srcfile) tencfile=$(target_path $encfile) tdecfile=$(target_path $decfile) @@ -217,7 +217,7 @@ enc_dec(){ -f $enc_fmt -y $tencfile || return do_md5sum $encfile echo $(wc -c $encfile) - ffmpeg -auto_conversion_filters $8 $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \ + ffmpeg -auto_conversion_filters $7 $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \ -f $dec_fmt -y $tdecfile || return do_md5sum $decfile tests/tiny_psnr${HOSTEXECSUF} $srcfile $decfile $cmp_unit $cmp_shift @@ -231,12 +231,12 @@ transcode(){ enc_fmt=$3 enc_opt=$4 final_encode=$5 - ffprobe_opts=$7 - additional_input=$8 - final_decode=$9 + ffprobe_opts=$6 + additional_input=$7 + final_decode=$8 test -z "$additional_input" || additional_input="$DEC_OPTS $additional_input" encfile="${outdir}/${test}.${enc_fmt}" - test "$6" = -keep || cleanfiles="$cleanfiles $encfile" + test $keep -ge 1 || cleanfiles="$cleanfiles $encfile" tsrcfile=$(target_path $srcfile) tencfile=$(target_path $encfile) ffmpeg -f $src_fmt $DEC_OPTS -i $tsrcfile $additional_input \ @@ -255,9 +255,9 @@ stream_remux(){ enc_fmt=$3 stream_maps=$4 final_decode=$5 - ffprobe_opts=$7 + ffprobe_opts=$6 encfile="${outdir}/${test}.${enc_fmt}" - test "$6" = -keep || cleanfiles="$cleanfiles $encfile" + test $keep -ge 1 || cleanfiles="$cleanfiles $encfile" tsrcfile=$(target_path $srcfile) tencfile=$(target_path $encfile) ffmpeg -f $src_fmt -i $tsrcfile $stream_maps -codec copy $FLAGS \ @@ -598,7 +598,7 @@ if test $err != 0 && test $gen != "no" ; then fi if test $err = 0; then - if test $keep = 0; then + if test $keep -lt 2; then rm -f $outfile $errfile $cmpfile $cleanfiles fi elif test $gen = "no"; then diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak index 848d57ef9c..27b69ad9fc 100644 --- a/tests/fate/acodec.mak +++ b/tests/fate/acodec.mak @@ -1,6 +1,6 @@ fate-acodec-%: CODEC = $(@:fate-acodec-%=%) fate-acodec-%: SRC = tests/data/asynth-44100-2.wav -fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b:a 128k -c $(CODEC) $(ENCOPTS)" wav "-c pcm_s16le $(DECOPTS)" "$(KEEP_OVERRIDE)" +fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b:a 128k -c $(CODEC) $(ENCOPTS)" wav "-c pcm_s16le $(DECOPTS)" fate-acodec-%: CMP_UNIT = 2 fate-acodec-%: REF = $(SRC_PATH)/tests/ref/acodec/$(@:fate-acodec-%=%) diff --git a/tests/fate/caf.mak b/tests/fate/caf.mak index f153bfeb79..a53f5fa0f8 100644 --- a/tests/fate/caf.mak +++ b/tests/fate/caf.mak @@ -2,7 +2,7 @@ FATE_CAF_FFMPEG-$(call ALLYES, CAF_DEMUXER CRC_MUXER) += fate-caf-demux fate-caf-demux: CMD = crc -i $(TARGET_SAMPLES)/caf/caf-pcm16.caf -c copy FATE_CAF_FFMPEG_FFPROBE-$(call REMUX, CAF, MOV_DEMUXER) += fate-caf-alac-remux -fate-caf-alac-remux: CMD = transcode m4a $(TARGET_SAMPLES)/lossless-audio/inside.m4a caf "-map 0:a -c copy -metadata major_brand= " "-c copy -t 0.2" "" "-show_entries format_tags" +fate-caf-alac-remux: CMD = transcode m4a $(TARGET_SAMPLES)/lossless-audio/inside.m4a caf "-map 0:a -c copy -metadata major_brand= " "-c copy -t 0.2" "-show_entries format_tags" FATE_CAF_FFMPEG-$(call REMUX, CAF, AMR_DEMUXER) += fate-caf-amr_nb-remux fate-caf-amr_nb-remux: CMD = transcode amr $(TARGET_SAMPLES)/amrnb/4.75k.amr caf "-c copy" "-c copy -t 0.2" diff --git a/tests/fate/cover-art.mak b/tests/fate/cover-art.mak index c2e3b1e7c1..faa2182745 100644 --- a/tests/fate/cover-art.mak +++ b/tests/fate/cover-art.mak @@ -37,14 +37,14 @@ FATE_COVER_ART_REMUX-$(call ALLYES, FILE_PROTOCOL FLAC_DEMUXER MJPEG_DECODER \ AIFF_DEMUXER BMP_DECODER PNG_DECODER \ FRAMECRC_MUXER PIPE_PROTOCOL) \ += fate-cover-art-aiff-id3v2-remux -fate-cover-art-aiff-id3v2-remux: CMD = transcode flac $(TARGET_SAMPLES)/cover_art/cover_art.flac aiff "-map 0 -map 0:v -map 0:v -map 0:v -c:a pcm_s16be -c:v:0 copy -filter:v:1 scale -c:v:1 png -filter:v:2 scale -c:v:2 bmp -c:v:3 copy -write_id3v2 1 -metadata:g unknown_key=unknown_value -metadata compilation=foo -metadata:s:v:0 title=first -metadata:s:v:1 title=second -metadata:s:v:1 comment=Illustration -metadata:s:v:2 title=third -metadata:s:v:2 comment=Conductor -metadata:s:v:3 title=fourth -metadata:s:v:3 comment=Composer" "-map 0 -c copy -t 0.1" "" "-show_entries format_tags:stream_tags:stream_disposition=attached_pic:stream=index,codec_name" +fate-cover-art-aiff-id3v2-remux: CMD = transcode flac $(TARGET_SAMPLES)/cover_art/cover_art.flac aiff "-map 0 -map 0:v -map 0:v -map 0:v -c:a pcm_s16be -c:v:0 copy -filter:v:1 scale -c:v:1 png -filter:v:2 scale -c:v:2 bmp -c:v:3 copy -write_id3v2 1 -metadata:g unknown_key=unknown_value -metadata compilation=foo -metadata:s:v:0 title=first -metadata:s:v:1 title=second -metadata:s:v:1 comment=Illustration -metadata:s:v:2 title=third -metadata:s:v:2 comment=Conductor -metadata:s:v:3 title=fourth -metadata:s:v:3 comment=Composer" "-map 0 -c copy -t 0.1" "-show_entries format_tags:stream_tags:stream_disposition=attached_pic:stream=index,codec_name" FATE_COVER_ART_REMUX-$(call ALLYES, FILE_PROTOCOL MP3_DEMUXER MJPEG_DECODER \ SCALE_FILTER PNG_ENCODER BMP_ENCODER \ MP3_MUXER BMP_DECODER PNG_DECODER \ FRAMECRC_MUXER PIPE_PROTOCOL) \ += fate-cover-art-mp3-id3v2-remux -fate-cover-art-mp3-id3v2-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/exif/embedded_small.mp3 mp3 "-map 0 -map 0:v -map 0:v -c:a copy -filter:v:0 scale -filter:v:2 scale -c:v:0 bmp -c:v:1 copy -c:v:2 png -metadata:s:v:0 comment=Band/Orchestra" "-map 0 -c copy -t 0.1" "" "-show_entries stream_tags:stream_disposition=attached_pic:stream=index,codec_name" +fate-cover-art-mp3-id3v2-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/exif/embedded_small.mp3 mp3 "-map 0 -map 0:v -map 0:v -c:a copy -filter:v:0 scale -filter:v:2 scale -c:v:0 bmp -c:v:1 copy -c:v:2 png -metadata:s:v:0 comment=Band/Orchestra" "-map 0 -c copy -t 0.1" "-show_entries stream_tags:stream_disposition=attached_pic:stream=index,codec_name" # Also covers muxing and demuxing of nonstandard channel layouts into FLAC # as well as the unorthodox multi_dim_quant option of the FLAC encoder. @@ -55,7 +55,7 @@ FATE_COVER_ART_REMUX-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER OGG_DEMUXER \ FLAC_MUXER FLAC_DEMUXER FLAC_DECODER \ FRAMECRC_MUXER PIPE_PROTOCOL) \ += fate-cover-art-flac-remux -fate-cover-art-flac-remux: CMD = transcode mov $(TARGET_SAMPLES)/lossless-audio/inside.m4a flac "-map 0 -map 1:v -map 1:v -af channelmap=channel_layout=FL+FC,aresample -c:a flac -multi_dim_quant 1 -c:v:0 copy -metadata:s:v:0 comment=Illustration -metadata:s:v:0 title=OpenMusic -filter:v:1 scale -c:v:1 png -metadata:s:v:1 title=landscape -c:v:2 copy -filter:v:3 scale -metadata:s:v:2 title=portrait -c:v:3 bmp -metadata:s:v:3 comment=Conductor -c:v:4 copy -t 0.4" "-map 0 -map 0:a -c:a:0 copy -c:v copy" "" "-show_entries format_tags:stream_tags:stream_disposition=attached_pic:stream=index,codec_name" "-f ogg -i $(TARGET_SAMPLES)/cover_art/ogg_vorbiscomment_cover.opus" +fate-cover-art-flac-remux: CMD = transcode mov $(TARGET_SAMPLES)/lossless-audio/inside.m4a flac "-map 0 -map 1:v -map 1:v -af channelmap=channel_layout=FL+FC,aresample -c:a flac -multi_dim_quant 1 -c:v:0 copy -metadata:s:v:0 comment=Illustration -metadata:s:v:0 title=OpenMusic -filter:v:1 scale -c:v:1 png -metadata:s:v:1 title=landscape -c:v:2 copy -filter:v:3 scale -metadata:s:v:2 title=portrait -c:v:3 bmp -metadata:s:v:3 comment=Conductor -c:v:4 copy -t 0.4" "-map 0 -map 0:a -c:a:0 copy -c:v copy" "-show_entries format_tags:stream_tags:stream_disposition=attached_pic:stream=index,codec_name" "-f ogg -i $(TARGET_SAMPLES)/cover_art/ogg_vorbiscomment_cover.opus" FCA_TEMP-$(call ALLYES, RAWVIDEO_MUXER FILE_PROTOCOL) = $(FATE_COVER_ART-yes) FATE_COVER_ART = $(FCA_TEMP-yes) diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 4dde880f67..c83978f39e 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -46,13 +46,13 @@ fate-force_key_frames: tests/data/vsynth_lena.yuv fate-force_key_frames: CMD = enc_dec \ "rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth_lena.yuv \ avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \ - framecrc "" "" "-skip_frame nokey" + framecrc "" "-skip_frame nokey" # Tests that the video is properly autorotated using the contained # display matrix and that the generated file does not contain # a display matrix any more. FATE_SAMPLES_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER H264_DECODER AAC_FIXED_DECODER MPEG2VIDEO_ENCODER AC3_FIXED_ENCODER MOV_MUXER MPEG2VIDEO_DECODER EXTRACT_EXTRADATA_BSF PIPE_PROTOCOL FRAMECRC_MUXER) += fate-autorotate -fate-autorotate: CMD = transcode "mov -c:a aac_fixed" $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c:v mpeg2video -c:a ac3_fixed" "-c copy -t 0.5" "" "-show_entries stream_side_data_list" +fate-autorotate: CMD = transcode "mov -c:a aac_fixed" $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c:v mpeg2video -c:a ac3_fixed" "-c copy -t 0.5" "-show_entries stream_side_data_list" FATE_SAMPLES_FFMPEG-$(call ALLYES, VOBSUB_DEMUXER DVDSUB_DECODER AVFILTER OVERLAY_FILTER DVDSUB_ENCODER) += fate-sub2video fate-sub2video: tests/data/vsynth_lena.yuv diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index b9f3ef238b..7851d35db2 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -584,7 +584,7 @@ fate-filter-pad: CMD = video_filter "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2" FATE_FILTER_PP = fate-filter-pp fate-filter-pp1 fate-filter-pp2 fate-filter-pp3 fate-filter-pp4 fate-filter-pp5 fate-filter-pp6 FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += $(FATE_FILTER_PP) $(FATE_FILTER_PP): fate-vsynth1-mpeg4-qprd -fate-vsynth1-mpeg4-qprd: KEEP_OVERRIDE= -keep +fate-vsynth1-mpeg4-qprd: KEEP_FILES ?= 1 fate-filter-pp: CMD = framecrc -flags bitexact -export_side_data venc_params -idct simple -i $(TARGET_PATH)/tests/data/fate/vsynth1-mpeg4-qprd.avi -frames:v 5 -flags +bitexact -vf "pp=be/hb/vb/tn/l5/al" fate-filter-pp1: CMD = video_filter "pp=fq|4/be/hb/vb/tn/l5/al" @@ -857,7 +857,7 @@ fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filt fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter=video=0" FATE_FILTER_SAMPLES-$(call TRANSCODE, RAWVIDEO H264, MOV, ARESAMPLE_FILTER AAC_FIXED_DECODER) += fate-filter-meta-4560-rotate0 -fate-filter-meta-4560-rotate0: CMD = transcode mov $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c copy -metadata:s:v:0 rotate=0" "-af aresample" "" "" "" "-flags +bitexact -c:a aac_fixed" +fate-filter-meta-4560-rotate0: CMD = transcode mov $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c copy -metadata:s:v:0 rotate=0" "-af aresample" "" "" "-flags +bitexact -c:a aac_fixed" REFCMP_DEPS = FFMPEG LAVFI_INDEV TESTSRC2_FILTER AVGBLUR_FILTER METADATA_FILTER diff --git a/tests/fate/id3v2.mak b/tests/fate/id3v2.mak index fc574e4487..4dca681e38 100644 --- a/tests/fate/id3v2.mak +++ b/tests/fate/id3v2.mak @@ -2,10 +2,10 @@ FATE_ID3V2_FFPROBE-$(CONFIG_MP3_DEMUXER) += fate-id3v2-priv fate-id3v2-priv: CMD = probetags $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, MP3) += fate-id3v2-priv-remux -fate-id3v2-priv-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 mp3 "-c copy" "-c copy -t 0.1" "" "-show_entries format_tags" +fate-id3v2-priv-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 mp3 "-c copy" "-c copy -t 0.1" "-show_entries format_tags" FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, AIFF, WAV_DEMUXER) += fate-id3v2-chapters -fate-id3v2-chapters: CMD = transcode wav $(TARGET_SAMPLES)/wav/200828-005.wav aiff "-c copy -metadata:c:0 description=foo -metadata:c:0 date=2021 -metadata:c copyright=none -metadata:c:1 genre=nonsense -write_id3v2 1" "-c copy -t 0.05" "" "-show_entries format_tags:chapters" +fate-id3v2-chapters: CMD = transcode wav $(TARGET_SAMPLES)/wav/200828-005.wav aiff "-c copy -metadata:c:0 description=foo -metadata:c:0 date=2021 -metadata:c copyright=none -metadata:c:1 genre=nonsense -write_id3v2 1" "-c copy -t 0.05" "-show_entries format_tags:chapters" FATE_SAMPLES_FFPROBE += $(FATE_ID3V2_FFPROBE-yes) FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_ID3V2_FFMPEG_FFPROBE-yes) diff --git a/tests/fate/image.mak b/tests/fate/image.mak index c8e0d321ef..fca4eaf60a 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -338,7 +338,7 @@ FATE_JPG += fate-jpg-jfif fate-jpg-jfif: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/20242.jpg FATE_JPG_TRANSCODE-$(call TRANSCODE, MJPEG, MJPEG IMAGE_JPEG_PIPE, IMAGE_PNG_PIPE_DEMUXER PNG_DECODER SCALE_FILTER) += fate-jpg-icc -fate-jpg-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png mjpeg "-vf scale" "" "" "-show_frames" +fate-jpg-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png mjpeg "-vf scale" "" "-show_frames" FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG) += $(FATE_JPG) FATE_IMAGE_FRAMECRC += $(FATE_JPG-yes) @@ -390,7 +390,7 @@ fate-png-side-data: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \ -i $(TARGET_SAMPLES)/png1/lena-int_rgb24.png FATE_PNG_TRANSCODE-$(call TRANSCODE, PNG, IMAGE2 IMAGE_PNG_PIPE) += fate-png-icc -fate-png-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png image2 "-c png" "" "" "-show_frames" +fate-png-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png image2 "-c png" "" "-show_frames" FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG) FATE_PNG_PROBE-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG_PROBE) diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index c9d88975ca..b8b6945de6 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -55,7 +55,7 @@ fate-matroska-flac-extradata-update: CMD = transcode matroska $(TARGET_SAMPLES)/ FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER OGG_DEMUXER \ VORBIS_DECODER VORBIS_PARSER WEBM_MUXER) \ += fate-webm-dash-chapters -fate-webm-dash-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg webm "-c copy -cluster_time_limit 1500 -dash 1 -dash_track_number 124 -reserve_index_space 400" "-c copy -t 0.5" "" -show_chapters +fate-webm-dash-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg webm "-c copy -cluster_time_limit 1500 -dash 1 -dash_track_number 124 -reserve_index_space 400" "-c copy -t 0.5" -show_chapters # The input file has a Block whose payload has a size of zero before reversing # header removal compression; it furthermore uses chained SeekHeads and has @@ -65,7 +65,7 @@ fate-webm-dash-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_cha # It furthermore tests correct propagation of the description tag. FATE_MATROSKA_FFMPEG_FFPROBE-$(call DEMMUX, MATROSKA, MATROSKA) \ += fate-matroska-zero-length-block -fate-matroska-zero-length-block: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/zero_length_block.mks matroska "-c:s copy -dash 1 -dash_track_number 2000000000 -reserve_index_space 62 -metadata_header_padding 1 -default_mode infer_no_subs" "-c:s copy" "" "-show_entries stream_tags=description" +fate-matroska-zero-length-block: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/zero_length_block.mks matroska "-c:s copy -dash 1 -dash_track_number 2000000000 -reserve_index_space 62 -metadata_header_padding 1 -default_mode infer_no_subs" "-c:s copy" "-show_entries stream_tags=description" # This mainly tests the Matroska muxer's ability to shift the data # to create enough free space to write the Cues at the front. @@ -83,12 +83,12 @@ fate-matroska-move-cues-to-front: CMD = transcode wav $(TARGET_SAMPLES)/audio-re # the initially reserved amount of space turns out to be insufficient. FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MOV_DEMUXER HEVC_DECODER) \ += fate-matroska-dovi-write-config7 -fate-matroska-dovi-write-config7: CMD = transcode mov $(TARGET_SAMPLES)/mov/dovi-p7.mp4 matroska "-map 0 -c copy -cues_to_front yes -reserve_index_space 40 -metadata_header_padding 64339" "-map 0 -c copy" "" "-show_entries stream_side_data_list" +fate-matroska-dovi-write-config7: CMD = transcode mov $(TARGET_SAMPLES)/mov/dovi-p7.mp4 matroska "-map 0 -c copy -cues_to_front yes -reserve_index_space 40 -metadata_header_padding 64339" "-map 0 -c copy" "-show_entries stream_side_data_list" FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MOV_DEMUXER \ HEVC_DECODER AAC_DECODER) \ += fate-matroska-dovi-write-config8 -fate-matroska-dovi-write-config8: CMD = transcode mov $(TARGET_SAMPLES)/hevc/dv84.mov matroska "-c copy" "-map 0 -c copy -t 0.4" "" "-show_entries stream_side_data_list -select_streams v" +fate-matroska-dovi-write-config8: CMD = transcode mov $(TARGET_SAMPLES)/hevc/dv84.mov matroska "-c copy" "-map 0 -c copy -t 0.4" "-show_entries stream_side_data_list -select_streams v" # This tests the scenario like tickets #4536, #5784 where # the first packet (with the overall lowest dts) is a video packet, @@ -120,7 +120,7 @@ fate-matroska-qt-mode: CMD = transcode mov $(TARGET_SAMPLES)/svq1/marymary-shack # and modifying and writing colorspace properties. FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, H264_DECODER H264_PARSER) \ += fate-matroska-spherical-mono-remux -fate-matroska-spherical-mono-remux: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/spherical.mkv matroska "-map 0 -map 0 -c copy -disposition:0 -default+forced -disposition:1 -default -default_mode passthrough -color_primaries:1 bt709 -color_trc:1 smpte170m -colorspace:1 bt2020c -color_range:1 pc" "-map 0 -c copy -t 0" "" "-show_entries stream_side_data_list:stream_disposition=default,forced:stream=color_range,color_space,color_primaries,color_transfer" +fate-matroska-spherical-mono-remux: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/spherical.mkv matroska "-map 0 -map 0 -c copy -disposition:0 -default+forced -disposition:1 -default -default_mode passthrough -color_primaries:1 bt709 -color_trc:1 smpte170m -colorspace:1 bt2020c -color_range:1 pc" "-map 0 -c copy -t 0" "-show_entries stream_side_data_list:stream_disposition=default,forced:stream=color_range,color_space,color_primaries,color_transfer" # The input file of the following test contains Content Light Level as well as # Mastering Display Metadata and so this test tests correct muxing and demuxing @@ -132,7 +132,7 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call TRANSCODE, FFV1 PRORES, MATROSKA, MXF_DEMUXE PCM_S24LE_DECODER ARESAMPLE_FILTER \ PCM_S16BE_ENCODER NOISE_BSF) \ += fate-matroska-mastering-display-metadata -fate-matroska-mastering-display-metadata: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf matroska "-map 0 -map 0:0 -c:v:0 copy -c:v:1 ffv1 -c:a:0 copy -bsf:a:0 noise=amount=3 -filter:a:1 aresample -c:a:1 pcm_s16be -bsf:a:1 noise=amount=-1:drop=-4" "-map 0 -c copy" "" "-show_entries stream_side_data_list:stream=index,codec_name" +fate-matroska-mastering-display-metadata: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf matroska "-map 0 -map 0:0 -c:v:0 copy -c:v:1 ffv1 -c:a:0 copy -bsf:a:0 noise=amount=3 -filter:a:1 aresample -c:a:1 pcm_s16be -bsf:a:1 noise=amount=-1:drop=-4" "-map 0 -c copy" "-show_entries stream_side_data_list:stream=index,codec_name" # This test tests remuxing annex B H.264 into Matroska. It also tests writing # the correct interlaced flags and overriding the sample aspect ratio, leading @@ -148,7 +148,7 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call TRANSCODE, PCM_S32LE MP2, MATROSKA, \ ARESAMPLE_FILTER \ PCM_S32BE_ENCODER) \ += fate-matroska-h264-remux -fate-matroska-h264-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts matroska "-map 0:0 -map 0 -c:v copy -sar:0 3:4 -bsf:v:1 h264_metadata=aud=remove:delete_filler=1 -disposition:v +hearing_impaired -af aresample -c:a:0 pcm_s32le -c:a:1 pcm_s32be -disposition:a:0 original -metadata:s:a:0 title=swedish_silence -metadata:s:a:1 title=norwegian_silence -disposition:a:1 dub" "-map 0:v" "" "-show_entries stream=index,codec_name:stream_tags=title,language" +fate-matroska-h264-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts matroska "-map 0:0 -map 0 -c:v copy -sar:0 3:4 -bsf:v:1 h264_metadata=aud=remove:delete_filler=1 -disposition:v +hearing_impaired -af aresample -c:a:0 pcm_s32le -c:a:1 pcm_s32be -disposition:a:0 original -metadata:s:a:0 title=swedish_silence -metadata:s:a:1 title=norwegian_silence -disposition:a:1 dub" "-map 0:v" "-show_entries stream=index,codec_name:stream_tags=title,language" # Tests writing BlockAdditional and BlockGroups with ReferenceBlock elements; # it also tests setting a track as suitable for hearing impaired. @@ -156,12 +156,12 @@ fate-matroska-h264-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/h264/h264_int # (the input file lacks ReferenceBlock elements making everything a keyframe). FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, VP8_PARSER) \ += fate-matroska-vp8-alpha-remux -fate-matroska-vp8-alpha-remux: CMD = transcode matroska $(TARGET_SAMPLES)/vp8_alpha/vp8_video_with_alpha.webm matroska "-c copy -disposition +hearing_impaired -cluster_size_limit 100000" "-c copy -t 0.2" "" "-show_entries stream_disposition:stream_side_data_list" +fate-matroska-vp8-alpha-remux: CMD = transcode matroska $(TARGET_SAMPLES)/vp8_alpha/vp8_video_with_alpha.webm matroska "-c copy -disposition +hearing_impaired -cluster_size_limit 100000" "-c copy -t 0.2" "-show_entries stream_disposition:stream_side_data_list" # The audio stream to be remuxed here has AV_DISPOSITION_VISUAL_IMPAIRED. FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MPEGTS_DEMUXER AC3_DECODER) \ += fate-matroska-mpegts-remux -fate-matroska-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts matroska "-map 0:2 -map 0:2 -c copy -disposition:a:1 -visual_impaired+hearing_impaired -default_mode infer" "-map 0 -c copy" "" "-show_entries stream_disposition:stream=index" +fate-matroska-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts matroska "-map 0:2 -map 0:2 -c copy -disposition:a:1 -visual_impaired+hearing_impaired -default_mode infer" "-map 0 -c copy" "-show_entries stream_disposition:stream=index" FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-spherical-mono fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mkv/spherical.mkv @@ -172,7 +172,7 @@ fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entrie # with multiple CueTrackPositions if the timestamps coincide. FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, WEBM MATROSKA, WEBVTT_DEMUXER) \ += fate-webm-webvtt-remux -fate-webm-webvtt-remux: CMD = transcode webvtt $(TARGET_SAMPLES)/sub/WebVTT_capability_tester.vtt webm "-map 0 -map 0 -map 0 -map 0 -c:s copy -disposition:0 original+descriptions+hearing_impaired -disposition:1 lyrics+default+metadata -disposition:2 comment+forced -disposition:3 karaoke+captions+dub" "-map 0:0 -map 0:1 -c copy" "" "-show_entries stream_disposition:stream=index,codec_name:packet=stream_index,pts:packet_side_data_list -show_data_hash CRC32" +fate-webm-webvtt-remux: CMD = transcode webvtt $(TARGET_SAMPLES)/sub/WebVTT_capability_tester.vtt webm "-map 0 -map 0 -map 0 -map 0 -c:s copy -disposition:0 original+descriptions+hearing_impaired -disposition:1 lyrics+default+metadata -disposition:2 comment+forced -disposition:3 karaoke+captions+dub" "-map 0:0 -map 0:1 -c copy" "-show_entries stream_disposition:stream=index,codec_name:packet=stream_index,pts:packet_side_data_list -show_data_hash CRC32" FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes) FATE_SAMPLES_FFPROBE += $(FATE_MATROSKA_FFPROBE-yes) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index a33f3694af..2fae054423 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -128,22 +128,22 @@ fate-mov-mp4-extended-atom: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets FATE_MOV_FFMPEG_FFPROBE-$(call REMUX, MP4 MOV, OGG_DEMUXER VORBIS_DECODER) \ += fate-mov-mp4-chapters -fate-mov-mp4-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg mp4 "-c copy" "-c copy -t 0.1" "" "-show_chapters" +fate-mov-mp4-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg mp4 "-c copy" "-c copy -t 0.1" "-show_chapters" FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, PNG, MP4 MOV, MJPEG_DECODER SCALE_FILTER) \ += fate-mov-cover-image -fate-mov-cover-image: CMD = transcode mov $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a mp4 "-map 0 -map 0:v -c:a copy -c:v:0 copy -filter:v:1 scale -c:v:1 png" "-map 0 -t 0.1 -c copy" "" "-show_entries stream_disposition=attached_pic:stream=index,codec_name" +fate-mov-cover-image: CMD = transcode mov $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a mp4 "-map 0 -map 0:v -c:a copy -c:v:0 copy -filter:v:1 scale -c:v:1 png" "-map 0 -t 0.1 -c copy" "-show_entries stream_disposition=attached_pic:stream=index,codec_name" FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, TTML SUBRIP, MP4 MOV, SRT_DEMUXER TTML_MUXER) += fate-mov-mp4-ttml-stpp fate-mov-mp4-ttml-dfxp -fate-mov-mp4-ttml-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" -fate-mov-mp4-ttml-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" +fate-mov-mp4-ttml-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000" "-map 0 -c copy" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" +fate-mov-mp4-ttml-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-map 0 -c copy" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" # Resulting remux should have: # 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED # 2. second audio stream with AV_DISPOSITION_VISUAL_IMPAIRED | DESCRIPTIONS FATE_MOV_FFMPEG_FFPROBE-$(call REMUX, MP4 MOV, MPEGTS_DEMUXER AC3_DECODER) \ += fate-mov-mp4-disposition-mpegts-remux -fate-mov-mp4-disposition-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts mp4 "-map 0:1 -map 0:2 -c copy -disposition:a:0 +hearing_impaired" "-map 0 -c copy" "" "-of json -show_entries stream_disposition:stream=index" +fate-mov-mp4-disposition-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts mp4 "-map 0:1 -map 0:2 -c copy -disposition:a:0 +hearing_impaired" "-map 0 -c copy" "-of json -show_entries stream_disposition:stream=index" FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MOV_FFMPEG_FFPROBE-yes) diff --git a/tests/fate/mxf.mak b/tests/fate/mxf.mak index 3a1096176f..3ab936b5de 100644 --- a/tests/fate/mxf.mak +++ b/tests/fate/mxf.mak @@ -46,7 +46,7 @@ fate-mxf-user-comments: $(SAMPLES)/mxf/Sony-00001.mxf fate-mxf-user-comments: CMD = md5 -y -i $(TARGET_SAMPLES)/mxf/Sony-00001.mxf -c copy -metadata "comment_test=value" -fflags +bitexact -f mxf FATE_MXF_D10_USER_COMMENTS-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER DVVIDEO_DECODER SCALE_FILTER MPEG2VIDEO_ENCODER MXF_D10_MUXER EXTRACT_EXTRADATA_BSF MPEGVIDEO_PARSER PIPE_PROTOCOL FRAMECRC_MUXER) += fate-mxf-d10-user-comments -fate-mxf-d10-user-comments: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Avid-00005.mxf mxf_d10 "-c:v mpeg2video -b:v 30000k -minrate:v 30000k -maxrate:v 30000k -bufsize:v 30000k -rc_init_occupancy 30000k -vf scale=w=1280:h=720 -an -metadata comment_test=value -metadata company_name=FATE-company -metadata product_name=FATE-test -metadata product_version=3.14159 -store_user_comments 1" "-c copy -frames:v 5" "" "-show_entries format_tags" +fate-mxf-d10-user-comments: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Avid-00005.mxf mxf_d10 "-c:v mpeg2video -b:v 30000k -minrate:v 30000k -maxrate:v 30000k -bufsize:v 30000k -rc_init_occupancy 30000k -vf scale=w=1280:h=720 -an -metadata comment_test=value -metadata company_name=FATE-company -metadata product_name=FATE-test -metadata product_version=3.14159 -store_user_comments 1" "-c copy -frames:v 5" "-show_entries format_tags" FATE_MXF_OPATOM_USER_COMMENTS-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-opatom-user-comments fate-mxf-opatom-user-comments: $(SAMPLES)/mxf/Sony-00001.mxf diff --git a/tests/fate/oma.mak b/tests/fate/oma.mak index 7e2020b7d0..8f872242f4 100644 --- a/tests/fate/oma.mak +++ b/tests/fate/oma.mak @@ -3,7 +3,7 @@ fate-oma-demux: CMD = crc -i $(TARGET_SAMPLES)/oma/01-Untitled-partial.oma -c:a # Also tests splitting and joining the date into TYER and TDAT id3v2.3 tags. FATE_OMA_REMUX_FFPROBE-yes += fate-oma-atrac3p-remux -fate-oma-atrac3p-remux: CMD = transcode oma $(TARGET_SAMPLES)/atrac3p/at3p_sample1.oma oma "-c copy -metadata date=2021-09-23 -metadata time=16:00 -metadata title=noise -metadata id3v2_priv.foo=hex\xB3 -metadata_header_padding 500" "-c copy -t 0.2" "" "-show_entries format_tags" +fate-oma-atrac3p-remux: CMD = transcode oma $(TARGET_SAMPLES)/atrac3p/at3p_sample1.oma oma "-c copy -metadata date=2021-09-23 -metadata time=16:00 -metadata title=noise -metadata id3v2_priv.foo=hex\xB3 -metadata_header_padding 500" "-c copy -t 0.2" "-show_entries format_tags" FATE_OMA_REMUX-$(CONFIG_WAV_DEMUXER) += fate-oma-atrac3-remux fate-oma-atrac3-remux: CMD = transcode wav $(TARGET_SAMPLES)/atrac3/mc_sich_at3_132_small.wav oma "-c copy" "-c copy -t 0.1" diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak index fc1ef50e49..dfc2fa6a96 100644 --- a/tests/fate/seek.mak +++ b/tests/fate/seek.mak @@ -202,7 +202,7 @@ FATE_SEEK_EXTRA += $(FATE_SEEK_EXTRA-yes) $(FATE_SEEK) $(FATE_SAMPLES_SEEK) $(FATE_SEEK_EXTRA): libavformat/tests/seek$(EXESUF) $(FATE_SEEK) $(FATE_SAMPLES_SEEK): CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_PATH)/tests/data/$(SRC) $(FATE_SEEK) $(FATE_SAMPLES_SEEK): fate-seek-%: fate-% -$(subst fate-seek-,fate-,$(FATE_SAMPLES_SEEK) $(FATE_SEEK)): KEEP_OVERRIDE = -keep +$(subst fate-seek-,fate-,$(FATE_SAMPLES_SEEK) $(FATE_SEEK)): KEEP_FILES ?= 1 fate-seek-%: REF = $(SRC_PATH)/tests/ref/seek/$(@:fate-seek-%=%) FATE_AVCONV += $(FATE_SEEK) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 7b22435406..3c9b7f1ff7 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -6,7 +6,7 @@ fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) fate-vsynth%: FMT = avi fate-vsynth%: DEFAULT_SIZE = -s 352x288 fate-vsynth3-%: DEFAULT_SIZE = -s $(FATEW)x$(FATEH) -fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "$(KEEP_OVERRIDE)" "$(DECINOPTS)" +fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "$(DECINOPTS)" fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) 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 From patchwork Wed May 4 14:39:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35589 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp479565pzb; Wed, 4 May 2022 07:40:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNedku1Bx2mqzHnw0IouCTTVUpJrlTM/Mrt79tzKR9J9Yu/gq3KF8c+tkW28fTPIP25YgU X-Received: by 2002:aa7:cd0a:0:b0:425:bc13:4ccb with SMTP id b10-20020aa7cd0a000000b00425bc134ccbmr23331082edw.229.1651675207697; Wed, 04 May 2022 07:40:07 -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 b20-20020a17090630d400b006f43bb50c9bsi7121247ejb.501.2022.05.04.07.40.07; Wed, 04 May 2022 07:40:07 -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=GVwczB1G; 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 90E1168B363; Wed, 4 May 2022 17:39:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066069.outbound.protection.outlook.com [40.92.66.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 309C568B2EF for ; Wed, 4 May 2022 17:39:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I7BkpwpV7x+EyMi446Knk7UB6eeuq7KUTIg6S6jr+7PBdh7kb9uzkw3tft34+uvQ+w/18T4Dp4/6YJBVg9ZuEj7hCVL4+zIiHTdZ7AvhB28eiBvRY+fnCrQptYnF9PH0ldtWOI+6czGa/4fDbgJmIpzl21Z9zP5ZwDYedWsUFdflEbhZE0njSiwzmX68INXZAAQltsNx4vIhgDPml1iZ5IHql/PIuOA8OmAWgQWQR5BGmgSxlHvf/7i5UwRfjUAAVECiGdV8fLR8Up3PWY3CIDuxkjrOztz8LBosmtdQtn6KwsCYmBoXs83aSoJFOYUz84/1k7wb7vV4Vxzf2/uWug== 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=SD8cSCTCypxls+krG/JnLOBnW0ukACBR4k2usit3clY=; b=m1/yB9ond4MYk4Y11yKZes2iQ3/A8dfeuaK42i+7rTLeGppeKMx7KEqFcNYRtx3j4A0Yn1cMNWLvkSf1M9TgkyI2nKtg/v62ZxDnIhtGTGCxUcUd0mPbYO/ojrjw3VoSdBe1U+BZ0E3fHlxxPYwH4CCR4WBwq66BvZMIR0ndJ+cgHSnRj6q3aymSIsRCortBfC2T9zx6Q8Nf+27wzmEzO5b4XBir351GrmlieB3NxwXNBxChz9A3K7v1V0qCnIzAMp6SD1hi52f6nuLfPZaqzFS9ZUZlfdeLyurjsrputEOf38q3rcX9eoyKI8Bmfn8xChldNjpB65Lom0AA1SicTg== 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=SD8cSCTCypxls+krG/JnLOBnW0ukACBR4k2usit3clY=; b=GVwczB1GNh+B5Nq8RqPYpt+gAStQI0qW8Jve+cZ1t4vg5dL5BDe1oaAvxrJ2zbHIZr/od4D2MVv61RXoJu/1Mhu1NQr2zxTEgzmsWQRZv72yWiuTdw7DVGLFO+yjZmfglo7XXDL2olpuH/aDmNS6DSXqMkT5Vc4YXJ61JJDZZH/zBmsTSye9kANzLvbGMxIQ69qLsLCc2GvaYnA25RKyUX5Qk4vy/gLe3LDbGC6l/D52ModGoZdZVwTAODJTCbw3rdaTU+W3tMp2cgz1AW/87iCvwJSAkuznol2y11IM8n5UdsAhhg0pfh+VwDZMjDkCgDQ5ZhQtCwZzR9pc7aNPVg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB7PR01MB4967.eurprd01.prod.exchangelabs.com (2603:10a6:10:57::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Wed, 4 May 2022 14:39:38 +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:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 May 2022 16:39:05 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [dL9Uk9Ysixzp5pduM/Hc5zvvrAmXfmxN] 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-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ec1bfdf-6786-4f2e-cd97-08da2ddbe98f X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJwWgviN1+H3et0VdCIH5zPkFc6hRlBaDS+bvTMhljClk6i1W/8t600cNTiaqeBhlufGTF1lmkovTgCKBjlF+DZbXvhH+0/7aIlok5KirZ0wnuCT5XTzHEYmSzMxryz4ryKzqfqkhCBklYEiVe07m31WIVEqj4eu42JAJ31mkn7v7+z8cyNQyV/KzEkTbjQlY18Th/THMwtUsBpOEdn1ZdLq8FMCv6byBdH6h6y57TOIfZDGR5HgURudi1XXBpAENqhryzD979icipweyG5IA8iNyzvSrC8nXUXNmEq8b+cA9Ysr9klLG5beOlI1FsRMKHO8xvIAR4iv4BC3cDH2/uvzbRIHFmKyUy1crHEAcW9VVqq2Yk7RKUnO6z8brv1skqrzdEex++c2FPmz4aueFb3b00ADin05hd46ch7edzCmjCXGkTxM3cYuRqeLYLknMrdBmEKl7b9IH+Mo/EdwP+0NW3dZpvbZgdiyxuPg0pupops+RSk/LQGYloHwpfdI414BYiU6KXwAfJkfP6PC5+ZbunN32Kq/HktfhmuFQRgwDyDFXXmFYcVBUZGfNL/S1sOA1L3JUYPh4gpfvPLaI3S+2ks+Who7yuKVCsqUe5mnyZN1FnKqiMRcJmsyHdc9SHevNMpjLd7raD+qAYPMEyBzcFBQuRIP8taJBmZBw6fhKDsXSp8xT2uSq513ORuo2TSiFflEX8+PA== X-MS-TrafficTypeDiagnostic: DB7PR01MB4967:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f28JKf83LzhFLpKJE6N6Mj+GgXVfn+eaKA8LNWc48cMLhHPR/s6XjtC0rcs3G+TLmifouPsf9FZm1CsI658FbHhyxQENny4MvTCRJ+Jsh/rpYIcxcsuhvB4jFKFeJBr3+GeU1aWIuJ9UrPTy187/wECC/3jERwp0CXIUT+AtAuUu5bpZJWjQWEHWuyX05/3y31oBOQXIgXI2aFZgsHCdAHcYtqaTetY7EIkfGDMPaFzKDEw1C4QF+tUciU/RjYzmMRxBVf9YzMet34Jb3wnlADDg2Jb9dnC46ZWgQ5Lw5uIkqrKxow7Gs3+eBwA8HEx3g+ICfosCivDWyKnVoC5NTREQ1ktbTnMwI+2qFBcMgOoOWfgJ0UqSiSADkcTRH77jq8a19z9Kgqj7RHVwUbl1YrbBWcuAFfZ9O5IbGJpjIo7Ge4SUcTEX/snp35epAd431tPVdvh0E5YYjYcBJEU6b+x15CDhv/6nk8N56unhN6F5kgaH3H0uft8JUZH3G9dLk1xm4FsoaE5rjkWTzIDsHDoxQEHGfrG5WszRDKzDIZJ3Equqf2bwYHhYVEhWf3LXOey4EgM9NpumdmBJV+WGkZVChH+uPnBX7afnd7D/Jkg83rSLHnvWrLDFhfrYiYJe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LNLc23rCSm+XKqtX+Fdhr5gQNGJNKXN9XiOauqYbEAaikpf8c/qbkukH7E8jZaEdk1kLdfMDqgpg0hRCToa2O69pYfshLvwDVis2eYm2iqRQ2LaIdCZRkKQ+0kC5iHpJS8COsh8ZOgAn0jLX79B3ZOeHPcRWINL/Wea9QEyLf3wnv7xRp5MtWRFvTsARJqlJliZEktknWs3BAh5x35z+Qxh9+3r8RPxVOTsgnNr2t74RQIBvUpaeadNXLzNY9pHz59zT73oM9JfiGoC+MAF2fPQA95+xLyW/AukM9CqqF7bZ7pZFjxQqJuzt2FBA9KuuhiN1V+77s+krqUjhVx/A8YyX8fUz1+dt/oCUZ8HpsHsAOgHfewry/AKbdENKQ5XWn2sTaSnpwpbMO9UUVoSUF27pbE08oh3Vk9XFR4sWPd5t43sH4CEp6w3haSrlTIrHFkjx5DHbD7AaNGVFsjEg1lyXJcnngwVggN/ksGQdfd4+Pmei5bxGouisrJiC5FK+Hnqm46IPUdNSqSvT3W8ENSr8xfDeQuSTQu5C46QgPbc0FS5Lhkbo1l24yNOGTkprvgqSknfq+iC+FTzq/kv5aiX7OSCaKVTc9B61WyCe4LUCZgg8MZcZmNaqWBktgFFASNLt0SCG1qDF0rDG6Y+gVruBUHknEPk3kY3TQsSSyIath0Tdk+SKQj5ZoIeBx7tyEILOsyGzMjfTCUlvcZvlyKZ+73IG1Nd/edUpZ+6kq6EK+esD/FOwL30DSF9/TX1QzLgRX+5BqIT6JECaxktEJdYZK8q3ueMGmO9FpmZ1nrmKY9MEVJQIRw1sszBCnYAG5L0HqUGf9ikSf/6j6Ou2gYzMkp/gzp/eN1sRBM51aDVPxAIQZ2Zyi3PDP4BMhRffQHouYMgJaJ5jWrHp3S0KPzVRuXvqdFId+bqMnzhYKVM5BxTk/M8GhNzcmYkPKvt3u4M++8JkmvIz2I5YrcPkS5+vTmwR/rciKl+I/9474b10NSGyJExd+ovZ9/3ND7w99zyzjwJoeDUTiCJThcpIiOeYgadRkwdl2aFeGaRlxMvuU6IUvOiX5GaEtSJoMUo5xDCCSx3wNBshHUJ5KSRDoI/QHJDQqmL4piWWj390clxvYNU0+9X6zxQBcWcGPzy3QtUDtn+E5DGba7d3+1iRmv9rfqc+DK5aXolIv4rqKmf/arbCBSahzC7gdpfVwg5TrUiGowLsIi9kpKO9nz6hGMIPNEju95NH4QXjrdkMsTd2Kwuv1wEOVjbMINDHjNDdAYDqETenghhXjHl7kQP2RZDpZ4gpc7vEdLDX7T3pMoSQotJblnFDtU67RN/hJqHXdujg+SgHFaTh7zjBSPjF11VgZETP0eBjeM9K0hRtplqbXGth1rTnvgE3mJqDlgndKSn/G+61dQPZD0amU/6QqKxQB5n61Tu+q22n5XhSXlV50LM/AX+po3G/lLhc7nt6xI5S2bF9LbH5eBazsIumvQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ec1bfdf-6786-4f2e-cd97-08da2ddbe98f 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:38.8450 (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: DB7PR01MB4967 Subject: [FFmpeg-devel] [PATCH 7/7] tests/fate-run: Remove temporary files from pixfmt conversions 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: mTcEY3LFVqHi Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 5939761997..c0d65be6f4 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -432,6 +432,7 @@ pixfmt_conversion(){ outdir="tests/data/pixfmt" raw_dst="$outdir/$conversion.out.yuv" file=${outdir}/${conversion}.yuv + cleanfiles="$cleanfiles $raw_dst $file" run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \ $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $conversion $target_path/$raw_dst do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $conversion -i $target_path/$raw_dst \