From patchwork Sun Apr 24 03:34:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35413 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1220242pzh; Sat, 23 Apr 2022 20:37:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLtIavy+PSdoWUauRkIdYnARAUvtb8vHHjyu2Idg7wEH4A8pSrlWxt55vu8SGLl2rdupg/ X-Received: by 2002:a17:906:c14a:b0:6e8:76d0:e0eb with SMTP id dp10-20020a170906c14a00b006e876d0e0ebmr10386196ejc.412.1650771479602; Sat, 23 Apr 2022 20:37:59 -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 x23-20020a170906805700b006f37c73010esi1955504ejw.209.2022.04.23.20.37.58; Sat, 23 Apr 2022 20:37:59 -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=Zs48sfjP; 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 9056468B2CC; Sun, 24 Apr 2022 06:35:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074092.outbound.protection.outlook.com [40.92.74.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9C5868B445 for ; Sun, 24 Apr 2022 06:35:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=STh+eCARibbLlImwcfXpZBg0OCLzhBoQDY2ywPkwcDQw5LuAjqGNPbQGfY3FGAsycG7ZTlP47jJIVbLQUGZY+82N8b2eqWGWJeojJjDneIx45a5oEKUOrgXJ7E2lM0DQiAAQo0BFRh40c8TtD0WeoeWPSIkR+oOChh2p/TjRSgqmtSpxIkVjMWF7b22cKku9647gfaPRL2EJ2f8xjxtTjSJuTcn0OJ1Otwr/C8Y8awjrHmO/GStIxm1N4k2wl608tF8ZGK31xnVw5ROASD1fHgmnkg3zmQwGkPoipdL1nbN/K5cfWrE31wnWHP+mAKsQzEUe2VX8+rmql8Kt3HGZkw== 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=VGEAbUTB6BGYMBNwaxttJh5YWPYibQjhG1aEPa2a57Q=; b=M4Ca87QdsEG0knXogIj4etHUFBfVbyv4lRnzKf8Br140TTM0STdIs5+yC5zyROn9AEWC0wytvbgn4GKDEmckYbNpNS2e5eENje4OGU2/QC6S87comia88XBfHf9Z1m1WdAtrmBmcbs74cdLxlQowy0pMghmDgwU0cV2x/TFrIYN2odfIMZyII5nVBLim7KZnmpiLgQ4qTQ0MPDlkrwNfrpsYKh5BIOuSgvHh4ymjtm7koEXb1Ht2ilR7xMbx5YiYph9IxJXRkC7/3tHo78qwsKYwzpFvNbn8Wgpu0zSMJD+Gb6Flq8KyALcsNjDyh6Kiyt1Lnb8D2s+/lztmSXWBMg== 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=VGEAbUTB6BGYMBNwaxttJh5YWPYibQjhG1aEPa2a57Q=; b=Zs48sfjP6iNL+lnd+HO+DkKxxHTUbpUsMaz/zIDw4b+So1+b+BASOkotlProPC7LnRDMMjqZjU9DiAkqsZNSkEaEWWZV5vEQfySfQKejVZeDIOx9JXhUDvPNyl1+QbsUL/0FQtV9PtkpsZzgpgYnfSRXSVhbHOxim//+ySZ3lxmBQCq1XqXYyLRjUurqIzymJDQZYIjhPu3ABH6MemvBZu5GG5fEwroQIzx6qtCU6AKFvDlyJkniDcDRunzNBr70zlEP9WNjjqylC1cVw9SXZNff3nMh4BQULQQNXKZuNWiPoaDbKdEELKnFcWSmVCp6xY/f0nKdtrrXYssvtBnE/g== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:21 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5186.020; Sun, 24 Apr 2022 03:35:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:07 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [BYsFpworgPGanodc1ZGkmJSz+lwlTr3b] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-21-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 15856c50-32b2-49fb-b435-08da25a375df X-MS-Exchange-SLBlob-MailProps: GjjEsbJCp86fDEzVeffD4t5EU7xgsxXWK5KUjZmwoFqBV0bgCty168r2oqzlc/wfWEteP6XWWZnreSobUvfO7ix2Jlwnph27G3UMSC3vkTICXROiyJDIpibYa8e2M+pV4BngUX1ZAoEb5zo2/9gtG0lVhkB36x9XZJhcUqlRSfmblLvx+8LUh9EK2CeXDyna02kL0VO+9BG7V3B37sn3ICLQOtAVoa/KrWT918ydK8jz+TG0+RgzvhvT0P/08POzJaPJNN9RVbSWypPi/t04JAiQfhWfhg85POGTD8ByVsPk36zgr5IFzn4LOZyMBr4nnB00KYDzYt9n5mtTHAUEe5MrVoXn2TX+PRwsiSIZSupozgZbZyshPW53U19vCipfKGrVBBjufcmNSM1BsflPpBr0v6GMnCRt/KWxufc5Xnom17toTjgGzz6wwjRqHMdoEei4BueWvGaCKQRc8+mzWAWW93NQ/l38p3Js2nlJ/g3oBceVgHgwN03zVwa9TFvi9gsruPwuP8VyYNuOhtBcWJ9/x60ec06ZvEkYKyM0RWZCa/n2UmlO3XOae9gCUAU27U2r6oaNx8P9v3Czok3qrZAvaFA0VUnY8cntW61UmR9pmOj44gMn7z84GcrLYCaMQCmGvVwJ3IXGoczktRAb8bW/9Io59QV7SkwF4/T4GfBPdfa+YGgPiWwbAuZBYtEdHncIjy5WAYaY8Tc7I9+Ixx7AHpPa52cT5gqrps8e6DbkwM47E540OHBcUbIXMqPphEzLl1Pck8KaNUT65Nq3RcnfN6gIBAeBG5cbSuHo6Ycv6KqaEfSOWW+Z2gUZliQP1HzgnBGJ4amHu9bRD3WAE1V2glTqezFDW+8OfUYYibp7NTHLRI0GVA== X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xTIepU3gtduz2w4Rzkgpu61GN1QYT2YwSflaMdZN6PupcRFjS8u1TKFBmbcdCPWz6XN+NRLXi8VONi7X2OaXFRl+3/0Zy9Mf/zv2asRjrSTNGiJ83fI7xzF6eH84WjGB4dzLNHAZz7x87iTwHCkl+a9oGDAa05WktKB+R3lt9FJdn2baE8Cj1S57r3qztBmNAHvhfrmAOBy9QrYYZnU876lYx7OsDKgxUT+w5tNWyti8EUMKy3NV1dQ808VwYwh/M4iQI2fPr0yFwcimcLrNt7UeA8Y7J+/V/cvtL9GJs3RknmGfnGmpbyYCJSRqEeVjuvIwL90AYI5r1OQ0n7wOfuEeyQglGs225ODYct5GzpUGuvZxH6OhO+lVOstGVdqHKvvgUfCrz9WIfrR2lA0+SvTyPSAjOp6s0jWfGUZA+5blmInbAXVOq+3Xt4vRB+RemwEJdFMkqbw1+R1BhU03eXntPPpugZwFcGc7VLHM1/ZtsR5rAth5DzCzxK/LehbIm/sWos4t9WEpCvs5MSdZs45lROHa/7mDhWqsKV1mkYfjE1MtjiqdBoDuMUoxGTmoh/kuEJ/vljf5jzXDRs6YrA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n4V97t+PJNHl3Bs+pglpFawW7NlNRS24mkNgEm8B5BK53wbsxIBhm3zyC05ySMpD/ZolG4KK3SlOfgiiX/0dqh3fvFY1cfre/R+p6nk7URExQJQhJF/qFmKZV6hxvVjKi9+ZU6H1EXyem2755ebe6qoLicQkNiJi7NWV4aXAPGtpuC3DyF8UGAiuBsbQ9CMAzOzLfFs3AaQdw8Ffs+MKcbLkkDSvpfjEawLxxXAZcJ033wMnrxYBbXYjoLxivIvqUAmuXXGONNg0fnIutTLtcQcD+17um9jPyHR5XWtJhtOFk8IfqaQXtvuAwEiwzCLQhXhUBiRHGtfObuv+EYV3uVe/KEBKll6ZFPkObqa4dj3gFffkK1OZFpGUM+HbUdtJ+ZlSqTrQq6O8HF0GWpMjAkwnW5d069BNW6QNm7rODzVvRPyUHklbqEjRTa6j5LNWwAfbvoBOYfEji+JwubRxbC/6WftUqtWpQGPSDdS+1FSLLybOZsuKpBnIFM/nurdZke4te2CWK5PueDalXXPkhkGDt+32g246gAbVgm5KDCL8WlXXktQX2a6193EmRM1gtsGnzkVVu3T0SyaRWypXQ8AEST2fo3ZF1M0YPzXYwnh8CpcmPgBvzLrThvfdC8khxw5WCzzGfNmXsZ5yXt2dSL6PF0Z61MDulcqGZA+mKhAg+3Q0S/l0+Zo1dyOi/2x3fapZk6VAvWB/PHRhE0OmmJA4PQCXNxILlYoG7AgjpSEzn6lyD1MazRe91sk4cQGfWjl1QDN3k2oEX6yIfCNVXkrAfPhapCWuVnLF7G4nDu97ypPWs6j3PK3NdFlVON71u9Ld5YhKtDUbD6xjSR1AULSeibwjppYyiFj+HOZGiPG3sYpyfnQNzGBkMZqmaVqOn0e51ukDdH2Paxr9Y2kqdqlfjWy3wJPeG/F3ryTa4JsW9M+hjRJ+23RHghOsx61OrqChB9xBZJyn5Tz8iFBJmr0nN8+1A4KmySxfVSSQnZUSceP9NJoblXe1ryRz7XuZnn4NBoBa+6wrId0myTnJVi7mlRhx/sCW0/q1UzKwp/R6JontnppwHbvlhgsqkhwwaIVR4kgMMaVifBz8AmDeupb7WlCZesVqJ+qBPo1bMdGQ9Tq/4DFRFztK/D3fL76FKdVo6WDq9xdIw7Xu4ck1NosRUYhPnF5Gnngu5Cb3GWQlh11ydCiE9BNWlABjrASStAHYuFinhh0HmVsDqY1uIi5NUVLfPITMlIJE8B79Wdh27N8vJY2m8UGS/cUTECpCnYC/wdUNKtBcWQPQkGgGIVqWFIwqk65iBf0uxSiPSeU7JohLfhko0+gh8Da80ff5/QqIZTPNGPSR9lbnYTCkaUNoMTbymE886B4uBA17dnZuJrOBIlDEt1ThOI2vGCMVBmJk0v9iju4Lqt0Agf/3uV3nyu5HXLlvRs+xWdu3RX63zx7hmmgMxkbBhE+D7Zog X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15856c50-32b2-49fb-b435-08da25a375df X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 03:35:21.5713 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 22/32] fate/seek: Don't duplicate test requirements X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sQs57k+SZZ2r Most of the tests in seek.mak use files created by other tests as input. Therefore these tests have the other tests as prerequisite and duplicate their CONFIG-requirements. This duplication is of course bad as usual, so stop it by using the corresponding variable that contains the non-seek-tests that are enabled to filter out all the seek-tests without a corresponding enabled non-seek test. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 1 + tests/fate/seek.mak | 189 ++++++++++++++++---------------------------- 2 files changed, 68 insertions(+), 122 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 1c9e3594c0..e02eb57035 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -120,6 +120,7 @@ include $(SRC_PATH)/tests/fate/lavf-container.mak include $(SRC_PATH)/tests/fate/lavf-image.mak include $(SRC_PATH)/tests/fate/lavf-image2pipe.mak include $(SRC_PATH)/tests/fate/lavf-video.mak +# Must be included after acodec.mak, vcodec.mak and lavf-*.mak include $(SRC_PATH)/tests/fate/seek.mak include $(SRC_PATH)/tests/fate/aac.mak diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak index b4e9246cc3..fc1ef50e49 100644 --- a/tests/fate/seek.mak +++ b/tests/fate/seek.mak @@ -1,32 +1,16 @@ # files from fate-acodec -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_QT, AIFF) += adpcm-ima_qt \ - adpcm-ima_qt-trellis -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += adpcm-ima_wav \ - adpcm-ima_wav-trellis -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_MS, WAV) += adpcm-ms \ - adpcm-ms-trellis -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_SWF, FLV) += adpcm-swf \ - adpcm-swf-trellis -FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_YAMAHA, WAV) += adpcm-yamaha \ - adpcm-yamaha-trellis -FATE_SEEK_ACODEC-$(call ENCDEC, ALAC, MOV) += alac -FATE_SEEK_ACODEC-$(call ENCDEC, FLAC, FLAC) += flac -FATE_SEEK_ACODEC-$(call ENCDEC, MP2, MP2 MP3) += mp2 -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_ALAW, WAV) += pcm-alaw -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_MULAW, WAV) += pcm-mulaw -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S8, MOV) += pcm-s8 -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_U8, WAV) += pcm-u8 -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S16BE, MOV) += pcm-s16be -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S16LE, WAV) += pcm-s16le -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S24BE, MOV) += pcm-s24be -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S24LE, WAV) += pcm-s24le -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S32BE, MOV) += pcm-s32be -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_S32LE, WAV) += pcm-s32le -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F32BE, AU) += pcm-f32be -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F32LE, WAV) += pcm-f32le -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F64BE, AU) += pcm-f64be -FATE_SEEK_ACODEC-$(call ENCDEC, PCM_F64LE, WAV) += pcm-f64le +FATE_SEEK_ACODEC += adpcm-ima_qt adpcm-ima_qt-trellis \ + adpcm-ima_wav adpcm-ima_wav-trellis \ + adpcm-ms adpcm-ms-trellis \ + adpcm-swf adpcm-swf-trellis \ + adpcm-yamaha adpcm-yamaha-trellis \ + alac flac mp2 \ + pcm-alaw pcm-mulaw pcm-s8 pcm-u8 \ + pcm-s16be pcm-s16le pcm-s24be \ + pcm-s24le pcm-s32be pcm-s32le \ + pcm-f32be pcm-f32le pcm-f64be \ + pcm-f64le \ fate-seek-acodec-adpcm-ima_qt: SRC = fate/acodec-adpcm-ima_qt.aiff fate-seek-acodec-adpcm-ima_wav: SRC = fate/acodec-adpcm-ima_wav.wav @@ -56,57 +40,37 @@ fate-seek-acodec-pcm-s32le: SRC = fate/acodec-pcm-s32le.wav fate-seek-acodec-pcm-s8: SRC = fate/acodec-pcm-s8.mov fate-seek-acodec-pcm-u8: SRC = fate/acodec-pcm-u8.wav -FATE_SEEK += $(FATE_SEEK_ACODEC-yes:%=fate-seek-acodec-%) +FATE_SEEK_ACODEC := $(FATE_SEEK_ACODEC:%=fate-seek-acodec-%) +# The following disables every fate-seek-* test whose +# corresponding fate-* test has unmet requirements (or is disabled). +FATE_SEEK_ACODEC := $(filter $(subst fate-,fate-seek-,$(FATE_ACODEC)), $(FATE_SEEK_ACODEC)) +FATE_SEEK += $(FATE_SEEK_ACODEC) # files from fate-vsynth_lena -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV1, AVI) += asv1 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV2, AVI) += asv2 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p-rd -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, MOV) += dnxhd-1080i -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO, DV) += dv -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO, DV) += dv-411 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO, DV) += dv-50 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, FFV1, AVI) += ffv1 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, FLASHSV, FLV) += flashsv -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, FLV, FLV) += flv -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, H261, AVI) += h261 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, H263, AVI) += h263 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, H263, AVI) += h263p -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, HUFFYUV, AVI) += huffyuv -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, JPEGLS, AVI) += jpegls -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MJPEG, AVI) += mjpeg - -FATE_SEEK_VSYNTH_LENA-$(call ALLYES, DNXHD_ENCODER DNXHD_DECODER LARGE_TESTS) += dnxhd-4k-hr-lb - -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += \ - mpeg1 \ - mpeg1b - -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG2VIDEO, MPEG2VIDEO MPEGVIDEO) += \ - mpeg2-422 \ - mpeg2-idct-int \ - mpeg2-ilace \ - mpeg2-ivlc-qprd \ - mpeg2-thread \ - mpeg2-thread-ivlc - -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG4, MP4 MOV) += mpeg4 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG4, AVI) += $(FATE_MPEG4_AVI) -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MSMPEG4V3, AVI) += msmpeg4 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MSMPEG4V2, AVI) += msmpeg4v2 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RAWVIDEO, AVI) += rgb -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ROQ, ROQ) += roqvideo -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RV10, RM) += rv10 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RV20, RM) += rv20 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SNOW, AVI) += snow -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SNOW, AVI) += snow-ll -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SVQ1, MOV) += svq1 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, WMV1, AVI) += wmv1 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, WMV2, AVI) += wmv2 -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RAWVIDEO, AVI) += yuv +FATE_SEEK_VSYNTH_LENA += asv1 asv2 \ + dnxhd-720p dnxhd-720p-rd \ + dnxhd-1080i dnxhd-4k-hr-lb \ + dv dv-411 dv-50 \ + ffv1 \ + flashsv \ + flv \ + h261 h263 h263p \ + huffyuv \ + jpegls ljpeg mjpeg \ + mpeg1 mpeg1b \ + mpeg2-422 mpeg2-idct-int \ + mpeg2-ilace mpeg2-ivlc-qprd \ + mpeg2-thread mpeg2-thread-ivlc \ + mpeg4 $(FATE_MPEG4_AVI) \ + msmpeg4 msmpeg4v2 \ + rgb \ + roqvideo \ + rv10 rv20 \ + snow snow-ll \ + svq1 \ + wmv1 wmv2 \ + yuv \ fate-seek-vsynth_lena-asv1: SRC = fate/vsynth_lena-asv1.avi fate-seek-vsynth_lena-asv2: SRC = fate/vsynth_lena-asv2.avi @@ -158,78 +122,59 @@ fate-seek-vsynth_lena-wmv1: SRC = fate/vsynth_lena-wmv1.avi fate-seek-vsynth_lena-wmv2: SRC = fate/vsynth_lena-wmv2.avi fate-seek-vsynth_lena-yuv: SRC = fate/vsynth_lena-yuv.avi -FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH_LENA-yes:%=fate-seek-vsynth_lena-%) +FATE_SEEK_VSYNTH_LENA := $(FATE_SEEK_VSYNTH_LENA:%=fate-seek-vsynth_lena-%) +FATE_SEEK_VSYNTH_LENA := $(filter $(subst fate-,fate-seek-,$(FATE_VSYNTH_LENA)), $(FATE_SEEK_VSYNTH_LENA)) +FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH_LENA) # files from fate-lavf-audio -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_S16BE, AIFF) += aiff -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_ALAW, PCM_ALAW) += al -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_S16BE, AU) += au -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, ADPCM_YAMAHA, MMF) += mmf -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += ul -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, FLAC, OGG) += ogg -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_U8, VOC) += voc -FATE_SEEK_LAVF_AUDIO-$(call ENCDEC, PCM_S16LE, WAV) += wav +FATE_SEEK_LAVF_AUDIO += aiff al au mmf ogg ul voc wav -FATE_SEEK_LAVF_AUDIO := $(FATE_SEEK_LAVF_AUDIO-yes:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_AUDIO := $(FATE_SEEK_LAVF_AUDIO:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_AUDIO := $(filter $(subst fate-,fate-seek-,$(FATE_LAVF_AUDIO)), $(FATE_SEEK_LAVF_AUDIO)) FATE_SEEK += $(FATE_SEEK_LAVF_AUDIO) # files from fate-lavf-container -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, AVI) += avi -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC, FLV, FLV) += flv -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10 -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dv25 -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += mxf_dvcpro50 -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, NUT) += nut -FATE_SEEK_LAVF_CONTAINER-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC, FLV, SWF) += swf -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts -FATE_SEEK_LAVF_CONTAINER-$(call ENCDEC, MP2, WTV) += wtv - -FATE_SEEK_LAVF_CONTAINER := $(FATE_SEEK_LAVF_CONTAINER-yes:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_CONTAINER += asf avi dv flv gxf mkv mov mpg \ + mxf mxf_d10 mxf_dv25 mxf_dvcpro50 \ + mxf_opatom mxf_opatom_audio \ + nut swf ts wtv +# rm is special: fate-lavf-rm does not read the created file +# and therefore does not require the corresponding demuxer +# to be present, so we have to explicitly check for this here. +FATE_SEEK_LAVF_CONTAINER-$(CONFIG_RM_DEMUXER) += rm +FATE_SEEK_LAVF_CONTAINER += $(FATE_SEEK_LAVF_CONTAINER-yes) + +FATE_SEEK_LAVF_CONTAINER := $(FATE_SEEK_LAVF_CONTAINER:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_CONTAINER := $(filter $(subst fate-,fate-seek-,$(FATE_LAVF_CONTAINER)), $(FATE_SEEK_LAVF_CONTAINER)) FATE_SEEK += $(FATE_SEEK_LAVF_CONTAINER) # files from fate-lavf-video -FATE_SEEK_LAVF_VIDEO-$(call ENCDEC, GIF, IMAGE2) += gif -FATE_SEEK_LAVF_VIDEO-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m +FATE_SEEK_LAVF_VIDEO += gif y4m -FATE_SEEK_LAVF_VIDEO := $(FATE_SEEK_LAVF_VIDEO-yes:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_VIDEO := $(FATE_SEEK_LAVF_VIDEO:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_VIDEO := $(filter $(subst fate-,fate-seek-,$(FATE_LAVF_VIDEO)), $(FATE_SEEK_LAVF_VIDEO)) FATE_SEEK += $(FATE_SEEK_LAVF_VIDEO) + $(FATE_SEEK_LAVF_AUDIO) $(FATE_SEEK_LAVF_CONTAINER) $(FATE_SEEK_LAVF_VIDEO): SRC = lavf/lavf.$(@:fate-seek-lavf-%=%) # files from fate-lavf-image -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, BMP, IMAGE2) += bmp -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, MJPEG, IMAGE2) += jpg -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, PCX, IMAGE2) += pcx -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, PGM, IMAGE2) += pgm -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, PPM, IMAGE2) += ppm -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, SGI, IMAGE2) += sgi -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, TARGA, IMAGE2) += tga -FATE_SEEK_LAVF_IMAGE-$(call ENCDEC, TIFF, IMAGE2) += tiff +FATE_SEEK_LAVF_IMAGE += bmp jpg pcx pgm ppm sgi tga tiff -FATE_SEEK_LAVF_IMAGE := $(FATE_SEEK_LAVF_IMAGE-yes:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_IMAGE := $(FATE_SEEK_LAVF_IMAGE:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_IMAGE := $(filter $(subst fate-,fate-seek-,$(FATE_LAVF_IMAGES)), $(FATE_SEEK_LAVF_IMAGE)) $(FATE_SEEK_LAVF_IMAGE): SRC = images/$(@:fate-seek-lavf-%=%)/%02d.$(@:fate-seek-lavf-%=%) FATE_SEEK += $(FATE_SEEK_LAVF_IMAGE) #files from fate-lavf-image2pipe -FATE_SEEK_LAVF_IMAGE2PIPE-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe -FATE_SEEK_LAVF_IMAGE2PIPE-$(call ENCDEC, PGM, IMAGE2PIPE) += pgmpipe -FATE_SEEK_LAVF_IMAGE2PIPE-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe +FATE_SEEK_LAVF_IMAGE2PIPE += pbmpipe pgmpipe ppmpipe -FATE_SEEK_LAVF_IMAGE2PIPE := $(FATE_SEEK_LAVF_IMAGE2PIPE-yes:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_IMAGE2PIPE := $(FATE_SEEK_LAVF_IMAGE2PIPE:%=fate-seek-lavf-%) +FATE_SEEK_LAVF_IMAGE2PIPE := $(filter $(subst fate-,fate-seek-,$(FATE_LAVF_IMAGE2PIPE)), $(FATE_SEEK_LAVF_IMAGE2PIPE)) $(FATE_SEEK_LAVF_IMAGE2PIPE): SRC = lavf/$(@:fate-seek-lavf-%pipe=%)pipe.$(@:fate-seek-lavf-%pipe=%) FATE_SEEK += $(FATE_SEEK_LAVF_IMAGE2PIPE)